diff --git a/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java b/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java
index 734e19847..fef3a649f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java
+++ b/querydsl-core/src/main/java/com/mysema/query/serialization/BaseSerializer.java
@@ -23,8 +23,8 @@ import com.mysema.query.types.expr.EArrayConstructor;
 import com.mysema.query.types.expr.EConstant;
 import com.mysema.query.types.expr.EConstructor;
 import com.mysema.query.types.expr.Expr;
+import com.mysema.query.types.operation.Op;
 import com.mysema.query.types.operation.Operation;
-import com.mysema.query.types.operation.Ops.Op;
 import com.mysema.query.types.path.Path;
 import com.mysema.query.types.path.PathMetadata.PathType;
 import com.mysema.query.types.quant.Quant;
diff --git a/querydsl-core/src/main/java/com/mysema/query/serialization/OperationPatterns.java b/querydsl-core/src/main/java/com/mysema/query/serialization/OperationPatterns.java
index 446e54cf3..4b577c4f3 100644
--- a/querydsl-core/src/main/java/com/mysema/query/serialization/OperationPatterns.java
+++ b/querydsl-core/src/main/java/com/mysema/query/serialization/OperationPatterns.java
@@ -8,8 +8,8 @@ package com.mysema.query.serialization;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.mysema.query.types.operation.Op;
 import com.mysema.query.types.operation.Ops;
-import com.mysema.query.types.operation.Ops.Op;
 import com.mysema.query.types.operation.Ops.OpNumberAgg;
 import com.mysema.query.types.path.PathMetadata;
 import com.mysema.query.types.path.PathMetadata.PathType;
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/OperationFactory.java b/querydsl-core/src/main/java/com/mysema/query/types/OperationFactory.java
index 1eec2c850..fcfdbdd5c 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/OperationFactory.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/OperationFactory.java
@@ -5,7 +5,7 @@ import com.mysema.query.types.expr.EComparable;
 import com.mysema.query.types.expr.ENumber;
 import com.mysema.query.types.expr.EString;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
+import com.mysema.query.types.operation.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/SimpleOperationFactory.java b/querydsl-core/src/main/java/com/mysema/query/types/SimpleOperationFactory.java
index 9b0cd4458..90dfa16f4 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/SimpleOperationFactory.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/SimpleOperationFactory.java
@@ -11,7 +11,7 @@ import com.mysema.query.types.operation.OComparable;
 import com.mysema.query.types.operation.ONumber;
 import com.mysema.query.types.operation.OString;
 import com.mysema.query.types.operation.OStringArray;
-import com.mysema.query.types.operation.Ops.Op;
+import com.mysema.query.types.operation.Op;
 
 public class SimpleOperationFactory implements OperationFactory {
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ValidationVisitor.java b/querydsl-core/src/main/java/com/mysema/query/types/ValidationVisitor.java
index 1194a0f07..53995698b 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ValidationVisitor.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/ValidationVisitor.java
@@ -12,8 +12,8 @@ import com.mysema.query.types.alias.AToPath;
 import com.mysema.query.types.custom.Custom;
 import com.mysema.query.types.expr.EConstant;
 import com.mysema.query.types.expr.Expr;
+import com.mysema.query.types.operation.Op;
 import com.mysema.query.types.operation.Operation;
-import com.mysema.query.types.operation.Ops.Op;
 import com.mysema.query.types.path.Path;
 import com.mysema.query.types.quant.Quant;
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/OBoolean.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/OBoolean.java
index 55f0e18ba..59ac9fa66 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/OBoolean.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/OBoolean.java
@@ -11,7 +11,6 @@ import java.util.List;
 
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/OComparable.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/OComparable.java
index 87eced12f..7e1ef6248 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/OComparable.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/OComparable.java
@@ -11,7 +11,6 @@ import java.util.List;
 
 import com.mysema.query.types.expr.EComparable;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/ONumber.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/ONumber.java
index 5a3478dd7..948b006f1 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/ONumber.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/ONumber.java
@@ -11,7 +11,6 @@ import java.util.List;
 
 import com.mysema.query.types.expr.ENumber;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/OSimple.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/OSimple.java
index 229c0aed7..9a0feb41d 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/OSimple.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/OSimple.java
@@ -11,7 +11,6 @@ import java.util.List;
 
 import com.mysema.query.types.expr.ESimple;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/OString.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/OString.java
index 97b75c9cf..2db397c0e 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/OString.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/OString.java
@@ -11,7 +11,6 @@ import java.util.List;
 
 import com.mysema.query.types.expr.EString;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/OStringArray.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/OStringArray.java
index a675b93a5..f001679cd 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/OStringArray.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/OStringArray.java
@@ -10,7 +10,6 @@ import java.util.Collections;
 import java.util.List;
 
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/Op.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/Op.java
new file mode 100644
index 000000000..502ff96dd
--- /dev/null
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/Op.java
@@ -0,0 +1,30 @@
+package com.mysema.query.types.operation;
+
+import static java.util.Collections.unmodifiableList;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * The Class Op represents an Operator symbol.
+ */
+public class Op<RT> {
+    private final List<Class<?>> types;
+
+    public Op(Class<?> type) {
+        this(Collections.<Class<?>> singletonList(type));
+    }
+
+    public Op(Class<?>... types) {
+        this(Arrays.<Class<?>> asList(types));
+    }
+
+    public Op(List<Class<?>> types) {
+        this.types = unmodifiableList(types);
+    }
+
+    public List<Class<?>> getTypes() {
+        return types;
+    }
+}
\ No newline at end of file
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/Operation.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/Operation.java
index d280cd824..f829cf0dd 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/Operation.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/Operation.java
@@ -8,7 +8,6 @@ package com.mysema.query.types.operation;
 import java.util.List;
 
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
 
 /**
  * Operation represents an operation with operator and arguments
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java b/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java
index fffba87ce..729c726ea 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/operation/Ops.java
@@ -31,29 +31,6 @@ public interface Ops {
 
     static List<Class<?>> String_x_2 = unmodifiableList(Arrays.<Class<?>> asList(String.class, String.class));
 
-    /**
-     * The Class Op.
-     */
-    public static class Op<RT> {
-        private final List<Class<?>> types;
-
-        public Op(Class<?> type) {
-            this(Collections.<Class<?>> singletonList(type));
-        }
-
-        public Op(Class<?>... types) {
-            this(Arrays.<Class<?>> asList(types));
-        }
-
-        public Op(List<Class<?>> types) {
-            this.types = unmodifiableList(types);
-        }
-
-        public List<Class<?>> getTypes() {
-            return types;
-        }
-    }
-
     // general
     Op<Boolean> EQ_PRIMITIVE = new Op<Boolean>(Object_x_2);
     Op<Boolean> EQ_OBJECT = new Op<Boolean>(Object_x_2);
@@ -68,6 +45,8 @@ public interface Ops {
     // collection
     Op<Boolean> COL_ISEMPTY = new Op<Boolean>(Object.class);
     Op<Boolean> COL_ISNOTEMPTY = new Op<Boolean>(Object.class);
+    
+    // map
     Op<Boolean> MAP_ISEMPTY = new Op<Boolean>(Object.class);
     Op<Boolean> MAP_ISNOTEMPTY = new Op<Boolean>(Object.class);
 
@@ -130,15 +109,11 @@ public interface Ops {
     // subquery operations
     Op<Boolean> EXISTS = new Op<Boolean>(Object.class);
 
-    public static final List<Op<?>> equalsOps = Collections
-            .unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE));
+    public static final List<Op<?>> equalsOps = Collections.unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE));
 
