[73/78] [abbrv] incubator-systemml git commit: Update source references based on new package structure

[lr...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/FunctionStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionStatement.java b/src/main/java/org/apache/sysml/parser/FunctionStatement.java
index 98d58d0..ddad0cc 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionStatement.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionStatement.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.Lop;
+import org.apache.sysml.lops.Lop;
 
 
 public class FunctionStatement extends Statement

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
index faf9ac5..583501f 100644
--- a/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.FunctionOp.FunctionType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.FunctionOp.FunctionType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class FunctionStatementBlock extends StatementBlock 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/Identifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/Identifier.java b/src/main/java/org/apache/sysml/parser/Identifier.java
index 522b513..774d7f0 100644
--- a/src/main/java/org/apache/sysml/parser/Identifier.java
+++ b/src/main/java/org/apache/sysml/parser/Identifier.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.parser.LanguageException.LanguageErrorCodes;
+import org.apache.sysml.parser.LanguageException.LanguageErrorCodes;
 
 public abstract class Identifier extends Expression
 {

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/IfStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IfStatement.java b/src/main/java/org/apache/sysml/parser/IfStatement.java
index 620d9de..95d2dd4 100644
--- a/src/main/java/org/apache/sysml/parser/IfStatement.java
+++ b/src/main/java/org/apache/sysml/parser/IfStatement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/IfStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IfStatementBlock.java b/src/main/java/org/apache/sysml/parser/IfStatementBlock.java
index 4de36e5..1fc904c 100644
--- a/src/main/java/org/apache/sysml/parser/IfStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/IfStatementBlock.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Expression.DataType;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.DataType;
 
 
 public class IfStatementBlock extends StatementBlock 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/ImportStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ImportStatement.java b/src/main/java/org/apache/sysml/parser/ImportStatement.java
index 87c9a4d..4f7414b 100644
--- a/src/main/java/org/apache/sysml/parser/ImportStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ImportStatement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 
  

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
index a23c663..c8a5446 100644
--- a/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/IntIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IntIdentifier.java b/src/main/java/org/apache/sysml/parser/IntIdentifier.java
index cb5446c..f5bb820 100644
--- a/src/main/java/org/apache/sysml/parser/IntIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/IntIdentifier.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/IterablePredicate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/IterablePredicate.java b/src/main/java/org/apache/sysml/parser/IterablePredicate.java
index 0fab6db..b84fda0 100644
--- a/src/main/java/org/apache/sysml/parser/IterablePredicate.java
+++ b/src/main/java/org/apache/sysml/parser/IterablePredicate.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.lops.Lop;
+import org.apache.sysml.lops.Lop;
 
 
 public class IterablePredicate extends Expression 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/LanguageException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/LanguageException.java b/src/main/java/org/apache/sysml/parser/LanguageException.java
index 6fd636a..13002ae 100644
--- a/src/main/java/org/apache/sysml/parser/LanguageException.java
+++ b/src/main/java/org/apache/sysml/parser/LanguageException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
-import com.ibm.bi.dml.api.DMLException;
+import org.apache.sysml.api.DMLException;
 
 /**
  * <p>Exception occurring at the Language level.</p>

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java b/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
index 735dc92..338ced2 100644
--- a/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
+++ b/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 
 public abstract class LiveVariableAnalysis 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
index 66e48b1..7139432 100644
--- a/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
+++ b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.debug.DMLBreakpointManager;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.debug.DMLBreakpointManager;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/OutputStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/OutputStatement.java b/src/main/java/org/apache/sysml/parser/OutputStatement.java
index 3b9d6d6..8a2aff7 100644
--- a/src/main/java/org/apache/sysml/parser/OutputStatement.java
+++ b/src/main/java/org/apache/sysml/parser/OutputStatement.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.debug.DMLBreakpointManager;
-import com.ibm.bi.dml.parser.Expression.DataOp;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.debug.DMLBreakpointManager;
+import org.apache.sysml.parser.Expression.DataOp;
 
  
 public class OutputStatement extends Statement

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/ParForStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParForStatement.java b/src/main/java/org/apache/sysml/parser/ParForStatement.java
index c8b1bf6..0e2feee 100644
--- a/src/main/java/org/apache/sysml/parser/ParForStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ParForStatement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 /**
  * This ParForStatement is essentially identical to a ForStatement, except an extended

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
index e2ae2d7..58bed91 100644
--- a/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,21 +29,21 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.ibm.bi.dml.parser.Expression.BinaryOp;
-import com.ibm.bi.dml.parser.Expression.BuiltinFunctionOp;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.PrintStatement.PRINTTYPE;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitioner;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.POptMode;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PResultMerge;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PTaskPartitioner;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.parser.Expression.BinaryOp;
+import org.apache.sysml.parser.Expression.BuiltinFunctionOp;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.PrintStatement.PRINTTYPE;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitioner;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.POptMode;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PResultMerge;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PTaskPartitioner;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 /**
  * 
@@ -147,7 +147,7 @@ public class ParForStatementBlock extends ForStatementBlock
 		
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.parser.ParForStatementBlock")
+			Logger.getLogger("org.apache.sysml.parser.ParForStatementBlock")
 				  .setLevel((Level) Level.TRACE);
 		}
 	}

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/ParameterExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParameterExpression.java b/src/main/java/org/apache/sysml/parser/ParameterExpression.java
index 2745384..75b746a 100644
--- a/src/main/java/org/apache/sysml/parser/ParameterExpression.java
+++ b/src/main/java/org/apache/sysml/parser/ParameterExpression.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 public class ParameterExpression 
 {

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
index 979cd22..13700bf 100644
--- a/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.Hop.ParamBuiltinOp;
-import com.ibm.bi.dml.parser.LanguageException.LanguageErrorCodes;
+import org.apache.sysml.hops.Hop.ParamBuiltinOp;
+import org.apache.sysml.parser.LanguageException.LanguageErrorCodes;
 
 
 public class ParameterizedBuiltinFunctionExpression extends DataIdentifier 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/ParseException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/ParseException.java b/src/main/java/org/apache/sysml/parser/ParseException.java
index 86ff297..db41bd0 100644
--- a/src/main/java/org/apache/sysml/parser/ParseException.java
+++ b/src/main/java/org/apache/sysml/parser/ParseException.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 /**
  * This exception is thrown when parse errors are encountered.

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/PathStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/PathStatement.java b/src/main/java/org/apache/sysml/parser/PathStatement.java
index 9a9280e..d820345 100644
--- a/src/main/java/org/apache/sysml/parser/PathStatement.java
+++ b/src/main/java/org/apache/sysml/parser/PathStatement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 
  

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/PrintStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/PrintStatement.java b/src/main/java/org/apache/sysml/parser/PrintStatement.java
index aac58ea..b74128d 100644
--- a/src/main/java/org/apache/sysml/parser/PrintStatement.java
+++ b/src/main/java/org/apache/sysml/parser/PrintStatement.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.debug.DMLBreakpointManager;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.debug.DMLBreakpointManager;
 
  
 public class PrintStatement extends Statement

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/RelationalExpression.java b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
index 06f76f2..d3d6107 100644
--- a/src/main/java/org/apache/sysml/parser/RelationalExpression.java
+++ b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.parser.LanguageException.LanguageErrorCodes;
+import org.apache.sysml.parser.LanguageException.LanguageErrorCodes;
 
 public class RelationalExpression extends Expression
 {

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/Statement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/Statement.java b/src/main/java/org/apache/sysml/parser/Statement.java
index bf76ce0..00ac236 100644
--- a/src/main/java/org/apache/sysml/parser/Statement.java
+++ b/src/main/java/org/apache/sysml/parser/Statement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/StatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/StatementBlock.java b/src/main/java/org/apache/sysml/parser/StatementBlock.java
index 437d859..b9d129e 100644
--- a/src/main/java/org/apache/sysml/parser/StatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/StatementBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,19 +24,19 @@ import java.util.HashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.MLContextProxy;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.FormatType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.LanguageException.LanguageErrorCodes;
-import com.ibm.bi.dml.parser.PrintStatement.PRINTTYPE;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.MLContextProxy;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.FormatType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.LanguageException.LanguageErrorCodes;
+import org.apache.sysml.parser.PrintStatement.PRINTTYPE;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
 
 
 public class StatementBlock extends LiveVariableAnalysis

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/StringIdentifier.java b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
index 260cfe6..1add275 100644
--- a/src/main/java/org/apache/sysml/parser/StringIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/Token.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/Token.java b/src/main/java/org/apache/sysml/parser/Token.java
index a0b0bef..372ced9 100644
--- a/src/main/java/org/apache/sysml/parser/Token.java
+++ b/src/main/java/org/apache/sysml/parser/Token.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 /**
  * Describes the input token stream.

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/VariableSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/VariableSet.java b/src/main/java/org/apache/sysml/parser/VariableSet.java
index f99ca5f..675dfef 100644
--- a/src/main/java/org/apache/sysml/parser/VariableSet.java
+++ b/src/main/java/org/apache/sysml/parser/VariableSet.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.HashMap;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/WhileStatement.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/WhileStatement.java b/src/main/java/org/apache/sysml/parser/WhileStatement.java
index 740b31b..d01da06 100644
--- a/src/main/java/org/apache/sysml/parser/WhileStatement.java
+++ b/src/main/java/org/apache/sysml/parser/WhileStatement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java b/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java
index 679fbee..c089001 100644
--- a/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.Lop;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
 
 
 public class WhileStatementBlock extends StatementBlock 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/antlr4/DMLParserWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/antlr4/DMLParserWrapper.java b/src/main/java/org/apache/sysml/parser/antlr4/DMLParserWrapper.java
index 5cf6cdd..a967132 100644
--- a/src/main/java/org/apache/sysml/parser/antlr4/DMLParserWrapper.java
+++ b/src/main/java/org/apache/sysml/parser/antlr4/DMLParserWrapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.antlr4;
+package org.apache.sysml.parser.antlr4;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -37,29 +37,29 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.parser.AParserWrapper;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.FunctionStatementBlock;
-import com.ibm.bi.dml.parser.IfStatement;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.ImportStatement;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.parser.ParForStatement;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatement;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.DmlprogramContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.FunctionStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.StatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlSyntacticErrorListener.CustomDmlErrorListener;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.parser.AParserWrapper;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.ImportStatement;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.ParForStatement;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.parser.antlr4.DmlParser.DmlprogramContext;
+import org.apache.sysml.parser.antlr4.DmlParser.FunctionStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.StatementContext;
+import org.apache.sysml.parser.antlr4.DmlSyntacticErrorListener.CustomDmlErrorListener;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 /**
  * This is the main entry point for the Antlr4 parser.
@@ -273,7 +273,7 @@ public class DMLParserWrapper extends AParserWrapper
 
 		// Then add all the statements
 		for(StatementContext stmtCtx : ast.blocks) {
-			com.ibm.bi.dml.parser.Statement current = stmtCtx.info.stmt;
+			org.apache.sysml.parser.Statement current = stmtCtx.info.stmt;
 			if(current == null) {
 				LOG.error("line: " + stmtCtx.start.getLine() + ":" + stmtCtx.start.getCharPositionInLine() + " cannot process the statement");
 				return null;

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/antlr4/Dml.g4
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/antlr4/Dml.g4 b/src/main/java/org/apache/sysml/parser/antlr4/Dml.g4
index 4911088..7c52c47 100644
--- a/src/main/java/org/apache/sysml/parser/antlr4/Dml.g4
+++ b/src/main/java/org/apache/sysml/parser/antlr4/Dml.g4
@@ -20,7 +20,7 @@ grammar Dml;
 @header
 {
 	// Commenting the package name and explicitly passing it in build.xml to maintain compatibility with maven plugin
-    // package com.ibm.bi.dml.antlr4;
+    // package org.apache.sysml.antlr4;
 }
 
 // DML Program is a list of expression
@@ -91,7 +91,7 @@ dataIdentifier returns [ ExpressionInfo dataInfo ]
 @init {
        // This actions occurs regardless of how many alternatives in this rule
        $dataInfo = new ExpressionInfo();
-       // $dataInfo.expr = new com.ibm.bi.dml.parser.DataIdentifier();
+       // $dataInfo.expr = new org.apache.sysml.parser.DataIdentifier();
 } :
     // ------------------------------------------
     // IndexedIdentifier
@@ -105,7 +105,7 @@ expression returns [ ExpressionInfo info ]
 @init {
        // This actions occurs regardless of how many alternatives in this rule
        $info = new ExpressionInfo();
-       // $info.expr = new com.ibm.bi.dml.parser.BinaryExpression(com.ibm.bi.dml.parser.Expression.BinaryOp.INVALID);
+       // $info.expr = new org.apache.sysml.parser.BinaryExpression(org.apache.sysml.parser.Expression.BinaryOp.INVALID);
 } :
     // ------------------------------------------
     // BinaryExpression

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticErrorListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticErrorListener.java b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticErrorListener.java
index 5fdf2d8..fa6489a 100644
--- a/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticErrorListener.java
+++ b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticErrorListener.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.antlr4;
+package org.apache.sysml.parser.antlr4;
 
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.RecognitionException;
@@ -23,7 +23,7 @@ import org.antlr.v4.runtime.Recognizer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.api.DMLScript;
+import org.apache.sysml.api.DMLScript;
 
 import java.util.Stack;
 

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidator.java
index f19f618..521a0f8 100644
--- a/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidator.java
+++ b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.antlr4;
+package org.apache.sysml.parser.antlr4;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -28,92 +28,92 @@ import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
-import com.ibm.bi.dml.parser.ConditionalPredicate;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.DoubleIdentifier;
-import com.ibm.bi.dml.parser.Expression;
-import com.ibm.bi.dml.parser.Expression.DataOp;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.AddSubExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.AssignmentStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.AtomicExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.BooleanAndExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.BooleanNotExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.BooleanOrExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.BuiltinFunctionExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.CommandlineParamExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.CommandlinePositionExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ConstDoubleIdExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ConstFalseExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ConstIntIdExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ConstStringIdExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ConstTrueExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.DataIdExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.DataIdentifierContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.DmlprogramContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ExternalFunctionDefExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ForStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.FunctionCallAssignmentStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.FunctionCallMultiAssignmentStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.FunctionStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.IfStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.IfdefAssignmentStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ImportStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.IndexedExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.InternalFunctionDefExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.IterablePredicateColonExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.IterablePredicateSeqExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.MatrixDataTypeCheckContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.MatrixMulExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.Ml_typeContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ModIntDivExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.MultDivExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ParForStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ParameterizedExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.PathStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.PowerExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.RelationalExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.SimpleDataIdentifierExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.StatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.StrictParameterizedExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.StrictParameterizedKeyValueStringContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.TypedArgNoAssignContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.UnaryExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ValueTypeContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.WhileStatementContext;
-import com.ibm.bi.dml.parser.AssignmentStatement;
-import com.ibm.bi.dml.parser.BinaryExpression;
-import com.ibm.bi.dml.parser.BooleanExpression;
-import com.ibm.bi.dml.parser.BooleanIdentifier;
-import com.ibm.bi.dml.parser.BuiltinFunctionExpression;
-import com.ibm.bi.dml.parser.ConstIdentifier;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.ExternalFunctionStatement;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.FunctionCallIdentifier;
-import com.ibm.bi.dml.parser.FunctionStatement;
-import com.ibm.bi.dml.parser.IfStatement;
-import com.ibm.bi.dml.parser.ImportStatement;
-import com.ibm.bi.dml.parser.IndexedIdentifier;
-import com.ibm.bi.dml.parser.IntIdentifier;
-import com.ibm.bi.dml.parser.IterablePredicate;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.parser.MultiAssignmentStatement;
-import com.ibm.bi.dml.parser.OutputStatement;
-import com.ibm.bi.dml.parser.ParForStatement;
-import com.ibm.bi.dml.parser.ParameterExpression;
-import com.ibm.bi.dml.parser.ParameterizedBuiltinFunctionExpression;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.parser.PathStatement;
-import com.ibm.bi.dml.parser.PrintStatement;
-import com.ibm.bi.dml.parser.RelationalExpression;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.StringIdentifier;
-import com.ibm.bi.dml.parser.WhileStatement;
+import org.apache.sysml.parser.ConditionalPredicate;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.DoubleIdentifier;
+import org.apache.sysml.parser.Expression;
+import org.apache.sysml.parser.Expression.DataOp;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.antlr4.DmlParser.AddSubExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.AssignmentStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.AtomicExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.BooleanAndExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.BooleanNotExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.BooleanOrExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.BuiltinFunctionExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.CommandlineParamExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.CommandlinePositionExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ConstDoubleIdExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ConstFalseExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ConstIntIdExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ConstStringIdExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ConstTrueExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.DataIdExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.DataIdentifierContext;
+import org.apache.sysml.parser.antlr4.DmlParser.DmlprogramContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ExternalFunctionDefExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ForStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.FunctionCallAssignmentStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.FunctionCallMultiAssignmentStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.FunctionStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.IfStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.IfdefAssignmentStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ImportStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.IndexedExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.InternalFunctionDefExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.IterablePredicateColonExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.IterablePredicateSeqExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.MatrixDataTypeCheckContext;
+import org.apache.sysml.parser.antlr4.DmlParser.MatrixMulExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.Ml_typeContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ModIntDivExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.MultDivExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ParForStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ParameterizedExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.PathStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.PowerExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.RelationalExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.SimpleDataIdentifierExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.StatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.StrictParameterizedExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.StrictParameterizedKeyValueStringContext;
+import org.apache.sysml.parser.antlr4.DmlParser.TypedArgNoAssignContext;
+import org.apache.sysml.parser.antlr4.DmlParser.UnaryExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ValueTypeContext;
+import org.apache.sysml.parser.antlr4.DmlParser.WhileStatementContext;
+import org.apache.sysml.parser.AssignmentStatement;
+import org.apache.sysml.parser.BinaryExpression;
+import org.apache.sysml.parser.BooleanExpression;
+import org.apache.sysml.parser.BooleanIdentifier;
+import org.apache.sysml.parser.BuiltinFunctionExpression;
+import org.apache.sysml.parser.ConstIdentifier;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.ExternalFunctionStatement;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.FunctionCallIdentifier;
+import org.apache.sysml.parser.FunctionStatement;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.ImportStatement;
+import org.apache.sysml.parser.IndexedIdentifier;
+import org.apache.sysml.parser.IntIdentifier;
+import org.apache.sysml.parser.IterablePredicate;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.MultiAssignmentStatement;
+import org.apache.sysml.parser.OutputStatement;
+import org.apache.sysml.parser.ParForStatement;
+import org.apache.sysml.parser.ParameterExpression;
+import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.parser.PathStatement;
+import org.apache.sysml.parser.PrintStatement;
+import org.apache.sysml.parser.RelationalExpression;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.StringIdentifier;
+import org.apache.sysml.parser.WhileStatement;
 
 public class DmlSyntacticValidator implements DmlListener
 {	

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidatorHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidatorHelper.java b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidatorHelper.java
index 1d0f675..33ad63d 100644
--- a/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidatorHelper.java
+++ b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidatorHelper.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.antlr4;
+package org.apache.sysml.parser.antlr4;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.antlr.v4.runtime.Token;
 
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.FunctionCallAssignmentStatementContext;
-import com.ibm.bi.dml.parser.antlr4.DmlParser.ParameterizedExpressionContext;
-import com.ibm.bi.dml.parser.antlr4.DmlSyntacticErrorListener.CustomDmlErrorListener;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.antlr4.DmlParser.FunctionCallAssignmentStatementContext;
+import org.apache.sysml.parser.antlr4.DmlParser.ParameterizedExpressionContext;
+import org.apache.sysml.parser.antlr4.DmlSyntacticErrorListener.CustomDmlErrorListener;
 
 public class DmlSyntacticValidatorHelper {
 	
@@ -47,16 +47,16 @@ public class DmlSyntacticValidatorHelper {
 		return _errorListener.peekFileName();
 	}
 	
-//	public static void setInfoForArithmeticOp(com.ibm.bi.dml.parser.Expression current, 
-//			com.ibm.bi.dml.parser.Expression left, 
-//			com.ibm.bi.dml.parser.Expression right, String opStr) {
+//	public static void setInfoForArithmeticOp(org.apache.sysml.parser.Expression current, 
+//			org.apache.sysml.parser.Expression left, 
+//			org.apache.sysml.parser.Expression right, String opStr) {
 //		try {
 //			// PLUS, MINUS, MULT, DIV, MODULUS, INTDIV, MATMULT, POW, INVALID
-//			com.ibm.bi.dml.parser.Expression.BinaryOp bop = com.ibm.bi.dml.parser.Expression.getBinaryOp(opStr);
-//			current = new com.ibm.bi.dml.parser.BinaryExpression(bop);
-//			((com.ibm.bi.dml.parser.BinaryExpression)current).setLeft(left);
-//			((com.ibm.bi.dml.parser.BinaryExpression)current).setRight(right);
-//			((com.ibm.bi.dml.parser.BinaryExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
+//			org.apache.sysml.parser.Expression.BinaryOp bop = org.apache.sysml.parser.Expression.getBinaryOp(opStr);
+//			current = new org.apache.sysml.parser.BinaryExpression(bop);
+//			((org.apache.sysml.parser.BinaryExpression)current).setLeft(left);
+//			((org.apache.sysml.parser.BinaryExpression)current).setRight(right);
+//			((org.apache.sysml.parser.BinaryExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
 //		}
 //		catch(Exception e) {
 //			System.out.println("In setInfoForArithmeticOp>>");
@@ -64,14 +64,14 @@ public class DmlSyntacticValidatorHelper {
 //		}
 //	}
 	
-//	public static void setInfoForBooleanOp(com.ibm.bi.dml.parser.Expression current, 
-//			com.ibm.bi.dml.parser.Expression left, 
-//			com.ibm.bi.dml.parser.Expression right, String opStr) {
-//		com.ibm.bi.dml.parser.Expression.BooleanOp bop = com.ibm.bi.dml.parser.Expression.getBooleanOp(opStr);
-//		current = new com.ibm.bi.dml.parser.BooleanExpression(bop);
-//		((com.ibm.bi.dml.parser.BooleanExpression)current).setLeft(left);
-//		((com.ibm.bi.dml.parser.BooleanExpression)current).setRight(right);
-//		((com.ibm.bi.dml.parser.BooleanExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
+//	public static void setInfoForBooleanOp(org.apache.sysml.parser.Expression current, 
+//			org.apache.sysml.parser.Expression left, 
+//			org.apache.sysml.parser.Expression right, String opStr) {
+//		org.apache.sysml.parser.Expression.BooleanOp bop = org.apache.sysml.parser.Expression.getBooleanOp(opStr);
+//		current = new org.apache.sysml.parser.BooleanExpression(bop);
+//		((org.apache.sysml.parser.BooleanExpression)current).setLeft(left);
+//		((org.apache.sysml.parser.BooleanExpression)current).setRight(right);
+//		((org.apache.sysml.parser.BooleanExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
 //	}
 	
 	public boolean validateBuiltinFunctions(FunctionCallAssignmentStatementContext ctx) {
@@ -87,14 +87,14 @@ public class DmlSyntacticValidatorHelper {
 		return true;
 	}
 	
-	public ArrayList<com.ibm.bi.dml.parser.ParameterExpression> getParameterExpressionList(List<ParameterizedExpressionContext> paramExprs) {
-		ArrayList<com.ibm.bi.dml.parser.ParameterExpression> retVal = new ArrayList<com.ibm.bi.dml.parser.ParameterExpression>();
+	public ArrayList<org.apache.sysml.parser.ParameterExpression> getParameterExpressionList(List<ParameterizedExpressionContext> paramExprs) {
+		ArrayList<org.apache.sysml.parser.ParameterExpression> retVal = new ArrayList<org.apache.sysml.parser.ParameterExpression>();
 		for(ParameterizedExpressionContext ctx : paramExprs) {
 			String paramName = null;
 			if(ctx.paramName != null && ctx.paramName.getText() != null && !ctx.paramName.getText().isEmpty()) {
 				paramName = ctx.paramName.getText();
 			}
-			com.ibm.bi.dml.parser.ParameterExpression myArg = new com.ibm.bi.dml.parser.ParameterExpression(paramName, ctx.paramVal.info.expr);
+			org.apache.sysml.parser.ParameterExpression myArg = new org.apache.sysml.parser.ParameterExpression(paramName, ctx.paramVal.info.expr);
 			retVal.add(myArg);
 		}
 		return retVal;

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/antlr4/ExpressionInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/antlr4/ExpressionInfo.java b/src/main/java/org/apache/sysml/parser/antlr4/ExpressionInfo.java
index d7ea7eb..c08bada 100644
--- a/src/main/java/org/apache/sysml/parser/antlr4/ExpressionInfo.java
+++ b/src/main/java/org/apache/sysml/parser/antlr4/ExpressionInfo.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.antlr4;
+package org.apache.sysml.parser.antlr4;
 
 
 public class ExpressionInfo {
 	
-	public com.ibm.bi.dml.parser.Expression expr = null;
+	public org.apache.sysml.parser.Expression expr = null;
 
 	// For parfor and for
-	public com.ibm.bi.dml.parser.Expression from = null;
-	public com.ibm.bi.dml.parser.Expression to = null;
-	public com.ibm.bi.dml.parser.Expression increment = null;
+	public org.apache.sysml.parser.Expression from = null;
+	public org.apache.sysml.parser.Expression to = null;
+	public org.apache.sysml.parser.Expression increment = null;
 }

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/antlr4/StatementInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/antlr4/StatementInfo.java b/src/main/java/org/apache/sysml/parser/antlr4/StatementInfo.java
index e32e21a..0037862 100644
--- a/src/main/java/org/apache/sysml/parser/antlr4/StatementInfo.java
+++ b/src/main/java/org/apache/sysml/parser/antlr4/StatementInfo.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.antlr4;
+package org.apache.sysml.parser.antlr4;
 
 import java.util.HashMap;
-import com.ibm.bi.dml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLProgram;
 
 public class StatementInfo {
 
-	public com.ibm.bi.dml.parser.Statement stmt = null;
+	public org.apache.sysml.parser.Statement stmt = null;
 	
 	// Valid only for import statements
 	public HashMap<String,DMLProgram> namespaces = null;

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/python/ExpressionInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/python/ExpressionInfo.java b/src/main/java/org/apache/sysml/parser/python/ExpressionInfo.java
index 09e8c27..6e4a464 100644
--- a/src/main/java/org/apache/sysml/parser/python/ExpressionInfo.java
+++ b/src/main/java/org/apache/sysml/parser/python/ExpressionInfo.java
@@ -1,4 +1,4 @@
-package com.ibm.bi.dml.parser.python;
+package org.apache.sysml.parser.python;
 
 /**
  * This class exists solely to prevent compiler warnings.
@@ -8,6 +8,6 @@ package com.ibm.bi.dml.parser.python;
  * (R-like and Python-like dialects), and Antlr-generated code assumes that
  * these classes are present in the parser's namespace.
  */
-class ExpressionInfo extends com.ibm.bi.dml.parser.antlr4.ExpressionInfo {
+class ExpressionInfo extends org.apache.sysml.parser.antlr4.ExpressionInfo {
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/python/PyDMLParserWrapper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/python/PyDMLParserWrapper.java b/src/main/java/org/apache/sysml/parser/python/PyDMLParserWrapper.java
index 69fb746..f57c3ac 100644
--- a/src/main/java/org/apache/sysml/parser/python/PyDMLParserWrapper.java
+++ b/src/main/java/org/apache/sysml/parser/python/PyDMLParserWrapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.python;
+package org.apache.sysml.parser.python;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
@@ -35,28 +35,28 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.parser.AParserWrapper;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.FunctionStatementBlock;
-import com.ibm.bi.dml.parser.IfStatement;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.ImportStatement;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.parser.ParForStatement;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatement;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.parser.antlr4.DMLParserWrapper;
-import com.ibm.bi.dml.parser.python.PydmlParser.FunctionStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.PmlprogramContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.StatementContext;
-import com.ibm.bi.dml.parser.python.PydmlSyntacticErrorListener.CustomDmlErrorListener;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.parser.AParserWrapper;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.ImportStatement;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.ParForStatement;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.parser.antlr4.DMLParserWrapper;
+import org.apache.sysml.parser.python.PydmlParser.FunctionStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.PmlprogramContext;
+import org.apache.sysml.parser.python.PydmlParser.StatementContext;
+import org.apache.sysml.parser.python.PydmlSyntacticErrorListener.CustomDmlErrorListener;
 
 /**
  * Logic of this wrapper is similar to DMLParserWrapper.
@@ -73,7 +73,7 @@ public class PyDMLParserWrapper extends AParserWrapper
 	 * @param current a statement
 	 * @return corresponding statement block
 	 */
-	public static StatementBlock getStatementBlock(com.ibm.bi.dml.parser.Statement current) {
+	public static StatementBlock getStatementBlock(org.apache.sysml.parser.Statement current) {
 		StatementBlock blk = null;
 		if(current instanceof ParForStatement) {
 			blk = new ParForStatementBlock();

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/python/Pydml.g4
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/python/Pydml.g4 b/src/main/java/org/apache/sysml/parser/python/Pydml.g4
index 821ca29..b03e3ec 100644
--- a/src/main/java/org/apache/sysml/parser/python/Pydml.g4
+++ b/src/main/java/org/apache/sysml/parser/python/Pydml.g4
@@ -19,9 +19,9 @@ grammar Pydml;
 
 @header
 {
-    // package com.ibm.bi.dml.python;
-    //import com.ibm.bi.dml.parser.antlr4.StatementInfo;
-    //import com.ibm.bi.dml.parser.antlr4.ExpressionInfo;
+    // package org.apache.sysml.python;
+    //import org.apache.sysml.parser.antlr4.StatementInfo;
+    //import org.apache.sysml.parser.antlr4.ExpressionInfo;
 }
 
 // This antlr grammar is based on Python 3.3 language reference: https://docs.python.org/3.3/reference/grammar.html
@@ -200,7 +200,7 @@ dataIdentifier returns [ ExpressionInfo dataInfo ]
 @init {
        // This actions occurs regardless of how many alternatives in this rule
        $dataInfo = new ExpressionInfo();
-       // $dataInfo.expr = new com.ibm.bi.dml.parser.DataIdentifier();
+       // $dataInfo.expr = new org.apache.sysml.parser.DataIdentifier();
 } :
     // ------------------------------------------
     // IndexedIdentifier
@@ -214,7 +214,7 @@ expression returns [ ExpressionInfo info ]
 @init {
        // This actions occurs regardless of how many alternatives in this rule
        $info = new ExpressionInfo();
-       // $info.expr = new com.ibm.bi.dml.parser.BinaryExpression(com.ibm.bi.dml.parser.Expression.BinaryOp.INVALID);
+       // $info.expr = new org.apache.sysml.parser.BinaryExpression(org.apache.sysml.parser.Expression.BinaryOp.INVALID);
 } :
     // ------------------------------------------
     // BinaryExpression

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticErrorListener.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticErrorListener.java b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticErrorListener.java
index 8a29038..c3e88d0 100644
--- a/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticErrorListener.java
+++ b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticErrorListener.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.python;
+package org.apache.sysml.parser.python;
 
 import java.util.Stack;
 
@@ -25,7 +25,7 @@ import org.antlr.v4.runtime.Recognizer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.api.DMLScript;
+import org.apache.sysml.api.DMLScript;
 
 public class PydmlSyntacticErrorListener {
 	

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidator.java
index 88b6138..1fb5e8b 100644
--- a/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidator.java
+++ b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.python;
+package org.apache.sysml.parser.python;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -29,94 +29,94 @@ import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.apache.commons.lang.StringUtils;
 
-import com.ibm.bi.dml.parser.AssignmentStatement;
-import com.ibm.bi.dml.parser.BinaryExpression;
-import com.ibm.bi.dml.parser.BooleanExpression;
-import com.ibm.bi.dml.parser.BooleanIdentifier;
-import com.ibm.bi.dml.parser.BuiltinFunctionExpression;
-import com.ibm.bi.dml.parser.ConditionalPredicate;
-import com.ibm.bi.dml.parser.ConstIdentifier;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.DoubleIdentifier;
-import com.ibm.bi.dml.parser.Expression;
-import com.ibm.bi.dml.parser.Expression.DataOp;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ExternalFunctionStatement;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.FunctionCallIdentifier;
-import com.ibm.bi.dml.parser.FunctionStatement;
-import com.ibm.bi.dml.parser.IfStatement;
-import com.ibm.bi.dml.parser.ImportStatement;
-import com.ibm.bi.dml.parser.IndexedIdentifier;
-import com.ibm.bi.dml.parser.IntIdentifier;
-import com.ibm.bi.dml.parser.IterablePredicate;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.parser.MultiAssignmentStatement;
-import com.ibm.bi.dml.parser.OutputStatement;
-import com.ibm.bi.dml.parser.ParForStatement;
-import com.ibm.bi.dml.parser.ParameterExpression;
-import com.ibm.bi.dml.parser.ParameterizedBuiltinFunctionExpression;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.parser.PathStatement;
-import com.ibm.bi.dml.parser.PrintStatement;
-import com.ibm.bi.dml.parser.RelationalExpression;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.StringIdentifier;
-import com.ibm.bi.dml.parser.WhileStatement;
-//import com.ibm.bi.dml.parser.antlr4.ExpressionInfo;
-//import com.ibm.bi.dml.parser.antlr4.StatementInfo;
-import com.ibm.bi.dml.parser.python.PydmlParser.AddSubExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.AssignmentStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.AtomicExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.BooleanAndExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.BooleanNotExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.BooleanOrExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.BuiltinFunctionExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.CommandlineParamExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.CommandlinePositionExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ConstDoubleIdExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ConstFalseExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ConstIntIdExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ConstStringIdExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ConstTrueExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.DataIdExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.DataIdentifierContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ExternalFunctionDefExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ForStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.FunctionCallAssignmentStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.FunctionCallMultiAssignmentStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.FunctionStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.IfStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.IfdefAssignmentStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.IgnoreNewLineContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ImportStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.IndexedExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.InternalFunctionDefExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.IterablePredicateColonExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.IterablePredicateSeqExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.MatrixDataTypeCheckContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.Ml_typeContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ModIntDivExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.MultDivExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ParForStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ParameterizedExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.PathStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.PmlprogramContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.PowerExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.RelationalExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.SimpleDataIdentifierExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.StatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.StrictParameterizedExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.StrictParameterizedKeyValueStringContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.TypedArgNoAssignContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.UnaryExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ValueDataTypeCheckContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.WhileStatementContext;
+import org.apache.sysml.parser.AssignmentStatement;
+import org.apache.sysml.parser.BinaryExpression;
+import org.apache.sysml.parser.BooleanExpression;
+import org.apache.sysml.parser.BooleanIdentifier;
+import org.apache.sysml.parser.BuiltinFunctionExpression;
+import org.apache.sysml.parser.ConditionalPredicate;
+import org.apache.sysml.parser.ConstIdentifier;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.DoubleIdentifier;
+import org.apache.sysml.parser.Expression;
+import org.apache.sysml.parser.Expression.DataOp;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ExternalFunctionStatement;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.FunctionCallIdentifier;
+import org.apache.sysml.parser.FunctionStatement;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.ImportStatement;
+import org.apache.sysml.parser.IndexedIdentifier;
+import org.apache.sysml.parser.IntIdentifier;
+import org.apache.sysml.parser.IterablePredicate;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.MultiAssignmentStatement;
+import org.apache.sysml.parser.OutputStatement;
+import org.apache.sysml.parser.ParForStatement;
+import org.apache.sysml.parser.ParameterExpression;
+import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.parser.PathStatement;
+import org.apache.sysml.parser.PrintStatement;
+import org.apache.sysml.parser.RelationalExpression;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.StringIdentifier;
+import org.apache.sysml.parser.WhileStatement;
+//import org.apache.sysml.parser.antlr4.ExpressionInfo;
+//import org.apache.sysml.parser.antlr4.StatementInfo;
+import org.apache.sysml.parser.python.PydmlParser.AddSubExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.AssignmentStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.AtomicExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.BooleanAndExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.BooleanNotExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.BooleanOrExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.BuiltinFunctionExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.CommandlineParamExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.CommandlinePositionExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ConstDoubleIdExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ConstFalseExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ConstIntIdExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ConstStringIdExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ConstTrueExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.DataIdExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.DataIdentifierContext;
+import org.apache.sysml.parser.python.PydmlParser.ExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ExternalFunctionDefExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ForStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.FunctionCallAssignmentStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.FunctionCallMultiAssignmentStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.FunctionStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.IfStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.IfdefAssignmentStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.IgnoreNewLineContext;
+import org.apache.sysml.parser.python.PydmlParser.ImportStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.IndexedExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.InternalFunctionDefExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.IterablePredicateColonExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.IterablePredicateSeqExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.MatrixDataTypeCheckContext;
+import org.apache.sysml.parser.python.PydmlParser.Ml_typeContext;
+import org.apache.sysml.parser.python.PydmlParser.ModIntDivExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.MultDivExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ParForStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.ParameterizedExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.PathStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.PmlprogramContext;
+import org.apache.sysml.parser.python.PydmlParser.PowerExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.RelationalExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.SimpleDataIdentifierExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.StatementContext;
+import org.apache.sysml.parser.python.PydmlParser.StrictParameterizedExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.StrictParameterizedKeyValueStringContext;
+import org.apache.sysml.parser.python.PydmlParser.TypedArgNoAssignContext;
+import org.apache.sysml.parser.python.PydmlParser.UnaryExpressionContext;
+import org.apache.sysml.parser.python.PydmlParser.ValueDataTypeCheckContext;
+import org.apache.sysml.parser.python.PydmlParser.WhileStatementContext;
 
 public class PydmlSyntacticValidator implements PydmlListener
 {	
@@ -1085,7 +1085,7 @@ public class PydmlSyntacticValidator implements PydmlListener
 			paramExpression.get(0).setName("rows");
 			paramExpression.get(1).setName("cols");
 			paramExpression.get(2).setName("sparsity");
-			paramExpression.add(new com.ibm.bi.dml.parser.ParameterExpression("pdf", new StringIdentifier("normal", fileName, line, col, line, col)));
+			paramExpression.add(new org.apache.sysml.parser.ParameterExpression("pdf", new StringIdentifier("normal", fileName, line, col, line, col)));
 			functionName = "rand";
 			namespace = DMLProgram.DEFAULT_NAMESPACE;
 		}
@@ -1099,7 +1099,7 @@ public class PydmlSyntacticValidator implements PydmlListener
 			paramExpression.get(2).setName("sparsity");
 			paramExpression.get(3).setName("min");
 			paramExpression.get(4).setName("max");
-			paramExpression.add(new com.ibm.bi.dml.parser.ParameterExpression("pdf", new StringIdentifier("uniform", fileName, line, col, line, col)));
+			paramExpression.add(new org.apache.sysml.parser.ParameterExpression("pdf", new StringIdentifier("uniform", fileName, line, col, line, col)));
 			functionName = "rand";
 			namespace = DMLProgram.DEFAULT_NAMESPACE;
 		}

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidatorHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidatorHelper.java b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidatorHelper.java
index 2805d9c..68bfa93 100644
--- a/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidatorHelper.java
+++ b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidatorHelper.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.parser.python;
+package org.apache.sysml.parser.python;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.antlr.v4.runtime.Token;
 
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.python.PydmlParser.FunctionCallAssignmentStatementContext;
-import com.ibm.bi.dml.parser.python.PydmlParser.ParameterizedExpressionContext;
-import com.ibm.bi.dml.parser.python.PydmlSyntacticErrorListener.CustomDmlErrorListener;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.python.PydmlParser.FunctionCallAssignmentStatementContext;
+import org.apache.sysml.parser.python.PydmlParser.ParameterizedExpressionContext;
+import org.apache.sysml.parser.python.PydmlSyntacticErrorListener.CustomDmlErrorListener;
 
 
 public class PydmlSyntacticValidatorHelper {
@@ -68,16 +68,16 @@ public class PydmlSyntacticValidatorHelper {
 		return retVal;
 	}
 	
-//	public static void setInfoForArithmeticOp(com.ibm.bi.dml.parser.Expression current, 
-//			com.ibm.bi.dml.parser.Expression left, 
-//			com.ibm.bi.dml.parser.Expression right, String opStr) {
+//	public static void setInfoForArithmeticOp(org.apache.sysml.parser.Expression current, 
+//			org.apache.sysml.parser.Expression left, 
+//			org.apache.sysml.parser.Expression right, String opStr) {
 //		try {
 //			// PLUS, MINUS, MULT, DIV, MODULUS, INTDIV, MATMULT, POW, INVALID
-//			com.ibm.bi.dml.parser.Expression.BinaryOp bop = com.ibm.bi.dml.parser.Expression.getBinaryOp(opStr);
-//			current = new com.ibm.bi.dml.parser.BinaryExpression(bop);
-//			((com.ibm.bi.dml.parser.BinaryExpression)current).setLeft(left);
-//			((com.ibm.bi.dml.parser.BinaryExpression)current).setRight(right);
-//			((com.ibm.bi.dml.parser.BinaryExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
+//			org.apache.sysml.parser.Expression.BinaryOp bop = org.apache.sysml.parser.Expression.getBinaryOp(opStr);
+//			current = new org.apache.sysml.parser.BinaryExpression(bop);
+//			((org.apache.sysml.parser.BinaryExpression)current).setLeft(left);
+//			((org.apache.sysml.parser.BinaryExpression)current).setRight(right);
+//			((org.apache.sysml.parser.BinaryExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
 //		}
 //		catch(Exception e) {
 //			System.out.println("In setInfoForArithmeticOp>>");
@@ -85,14 +85,14 @@ public class PydmlSyntacticValidatorHelper {
 //		}
 //	}
 	
-//	public static void setInfoForBooleanOp(com.ibm.bi.dml.parser.Expression current, 
-//			com.ibm.bi.dml.parser.Expression left, 
-//			com.ibm.bi.dml.parser.Expression right, String opStr) {
-//		com.ibm.bi.dml.parser.Expression.BooleanOp bop = com.ibm.bi.dml.parser.Expression.getBooleanOp(opStr);
-//		current = new com.ibm.bi.dml.parser.BooleanExpression(bop);
-//		((com.ibm.bi.dml.parser.BooleanExpression)current).setLeft(left);
-//		((com.ibm.bi.dml.parser.BooleanExpression)current).setRight(right);
-//		((com.ibm.bi.dml.parser.BooleanExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
+//	public static void setInfoForBooleanOp(org.apache.sysml.parser.Expression current, 
+//			org.apache.sysml.parser.Expression left, 
+//			org.apache.sysml.parser.Expression right, String opStr) {
+//		org.apache.sysml.parser.Expression.BooleanOp bop = org.apache.sysml.parser.Expression.getBooleanOp(opStr);
+//		current = new org.apache.sysml.parser.BooleanExpression(bop);
+//		((org.apache.sysml.parser.BooleanExpression)current).setLeft(left);
+//		((org.apache.sysml.parser.BooleanExpression)current).setRight(right);
+//		((org.apache.sysml.parser.BooleanExpression)current).setFilename(DmlSyntacticErrorListener.currentFileName.peek());
 //	}
 	
 	public boolean validateBuiltinFunctions(FunctionCallAssignmentStatementContext ctx) {
@@ -108,14 +108,14 @@ public class PydmlSyntacticValidatorHelper {
 		return true;
 	}
 	
-	public ArrayList<com.ibm.bi.dml.parser.ParameterExpression> getParameterExpressionList(List<ParameterizedExpressionContext> paramExprs) {
-		ArrayList<com.ibm.bi.dml.parser.ParameterExpression> retVal = new ArrayList<com.ibm.bi.dml.parser.ParameterExpression>();
+	public ArrayList<org.apache.sysml.parser.ParameterExpression> getParameterExpressionList(List<ParameterizedExpressionContext> paramExprs) {
+		ArrayList<org.apache.sysml.parser.ParameterExpression> retVal = new ArrayList<org.apache.sysml.parser.ParameterExpression>();
 		for(ParameterizedExpressionContext ctx : paramExprs) {
 			String paramName = null;
 			if(ctx.paramName != null && ctx.paramName.getText() != null && !ctx.paramName.getText().isEmpty()) {
 				paramName = ctx.paramName.getText();
 			}
-			com.ibm.bi.dml.parser.ParameterExpression myArg = new com.ibm.bi.dml.parser.ParameterExpression(paramName, ctx.paramVal.info.expr);
+			org.apache.sysml.parser.ParameterExpression myArg = new org.apache.sysml.parser.ParameterExpression(paramName, ctx.paramVal.info.expr);
 			retVal.add(myArg);
 		}
 		return retVal;

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/parser/python/StatementInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/parser/python/StatementInfo.java b/src/main/java/org/apache/sysml/parser/python/StatementInfo.java
index 82417a5..d0f07c2 100644
--- a/src/main/java/org/apache/sysml/parser/python/StatementInfo.java
+++ b/src/main/java/org/apache/sysml/parser/python/StatementInfo.java
@@ -1,4 +1,4 @@
-package com.ibm.bi.dml.parser.python;
+package org.apache.sysml.parser.python;
 
 /**
  * This class exists solely to prevent compiler warnings.
@@ -8,6 +8,6 @@ package com.ibm.bi.dml.parser.python;
  * (R-like and Python-like dialects), and Antlr-generated code assumes that
  * these classes are present in the parser's namespace.
  */
-class StatementInfo extends com.ibm.bi.dml.parser.antlr4.StatementInfo {
+class StatementInfo extends org.apache.sysml.parser.antlr4.StatementInfo {
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/runtime/DMLRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/DMLRuntimeException.java b/src/main/java/org/apache/sysml/runtime/DMLRuntimeException.java
index 2bee04c..3a5ae49 100644
--- a/src/main/java/org/apache/sysml/runtime/DMLRuntimeException.java
+++ b/src/main/java/org/apache/sysml/runtime/DMLRuntimeException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime;
+package org.apache.sysml.runtime;
 
-import com.ibm.bi.dml.api.DMLException;
+import org.apache.sysml.api.DMLException;
 
 /**
  * This exception should be thrown to flag runtime errors -- DML equivalent to java.lang.RuntimeException.

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/runtime/DMLScriptException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/DMLScriptException.java b/src/main/java/org/apache/sysml/runtime/DMLScriptException.java
index 8caa3e4..30c29f0 100644
--- a/src/main/java/org/apache/sysml/runtime/DMLScriptException.java
+++ b/src/main/java/org/apache/sysml/runtime/DMLScriptException.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime;
+package org.apache.sysml.runtime;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/runtime/DMLUnsupportedOperationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/DMLUnsupportedOperationException.java b/src/main/java/org/apache/sysml/runtime/DMLUnsupportedOperationException.java
index c968a03..7096a53 100644
--- a/src/main/java/org/apache/sysml/runtime/DMLUnsupportedOperationException.java
+++ b/src/main/java/org/apache/sysml/runtime/DMLUnsupportedOperationException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime;
+package org.apache.sysml.runtime;
 
-import com.ibm.bi.dml.api.DMLException;
+import org.apache.sysml.api.DMLException;
 
 public class DMLUnsupportedOperationException extends DMLException 
 {

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/7cd7dc2b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
index b48472c..07ae9b6 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,44 +24,44 @@ import java.util.HashSet;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.ReBlock;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ExternalFunctionStatement;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanObject;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.instructions.cp.StringObject;
-import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.udf.ExternalFunctionInvocationInstruction;
-import com.ibm.bi.dml.udf.FunctionParameter;
-import com.ibm.bi.dml.udf.Matrix;
-import com.ibm.bi.dml.udf.PackageFunction;
-import com.ibm.bi.dml.udf.PackageRuntimeException;
-import com.ibm.bi.dml.udf.Scalar;
-import com.ibm.bi.dml.udf.FunctionParameter.FunctionParameterType;
-import com.ibm.bi.dml.udf.BinaryObject;
-import com.ibm.bi.dml.udf.Scalar.ScalarValueType;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.ReBlock;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ExternalFunctionStatement;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.CacheException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.BooleanObject;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.instructions.cp.StringObject;
+import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.udf.ExternalFunctionInvocationInstruction;
+import org.apache.sysml.udf.FunctionParameter;
+import org.apache.sysml.udf.Matrix;
+import org.apache.sysml.udf.PackageFunction;
+import org.apache.sysml.udf.PackageRuntimeException;
+import org.apache.sysml.udf.Scalar;
+import org.apache.sysml.udf.FunctionParameter.FunctionParameterType;
+import org.apache.sysml.udf.BinaryObject;
+import org.apache.sysml.udf.Scalar.ScalarValueType;
 
 public class ExternalFunctionProgramBlock extends FunctionProgramBlock 
 {
@@ -916,7 +916,7 @@ public class ExternalFunctionProgramBlock extends FunctionProgramBlock
 	 * @return
 	 */
 
-	protected com.ibm.bi.dml.udf.Matrix.ValueType getMatrixValueType(String string) {
+	protected org.apache.sysml.udf.Matrix.ValueType getMatrixValueType(String string) {
 
 		if (string.equals("Double"))
 			return Matrix.ValueType.Double;