diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/base/AbstractExpression.java b/asterix-aql/src/main/java/org/apache/asterix/aql/base/AbstractExpression.java
index 31311a8..5012228 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/base/AbstractExpression.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/base/AbstractExpression.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.base;
+package org.apache.asterix.aql.base;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
 
 public abstract class AbstractExpression implements Expression {
     protected List<IExpressionAnnotation> hints;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Clause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Clause.java
index e92d132..29e0e9d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Clause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Clause.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.base;
+package org.apache.asterix.aql.base;
 
 public interface Clause extends IAqlExpression {
     public ClauseType getClauseType();
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Expression.java b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Expression.java
index 0208f42..a3fb40e 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Expression.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Expression.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.base;
+package org.apache.asterix.aql.base;
 
 public interface Expression extends IAqlExpression {
     public abstract Kind getKind();
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/base/IAqlExpression.java b/asterix-aql/src/main/java/org/apache/asterix/aql/base/IAqlExpression.java
index e977efb..a39cc57 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/base/IAqlExpression.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/base/IAqlExpression.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.base;
+package org.apache.asterix.aql.base;
 
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public interface IAqlExpression {
     public <R, T> R accept(IAqlExpressionVisitor<R, T> visitor, T arg) throws AsterixException;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Literal.java b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Literal.java
index 84ae0d1..90847e1 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Literal.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Literal.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.base;
+package org.apache.asterix.aql.base;
 
 import java.io.Serializable;
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Statement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Statement.java
index d6cfeec..1e63c34 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/base/Statement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/base/Statement.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.base;
+package org.apache.asterix.aql.base;
 
 public interface Statement extends IAqlExpression {
     public enum Kind {
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionExpressionMap.java b/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionExpressionMap.java
index 1eb4da9..79b8900 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionExpressionMap.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionExpressionMap.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.context;
+package org.apache.asterix.aql.context;
 
 import java.util.HashMap;
 
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public class FunctionExpressionMap extends HashMap<Integer, FunctionSignature> {
     /**
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionSignatures.java b/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionSignatures.java
index a2e966c..29b8a66 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionSignatures.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/context/FunctionSignatures.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.context;
+package org.apache.asterix.aql.context;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public class FunctionSignatures {
     private final Map<FunctionSignature, FunctionExpressionMap> functionMap;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/context/RootScopeFactory.java b/asterix-aql/src/main/java/org/apache/asterix/aql/context/RootScopeFactory.java
index 605f54c..6a9563c 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/context/RootScopeFactory.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/context/RootScopeFactory.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.context;
+package org.apache.asterix.aql.context;
 
-import edu.uci.ics.asterix.aql.parser.ScopeChecker;
+import org.apache.asterix.aql.parser.ScopeChecker;
 
 public class RootScopeFactory {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/context/Scope.java b/asterix-aql/src/main/java/org/apache/asterix/aql/context/Scope.java
index e73c084..10cf104 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/context/Scope.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/context/Scope.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.context;
+package org.apache.asterix.aql.context;
 
 import java.util.HashMap;
 
-import edu.uci.ics.asterix.aql.expression.Identifier;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.parser.ScopeChecker;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.aql.expression.Identifier;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.parser.ScopeChecker;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public final class Scope {
     private Scope parent;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AbstractAccessor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AbstractAccessor.java
index 1138a57..4cfbbcf 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AbstractAccessor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AbstractAccessor.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression;
 
 public abstract class AbstractAccessor implements Expression {
     protected Expression expr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AdmSplitInfo.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AdmSplitInfo.java
index 89bb8e6..7963e0e 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AdmSplitInfo.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/AdmSplitInfo.java
@@ -15,7 +15,7 @@
 /**
  *
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 public class AdmSplitInfo {
     public Identifier nodeName;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CallExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CallExpr.java
index 1c7c754..b620b9e 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CallExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CallExpr.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.AbstractExpression;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.aql.base.AbstractExpression;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public class CallExpr extends AbstractExpression {
     private final FunctionSignature functionSignature;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CompactStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CompactStatement.java
index eab75cf..25256df 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CompactStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CompactStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class CompactStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConnectFeedStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConnectFeedStatement.java
index 5d9794e..baf0835 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConnectFeedStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConnectFeedStatement.java
@@ -12,34 +12,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.io.StringReader;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.aql.parser.AQLParser;
-import edu.uci.ics.asterix.aql.parser.ParseException;
-import edu.uci.ics.asterix.aql.util.FunctionUtils;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.MetadataException;
-import edu.uci.ics.asterix.metadata.MetadataManager;
-import edu.uci.ics.asterix.metadata.MetadataTransactionContext;
-import edu.uci.ics.asterix.metadata.entities.Dataset;
-import edu.uci.ics.asterix.metadata.entities.DatasourceAdapter.AdapterType;
-import edu.uci.ics.asterix.metadata.entities.Feed;
-import edu.uci.ics.asterix.metadata.entities.Function;
-import edu.uci.ics.asterix.metadata.entities.PrimaryFeed;
-import edu.uci.ics.asterix.metadata.feeds.BuiltinFeedPolicies;
-import edu.uci.ics.asterix.metadata.feeds.FeedUtil;
-import edu.uci.ics.asterix.metadata.feeds.IFeedAdapterFactory;
-import edu.uci.ics.asterix.om.types.ARecordType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.common.utils.Triple;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.aql.parser.AQLParser;
+import org.apache.asterix.aql.parser.ParseException;
+import org.apache.asterix.aql.util.FunctionUtils;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.MetadataException;
+import org.apache.asterix.metadata.MetadataManager;
+import org.apache.asterix.metadata.MetadataTransactionContext;
+import org.apache.asterix.metadata.entities.Dataset;
+import org.apache.asterix.metadata.entities.DatasourceAdapter.AdapterType;
+import org.apache.asterix.metadata.entities.Feed;
+import org.apache.asterix.metadata.entities.Function;
+import org.apache.asterix.metadata.entities.PrimaryFeed;
+import org.apache.asterix.metadata.feeds.BuiltinFeedPolicies;
+import org.apache.asterix.metadata.feeds.FeedUtil;
+import org.apache.asterix.metadata.feeds.IFeedAdapterFactory;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.common.utils.Triple;
 
 public class ConnectFeedStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConstructorType.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConstructorType.java
index 0f61c86..7f43eb0 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConstructorType.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ConstructorType.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 public enum ConstructorType {
     ORDERED_LIST_CONSTRUCTOR,
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateDataverseStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateDataverseStatement.java
index 356663b..f4c2870 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateDataverseStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateDataverseStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class CreateDataverseStatement implements Statement {
 
@@ -28,7 +28,7 @@
     public CreateDataverseStatement(Identifier dataverseName, String format, boolean ifNotExists) {
         this.dataverseName = dataverseName;
         if (format == null)
-            this.format = "edu.uci.ics.asterix.runtime.formats.NonTaggedDataFormat";
+            this.format = "org.apache.asterix.runtime.formats.NonTaggedDataFormat";
         else
             this.format = format;
         this.ifNotExists = ifNotExists;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedPolicyStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedPolicyStatement.java
index 9023f72..416b224 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedPolicyStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedPolicyStatement.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.Map;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class CreateFeedPolicyStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedStatement.java
index 6eac757..55de2e7 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFeedStatement.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public abstract class CreateFeedStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFunctionStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFunctionStatement.java
index f08d0e9..f159c8e 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFunctionStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateFunctionStatement.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public class CreateFunctionStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateIndexStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateIndexStatement.java
index e215f13..7dd1c47 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateIndexStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateIndexStatement.java
@@ -12,18 +12,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.config.DatasetConfig.IndexType;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.config.DatasetConfig.IndexType;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class CreateIndexStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreatePrimaryFeedStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreatePrimaryFeedStatement.java
index 5710a23..0f2b9fd 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreatePrimaryFeedStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreatePrimaryFeedStatement.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.Map;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class CreatePrimaryFeedStatement extends CreateFeedStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateSecondaryFeedStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateSecondaryFeedStatement.java
index 16d48f1..70602b9 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateSecondaryFeedStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/CreateSecondaryFeedStatement.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 /**
  * Represents the AQL statement for creating a secondary feed.
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DatasetDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DatasetDecl.java
index 9d52e01..82a604a 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DatasetDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DatasetDecl.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.Map;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.config.DatasetConfig.DatasetType;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.metadata.bootstrap.MetadataConstants;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.config.DatasetConfig.DatasetType;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.metadata.bootstrap.MetadataConstants;
 
 public class DatasetDecl implements Statement {
     protected final Identifier name;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDecl.java
index a462b1c..d26160c 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDecl.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class DataverseDecl implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDropStatement.java
index 4e193d6..fc0d4a3 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DataverseDropStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class DataverseDropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DeleteStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DeleteStatement.java
index bf410b5..f53a219 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DeleteStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DeleteStatement.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class DeleteStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DisconnectFeedStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DisconnectFeedStatement.java
index b140cd6..cedde09 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DisconnectFeedStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DisconnectFeedStatement.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class DisconnectFeedStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DistinctClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DistinctClause.java
index 0b96fbc..f485f50 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DistinctClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DistinctClause.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class DistinctClause implements Clause {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DropStatement.java
index 2d661d4..07e9609 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/DropStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class DropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ExternalDetailsDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ExternalDetailsDecl.java
index 69d5201..8cd7a5d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ExternalDetailsDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ExternalDetailsDecl.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.Map;
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FLWOGRExpression.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FLWOGRExpression.java
index 3a29f25..7360062 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FLWOGRExpression.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FLWOGRExpression.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Clause.ClauseType;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Clause.ClauseType;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class FLWOGRExpression implements Expression {
     private List<Clause> clauseList;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDetailsDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDetailsDecl.java
index 0c773ba..5a10ccf 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDetailsDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDetailsDecl.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 import java.util.Map;
 
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public class FeedDetailsDecl extends InternalDetailsDecl {
     private final Map<String, String> configuration;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDropStatement.java
index 956a5b8..6b56c51 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedDropStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class FeedDropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedPolicyDropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedPolicyDropStatement.java
index bcf216f..5c2b5e1 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedPolicyDropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FeedPolicyDropStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class FeedPolicyDropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldAccessor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldAccessor.java
index 041dbb7..24f3cec 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldAccessor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldAccessor.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class FieldAccessor extends AbstractAccessor {
     private Identifier ident;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldBinding.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldBinding.java
index 99844ca..2418eb1 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldBinding.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FieldBinding.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression;
 
 public class FieldBinding {
     private Expression leftExpr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ForClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ForClause.java
index 2bcb504..1bee808 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ForClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ForClause.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class ForClause implements Clause {
     private VariableExpr varExpr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDecl.java
index c8bebe1..67a22b8 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDecl.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public class FunctionDecl implements Statement {
     private FunctionSignature signature;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDropStatement.java
index 3dcf746..1d79fd5 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/FunctionDropStatement.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
 
 public class FunctionDropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GbyVariableExpressionPair.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GbyVariableExpressionPair.java
index 3dff292..073b57f 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GbyVariableExpressionPair.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GbyVariableExpressionPair.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression;
 
 public class GbyVariableExpressionPair {
     private VariableExpr var; // can be null
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GroupbyClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GroupbyClause.java
index 331c391..314ccd2 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GroupbyClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/GroupbyClause.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class GroupbyClause implements Clause {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/HdfsPathInfo.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/HdfsPathInfo.java
index 0fab39f..cf24b65 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/HdfsPathInfo.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/HdfsPathInfo.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 public class HdfsPathInfo {
     public String hdfsPath;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IDatasetDetailsDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IDatasetDetailsDecl.java
index b86a5f6..74d4867 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IDatasetDetailsDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IDatasetDetailsDecl.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 
 public interface IDatasetDetailsDecl {
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Identifier.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Identifier.java
index 0d8dfcb..a201083 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Identifier.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Identifier.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 public class Identifier {
     protected String value;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IfExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IfExpr.java
index 04814a1..b8edad1 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IfExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IfExpr.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class IfExpr implements Expression {
     private Expression condExpr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexAccessor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexAccessor.java
index 0b5e2fde..1bb33a9 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexAccessor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexAccessor.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class IndexAccessor extends AbstractAccessor {
     private boolean any;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDecl.java
index bbeb9c4..76ae1ff 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDecl.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 public class IndexDecl extends CreateIndexStatement {
     @Override
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDropStatement.java
index 3eb2655..c7e7b89 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/IndexDropStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class IndexDropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InsertStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InsertStatement.java
index f602469..072ea96 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InsertStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InsertStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class InsertStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InternalDetailsDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InternalDetailsDecl.java
index 3d87a9a..7a90732 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InternalDetailsDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/InternalDetailsDecl.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/JoinClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/JoinClause.java
index ea3bac1..c90215f 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/JoinClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/JoinClause.java
@@ -12,17 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
 
 public class JoinClause implements Clause {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LetClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LetClause.java
index 3da6b06..10bda89 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LetClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LetClause.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class LetClause implements Clause {
     private VariableExpr varExpr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LimitClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LimitClause.java
index 4f1c60e..a59822a 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LimitClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LimitClause.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class LimitClause implements Clause {
     private Expression limitexpr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ListConstructor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ListConstructor.java
index 38982a7..46aee39 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ListConstructor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/ListConstructor.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class ListConstructor implements Expression {
     private List<Expression> exprList;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LiteralExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LiteralExpr.java
index 8394aea..4d95947 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LiteralExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LiteralExpr.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Literal;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Literal;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class LiteralExpr implements Expression {
     private Literal value;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LoadStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LoadStatement.java
index e6cd610..715e3ec 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LoadStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/LoadStatement.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.Map;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class LoadStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableClause.java
index c3d045e..2868a24 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableClause.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
 
 public class MetaVariableClause implements Clause {
     private VarIdentifier var;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableExpr.java
index 796e58a..ebb7066 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/MetaVariableExpr.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlPlusExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
 
 public class MetaVariableExpr extends VariableExpr {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodeGroupDropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodeGroupDropStatement.java
index a3146dc..bb35d1c 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodeGroupDropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodeGroupDropStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class NodeGroupDropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodegroupDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodegroupDecl.java
index 4009080..c68e040 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodegroupDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/NodegroupDecl.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class NodegroupDecl implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorExpr.java
index 4184128..85df1ad 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorExpr.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.ArrayList;
 
-import edu.uci.ics.asterix.aql.base.AbstractExpression;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.AbstractExpression;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class OperatorExpr extends AbstractExpression {
     private ArrayList<Expression> exprList;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorType.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorType.java
index e9ffffd..4a63744 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorType.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OperatorType.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 public enum OperatorType {
     OR,
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderbyClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderbyClause.java
index 24f55ee..cca2446 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderbyClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderbyClause.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.dataflow.common.data.partition.range.IRangeMap;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.dataflow.common.data.partition.range.IRangeMap;
 
 public class OrderbyClause implements Clause {
     private List<Expression> orderbyList;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderedListTypeDefinition.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderedListTypeDefinition.java
index 3ded54a..7cccdca 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderedListTypeDefinition.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/OrderedListTypeDefinition.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class OrderedListTypeDefinition extends TypeExpression {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedExpression.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedExpression.java
index 6a6059d..c6f32bc 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedExpression.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedExpression.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class QuantifiedExpression implements Expression {
     private List<QuantifiedPair> quantifiedList;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedPair.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedPair.java
index e19f283..b311005 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedPair.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/QuantifiedPair.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression;
 
 public class QuantifiedPair {
     private VariableExpr varExpr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Query.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Query.java
index d3c3c26..d406863 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Query.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/Query.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class Query implements Statement {
     private Expression body;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordConstructor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordConstructor.java
index 62e6b1e..26e6298 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordConstructor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordConstructor.java
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class RecordConstructor implements Expression {
     private List<FieldBinding> fbList;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordTypeDefinition.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordTypeDefinition.java
index 7c23c6a..bb58583 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordTypeDefinition.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RecordTypeDefinition.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.ArrayList;
 
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.annotations.IRecordFieldDataGen;
-import edu.uci.ics.asterix.common.annotations.UndeclaredFieldsDataGen;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.annotations.IRecordFieldDataGen;
+import org.apache.asterix.common.annotations.UndeclaredFieldsDataGen;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class RecordTypeDefinition extends TypeExpression {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RefreshExternalDatasetStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RefreshExternalDatasetStatement.java
index 69098df..b9b901e 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RefreshExternalDatasetStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RefreshExternalDatasetStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class RefreshExternalDatasetStatement implements Statement{
     
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RunStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RunStatement.java
index 96e11cb..076f864 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RunStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/RunStatement.java
@@ -12,16 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.config.DatasetConfig.IndexType;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.config.DatasetConfig.IndexType;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class RunStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SetStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SetStatement.java
index 47381c1..8e01775 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SetStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SetStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class SetStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SubscribeFeedStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SubscribeFeedStatement.java
index 1825bb4..47100ca 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SubscribeFeedStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/SubscribeFeedStatement.java
@@ -12,38 +12,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.io.StringReader;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.aql.parser.AQLParser;
-import edu.uci.ics.asterix.aql.parser.ParseException;
-import edu.uci.ics.asterix.aql.util.FunctionUtils;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.feeds.FeedActivity;
-import edu.uci.ics.asterix.common.feeds.FeedConnectionRequest;
-import edu.uci.ics.asterix.common.feeds.FeedId;
-import edu.uci.ics.asterix.common.feeds.FeedPolicyAccessor;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.MetadataException;
-import edu.uci.ics.asterix.metadata.MetadataManager;
-import edu.uci.ics.asterix.metadata.MetadataTransactionContext;
-import edu.uci.ics.asterix.metadata.entities.DatasourceAdapter.AdapterType;
-import edu.uci.ics.asterix.metadata.entities.Feed;
-import edu.uci.ics.asterix.metadata.entities.Function;
-import edu.uci.ics.asterix.metadata.entities.PrimaryFeed;
-import edu.uci.ics.asterix.metadata.entities.SecondaryFeed;
-import edu.uci.ics.asterix.metadata.feeds.FeedUtil;
-import edu.uci.ics.asterix.metadata.feeds.IFeedAdapterFactory;
-import edu.uci.ics.asterix.om.types.ARecordType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Triple;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.aql.parser.AQLParser;
+import org.apache.asterix.aql.parser.ParseException;
+import org.apache.asterix.aql.util.FunctionUtils;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.feeds.FeedActivity;
+import org.apache.asterix.common.feeds.FeedConnectionRequest;
+import org.apache.asterix.common.feeds.FeedId;
+import org.apache.asterix.common.feeds.FeedPolicyAccessor;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.MetadataException;
+import org.apache.asterix.metadata.MetadataManager;
+import org.apache.asterix.metadata.MetadataTransactionContext;
+import org.apache.asterix.metadata.entities.DatasourceAdapter.AdapterType;
+import org.apache.asterix.metadata.entities.Feed;
+import org.apache.asterix.metadata.entities.Function;
+import org.apache.asterix.metadata.entities.PrimaryFeed;
+import org.apache.asterix.metadata.entities.SecondaryFeed;
+import org.apache.asterix.metadata.feeds.FeedUtil;
+import org.apache.asterix.metadata.feeds.IFeedAdapterFactory;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.utils.Triple;
 
 /**
  * Represents the AQL statement for subscribing to a feed.
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDecl.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDecl.java
index ee36bc9..a90e041 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDecl.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDecl.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.annotations.TypeDataGen;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.annotations.TypeDataGen;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class TypeDecl implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDropStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDropStatement.java
index 6246820..0478227 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDropStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeDropStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class TypeDropStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeExpression.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeExpression.java
index 1febec1..0cf4e43 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeExpression.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeExpression.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.IAqlExpression;
+import org.apache.asterix.aql.base.IAqlExpression;
 
 public abstract class TypeExpression implements IAqlExpression {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeReferenceExpression.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeReferenceExpression.java
index b25a43b..1c4edfa 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeReferenceExpression.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/TypeReferenceExpression.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class TypeReferenceExpression extends TypeExpression {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnaryExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnaryExpr.java
index d634fdb..f840e5d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnaryExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnaryExpr.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class UnaryExpr implements Expression {
     private Sign sign;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnionExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnionExpr.java
index 68e8baf..1885945 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnionExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnionExpr.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class UnionExpr implements Expression {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnorderedListTypeDefinition.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnorderedListTypeDefinition.java
index ea60abe..5d124f9 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnorderedListTypeDefinition.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UnorderedListTypeDefinition.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class UnorderedListTypeDefinition extends TypeExpression {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateClause.java
index 6ac5dea..e465379 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateClause.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class UpdateClause implements Clause {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateStatement.java
index b97fe7e..44aa6ae 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/UpdateStatement.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class UpdateStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VarIdentifier.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VarIdentifier.java
index da13027..4789840 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VarIdentifier.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VarIdentifier.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
 public final class VarIdentifier extends Identifier {
     private int id;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VariableExpr.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VariableExpr.java
index 340b25b..dff70b5 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VariableExpr.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/VariableExpr.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class VariableExpr implements Expression {
     private VarIdentifier var;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WhereClause.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WhereClause.java
index 64b44dc..788c839 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WhereClause.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WhereClause.java
@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class WhereClause implements Clause {
     private Expression whereExpr;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WriteStatement.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WriteStatement.java
index c971cb5..e4c651d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WriteStatement.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/WriteStatement.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression;
+package org.apache.asterix.aql.expression;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.expression.visitor.IAqlVisitorWithVoidReturn;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class WriteStatement implements Statement {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/AQLPrintVisitor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/AQLPrintVisitor.java
index f3be539..f4b57b9 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/AQLPrintVisitor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/AQLPrintVisitor.java
@@ -12,79 +12,79 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression.visitor;
+package org.apache.asterix.aql.expression.visitor;
 
 import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Literal;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.InternalDetailsDecl;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OperatorType;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause.OrderModifier;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition.RecordKind;
-import edu.uci.ics.asterix.aql.expression.RunStatement;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeExpression;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.common.config.DatasetConfig.DatasetType;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Literal;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFeedStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.InternalDetailsDecl;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OperatorType;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderbyClause.OrderModifier;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.RecordTypeDefinition.RecordKind;
+import org.apache.asterix.aql.expression.RunStatement;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeExpression;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.common.config.DatasetConfig.DatasetType;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public class AQLPrintVisitor implements IAqlVisitorWithVoidReturn<Integer> {
     // private int level =0;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlExpressionVisitor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlExpressionVisitor.java
index 54b2805..fe6cb40 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlExpressionVisitor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlExpressionVisitor.java
@@ -12,63 +12,63 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression.visitor;
+package org.apache.asterix.aql.expression.visitor;
 
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public interface IAqlExpressionVisitor<R, T> {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlPlusExpressionVisitor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlPlusExpressionVisitor.java
index d1c8aeb..4ac670f 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlPlusExpressionVisitor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlPlusExpressionVisitor.java
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression.visitor;
+package org.apache.asterix.aql.expression.visitor;
 
-import edu.uci.ics.asterix.aql.expression.JoinClause;
-import edu.uci.ics.asterix.aql.expression.MetaVariableClause;
-import edu.uci.ics.asterix.aql.expression.MetaVariableExpr;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.JoinClause;
+import org.apache.asterix.aql.expression.MetaVariableClause;
+import org.apache.asterix.aql.expression.MetaVariableExpr;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public interface IAqlPlusExpressionVisitor<R, T> extends IAqlExpressionVisitor<R, T> {
     R visitJoinClause(JoinClause c, T arg) throws AsterixException;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlVisitorWithVoidReturn.java b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlVisitorWithVoidReturn.java
index 034fbdc..ad0f1a9 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlVisitorWithVoidReturn.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/expression/visitor/IAqlVisitorWithVoidReturn.java
@@ -12,63 +12,63 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.expression.visitor;
+package org.apache.asterix.aql.expression.visitor;
 
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.RunStatement;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFeedStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.RunStatement;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.common.exceptions.AsterixException;
 
 public interface IAqlVisitorWithVoidReturn<T> {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/DoubleLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/DoubleLiteral.java
index 1456604..47766c0 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/DoubleLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/DoubleLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class DoubleLiteral extends Literal {
     /**
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FalseLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FalseLiteral.java
index 9fb667d..1b5b0d8 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FalseLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FalseLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class FalseLiteral extends Literal {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FloatLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FloatLiteral.java
index 2b3e0a9..0cd173e 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FloatLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/FloatLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class FloatLiteral extends Literal {
     /**
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/IntegerLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/IntegerLiteral.java
index e72b1d5..bfbb100 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/IntegerLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/IntegerLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class IntegerLiteral extends Literal {
     /**
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/LongIntegerLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/LongIntegerLiteral.java
index e24ef6f..61baf87 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/LongIntegerLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/LongIntegerLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class LongIntegerLiteral extends Literal {
     /**
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/NullLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/NullLiteral.java
index 4a72336..4023b18 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/NullLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/NullLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class NullLiteral extends Literal {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/StringLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/StringLiteral.java
index 40bc61a..48aad26 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/StringLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/StringLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class StringLiteral extends Literal {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java
index 97c6b73..27114de 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/literal/TrueLiteral.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.literal;
+package org.apache.asterix.aql.literal;
 
-import edu.uci.ics.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Literal;
 
 public class TrueLiteral extends Literal {
     private static final long serialVersionUID = -8513245514578847512L;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java b/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java
index ef2112a..6f3e99d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/parser/ScopeChecker.java
@@ -12,15 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.parser;
+package org.apache.asterix.aql.parser;
 
 import java.util.List;
 import java.util.Stack;
 
-import edu.uci.ics.asterix.aql.context.Scope;
-import edu.uci.ics.asterix.aql.expression.Identifier;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.hyracks.algebricks.core.algebra.base.Counter;
+import org.apache.asterix.aql.context.Scope;
+import org.apache.asterix.aql.expression.Identifier;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.hyracks.algebricks.core.algebra.base.Counter;
 
 public abstract class ScopeChecker {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java
index 618160a..39b68f3 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewriter.java
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,77 +21,77 @@
 import java.util.Map;
 import java.util.Set;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Expression.Kind;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.aql.util.FunctionUtils;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.MetadataManager;
-import edu.uci.ics.asterix.metadata.MetadataTransactionContext;
-import edu.uci.ics.asterix.metadata.declared.AqlMetadataProvider;
-import edu.uci.ics.asterix.metadata.entities.Function;
-import edu.uci.ics.asterix.om.functions.AsterixBuiltinFunctions;
-import edu.uci.ics.asterix.om.functions.AsterixFunction;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression.Kind;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.aql.util.FunctionUtils;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.MetadataManager;
+import org.apache.asterix.metadata.MetadataTransactionContext;
+import org.apache.asterix.metadata.declared.AqlMetadataProvider;
+import org.apache.asterix.metadata.entities.Function;
+import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.asterix.om.functions.AsterixFunction;
 
 public final class AqlRewriter {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java
index 449da2e..990f4a1 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/AqlRewritingContext.java
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.HashMap;
 
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VarIdentifier;
 
 public final class AqlRewritingContext {
     private int varCounter;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java
index 6dd2f9c..6b9b44d 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/CloneAndSubstituteVariablesVisitor.java
@@ -12,76 +12,76 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.IAqlExpression;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.IAqlExpression;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class CloneAndSubstituteVariablesVisitor implements
         IAqlExpressionVisitor<Pair<IAqlExpression, List<VariableSubstitution>>, List<VariableSubstitution>> {
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java
index cb63a8f..d94dbf9 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/InlineUdfsVisitor.java
@@ -12,78 +12,78 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Expression.Kind;
-import edu.uci.ics.asterix.aql.base.IAqlExpression;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FeedPolicyDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.expression.visitor.IAqlExpressionVisitor;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression.Kind;
+import org.apache.asterix.aql.base.IAqlExpression;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FeedPolicyDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.expression.visitor.IAqlExpressionVisitor;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.hyracks.algebricks.common.utils.Pair;
 
 public class InlineUdfsVisitor implements IAqlExpressionVisitor<Boolean, List<FunctionDecl>> {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java
index 74f9a1a..71c3b4a 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/rewrites/VariableSubstitution.java
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.rewrites;
+package org.apache.asterix.aql.rewrites;
 
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VarIdentifier;
 
 public final class VariableSubstitution {
     private final VarIdentifier oldVar;
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java b/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java
index f850a8d..1f10020 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/util/FunctionUtils.java
@@ -13,23 +13,23 @@
  * limitations under the License.
  */
 
-package edu.uci.ics.asterix.aql.util;
+package org.apache.asterix.aql.util;
 
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.parser.AQLParser;
-import edu.uci.ics.asterix.aql.parser.ParseException;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.entities.Function;
-import edu.uci.ics.asterix.om.functions.AsterixBuiltinFunctions;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.parser.AQLParser;
+import org.apache.asterix.aql.parser.ParseException;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.entities.Function;
+import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
 
 public class FunctionUtils {
 
diff --git a/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java b/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java
index 223358c..4336f13 100644
--- a/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java
+++ b/asterix-aql/src/main/java/org/apache/asterix/aql/util/RangeMapBuilder.java
@@ -12,43 +12,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package edu.uci.ics.asterix.aql.util;
+package org.apache.asterix.aql.util;
 
 import java.io.DataOutput;
 import java.util.List;
 
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Expression.Kind;
-import edu.uci.ics.asterix.aql.base.Literal;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.literal.DoubleLiteral;
-import edu.uci.ics.asterix.aql.literal.FloatLiteral;
-import edu.uci.ics.asterix.aql.literal.IntegerLiteral;
-import edu.uci.ics.asterix.aql.literal.LongIntegerLiteral;
-import edu.uci.ics.asterix.aql.literal.StringLiteral;
-import edu.uci.ics.asterix.aql.parser.AQLParser;
-import edu.uci.ics.asterix.aql.parser.ParseException;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider;
-import edu.uci.ics.asterix.formats.nontagged.AqlSerializerDeserializerProvider;
-import edu.uci.ics.asterix.om.base.AMutableDouble;
-import edu.uci.ics.asterix.om.base.AMutableFloat;
-import edu.uci.ics.asterix.om.base.AMutableInt32;
-import edu.uci.ics.asterix.om.base.AMutableInt64;
-import edu.uci.ics.asterix.om.base.AMutableString;
-import edu.uci.ics.asterix.om.types.ATypeTag;
-import edu.uci.ics.asterix.om.types.BuiltinType;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.NotImplementedException;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparator;
-import edu.uci.ics.hyracks.api.dataflow.value.IBinaryComparatorFactory;
-import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer;
-import edu.uci.ics.hyracks.api.exceptions.HyracksDataException;
-import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage;
-import edu.uci.ics.hyracks.dataflow.common.data.partition.range.IRangeMap;
-import edu.uci.ics.hyracks.dataflow.common.data.partition.range.RangeMap;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Expression.Kind;
+import org.apache.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.literal.DoubleLiteral;
+import org.apache.asterix.aql.literal.FloatLiteral;
+import org.apache.asterix.aql.literal.IntegerLiteral;
+import org.apache.asterix.aql.literal.LongIntegerLiteral;
+import org.apache.asterix.aql.literal.StringLiteral;
+import org.apache.asterix.aql.parser.AQLParser;
+import org.apache.asterix.aql.parser.ParseException;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider;
+import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider;
+import org.apache.asterix.om.base.AMutableDouble;
+import org.apache.asterix.om.base.AMutableFloat;
+import org.apache.asterix.om.base.AMutableInt32;
+import org.apache.asterix.om.base.AMutableInt64;
+import org.apache.asterix.om.base.AMutableString;
+import org.apache.asterix.om.types.ATypeTag;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
+import org.apache.hyracks.api.dataflow.value.IBinaryComparator;
+import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
+import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
+import org.apache.hyracks.dataflow.common.data.partition.range.IRangeMap;
+import org.apache.hyracks.dataflow.common.data.partition.range.RangeMap;
 
 public abstract class RangeMapBuilder {
 
diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj
index 52d2b83..0aab549 100644
--- a/asterix-aql/src/main/javacc/AQL.jj
+++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -8,7 +8,7 @@
 
 PARSER_BEGIN(AQLParser)
 
-package edu.uci.ics.asterix.aql.parser;
+package org.apache.asterix.aql.parser;
 
 // For AQLParserTokenManager
 import org.apache.xerces.util.IntStack;
@@ -27,111 +27,111 @@
 import java.util.List;
 import java.util.Map;
 
-import edu.uci.ics.asterix.aql.base.Clause;
-import edu.uci.ics.asterix.aql.base.Expression;
-import edu.uci.ics.asterix.aql.base.Literal;
-import edu.uci.ics.asterix.aql.base.Statement;
-import edu.uci.ics.asterix.aql.context.RootScopeFactory;
-import edu.uci.ics.asterix.aql.context.Scope;
-import edu.uci.ics.asterix.aql.expression.AbstractAccessor;
-import edu.uci.ics.asterix.aql.expression.CallExpr;
-import edu.uci.ics.asterix.aql.expression.CompactStatement;
-import edu.uci.ics.asterix.aql.expression.ConnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedPolicyStatement;
-import edu.uci.ics.asterix.aql.expression.CreatePrimaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateSecondaryFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateDataverseStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFeedStatement;
-import edu.uci.ics.asterix.aql.expression.CreateFunctionStatement;
-import edu.uci.ics.asterix.aql.expression.CreateIndexStatement;
-import edu.uci.ics.asterix.aql.expression.DatasetDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDecl;
-import edu.uci.ics.asterix.aql.expression.DataverseDropStatement;
-import edu.uci.ics.asterix.aql.expression.DeleteStatement;
-import edu.uci.ics.asterix.aql.expression.DisconnectFeedStatement;
-import edu.uci.ics.asterix.aql.expression.DistinctClause;
-import edu.uci.ics.asterix.aql.expression.DropStatement;
-import edu.uci.ics.asterix.aql.expression.ExternalDetailsDecl;
-import edu.uci.ics.asterix.aql.expression.FLWOGRExpression;
-import edu.uci.ics.asterix.aql.expression.FeedDropStatement;
-import edu.uci.ics.asterix.aql.expression.FieldAccessor;
-import edu.uci.ics.asterix.aql.expression.FieldBinding;
-import edu.uci.ics.asterix.aql.expression.ForClause;
-import edu.uci.ics.asterix.aql.expression.FunctionDecl;
-import edu.uci.ics.asterix.aql.expression.FunctionDropStatement;
-import edu.uci.ics.asterix.aql.expression.GbyVariableExpressionPair;
-import edu.uci.ics.asterix.aql.expression.GroupbyClause;
-import edu.uci.ics.asterix.aql.expression.Identifier;
-import edu.uci.ics.asterix.aql.expression.IfExpr;
-import edu.uci.ics.asterix.aql.expression.IndexAccessor;
-import edu.uci.ics.asterix.aql.expression.IndexDropStatement;
-import edu.uci.ics.asterix.aql.expression.InsertStatement;
-import edu.uci.ics.asterix.aql.expression.InternalDetailsDecl;
-import edu.uci.ics.asterix.aql.expression.LetClause;
-import edu.uci.ics.asterix.aql.expression.LimitClause;
-import edu.uci.ics.asterix.aql.expression.ListConstructor;
-import edu.uci.ics.asterix.aql.expression.LiteralExpr;
-import edu.uci.ics.asterix.aql.expression.LoadStatement;
-import edu.uci.ics.asterix.aql.expression.NodeGroupDropStatement;
-import edu.uci.ics.asterix.aql.expression.NodegroupDecl;
-import edu.uci.ics.asterix.aql.expression.OperatorExpr;
-import edu.uci.ics.asterix.aql.expression.OrderbyClause;
-import edu.uci.ics.asterix.aql.expression.OrderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.QuantifiedExpression;
-import edu.uci.ics.asterix.aql.expression.QuantifiedPair;
-import edu.uci.ics.asterix.aql.expression.Query;
-import edu.uci.ics.asterix.aql.expression.RecordConstructor;
-import edu.uci.ics.asterix.aql.expression.RecordTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.RefreshExternalDatasetStatement;
-import edu.uci.ics.asterix.aql.expression.RunStatement;
-import edu.uci.ics.asterix.aql.expression.SetStatement;
-import edu.uci.ics.asterix.aql.expression.TypeDecl;
-import edu.uci.ics.asterix.aql.expression.TypeDropStatement;
-import edu.uci.ics.asterix.aql.expression.TypeExpression;
-import edu.uci.ics.asterix.aql.expression.TypeReferenceExpression;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr;
-import edu.uci.ics.asterix.aql.expression.UnaryExpr.Sign;
-import edu.uci.ics.asterix.aql.expression.UnionExpr;
-import edu.uci.ics.asterix.aql.expression.UnorderedListTypeDefinition;
-import edu.uci.ics.asterix.aql.expression.UpdateClause;
-import edu.uci.ics.asterix.aql.expression.UpdateStatement;
-import edu.uci.ics.asterix.aql.expression.VarIdentifier;
-import edu.uci.ics.asterix.aql.expression.VariableExpr;
-import edu.uci.ics.asterix.aql.expression.WhereClause;
-import edu.uci.ics.asterix.aql.expression.WriteStatement;
-import edu.uci.ics.asterix.aql.literal.DoubleLiteral;
-import edu.uci.ics.asterix.aql.literal.FalseLiteral;
-import edu.uci.ics.asterix.aql.literal.FloatLiteral;
-import edu.uci.ics.asterix.aql.literal.LongIntegerLiteral;
-import edu.uci.ics.asterix.aql.literal.NullLiteral;
-import edu.uci.ics.asterix.aql.literal.StringLiteral;
-import edu.uci.ics.asterix.aql.literal.TrueLiteral;
-import edu.uci.ics.asterix.aql.util.RangeMapBuilder;
-import edu.uci.ics.asterix.common.annotations.AutoDataGen;
-import edu.uci.ics.asterix.common.annotations.DateBetweenYearsDataGen;
-import edu.uci.ics.asterix.common.annotations.DatetimeAddRandHoursDataGen;
-import edu.uci.ics.asterix.common.annotations.DatetimeBetweenYearsDataGen;
-import edu.uci.ics.asterix.common.annotations.FieldIntervalDataGen;
-import edu.uci.ics.asterix.common.annotations.FieldValFileDataGen;
-import edu.uci.ics.asterix.common.annotations.FieldValFileSameIndexDataGen;
-import edu.uci.ics.asterix.common.annotations.IRecordFieldDataGen;
-import edu.uci.ics.asterix.common.annotations.InsertRandIntDataGen;
-import edu.uci.ics.asterix.common.annotations.ListDataGen;
-import edu.uci.ics.asterix.common.annotations.ListValFileDataGen;
-import edu.uci.ics.asterix.common.annotations.SkipSecondaryIndexSearchExpressionAnnotation;
-import edu.uci.ics.asterix.common.annotations.TypeDataGen;
-import edu.uci.ics.asterix.common.annotations.UndeclaredFieldsDataGen;
-import edu.uci.ics.asterix.common.config.DatasetConfig.DatasetType;
-import edu.uci.ics.asterix.common.config.DatasetConfig.IndexType;
-import edu.uci.ics.asterix.common.exceptions.AsterixException;
-import edu.uci.ics.asterix.common.functions.FunctionSignature;
-import edu.uci.ics.asterix.metadata.bootstrap.MetadataConstants;
-import edu.uci.ics.hyracks.algebricks.common.utils.Pair;
-import edu.uci.ics.hyracks.algebricks.common.utils.Triple;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
-import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import edu.uci.ics.hyracks.dataflow.common.data.partition.range.IRangeMap;
+import org.apache.asterix.aql.base.Clause;
+import org.apache.asterix.aql.base.Expression;
+import org.apache.asterix.aql.base.Literal;
+import org.apache.asterix.aql.base.Statement;
+import org.apache.asterix.aql.context.RootScopeFactory;
+import org.apache.asterix.aql.context.Scope;
+import org.apache.asterix.aql.expression.AbstractAccessor;
+import org.apache.asterix.aql.expression.CallExpr;
+import org.apache.asterix.aql.expression.CompactStatement;
+import org.apache.asterix.aql.expression.ConnectFeedStatement;
+import org.apache.asterix.aql.expression.CreateFeedPolicyStatement;
+import org.apache.asterix.aql.expression.CreatePrimaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateSecondaryFeedStatement;
+import org.apache.asterix.aql.expression.CreateDataverseStatement;
+import org.apache.asterix.aql.expression.CreateFeedStatement;
+import org.apache.asterix.aql.expression.CreateFunctionStatement;
+import org.apache.asterix.aql.expression.CreateIndexStatement;
+import org.apache.asterix.aql.expression.DatasetDecl;
+import org.apache.asterix.aql.expression.DataverseDecl;
+import org.apache.asterix.aql.expression.DataverseDropStatement;
+import org.apache.asterix.aql.expression.DeleteStatement;
+import org.apache.asterix.aql.expression.DisconnectFeedStatement;
+import org.apache.asterix.aql.expression.DistinctClause;
+import org.apache.asterix.aql.expression.DropStatement;
+import org.apache.asterix.aql.expression.ExternalDetailsDecl;
+import org.apache.asterix.aql.expression.FLWOGRExpression;
+import org.apache.asterix.aql.expression.FeedDropStatement;
+import org.apache.asterix.aql.expression.FieldAccessor;
+import org.apache.asterix.aql.expression.FieldBinding;
+import org.apache.asterix.aql.expression.ForClause;
+import org.apache.asterix.aql.expression.FunctionDecl;
+import org.apache.asterix.aql.expression.FunctionDropStatement;
+import org.apache.asterix.aql.expression.GbyVariableExpressionPair;
+import org.apache.asterix.aql.expression.GroupbyClause;
+import org.apache.asterix.aql.expression.Identifier;
+import org.apache.asterix.aql.expression.IfExpr;
+import org.apache.asterix.aql.expression.IndexAccessor;
+import org.apache.asterix.aql.expression.IndexDropStatement;
+import org.apache.asterix.aql.expression.InsertStatement;
+import org.apache.asterix.aql.expression.InternalDetailsDecl;
+import org.apache.asterix.aql.expression.LetClause;
+import org.apache.asterix.aql.expression.LimitClause;
+import org.apache.asterix.aql.expression.ListConstructor;
+import org.apache.asterix.aql.expression.LiteralExpr;
+import org.apache.asterix.aql.expression.LoadStatement;
+import org.apache.asterix.aql.expression.NodeGroupDropStatement;
+import org.apache.asterix.aql.expression.NodegroupDecl;
+import org.apache.asterix.aql.expression.OperatorExpr;
+import org.apache.asterix.aql.expression.OrderbyClause;
+import org.apache.asterix.aql.expression.OrderedListTypeDefinition;
+import org.apache.asterix.aql.expression.QuantifiedExpression;
+import org.apache.asterix.aql.expression.QuantifiedPair;
+import org.apache.asterix.aql.expression.Query;
+import org.apache.asterix.aql.expression.RecordConstructor;
+import org.apache.asterix.aql.expression.RecordTypeDefinition;
+import org.apache.asterix.aql.expression.RefreshExternalDatasetStatement;
+import org.apache.asterix.aql.expression.RunStatement;
+import org.apache.asterix.aql.expression.SetStatement;
+import org.apache.asterix.aql.expression.TypeDecl;
+import org.apache.asterix.aql.expression.TypeDropStatement;
+import org.apache.asterix.aql.expression.TypeExpression;
+import org.apache.asterix.aql.expression.TypeReferenceExpression;
+import org.apache.asterix.aql.expression.UnaryExpr;
+import org.apache.asterix.aql.expression.UnaryExpr.Sign;
+import org.apache.asterix.aql.expression.UnionExpr;
+import org.apache.asterix.aql.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.aql.expression.UpdateClause;
+import org.apache.asterix.aql.expression.UpdateStatement;
+import org.apache.asterix.aql.expression.VarIdentifier;
+import org.apache.asterix.aql.expression.VariableExpr;
+import org.apache.asterix.aql.expression.WhereClause;
+import org.apache.asterix.aql.expression.WriteStatement;
+import org.apache.asterix.aql.literal.DoubleLiteral;
+import org.apache.asterix.aql.literal.FalseLiteral;
+import org.apache.asterix.aql.literal.FloatLiteral;
+import org.apache.asterix.aql.literal.LongIntegerLiteral;
+import org.apache.asterix.aql.literal.NullLiteral;
+import org.apache.asterix.aql.literal.StringLiteral;
+import org.apache.asterix.aql.literal.TrueLiteral;
+import org.apache.asterix.aql.util.RangeMapBuilder;
+import org.apache.asterix.common.annotations.AutoDataGen;
+import org.apache.asterix.common.annotations.DateBetweenYearsDataGen;
+import org.apache.asterix.common.annotations.DatetimeAddRandHoursDataGen;
+import org.apache.asterix.common.annotations.DatetimeBetweenYearsDataGen;
+import org.apache.asterix.common.annotations.FieldIntervalDataGen;
+import org.apache.asterix.common.annotations.FieldValFileDataGen;
+import org.apache.asterix.common.annotations.FieldValFileSameIndexDataGen;
+import org.apache.asterix.common.annotations.IRecordFieldDataGen;
+import org.apache.asterix.common.annotations.InsertRandIntDataGen;
+import org.apache.asterix.common.annotations.ListDataGen;
+import org.apache.asterix.common.annotations.ListValFileDataGen;
+import org.apache.asterix.common.annotations.SkipSecondaryIndexSearchExpressionAnnotation;
+import org.apache.asterix.common.annotations.TypeDataGen;
+import org.apache.asterix.common.annotations.UndeclaredFieldsDataGen;
+import org.apache.asterix.common.config.DatasetConfig.DatasetType;
+import org.apache.asterix.common.config.DatasetConfig.IndexType;
+import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.metadata.bootstrap.MetadataConstants;
+import org.apache.hyracks.algebricks.common.utils.Pair;
+import org.apache.hyracks.algebricks.common.utils.Triple;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.expressions.IndexedNLJoinExpressionAnnotation;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.dataflow.common.data.partition.range.IRangeMap;