-    public static final List<Op<?>> notEqualsOps = Collections
-            .unmodifiableList(Arrays.<Op<?>> asList(NE_OBJECT, NE_PRIMITIVE));
+    public static final List<Op<?>> notEqualsOps = Collections.unmodifiableList(Arrays.<Op<?>> asList(NE_OBJECT, NE_PRIMITIVE));
 
-    public static final List<Op<?>> compareOps = Collections
-            .unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE,
-                    LT, GT, GOE, LOE));
+    public static final List<Op<?>> compareOps = Collections.unmodifiableList(Arrays.<Op<?>> asList(EQ_OBJECT, EQ_PRIMITIVE,LT, GT, GOE, LOE));
 
     /**
      * Aggreate operators
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java
index c38356cbb..a7f8ebf41 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java
@@ -11,7 +11,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
 import com.mysema.query.types.ExprFactory;
 import com.mysema.query.types.SimpleExprFactory;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops;
+import com.mysema.query.types.operation.Op;
 
 /**
  * PathMetadata provides metadata for Path expressions.
@@ -151,7 +151,7 @@ public final class PathMetadata<T> {
     /**
      * The Class PathType.
      */
-    public static class PathType extends Ops.Op<Path<?>> {
+    public static class PathType extends Op<Path<?>> {
         private final String symbol;
 
         public PathType(String symbol) {
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/quant/QBoolean.java b/querydsl-core/src/main/java/com/mysema/query/types/quant/QBoolean.java
index 4970d6534..a8c071b80 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/quant/QBoolean.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/quant/QBoolean.java
@@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
 import com.mysema.query.types.CollectionType;
 import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
+import com.mysema.query.types.operation.Op;
 
 /**
  * The Class Boolean.
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/quant/QComparable.java b/querydsl-core/src/main/java/com/mysema/query/types/quant/QComparable.java
index 2bd0c0ecb..656aac10a 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/quant/QComparable.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/quant/QComparable.java
@@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
 import com.mysema.query.types.CollectionType;
 import com.mysema.query.types.expr.EComparable;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
+import com.mysema.query.types.operation.Op;
 
 /**
  * The Class Comparable.
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/quant/QNumber.java b/querydsl-core/src/main/java/com/mysema/query/types/quant/QNumber.java
index 03d130f40..8411b7a79 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/quant/QNumber.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/quant/QNumber.java
@@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
 import com.mysema.query.types.CollectionType;
 import com.mysema.query.types.expr.ENumber;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
+import com.mysema.query.types.operation.Op;
 
 /**
  * @author tiwe
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/quant/QSimple.java b/querydsl-core/src/main/java/com/mysema/query/types/quant/QSimple.java
index 9b8704198..a057fec5d 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/quant/QSimple.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/quant/QSimple.java
@@ -8,7 +8,7 @@ package com.mysema.query.types.quant;
 import com.mysema.query.types.CollectionType;
 import com.mysema.query.types.expr.ESimple;
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
+import com.mysema.query.types.operation.Op;
 
 /**
  * The Class Simple.
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/quant/Quant.java b/querydsl-core/src/main/java/com/mysema/query/types/quant/Quant.java
index 098abb646..20deb0680 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/quant/Quant.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/quant/Quant.java
@@ -6,7 +6,7 @@
 package com.mysema.query.types.quant;
 
 import com.mysema.query.types.expr.Expr;
-import com.mysema.query.types.operation.Ops.Op;
+import com.mysema.query.types.operation.Op;
 
 /**
  * Quant provides expressions for quantification.