diff --git a/.gitignore b/.gitignore index 5e54ba14db5..d59cc60fa5b 100644 --- a/.gitignore +++ b/.gitignore @@ -37,14 +37,14 @@ src/main/java/Dml.tokens src/main/java/DmlLexer.tokens src/main/java/Pydml.tokens src/main/java/PydmlLexer.tokens -src/main/java/com/ibm/bi/dml/parser/antlr4/DmlBaseListener.java -src/main/java/com/ibm/bi/dml/parser/antlr4/DmlLexer.java -src/main/java/com/ibm/bi/dml/parser/antlr4/DmlListener.java -src/main/java/com/ibm/bi/dml/parser/antlr4/DmlParser.java -src/main/java/com/ibm/bi/dml/parser/python/PydmlBaseListener.java -src/main/java/com/ibm/bi/dml/parser/python/PydmlLexer.java -src/main/java/com/ibm/bi/dml/parser/python/PydmlListener.java -src/main/java/com/ibm/bi/dml/parser/python/PydmlParser.java +src/main/java/org/apache/sysml/parser/antlr4/DmlBaseListener.java +src/main/java/org/apache/sysml/parser/antlr4/DmlLexer.java +src/main/java/org/apache/sysml/parser/antlr4/DmlListener.java +src/main/java/org/apache/sysml/parser/antlr4/DmlParser.java +src/main/java/org/apache/sysml/parser/python/PydmlBaseListener.java +src/main/java/org/apache/sysml/parser/python/PydmlLexer.java +src/main/java/org/apache/sysml/parser/python/PydmlListener.java +src/main/java/org/apache/sysml/parser/python/PydmlParser.java src/test/scripts/**/in src/test/scripts/**/out src/test/scripts/**/expected diff --git a/bin/systemml b/bin/systemml index 08a440d9c77..055e74204c8 100755 --- a/bin/systemml +++ b/bin/systemml @@ -55,7 +55,7 @@ USER_DIR=$PWD BUILD_DIR=${PROJECT_ROOT_DIR}/target HADOOP_LIB_DIR=${BUILD_DIR}/lib -DML_SCRIPT_CLASS=${BUILD_DIR}/classes/com/ibm/bi/dml/api/DMLScript.class +DML_SCRIPT_CLASS=${BUILD_DIR}/classes/org/apache/sysml/api/DMLScript.class BUILD_ERR_MSG="You must build the project before running this script." BUILD_DIR_ERR_MSG="Could not find target directory \"${BUILD_DIR}\". ${BUILD_ERR_MSG}" @@ -130,7 +130,7 @@ CMD="java -Xmx8g -Xms4g -Xmn1g \ -cp $CLASSPATH \ -Dlog4j.configuration=file:'$PROJECT_ROOT_DIR/conf/log4j.properties' \ -Duser.dir='$USER_DIR' \ - com.ibm.bi.dml.api.DMLScript \ + org.apache.sysml.api.DMLScript \ -f '$SCRIPT_FILE' \ -exec singlenode \ -config='$PROJECT_ROOT_DIR/conf/SystemML-config.xml' \ diff --git a/bin/systemml.bat b/bin/systemml.bat index b039a942a8d..f4d593b99cc 100755 --- a/bin/systemml.bat +++ b/bin/systemml.bat @@ -111,7 +111,7 @@ set CMD=java -Xmx4g -Xms2g -Xmn400m ^ -cp "%CLASSPATH%" ^ -Dlog4j.configuration=file:"%PROJECT_ROOT_DIR%\conf\log4j.properties" ^ -Duser.dir="%USER_DIR%" ^ - com.ibm.bi.dml.api.DMLScript ^ + org.apache.sysml.api.DMLScript ^ -f %SCRIPT_FILE% ^ -exec singlenode ^ -config="%PROJECT_ROOT_DIR%\conf\SystemML-config.xml" ^ diff --git a/docs/Language Reference/SystemML_Language_Reference.html b/docs/Language Reference/SystemML_Language_Reference.html index ce3635d8e97..b442da3830a 100644 --- a/docs/Language Reference/SystemML_Language_Reference.html +++ b/docs/Language Reference/SystemML_Language_Reference.html @@ -3673,7 +3673,7 @@

implemented -in (classname="com.ibm.bi.dml.packagesupport.JLapackEigenWrapper")

+in (classname="org.apache.sysml.packagesupport.JLapackEigenWrapper")

A UDF invocation specifies the function identifier, variable identifiers for calling parameters, and the variables to be populated by the @@ -9479,7 +9479,7 @@

scala> import com.ibm.bi.dml.api.MLContext

+"Courier New";mso-bidi-font-style:italic'>> import org.apache.sysml.api.MLContext

 

diff --git a/docs/dml-language-reference.md b/docs/dml-language-reference.md index dff088653d6..abebe1f5124 100644 --- a/docs/dml-language-reference.md +++ b/docs/dml-language-reference.md @@ -407,7 +407,7 @@ userParam=value | User-defined parameter to invoke the package. | Yes | Any non- # example of an external UDF eigen = externalFunction(matrix[double] A) return (matrix[double] evec, matrix[double] eval) - implemented in (classname="com.ibm.bi.dml.packagesupport.JLapackEigenWrapper") + implemented in (classname="org.apache.sysml.packagesupport.JLapackEigenWrapper") A UDF invocation specifies the function identifier, variable identifiers for calling parameters, and the variables to be populated by the returned values from the function. The syntax for function calls is as follows. @@ -1186,7 +1186,7 @@ The MLContext API allows users to pass RDDs as input/output to SystemML through Typical usage for MLContext using Spark's Scala Shell is as follows: - scala> import com.ibm.bi.dml.api.MLContext + scala> import org.apache.sysml.api.MLContext Create input DataFrame from CSV file and potentially perform some feature transformation diff --git a/docs/mlcontext-programming-guide.md b/docs/mlcontext-programming-guide.md index c7d415df070..66caa3d644e 100644 --- a/docs/mlcontext-programming-guide.md +++ b/docs/mlcontext-programming-guide.md @@ -44,17 +44,17 @@ An `MLContext` object can be created by passing its constructor a reference to t
{% highlight scala %} -scala>import com.ibm.bi.dml.api.MLContext -import com.ibm.bi.dml.api.MLContext +scala>import org.apache.sysml.api.MLContext +import org.apache.sysml.api.MLContext scala> val ml = new MLContext(sc) -ml: com.ibm.bi.dml.api.MLContext = com.ibm.bi.dml.api.MLContext@33e38c6b +ml: org.apache.sysml.api.MLContext = org.apache.sysml.api.MLContext@33e38c6b {% endhighlight %}
{% highlight scala %} -import com.ibm.bi.dml.api.MLContext +import org.apache.sysml.api.MLContext val ml = new MLContext(sc) {% endhighlight %}
@@ -125,27 +125,27 @@ an `MLOutput` object. The `getScalar()` method extracts a scalar value from a `D
{% highlight scala %} -scala> import com.ibm.bi.dml.api.MLOutput -import com.ibm.bi.dml.api.MLOutput +scala> import org.apache.sysml.api.MLOutput +import org.apache.sysml.api.MLOutput scala> def getScalar(outputs: MLOutput, symbol: String): Any = | outputs.getDF(sqlContext, symbol).first()(1) -getScalar: (outputs: com.ibm.bi.dml.api.MLOutput, symbol: String)Any +getScalar: (outputs: org.apache.sysml.api.MLOutput, symbol: String)Any scala> def getScalarDouble(outputs: MLOutput, symbol: String): Double = | getScalar(outputs, symbol).asInstanceOf[Double] -getScalarDouble: (outputs: com.ibm.bi.dml.api.MLOutput, symbol: String)Double +getScalarDouble: (outputs: org.apache.sysml.api.MLOutput, symbol: String)Double scala> def getScalarInt(outputs: MLOutput, symbol: String): Int = | getScalarDouble(outputs, symbol).toInt -getScalarInt: (outputs: com.ibm.bi.dml.api.MLOutput, symbol: String)Int +getScalarInt: (outputs: org.apache.sysml.api.MLOutput, symbol: String)Int {% endhighlight %}
{% highlight scala %} -import com.ibm.bi.dml.api.MLOutput +import org.apache.sysml.api.MLOutput def getScalar(outputs: MLOutput, symbol: String): Any = outputs.getDF(sqlContext, symbol).first()(1) def getScalarDouble(outputs: MLOutput, symbol: String): Double = @@ -176,11 +176,11 @@ to convert the `DataFrame df` to a SystemML binary-block matrix, which is repres
{% highlight scala %} -scala> import com.ibm.bi.dml.runtime.instructions.spark.utils.{RDDConverterUtilsExt => RDDConverterUtils} -import com.ibm.bi.dml.runtime.instructions.spark.utils.{RDDConverterUtilsExt=>RDDConverterUtils} +scala> import org.apache.sysml.runtime.instructions.spark.utils.{RDDConverterUtilsExt => RDDConverterUtils} +import org.apache.sysml.runtime.instructions.spark.utils.{RDDConverterUtilsExt=>RDDConverterUtils} -scala> import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics; -import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics +scala> import org.apache.sysml.runtime.matrix.MatrixCharacteristics; +import org.apache.sysml.runtime.matrix.MatrixCharacteristics scala> val numRowsPerBlock = 1000 numRowsPerBlock: Int = 1000 @@ -189,18 +189,18 @@ scala> val numColsPerBlock = 1000 numColsPerBlock: Int = 1000 scala> val mc = new MatrixCharacteristics(numRows, numCols, numRowsPerBlock, numColsPerBlock) -mc: com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics = [100000 x 1000, nnz=-1, blocks (1000 x 1000)] +mc: org.apache.sysml.runtime.matrix.MatrixCharacteristics = [100000 x 1000, nnz=-1, blocks (1000 x 1000)] scala> val sysMlMatrix = RDDConverterUtils.dataFrameToBinaryBlock(sc, df, mc, false) -sysMlMatrix: org.apache.spark.api.java.JavaPairRDD[com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes,com.ibm.bi.dml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@2bce3248 +sysMlMatrix: org.apache.spark.api.java.JavaPairRDD[org.apache.sysml.runtime.matrix.data.MatrixIndexes,org.apache.sysml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@2bce3248 {% endhighlight %}
{% highlight scala %} -import com.ibm.bi.dml.runtime.instructions.spark.utils.{RDDConverterUtilsExt => RDDConverterUtils} -import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics; +import org.apache.sysml.runtime.instructions.spark.utils.{RDDConverterUtilsExt => RDDConverterUtils} +import org.apache.sysml.runtime.matrix.MatrixCharacteristics; val numRowsPerBlock = 1000 val numColsPerBlock = 1000 val mc = new MatrixCharacteristics(numRows, numCols, numRowsPerBlock, numColsPerBlock) @@ -268,7 +268,7 @@ nargs: scala.collection.immutable.Map[String,String] = Map(Xin -> " ", Mout -> " scala> val outputs = ml.execute("shape.dml", nargs) 15/10/12 16:29:15 WARN : Your hostname, derons-mbp.usca.ibm.com resolves to a loopback/non-reachable address: 127.0.0.1, but we couldn't find any external IP address! 15/10/12 16:29:15 WARN OptimizerUtils: Auto-disable multi-threaded text read for 'text' and 'csv' due to thread contention on JRE < 1.8 (java.version=1.7.0_80). -outputs: com.ibm.bi.dml.api.MLOutput = com.ibm.bi.dml.api.MLOutput@4d424743 +outputs: org.apache.sysml.api.MLOutput = org.apache.sysml.api.MLOutput@4d424743 scala> val m = getScalarInt(outputs, "m") m: Int = 100000 @@ -362,11 +362,11 @@ mean value of the matrix.
{% highlight scala %} -scala> import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes -import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes +scala> import org.apache.sysml.runtime.matrix.data.MatrixIndexes +import org.apache.sysml.runtime.matrix.data.MatrixIndexes -scala> import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock +scala> import org.apache.sysml.runtime.matrix.data.MatrixBlock +import org.apache.sysml.runtime.matrix.data.MatrixBlock scala> import org.apache.spark.api.java.JavaPairRDD import org.apache.spark.api.java.JavaPairRDD @@ -383,15 +383,15 @@ scala> def minMaxMean(mat: JavaPairRDD[MatrixIndexes, MatrixBlock], rows: Int, c | val meanOut = getScalarDouble(outputs, "meanOut") | (minOut, maxOut, meanOut) | } -minMaxMean: (mat: org.apache.spark.api.java.JavaPairRDD[com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes,com.ibm.bi.dml.runtime.matrix.data.MatrixBlock], rows: Int, cols: Int, ml: com.ibm.bi.dml.api.MLContext)(Double, Double, Double) +minMaxMean: (mat: org.apache.spark.api.java.JavaPairRDD[org.apache.sysml.runtime.matrix.data.MatrixIndexes,org.apache.sysml.runtime.matrix.data.MatrixBlock], rows: Int, cols: Int, ml: org.apache.sysml.api.MLContext)(Double, Double, Double) {% endhighlight %}
{% highlight scala %} -import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock +import org.apache.sysml.runtime.matrix.data.MatrixIndexes +import org.apache.sysml.runtime.matrix.data.MatrixBlock import org.apache.spark.api.java.JavaPairRDD def minMaxMean(mat: JavaPairRDD[MatrixIndexes, MatrixBlock], rows: Int, cols: Int, ml: MLContext): (Double, Double, Double) = { ml.reset() @@ -452,7 +452,7 @@ to standard output. {% highlight java %} -package com.ibm.bi.dml; +package org.apache.sysml; import java.util.HashMap; @@ -462,8 +462,8 @@ import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.sql.DataFrame; import org.apache.spark.sql.SQLContext; -import com.ibm.bi.dml.api.MLContext; -import com.ibm.bi.dml.api.MLOutput; +import org.apache.sysml.api.MLContext; +import org.apache.sysml.api.MLOutput; public class MLContextExample { @@ -835,7 +835,7 @@ This cell contains helper methods to return `Double` and `Int` values from outpu **Cell:** {% highlight scala %} // Helper functions -import com.ibm.bi.dml.api.MLOutput +import org.apache.sysml.api.MLOutput def getScalar(outputs: MLOutput, symbol: String): Any = outputs.getDF(sqlContext, symbol).first()(1) @@ -849,10 +849,10 @@ def getScalarInt(outputs: MLOutput, symbol: String): Int = **Output:** {% highlight scala %} -import com.ibm.bi.dml.api.MLOutput -getScalar: (outputs: com.ibm.bi.dml.api.MLOutput, symbol: String)Any -getScalarDouble: (outputs: com.ibm.bi.dml.api.MLOutput, symbol: String)Double -getScalarInt: (outputs: com.ibm.bi.dml.api.MLOutput, symbol: String)Int +import org.apache.sysml.api.MLOutput +getScalar: (outputs: org.apache.sysml.api.MLOutput, symbol: String)Any +getScalarDouble: (outputs: org.apache.sysml.api.MLOutput, symbol: String)Double +getScalarInt: (outputs: org.apache.sysml.api.MLOutput, symbol: String)Int {% endhighlight %} @@ -867,9 +867,9 @@ and single-column `label` matrix, both represented by the **Cell:** {% highlight scala %} // Imports -import com.ibm.bi.dml.api.MLContext -import com.ibm.bi.dml.runtime.instructions.spark.utils.{RDDConverterUtilsExt => RDDConverterUtils} -import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics; +import org.apache.sysml.api.MLContext +import org.apache.sysml.runtime.instructions.spark.utils.{RDDConverterUtilsExt => RDDConverterUtils} +import org.apache.sysml.runtime.matrix.MatrixCharacteristics; // Create SystemML context val ml = new MLContext(sc) @@ -890,16 +890,16 @@ val cnt2 = y2.count() **Output:** {% highlight scala %} -import com.ibm.bi.dml.api.MLContext -import com.ibm.bi.dml.runtime.instructions.spark.utils.{RDDConverterUtilsExt=>RDDConverterUtils} -import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics -ml: com.ibm.bi.dml.api.MLContext = com.ibm.bi.dml.api.MLContext@38d59245 -mcX: com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics = [10000 x 1000, nnz=-1, blocks (1000 x 1000)] -mcY: com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics = [10000 x 1, nnz=-1, blocks (1000 x 1000)] -X: org.apache.spark.api.java.JavaPairRDD[com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes,com.ibm.bi.dml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@b5a86e3 -y: org.apache.spark.api.java.JavaPairRDD[com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes,com.ibm.bi.dml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@56377665 -X2: org.apache.spark.api.java.JavaPairRDD[com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes,com.ibm.bi.dml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@650f29d2 -y2: org.apache.spark.api.java.JavaPairRDD[com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes,com.ibm.bi.dml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@334857a8 +import org.apache.sysml.api.MLContext +import org.apache.sysml.runtime.instructions.spark.utils.{RDDConverterUtilsExt=>RDDConverterUtils} +import org.apache.sysml.runtime.matrix.MatrixCharacteristics +ml: org.apache.sysml.api.MLContext = org.apache.sysml.api.MLContext@38d59245 +mcX: org.apache.sysml.runtime.matrix.MatrixCharacteristics = [10000 x 1000, nnz=-1, blocks (1000 x 1000)] +mcY: org.apache.sysml.runtime.matrix.MatrixCharacteristics = [10000 x 1, nnz=-1, blocks (1000 x 1000)] +X: org.apache.spark.api.java.JavaPairRDD[org.apache.sysml.runtime.matrix.data.MatrixIndexes,org.apache.sysml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@b5a86e3 +y: org.apache.spark.api.java.JavaPairRDD[org.apache.sysml.runtime.matrix.data.MatrixIndexes,org.apache.sysml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@56377665 +X2: org.apache.spark.api.java.JavaPairRDD[org.apache.sysml.runtime.matrix.data.MatrixIndexes,org.apache.sysml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@650f29d2 +y2: org.apache.spark.api.java.JavaPairRDD[org.apache.sysml.runtime.matrix.data.MatrixIndexes,org.apache.sysml.runtime.matrix.data.MatrixBlock] = org.apache.spark.api.java.JavaPairRDD@334857a8 cnt1: Long = 10 cnt2: Long = 10 {% endhighlight %} @@ -936,7 +936,7 @@ val trainingTimePerIter = trainingTime / iters **Output:** {% highlight scala %} start: Long = 1444672090620 -outputs: com.ibm.bi.dml.api.MLOutput = com.ibm.bi.dml.api.MLOutput@5d2c22d0 +outputs: org.apache.sysml.api.MLOutput = org.apache.sysml.api.MLOutput@5d2c22d0 trainingTime: Double = 1.176 B: org.apache.spark.sql.DataFrame = [C1: double] r2: Double = 0.9677079547216473 diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md index b01aea1fa8a..1a7935b68db 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -357,7 +357,7 @@ If you encounter a `"java.lang.OutOfMemoryError"` you can edit the invocation script (`runStandaloneSystemML.sh` or `runStandaloneSystemML.bat`) to increase the memory available to the JVM, i.e: - java -Xmx16g -Xms4g -Xmn1g -cp ${CLASSPATH} com.ibm.bi.dml.api.DMLScript \ + java -Xmx16g -Xms4g -Xmn1g -cp ${CLASSPATH} org.apache.sysml.api.DMLScript \ -f ${SCRIPT_FILE} -exec singlenode -config=SystemML-config.xml \ $@ diff --git a/pom.xml b/pom.xml index 1bf1cbfbba9..ebbba39b772 100644 --- a/pom.xml +++ b/pom.xml @@ -1,56 +1,87 @@ + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> 4.0.0 - com.ibm.systemml - 0.9.0-SNAPSHOT - system-ml - jar - SystemML compiler - org.apache apache 17 + org.apache.systemml + 0.9.0-SNAPSHOT + system-ml + jar + SystemML + Declarative machine learning + http://systemml.apache.org/ + + + Apache 2.0 License + http://www.apache.org/licenses/LICENSE-2.0.html + + + + scm:git:git@github.com:apache/incubator-systemml + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-systemml + scm:git:git@github.com:apache/incubator-systemml + HEAD + + + JIRA + https://issues.apache.org/jira/browse/SYSTEMML + + + + Dev Mailing List + dev@systemml.incubator.apache.org + dev-subscribe@systemml.incubator.apache.org + dev-unsubscribe@systemml.incubator.apache.org + + + Commits Mailing List + commits@systemml.incubator.apache.org + commits-subscribe@systemml.incubator.apache.org + commits-unsubscribe@systemml.incubator.apache.org + + - - - org.codehaus.mojo - exec-maven-plugin - 1.1.1 - - - pre-integration-test - - java - - - com.ibm.bi.dml.utils.InstallDependencyForIntegrationTests - - ${skipTests} - - - - - + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + pre-integration-test + + java + + + org.apache.sysml.utils.InstallDependencyForIntegrationTests + + ${skipTests} + + + + + org.apache.maven.plugins @@ -123,7 +154,6 @@ - org.codehaus.mojo build-helper-maven-plugin @@ -145,8 +175,7 @@ - - + org.apache.maven.plugins maven-compiler-plugin @@ -156,7 +185,6 @@ - maven-assembly-plugin 2.4 @@ -234,7 +262,7 @@ ${maven.build.timestamp} - com.ibm.bi.dml.api.DMLScript + org.apache.sysml.api.DMLScript @@ -354,7 +382,6 @@ **/integration/**/*Suite.java - **/integration/functions/append/*Test.java **/integration/functions/binary/matrix/*Test.java @@ -444,7 +471,6 @@ - org.apache.spark spark-core_2.10 @@ -568,7 +594,6 @@ - net.sf.opencsv opencsv @@ -602,7 +627,6 @@ provided - org.antlr antlr4 diff --git a/scripts/algorithms/decision-tree.dml b/scripts/algorithms/decision-tree.dml index 6dfe688235c..5c90976d926 100644 --- a/scripts/algorithms/decision-tree.dml +++ b/scripts/algorithms/decision-tree.dml @@ -63,7 +63,7 @@ # External function for binning binning = externalFunction(Matrix[Double] A, Integer binsize, Integer numbins) return (Matrix[Double] B, Integer numbinsdef) - implemented in (classname="com.ibm.bi.dml.udf.lib.BinningWrapper",exectype="mem") + implemented in (classname="org.apache.sysml.udf.lib.BinningWrapper",exectype="mem") # Default values of some parameters diff --git a/scripts/algorithms/random-forest.dml b/scripts/algorithms/random-forest.dml index df688694f51..4bf02504deb 100644 --- a/scripts/algorithms/random-forest.dml +++ b/scripts/algorithms/random-forest.dml @@ -67,7 +67,7 @@ # External function for binning binning = externalFunction(Matrix[Double] A, Integer binsize, Integer numbins) return (Matrix[Double] B, Integer numbinsdef) - implemented in (classname="com.ibm.bi.dml.udf.lib.BinningWrapper",exectype="mem") + implemented in (classname="org.apache.sysml.udf.lib.BinningWrapper",exectype="mem") # Default values of some parameters diff --git a/scripts/staging/Lanczos.dml b/scripts/staging/Lanczos.dml index 6d4b2ab0b84..e432ab1c799 100644 --- a/scripts/staging/Lanczos.dml +++ b/scripts/staging/Lanczos.dml @@ -3,7 +3,7 @@ eigen = externalFunction(Matrix[Double] A) return(Matrix[Double] eval, Matrix[Double] evec) - implemented in (classname="com.ibm.bi.dml.udf.lib.EigenWrapper", exectype="mem") + implemented in (classname="org.apache.sysml.udf.lib.EigenWrapper", exectype="mem") A = read($1); # input data, must be a square matrix diff --git a/src/main/java/com/ibm/bi/dml/api/DMLException.java b/src/main/java/org/apache/sysml/api/DMLException.java similarity index 97% rename from src/main/java/com/ibm/bi/dml/api/DMLException.java rename to src/main/java/org/apache/sysml/api/DMLException.java index 078c0670226..92d350d5f4e 100644 --- a/src/main/java/com/ibm/bi/dml/api/DMLException.java +++ b/src/main/java/org/apache/sysml/api/DMLException.java @@ -15,7 +15,7 @@ *  */ -package com.ibm.bi.dml.api; +package org.apache.sysml.api; /** *

Exception occurring in the DML framework.

diff --git a/src/main/java/com/ibm/bi/dml/api/DMLScript.java b/src/main/java/org/apache/sysml/api/DMLScript.java similarity index 93% rename from src/main/java/com/ibm/bi/dml/api/DMLScript.java rename to src/main/java/org/apache/sysml/api/DMLScript.java index 0b2d59eebf0..0c21be947b4 100644 --- a/src/main/java/com/ibm/bi/dml/api/DMLScript.java +++ b/src/main/java/org/apache/sysml/api/DMLScript.java @@ -15,7 +15,7 @@ *  */ -package com.ibm.bi.dml.api; +package org.apache.sysml.api; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -45,46 +45,46 @@ import org.apache.log4j.Logger; import org.xml.sax.SAXException; -import com.ibm.bi.dml.conf.ConfigurationManager; -import com.ibm.bi.dml.conf.DMLConfig; -import com.ibm.bi.dml.debug.DMLDebugger; -import com.ibm.bi.dml.debug.DMLDebuggerException; -import com.ibm.bi.dml.debug.DMLDebuggerProgramInfo; -import com.ibm.bi.dml.hops.HopsException; -import com.ibm.bi.dml.hops.OptimizerUtils; -import com.ibm.bi.dml.hops.OptimizerUtils.OptimizationLevel; -import com.ibm.bi.dml.hops.globalopt.GlobalOptimizerWrapper; -import com.ibm.bi.dml.lops.Lop; -import com.ibm.bi.dml.lops.LopsException; -import com.ibm.bi.dml.parser.AParserWrapper; -import com.ibm.bi.dml.parser.DMLProgram; -import com.ibm.bi.dml.parser.DMLTranslator; -import com.ibm.bi.dml.parser.LanguageException; -import com.ibm.bi.dml.parser.ParseException; -import com.ibm.bi.dml.runtime.DMLRuntimeException; -import com.ibm.bi.dml.runtime.DMLScriptException; -import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException; -import com.ibm.bi.dml.runtime.controlprogram.Program; -import com.ibm.bi.dml.runtime.controlprogram.caching.CacheStatistics; -import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData; -import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext; -import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContextFactory; -import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext; -import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter; -import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; -import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler; -import com.ibm.bi.dml.runtime.matrix.CleanupMR; -import com.ibm.bi.dml.runtime.matrix.mapred.MRConfigurationNames; -import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration; -import com.ibm.bi.dml.runtime.util.LocalFileUtils; -import com.ibm.bi.dml.runtime.util.MapReduceTool; -import com.ibm.bi.dml.utils.Explain; -import com.ibm.bi.dml.utils.Explain.ExplainCounts; -import com.ibm.bi.dml.utils.Explain.ExplainType; -import com.ibm.bi.dml.utils.Statistics; -import com.ibm.bi.dml.yarn.DMLAppMasterUtils; -// import com.ibm.bi.dml.utils.visualize.DotGraph; -import com.ibm.bi.dml.yarn.DMLYarnClientProxy; +import org.apache.sysml.conf.ConfigurationManager; +import org.apache.sysml.conf.DMLConfig; +import org.apache.sysml.debug.DMLDebugger; +import org.apache.sysml.debug.DMLDebuggerException; +import org.apache.sysml.debug.DMLDebuggerProgramInfo; +import org.apache.sysml.hops.HopsException; +import org.apache.sysml.hops.OptimizerUtils; +import org.apache.sysml.hops.OptimizerUtils.OptimizationLevel; +import org.apache.sysml.hops.globalopt.GlobalOptimizerWrapper; +import org.apache.sysml.lops.Lop; +import org.apache.sysml.lops.LopsException; +import org.apache.sysml.parser.AParserWrapper; +import org.apache.sysml.parser.DMLProgram; +import org.apache.sysml.parser.DMLTranslator; +import org.apache.sysml.parser.LanguageException; +import org.apache.sysml.parser.ParseException; +import org.apache.sysml.runtime.DMLRuntimeException; +import org.apache.sysml.runtime.DMLScriptException; +import org.apache.sysml.runtime.DMLUnsupportedOperationException; +import org.apache.sysml.runtime.controlprogram.Program; +import org.apache.sysml.runtime.controlprogram.caching.CacheStatistics; +import org.apache.sysml.runtime.controlprogram.caching.CacheableData; +import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; +import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory; +import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; +import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter; +import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer; +import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler; +import org.apache.sysml.runtime.matrix.CleanupMR; +import org.apache.sysml.runtime.matrix.mapred.MRConfigurationNames; +import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration; +import org.apache.sysml.runtime.util.LocalFileUtils; +import org.apache.sysml.runtime.util.MapReduceTool; +import org.apache.sysml.utils.Explain; +import org.apache.sysml.utils.Explain.ExplainCounts; +import org.apache.sysml.utils.Explain.ExplainType; +import org.apache.sysml.utils.Statistics; +import org.apache.sysml.yarn.DMLAppMasterUtils; +// import org.apache.sysml.utils.visualize.DotGraph; +import org.apache.sysml.yarn.DMLYarnClientProxy; public class DMLScript @@ -536,10 +536,10 @@ private static void setLoggingProperties( Configuration conf ) if (debug != null){ if (debug.equalsIgnoreCase("debug")){ - Logger.getLogger("com.ibm.bi.dml").setLevel((Level) Level.DEBUG); + Logger.getLogger("org.apache.sysml").setLevel((Level) Level.DEBUG); } else if (debug.equalsIgnoreCase("trace")){ - Logger.getLogger("com.ibm.bi.dml").setLevel((Level) Level.TRACE); + Logger.getLogger("org.apache.sysml").setLevel((Level) Level.TRACE); } } } diff --git a/src/main/java/com/ibm/bi/dml/api/MLBlock.java b/src/main/java/org/apache/sysml/api/MLBlock.java similarity index 97% rename from src/main/java/com/ibm/bi/dml/api/MLBlock.java rename to src/main/java/org/apache/sysml/api/MLBlock.java index b68f1ade41b..32ce5f3df56 100644 --- a/src/main/java/com/ibm/bi/dml/api/MLBlock.java +++ b/src/main/java/org/apache/sysml/api/MLBlock.java @@ -14,7 +14,7 @@ * limitations under the License. *  */ -package com.ibm.bi.dml.api; +package org.apache.sysml.api; import java.math.BigDecimal; import java.sql.Date; @@ -27,8 +27,8 @@ import org.apache.spark.sql.types.StructField; import org.apache.spark.sql.types.StructType; -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock; -import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes; +import org.apache.sysml.runtime.matrix.data.MatrixBlock; +import org.apache.sysml.runtime.matrix.data.MatrixIndexes; import scala.collection.Seq; diff --git a/src/main/java/com/ibm/bi/dml/api/MLContext.java b/src/main/java/org/apache/sysml/api/MLContext.java similarity index 94% rename from src/main/java/com/ibm/bi/dml/api/MLContext.java rename to src/main/java/org/apache/sysml/api/MLContext.java index 39c6384aebc..0099d8a51b0 100644 --- a/src/main/java/com/ibm/bi/dml/api/MLContext.java +++ b/src/main/java/org/apache/sysml/api/MLContext.java @@ -15,7 +15,7 @@ *  */ -package com.ibm.bi.dml.api; +package org.apache.sysml.api; import java.io.IOException; @@ -32,53 +32,53 @@ import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.rdd.RDD; -import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM; -import com.ibm.bi.dml.api.jmlc.JMLCUtils; -import com.ibm.bi.dml.api.monitoring.SparkMonitoringUtil; -import com.ibm.bi.dml.conf.ConfigurationManager; -import com.ibm.bi.dml.conf.DMLConfig; -import com.ibm.bi.dml.hops.OptimizerUtils; -import com.ibm.bi.dml.hops.OptimizerUtils.OptimizationLevel; -import com.ibm.bi.dml.hops.globalopt.GlobalOptimizerWrapper; -import com.ibm.bi.dml.hops.rewrite.ProgramRewriter; -import com.ibm.bi.dml.hops.rewrite.RewriteRemovePersistentReadWrite; -import com.ibm.bi.dml.parser.AParserWrapper; -import com.ibm.bi.dml.parser.DMLProgram; -import com.ibm.bi.dml.parser.DMLTranslator; -import com.ibm.bi.dml.parser.DataExpression; -import com.ibm.bi.dml.parser.Expression; -import com.ibm.bi.dml.parser.IntIdentifier; -import com.ibm.bi.dml.parser.LanguageException; -import com.ibm.bi.dml.parser.StringIdentifier; -import com.ibm.bi.dml.parser.Expression.ValueType; -import com.ibm.bi.dml.parser.ParseException; -import com.ibm.bi.dml.runtime.DMLRuntimeException; -import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap; -import com.ibm.bi.dml.runtime.controlprogram.Program; -import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData; -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.context.ExecutionContextFactory; -import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext; -import com.ibm.bi.dml.runtime.instructions.Instruction; -import com.ibm.bi.dml.runtime.instructions.cp.Data; -import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction; -import com.ibm.bi.dml.runtime.instructions.spark.data.RDDObject; -import com.ibm.bi.dml.runtime.instructions.spark.data.RDDProperties; -import com.ibm.bi.dml.runtime.instructions.spark.functions.ConvertStringToLongTextPair; -import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyBlockPairFunction; -import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyTextInputFunction; -import com.ibm.bi.dml.runtime.instructions.spark.functions.SparkListener; -import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtilsExt; -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.MatrixBlock; -import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes; -import com.ibm.bi.dml.runtime.matrix.data.OutputInfo; -import com.ibm.bi.dml.utils.Explain; -import com.ibm.bi.dml.utils.Statistics; -import com.ibm.bi.dml.utils.Explain.ExplainCounts; +import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; +import org.apache.sysml.api.jmlc.JMLCUtils; +import org.apache.sysml.api.monitoring.SparkMonitoringUtil; +import org.apache.sysml.conf.ConfigurationManager; +import org.apache.sysml.conf.DMLConfig; +import org.apache.sysml.hops.OptimizerUtils; +import org.apache.sysml.hops.OptimizerUtils.OptimizationLevel; +import org.apache.sysml.hops.globalopt.GlobalOptimizerWrapper; +import org.apache.sysml.hops.rewrite.ProgramRewriter; +import org.apache.sysml.hops.rewrite.RewriteRemovePersistentReadWrite; +import org.apache.sysml.parser.AParserWrapper; +import org.apache.sysml.parser.DMLProgram; +import org.apache.sysml.parser.DMLTranslator; +import org.apache.sysml.parser.DataExpression; +import org.apache.sysml.parser.Expression; +import org.apache.sysml.parser.IntIdentifier; +import org.apache.sysml.parser.LanguageException; +import org.apache.sysml.parser.StringIdentifier; +import org.apache.sysml.parser.Expression.ValueType; +import org.apache.sysml.parser.ParseException; +import org.apache.sysml.runtime.DMLRuntimeException; +import org.apache.sysml.runtime.controlprogram.LocalVariableMap; +import org.apache.sysml.runtime.controlprogram.Program; +import org.apache.sysml.runtime.controlprogram.caching.CacheableData; +import org.apache.sysml.runtime.controlprogram.caching.MatrixObject; +import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; +import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory; +import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext; +import org.apache.sysml.runtime.instructions.Instruction; +import org.apache.sysml.runtime.instructions.cp.Data; +import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction; +import org.apache.sysml.runtime.instructions.spark.data.RDDObject; +import org.apache.sysml.runtime.instructions.spark.data.RDDProperties; +import org.apache.sysml.runtime.instructions.spark.functions.ConvertStringToLongTextPair; +import org.apache.sysml.runtime.instructions.spark.functions.CopyBlockPairFunction; +import org.apache.sysml.runtime.instructions.spark.functions.CopyTextInputFunction; +import org.apache.sysml.runtime.instructions.spark.functions.SparkListener; +import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtilsExt; +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.MatrixBlock; +import org.apache.sysml.runtime.matrix.data.MatrixIndexes; +import org.apache.sysml.runtime.matrix.data.OutputInfo; +import org.apache.sysml.utils.Explain; +import org.apache.sysml.utils.Statistics; +import org.apache.sysml.utils.Explain.ExplainCounts; import org.apache.spark.sql.DataFrame; import org.apache.spark.sql.SQLContext; @@ -89,7 +89,7 @@ *

* Typical usage for MLContext is as follows: * 


- * scala> import com.ibm.bi.dml.api.MLContext
+ * scala> import org.apache.sysml.api.MLContext
  *
*

* Create input DataFrame from CSV file and potentially perform some feature transformation diff --git a/src/main/java/com/ibm/bi/dml/api/MLContextProxy.java b/src/main/java/org/apache/sysml/api/MLContextProxy.java similarity index 89% rename from src/main/java/com/ibm/bi/dml/api/MLContextProxy.java rename to src/main/java/org/apache/sysml/api/MLContextProxy.java index ad32c5fb7cf..d7de98d3727 100644 --- a/src/main/java/com/ibm/bi/dml/api/MLContextProxy.java +++ b/src/main/java/org/apache/sysml/api/MLContextProxy.java @@ -15,15 +15,15 @@ *  */ -package com.ibm.bi.dml.api; +package org.apache.sysml.api; import java.util.ArrayList; -import com.ibm.bi.dml.api.monitoring.Location; -import com.ibm.bi.dml.parser.Expression; -import com.ibm.bi.dml.parser.LanguageException; -import com.ibm.bi.dml.runtime.instructions.Instruction; -import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction; +import org.apache.sysml.api.monitoring.Location; +import org.apache.sysml.parser.Expression; +import org.apache.sysml.parser.LanguageException; +import org.apache.sysml.runtime.instructions.Instruction; +import org.apache.sysml.runtime.instructions.spark.SPInstruction; /** * The purpose of this proxy is to shield systemml internals from direct access to MLContext diff --git a/src/main/java/com/ibm/bi/dml/api/MLMatrix.java b/src/main/java/org/apache/sysml/api/MLMatrix.java similarity index 96% rename from src/main/java/com/ibm/bi/dml/api/MLMatrix.java rename to src/main/java/org/apache/sysml/api/MLMatrix.java index 541f09435df..00f56c464ed 100644 --- a/src/main/java/com/ibm/bi/dml/api/MLMatrix.java +++ b/src/main/java/org/apache/sysml/api/MLMatrix.java @@ -14,7 +14,7 @@ * limitations under the License. *  */ -package com.ibm.bi.dml.api; +package org.apache.sysml.api; import java.io.IOException; import java.util.List; @@ -32,14 +32,14 @@ import scala.Tuple2; -import com.ibm.bi.dml.parser.DMLTranslator; -import com.ibm.bi.dml.parser.ParseException; -import com.ibm.bi.dml.runtime.DMLRuntimeException; -import com.ibm.bi.dml.runtime.instructions.spark.functions.GetMIMBFromRow; -import com.ibm.bi.dml.runtime.instructions.spark.functions.GetMLBlock; -import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics; -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock; -import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes; +import org.apache.sysml.parser.DMLTranslator; +import org.apache.sysml.parser.ParseException; +import org.apache.sysml.runtime.DMLRuntimeException; +import org.apache.sysml.runtime.instructions.spark.functions.GetMIMBFromRow; +import org.apache.sysml.runtime.instructions.spark.functions.GetMLBlock; +import org.apache.sysml.runtime.matrix.MatrixCharacteristics; +import org.apache.sysml.runtime.matrix.data.MatrixBlock; +import org.apache.sysml.runtime.matrix.data.MatrixIndexes; /** * Experimental API: Might be discontinued in future release @@ -56,7 +56,7 @@ * Also, note that this library is not thread-safe. The operator precedence is not exactly same as DML (as the precedence is * enforced by scala compiler), so please use appropriate brackets to enforce precedence. - import com.ibm.bi.dml.api.{MLContext, MLMatrix} + import org.apache.sysml.api.{MLContext, MLMatrix} val ml = new MLContext(sc) val mat1 = ml.read(sqlContext, "V_small.csv", "csv") val mat2 = ml.read(sqlContext, "W_small.mtx", "binary") diff --git a/src/main/java/com/ibm/bi/dml/api/MLOutput.java b/src/main/java/org/apache/sysml/api/MLOutput.java similarity index 97% rename from src/main/java/com/ibm/bi/dml/api/MLOutput.java rename to src/main/java/org/apache/sysml/api/MLOutput.java index 82f74a0c50a..299ce501b87 100644 --- a/src/main/java/com/ibm/bi/dml/api/MLOutput.java +++ b/src/main/java/org/apache/sysml/api/MLOutput.java @@ -15,7 +15,7 @@ *  */ -package com.ibm.bi.dml.api; +package org.apache.sysml.api; import java.util.ArrayList; import java.util.HashMap; @@ -38,13 +38,13 @@ import scala.Tuple2; -import com.ibm.bi.dml.runtime.DMLRuntimeException; -import com.ibm.bi.dml.runtime.instructions.spark.functions.GetMLBlock; -import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtilsExt; -import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics; -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock; -import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes; -import com.ibm.bi.dml.runtime.util.UtilFunctions; +import org.apache.sysml.runtime.DMLRuntimeException; +import org.apache.sysml.runtime.instructions.spark.functions.GetMLBlock; +import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtilsExt; +import org.apache.sysml.runtime.matrix.MatrixCharacteristics; +import org.apache.sysml.runtime.matrix.data.MatrixBlock; +import org.apache.sysml.runtime.matrix.data.MatrixIndexes; +import org.apache.sysml.runtime.util.UtilFunctions; /** * This is a simple container object that returns the output of execute from MLContext diff --git a/src/main/java/com/ibm/bi/dml/api/jmlc/Connection.java b/src/main/java/org/apache/sysml/api/jmlc/Connection.java similarity index 84% rename from src/main/java/com/ibm/bi/dml/api/jmlc/Connection.java rename to src/main/java/org/apache/sysml/api/jmlc/Connection.java index 57d389f597b..2c72ee12ef3 100644 --- a/src/main/java/com/ibm/bi/dml/api/jmlc/Connection.java +++ b/src/main/java/org/apache/sysml/api/jmlc/Connection.java @@ -15,7 +15,7 @@ *  */ -package com.ibm.bi.dml.api.jmlc; +package org.apache.sysml.api.jmlc; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -28,26 +28,26 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import com.ibm.bi.dml.api.DMLException; -import com.ibm.bi.dml.api.DMLScript; -import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM; -import com.ibm.bi.dml.conf.ConfigurationManager; -import com.ibm.bi.dml.conf.DMLConfig; -import com.ibm.bi.dml.hops.OptimizerUtils; -import com.ibm.bi.dml.hops.rewrite.ProgramRewriter; -import com.ibm.bi.dml.hops.rewrite.RewriteRemovePersistentReadWrite; -import com.ibm.bi.dml.parser.AParserWrapper; -import com.ibm.bi.dml.parser.DMLProgram; -import com.ibm.bi.dml.parser.DMLTranslator; -import com.ibm.bi.dml.parser.DataExpression; -import com.ibm.bi.dml.runtime.DMLRuntimeException; -import com.ibm.bi.dml.runtime.controlprogram.Program; -import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData; -import com.ibm.bi.dml.runtime.io.MatrixReaderFactory; -import com.ibm.bi.dml.runtime.io.ReaderTextCell; -import com.ibm.bi.dml.runtime.matrix.data.InputInfo; -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock; -import com.ibm.bi.dml.runtime.util.DataConverter; +import org.apache.sysml.api.DMLException; +import org.apache.sysml.api.DMLScript; +import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM; +import org.apache.sysml.conf.ConfigurationManager; +import org.apache.sysml.conf.DMLConfig; +import org.apache.sysml.hops.OptimizerUtils; +import org.apache.sysml.hops.rewrite.ProgramRewriter; +import org.apache.sysml.hops.rewrite.RewriteRemovePersistentReadWrite; +import org.apache.sysml.parser.AParserWrapper; +import org.apache.sysml.parser.DMLProgram; +import org.apache.sysml.parser.DMLTranslator; +import org.apache.sysml.parser.DataExpression; +import org.apache.sysml.runtime.DMLRuntimeException; +import org.apache.sysml.runtime.controlprogram.Program; +import org.apache.sysml.runtime.controlprogram.caching.CacheableData; +import org.apache.sysml.runtime.io.MatrixReaderFactory; +import org.apache.sysml.runtime.io.ReaderTextCell; +import org.apache.sysml.runtime.matrix.data.InputInfo; +import org.apache.sysml.runtime.matrix.data.MatrixBlock; +import org.apache.sysml.runtime.util.DataConverter; /** * JMLC (Java Machine Learning Connector) API: diff --git a/src/main/java/com/ibm/bi/dml/api/jmlc/JMLCUtils.java b/src/main/java/org/apache/sysml/api/jmlc/JMLCUtils.java similarity index 83% rename from src/main/java/com/ibm/bi/dml/api/jmlc/JMLCUtils.java rename to src/main/java/org/apache/sysml/api/jmlc/JMLCUtils.java index 3cf3e18680a..57f4581b64c 100644 --- a/src/main/java/com/ibm/bi/dml/api/jmlc/JMLCUtils.java +++ b/src/main/java/org/apache/sysml/api/jmlc/JMLCUtils.java @@ -15,20 +15,20 @@ *  */ -package com.ibm.bi.dml.api.jmlc; +package org.apache.sysml.api.jmlc; import java.util.ArrayList; import java.util.Map; import java.util.Map.Entry; -import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock; -import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock; -import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock; -import com.ibm.bi.dml.runtime.controlprogram.Program; -import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock; -import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock; -import com.ibm.bi.dml.runtime.instructions.Instruction; -import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction; +import org.apache.sysml.runtime.controlprogram.ForProgramBlock; +import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock; +import org.apache.sysml.runtime.controlprogram.IfProgramBlock; +import org.apache.sysml.runtime.controlprogram.Program; +import org.apache.sysml.runtime.controlprogram.ProgramBlock; +import org.apache.sysml.runtime.controlprogram.WhileProgramBlock; +import org.apache.sysml.runtime.instructions.Instruction; +import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction; public class JMLCUtils { diff --git a/src/main/java/com/ibm/bi/dml/api/jmlc/PreparedScript.java b/src/main/java/org/apache/sysml/api/jmlc/PreparedScript.java similarity index 80% rename from src/main/java/com/ibm/bi/dml/api/jmlc/PreparedScript.java rename to src/main/java/org/apache/sysml/api/jmlc/PreparedScript.java index c3d4555fb01..071ccf3f899 100644 --- a/src/main/java/com/ibm/bi/dml/api/jmlc/PreparedScript.java +++ b/src/main/java/org/apache/sysml/api/jmlc/PreparedScript.java @@ -15,30 +15,30 @@ *  */ -package com.ibm.bi.dml.api.jmlc; +package org.apache.sysml.api.jmlc; import java.util.HashSet; -import com.ibm.bi.dml.api.DMLException; -import com.ibm.bi.dml.conf.ConfigurationManager; -import com.ibm.bi.dml.conf.DMLConfig; -import com.ibm.bi.dml.parser.Expression.ValueType; -import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap; -import com.ibm.bi.dml.runtime.controlprogram.Program; -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.context.ExecutionContextFactory; -import com.ibm.bi.dml.runtime.instructions.cp.BooleanObject; -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.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.MatrixBlock; -import com.ibm.bi.dml.runtime.matrix.data.OutputInfo; -import com.ibm.bi.dml.runtime.util.DataConverter; +import org.apache.sysml.api.DMLException; +import org.apache.sysml.conf.ConfigurationManager; +import org.apache.sysml.conf.DMLConfig; +import org.apache.sysml.parser.Expression.ValueType; +import org.apache.sysml.runtime.controlprogram.LocalVariableMap; +import org.apache.sysml.runtime.controlprogram.Program; +import org.apache.sysml.runtime.controlprogram.caching.MatrixObject; +import org.apache.sysml.runtime.controlprogram.context.ExecutionContext; +import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory; +import org.apache.sysml.runtime.instructions.cp.BooleanObject; +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.matrix.MatrixCharacteristics; +import org.apache.sysml.runtime.matrix.MatrixFormatMetaData; +import org.apache.sysml.runtime.matrix.data.InputInfo; +import org.apache.sysml.runtime.matrix.data.MatrixBlock; +import org.apache.sysml.runtime.matrix.data.OutputInfo; +import org.apache.sysml.runtime.util.DataConverter; /** * JMLC (Java Machine Learning Connector) API: diff --git a/src/main/java/com/ibm/bi/dml/api/jmlc/ResultVariables.java b/src/main/java/org/apache/sysml/api/jmlc/ResultVariables.java similarity index 85% rename from src/main/java/com/ibm/bi/dml/api/jmlc/ResultVariables.java rename to src/main/java/org/apache/sysml/api/jmlc/ResultVariables.java index dedb08f7e56..d226030f95a 100644 --- a/src/main/java/com/ibm/bi/dml/api/jmlc/ResultVariables.java +++ b/src/main/java/org/apache/sysml/api/jmlc/ResultVariables.java @@ -15,16 +15,16 @@ *  */ -package com.ibm.bi.dml.api.jmlc; +package org.apache.sysml.api.jmlc; import java.util.HashMap; import java.util.Set; -import com.ibm.bi.dml.api.DMLException; -import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject; -import com.ibm.bi.dml.runtime.instructions.cp.Data; -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock; -import com.ibm.bi.dml.runtime.util.DataConverter; +import org.apache.sysml.api.DMLException; +import org.apache.sysml.runtime.controlprogram.caching.MatrixObject; +import org.apache.sysml.runtime.instructions.cp.Data; +import org.apache.sysml.runtime.matrix.data.MatrixBlock; +import org.apache.sysml.runtime.util.DataConverter; /** * JMLC (Java Machine Learning Connector) API: diff --git a/src/main/java/com/ibm/bi/dml/api/ml/LogisticRegression.java b/src/main/java/org/apache/sysml/api/ml/LogisticRegression.java similarity index 95% rename from src/main/java/com/ibm/bi/dml/api/ml/LogisticRegression.java rename to src/main/java/org/apache/sysml/api/ml/LogisticRegression.java index 8803d76d4bf..523c77a3bdf 100644 --- a/src/main/java/com/ibm/bi/dml/api/ml/LogisticRegression.java +++ b/src/main/java/org/apache/sysml/api/ml/LogisticRegression.java @@ -1,4 +1,4 @@ -package com.ibm.bi.dml.api.ml; +package org.apache.sysml.api.ml; import java.io.File; import java.io.IOException; @@ -18,17 +18,17 @@ import org.apache.spark.sql.DataFrame; import org.apache.spark.sql.SQLContext; -import com.ibm.bi.dml.api.DMLException; -import com.ibm.bi.dml.api.MLContext; -import com.ibm.bi.dml.api.MLOutput; -import com.ibm.bi.dml.api.ml.LogisticRegressionModel; -import com.ibm.bi.dml.api.ml.functions.ConvertSingleColumnToString; -import com.ibm.bi.dml.parser.ParseException; -import com.ibm.bi.dml.runtime.DMLRuntimeException; -import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtilsExt; -import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics; -import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock; -import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes; +import org.apache.sysml.api.DMLException; +import org.apache.sysml.api.MLContext; +import org.apache.sysml.api.MLOutput; +import org.apache.sysml.api.ml.LogisticRegressionModel; +import org.apache.sysml.api.ml.functions.ConvertSingleColumnToString; +import org.apache.sysml.parser.ParseException; +import org.apache.sysml.runtime.DMLRuntimeException; +import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtilsExt; +import org.apache.sysml.runtime.matrix.MatrixCharacteristics; +import org.apache.sysml.runtime.matrix.data.MatrixBlock; +import org.apache.sysml.runtime.matrix.data.MatrixIndexes; /** * @@ -46,7 +46,7 @@ * 


  * // Code to demonstrate usage of pipeline
  * import org.apache.spark.ml.Pipeline
- * import com.ibm.bi.dml.api.ml.LogisticRegression
+ * import org.apache.sysml.api.ml.LogisticRegression
  * import org.apache.spark.ml.feature.{HashingTF, Tokenizer}
  * import org.apache.spark.mllib.linalg.Vector
  * case class LabeledDocument(id: Long, text: String, label: Double)
@@ -78,7 +78,7 @@
  * 
  * // Code to demonstrate usage of cross-validation
  * import org.apache.spark.ml.Pipeline
- * import com.ibm.bi.dml.api.ml.LogisticRegression
+ * import org.apache.sysml.api.ml.LogisticRegression
  * import org.apache.spark.ml.evaluation.BinaryClassificationEvaluator
  * import org.apache.spark.ml.feature.{HashingTF, Tokenizer}
  * import org.apache.spark.ml.tuning.{ParamGridBuilder, CrossValidator}
diff --git a/src/main/java/com/ibm/bi/dml/api/ml/LogisticRegressionModel.java b/src/main/java/org/apache/sysml/api/ml/LogisticRegressionModel.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/api/ml/LogisticRegressionModel.java
rename to src/main/java/org/apache/sysml/api/ml/LogisticRegressionModel.java
index 590372e542b..6880c2d5901 100644
--- a/src/main/java/com/ibm/bi/dml/api/ml/LogisticRegressionModel.java
+++ b/src/main/java/org/apache/sysml/api/ml/LogisticRegressionModel.java
@@ -1,4 +1,4 @@
-package com.ibm.bi.dml.api.ml;
+package org.apache.sysml.api.ml;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,15 +16,15 @@
 import org.apache.spark.sql.RowFactory;
 import org.apache.spark.sql.SQLContext;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.api.MLContext;
-import com.ibm.bi.dml.api.MLOutput;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtilsExt;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.MLContext;
+import org.apache.sysml.api.MLOutput;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtilsExt;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 public class LogisticRegressionModel extends ProbabilisticClassificationModel {
 
diff --git a/src/main/java/com/ibm/bi/dml/api/ml/functions/ConvertSingleColumnToString.java b/src/main/java/org/apache/sysml/api/ml/functions/ConvertSingleColumnToString.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/api/ml/functions/ConvertSingleColumnToString.java
rename to src/main/java/org/apache/sysml/api/ml/functions/ConvertSingleColumnToString.java
index 32844de0f86..38f8d27e45a 100644
--- a/src/main/java/com/ibm/bi/dml/api/ml/functions/ConvertSingleColumnToString.java
+++ b/src/main/java/org/apache/sysml/api/ml/functions/ConvertSingleColumnToString.java
@@ -1,4 +1,4 @@
-package com.ibm.bi.dml.api.ml.functions;
+package org.apache.sysml.api.ml.functions;
 
 import org.apache.spark.api.java.function.Function;
 import org.apache.spark.sql.Row;
diff --git a/src/main/java/com/ibm/bi/dml/api/ml/functions/ConvertVectorToDouble.java b/src/main/java/org/apache/sysml/api/ml/functions/ConvertVectorToDouble.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/api/ml/functions/ConvertVectorToDouble.java
rename to src/main/java/org/apache/sysml/api/ml/functions/ConvertVectorToDouble.java
index e9c77ba9275..f1152d1b69d 100644
--- a/src/main/java/com/ibm/bi/dml/api/ml/functions/ConvertVectorToDouble.java
+++ b/src/main/java/org/apache/sysml/api/ml/functions/ConvertVectorToDouble.java
@@ -1,4 +1,4 @@
-package com.ibm.bi.dml.api.ml.functions;
+package org.apache.sysml.api.ml.functions;
 
 import org.apache.spark.api.java.function.Function;
 import org.apache.spark.sql.Row;
diff --git a/src/main/java/com/ibm/bi/dml/api/monitoring/InstructionComparator.java b/src/main/java/org/apache/sysml/api/monitoring/InstructionComparator.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/api/monitoring/InstructionComparator.java
rename to src/main/java/org/apache/sysml/api/monitoring/InstructionComparator.java
index 906ebb47f7f..539ab9bed24 100644
--- a/src/main/java/com/ibm/bi/dml/api/monitoring/InstructionComparator.java
+++ b/src/main/java/org/apache/sysml/api/monitoring/InstructionComparator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.api.monitoring;
+package org.apache.sysml.api.monitoring;
 
 import java.util.Comparator;
 import java.util.HashMap;
diff --git a/src/main/java/com/ibm/bi/dml/api/monitoring/Location.java b/src/main/java/org/apache/sysml/api/monitoring/Location.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/api/monitoring/Location.java
rename to src/main/java/org/apache/sysml/api/monitoring/Location.java
index 3cc29571ede..efab6b407e5 100644
--- a/src/main/java/com/ibm/bi/dml/api/monitoring/Location.java
+++ b/src/main/java/org/apache/sysml/api/monitoring/Location.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.api.monitoring;
+package org.apache.sysml.api.monitoring;
 
 public class Location implements Comparable {
 	public int beginLine;
diff --git a/src/main/java/com/ibm/bi/dml/api/monitoring/SparkMonitoringUtil.java b/src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/api/monitoring/SparkMonitoringUtil.java
rename to src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java
index 9b4996bc489..897b18fd1b6 100644
--- a/src/main/java/com/ibm/bi/dml/api/monitoring/SparkMonitoringUtil.java
+++ b/src/main/java/org/apache/sysml/api/monitoring/SparkMonitoringUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.api.monitoring;
+package org.apache.sysml.api.monitoring;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
@@ -31,11 +31,11 @@
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.SparkListener;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.runtime.instructions.spark.functions.SparkListener;
 
 /**
  * Usage guide:
diff --git a/src/main/java/com/ibm/bi/dml/api/python/SystemML.py b/src/main/java/org/apache/sysml/api/python/SystemML.py
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/api/python/SystemML.py
rename to src/main/java/org/apache/sysml/api/python/SystemML.py
index a4b22ff7de3..e02d1852a97 100644
--- a/src/main/java/com/ibm/bi/dml/api/python/SystemML.py
+++ b/src/main/java/org/apache/sysml/api/python/SystemML.py
@@ -36,7 +36,7 @@ def __init__(self, sc, *args):
             monitorPerformance = (args[0] if len(args) > 0 else False)
             setForcedSparkExecType = (args[1] if len(args) > 1 else False)
             self.sc = sc
-            self.ml = sc._jvm.com.ibm.bi.dml.api.MLContext(sc._jsc, monitorPerformance, setForcedSparkExecType)
+            self.ml = sc._jvm.org.apache.sysml.api.MLContext(sc._jsc, monitorPerformance, setForcedSparkExecType)
         except Py4JError:
             traceback.print_exc()
 
diff --git a/src/main/java/com/ibm/bi/dml/conf/ConfigurationManager.java b/src/main/java/org/apache/sysml/conf/ConfigurationManager.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/conf/ConfigurationManager.java
rename to src/main/java/org/apache/sysml/conf/ConfigurationManager.java
index a8fa5f631f1..bdf474ae9b7 100644
--- a/src/main/java/com/ibm/bi/dml/conf/ConfigurationManager.java
+++ b/src/main/java/org/apache/sysml/conf/ConfigurationManager.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.conf;
+package org.apache.sysml.conf;
 
 import org.apache.hadoop.mapred.JobConf;
 
diff --git a/src/main/java/com/ibm/bi/dml/conf/DMLConfig.java b/src/main/java/org/apache/sysml/conf/DMLConfig.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/conf/DMLConfig.java
rename to src/main/java/org/apache/sysml/conf/DMLConfig.java
index 2b54f7b3774..cd26953d3ab 100644
--- a/src/main/java/com/ibm/bi/dml/conf/DMLConfig.java
+++ b/src/main/java/org/apache/sysml/conf/DMLConfig.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.conf;
+package org.apache.sysml.conf;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
@@ -41,9 +41,9 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 
 public class DMLConfig 
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLBreakpointManager.java b/src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/debug/DMLBreakpointManager.java
rename to src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java
index 80b04473acb..13080c1c250 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLBreakpointManager.java
+++ b/src/main/java/org/apache/sysml/debug/DMLBreakpointManager.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
 import java.util.TreeMap;
 
-import com.ibm.bi.dml.runtime.instructions.cp.BreakPointInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BreakPointInstruction.BPINSTRUCTION_STATUS;
+import org.apache.sysml.runtime.instructions.cp.BreakPointInstruction;
+import org.apache.sysml.runtime.instructions.cp.BreakPointInstruction.BPINSTRUCTION_STATUS;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLDebugger.java b/src/main/java/org/apache/sysml/debug/DMLDebugger.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/debug/DMLDebugger.java
rename to src/main/java/org/apache/sysml/debug/DMLDebugger.java
index 33d8116e060..7bedbb44784 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLDebugger.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebugger.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
 import java.io.PrintStream;
 import java.util.HashMap;
@@ -23,10 +23,10 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.lang.math.IntRange;
 
-import com.ibm.bi.dml.debug.DMLDebuggerFunctions;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.instructions.cp.BreakPointInstruction.BPINSTRUCTION_STATUS;
+import org.apache.sysml.debug.DMLDebuggerFunctions;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.instructions.cp.BreakPointInstruction.BPINSTRUCTION_STATUS;
 
 /** 
  * This class implements a debugger control module for DML scripts.
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerException.java b/src/main/java/org/apache/sysml/debug/DMLDebuggerException.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/debug/DMLDebuggerException.java
rename to src/main/java/org/apache/sysml/debug/DMLDebuggerException.java
index 132a5c72f4b..b257a52559f 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerException.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebuggerException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
-import com.ibm.bi.dml.api.DMLException;
+import org.apache.sysml.api.DMLException;
 
 /**
  * This exception should be thrown to flag debugger errors.
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerFunctions.java b/src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/debug/DMLDebuggerFunctions.java
rename to src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java
index 94ce010492c..637074e13b7 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerFunctions.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebuggerFunctions.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
 import java.util.ArrayList;
 import java.util.Map.Entry;
@@ -24,24 +24,24 @@
 
 import org.apache.commons.lang.math.IntRange;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-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.BreakPointInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-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.BreakPointInstruction.BPINSTRUCTION_STATUS;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+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.BreakPointInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+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.BreakPointInstruction.BPINSTRUCTION_STATUS;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 public class DMLDebuggerFunctions {
 	
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerInterface.java b/src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/debug/DMLDebuggerInterface.java
rename to src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java
index b2bab7528dd..420d7f0f594 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerInterface.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebuggerInterface.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerProgramInfo.java b/src/main/java/org/apache/sysml/debug/DMLDebuggerProgramInfo.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/debug/DMLDebuggerProgramInfo.java
rename to src/main/java/org/apache/sysml/debug/DMLDebuggerProgramInfo.java
index f90ca496c9b..431a6df96e8 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLDebuggerProgramInfo.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDebuggerProgramInfo.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BreakPointInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BreakPointInstruction.BPINSTRUCTION_STATUS;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.BreakPointInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.BreakPointInstruction.BPINSTRUCTION_STATUS;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
 
 /**
  * This class contains the parsed and compiled DML script w/ hops, lops and runtime program.
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLDisassemble.java b/src/main/java/org/apache/sysml/debug/DMLDisassemble.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/debug/DMLDisassemble.java
rename to src/main/java/org/apache/sysml/debug/DMLDisassemble.java
index 1e1838a7c86..cb38d03f85c 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLDisassemble.java
+++ b/src/main/java/org/apache/sysml/debug/DMLDisassemble.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BreakPointInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.BreakPointInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLFrame.java b/src/main/java/org/apache/sysml/debug/DMLFrame.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/debug/DMLFrame.java
rename to src/main/java/org/apache/sysml/debug/DMLFrame.java
index a43f269fcaf..0a3522df54d 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLFrame.java
+++ b/src/main/java/org/apache/sysml/debug/DMLFrame.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
 
 public class DMLFrame {
 	
diff --git a/src/main/java/com/ibm/bi/dml/debug/DMLProgramCounter.java b/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/debug/DMLProgramCounter.java
rename to src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
index 8f5dc80d4f8..7b83e490822 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DMLProgramCounter.java
+++ b/src/main/java/org/apache/sysml/debug/DMLProgramCounter.java
@@ -16,9 +16,9 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
-import com.ibm.bi.dml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLProgram;
 
 
 public class DMLProgramCounter {
diff --git a/src/main/java/com/ibm/bi/dml/debug/DebugState.java b/src/main/java/org/apache/sysml/debug/DebugState.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/debug/DebugState.java
rename to src/main/java/org/apache/sysml/debug/DebugState.java
index b7330b91275..e37f6b3f83c 100644
--- a/src/main/java/com/ibm/bi/dml/debug/DebugState.java
+++ b/src/main/java/org/apache/sysml/debug/DebugState.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.debug;
+package org.apache.sysml.debug;
 
 import java.util.Stack;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
 
 public class DebugState 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/AggBinaryOp.java b/src/main/java/org/apache/sysml/hops/AggBinaryOp.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/AggBinaryOp.java
rename to src/main/java/org/apache/sysml/hops/AggBinaryOp.java
index 005744f3d18..30ca1e96df5 100644
--- a/src/main/java/com/ibm/bi/dml/hops/AggBinaryOp.java
+++ b/src/main/java/org/apache/sysml/hops/AggBinaryOp.java
@@ -15,41 +15,41 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.Binary;
-import com.ibm.bi.dml.lops.DataPartition;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.hops.Hop.MultiThreadedHop;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.MMCJ;
-import com.ibm.bi.dml.lops.MMRJ;
-import com.ibm.bi.dml.lops.MMTSJ;
-import com.ibm.bi.dml.lops.MMCJ.MMCJType;
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.lops.MMZip;
-import com.ibm.bi.dml.lops.MapMult;
-import com.ibm.bi.dml.lops.MapMultChain;
-import com.ibm.bi.dml.lops.MapMultChain.ChainType;
-import com.ibm.bi.dml.lops.PMMJ;
-import com.ibm.bi.dml.lops.PMapMult;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.lops.Transform;
-import com.ibm.bi.dml.lops.Transform.OperationTypes;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.MMCJMRReducerWithAggregator;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.Binary;
+import org.apache.sysml.lops.DataPartition;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.hops.Hop.MultiThreadedHop;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.MMCJ;
+import org.apache.sysml.lops.MMRJ;
+import org.apache.sysml.lops.MMTSJ;
+import org.apache.sysml.lops.MMCJ.MMCJType;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.lops.MMZip;
+import org.apache.sysml.lops.MapMult;
+import org.apache.sysml.lops.MapMultChain;
+import org.apache.sysml.lops.MapMultChain.ChainType;
+import org.apache.sysml.lops.PMMJ;
+import org.apache.sysml.lops.PMapMult;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.lops.Transform;
+import org.apache.sysml.lops.Transform.OperationTypes;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.MMCJMRReducerWithAggregator;
 
 
 /* Aggregate binary (cell operations): Sum (aij + bij)
diff --git a/src/main/java/com/ibm/bi/dml/hops/AggUnaryOp.java b/src/main/java/org/apache/sysml/hops/AggUnaryOp.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/hops/AggUnaryOp.java
rename to src/main/java/org/apache/sysml/hops/AggUnaryOp.java
index a0be584d70a..b1463e93b5d 100644
--- a/src/main/java/com/ibm/bi/dml/hops/AggUnaryOp.java
+++ b/src/main/java/org/apache/sysml/hops/AggUnaryOp.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.hops.Hop.MultiThreadedHop;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.Aggregate.OperationTypes;
-import com.ibm.bi.dml.lops.Binary;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.PartialAggregate;
-import com.ibm.bi.dml.lops.PartialAggregate.DirectionTypes;
-import com.ibm.bi.dml.lops.TernaryAggregate;
-import com.ibm.bi.dml.lops.UAggOuterChain;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.hops.Hop.MultiThreadedHop;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.Aggregate.OperationTypes;
+import org.apache.sysml.lops.Binary;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.PartialAggregate;
+import org.apache.sysml.lops.PartialAggregate.DirectionTypes;
+import org.apache.sysml.lops.TernaryAggregate;
+import org.apache.sysml.lops.UAggOuterChain;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 
 /* Aggregate unary (cell) operation: Sum (aij), col_sum, row_sum
diff --git a/src/main/java/com/ibm/bi/dml/hops/BinaryOp.java b/src/main/java/org/apache/sysml/hops/BinaryOp.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/BinaryOp.java
rename to src/main/java/org/apache/sysml/hops/BinaryOp.java
index 9d6d6fbb197..a39a2e8f71d 100644
--- a/src/main/java/com/ibm/bi/dml/hops/BinaryOp.java
+++ b/src/main/java/org/apache/sysml/hops/BinaryOp.java
@@ -15,41 +15,41 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.AppendGAlignedSP;
-import com.ibm.bi.dml.lops.AppendM;
-import com.ibm.bi.dml.lops.AppendCP;
-import com.ibm.bi.dml.lops.AppendG;
-import com.ibm.bi.dml.lops.AppendR;
-import com.ibm.bi.dml.lops.Binary;
-import com.ibm.bi.dml.lops.BinaryScalar;
-import com.ibm.bi.dml.lops.BinaryM;
-import com.ibm.bi.dml.lops.BinaryUAggChain;
-import com.ibm.bi.dml.lops.CentralMoment;
-import com.ibm.bi.dml.lops.CoVariance;
-import com.ibm.bi.dml.lops.CombineBinary;
-import com.ibm.bi.dml.lops.CombineUnary;
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.DataPartition;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.PartialAggregate;
-import com.ibm.bi.dml.lops.PickByCount;
-import com.ibm.bi.dml.lops.RepMat;
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.lops.Unary;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.lops.CombineBinary.OperationTypes;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.AppendGAlignedSP;
+import org.apache.sysml.lops.AppendM;
+import org.apache.sysml.lops.AppendCP;
+import org.apache.sysml.lops.AppendG;
+import org.apache.sysml.lops.AppendR;
+import org.apache.sysml.lops.Binary;
+import org.apache.sysml.lops.BinaryScalar;
+import org.apache.sysml.lops.BinaryM;
+import org.apache.sysml.lops.BinaryUAggChain;
+import org.apache.sysml.lops.CentralMoment;
+import org.apache.sysml.lops.CoVariance;
+import org.apache.sysml.lops.CombineBinary;
+import org.apache.sysml.lops.CombineUnary;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.DataPartition;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.PartialAggregate;
+import org.apache.sysml.lops.PickByCount;
+import org.apache.sysml.lops.RepMat;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.lops.Unary;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.lops.CombineBinary.OperationTypes;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
 
 
 /* Binary (cell operations): aij + bij
diff --git a/src/main/java/com/ibm/bi/dml/hops/DataGenOp.java b/src/main/java/org/apache/sysml/hops/DataGenOp.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/hops/DataGenOp.java
rename to src/main/java/org/apache/sysml/hops/DataGenOp.java
index 90d5ec05930..dd40f8c7afa 100644
--- a/src/main/java/com/ibm/bi/dml/hops/DataGenOp.java
+++ b/src/main/java/org/apache/sysml/hops/DataGenOp.java
@@ -15,28 +15,28 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-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.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.hops.Hop.MultiThreadedHop;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.hops.Hop.MultiThreadedHop;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/hops/DataOp.java b/src/main/java/org/apache/sysml/hops/DataOp.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/hops/DataOp.java
rename to src/main/java/org/apache/sysml/hops/DataOp.java
index 3975ed95525..943cfba8ef8 100644
--- a/src/main/java/com/ibm/bi/dml/hops/DataOp.java
+++ b/src/main/java/org/apache/sysml/hops/DataOp.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 import java.util.HashMap;
 import java.util.Map.Entry;
diff --git a/src/main/java/com/ibm/bi/dml/hops/FunctionOp.java b/src/main/java/org/apache/sysml/hops/FunctionOp.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/hops/FunctionOp.java
rename to src/main/java/org/apache/sysml/hops/FunctionOp.java
index 3fe3c61609a..05f30ae1110 100644
--- a/src/main/java/com/ibm/bi/dml/hops/FunctionOp.java
+++ b/src/main/java/org/apache/sysml/hops/FunctionOp.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.FunctionCallCP;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.CostEstimatorHops;
+import org.apache.sysml.lops.FunctionCallCP;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.CostEstimatorHops;
 
 /**
  * This FunctionOp represents the call to a DML-bodied or external function.
diff --git a/src/main/java/com/ibm/bi/dml/hops/Hop.java b/src/main/java/org/apache/sysml/hops/Hop.java
similarity index 74%
rename from src/main/java/com/ibm/bi/dml/hops/Hop.java
rename to src/main/java/org/apache/sysml/hops/Hop.java
index 3545ba31862..19a5df5431d 100644
--- a/src/main/java/com/ibm/bi/dml/hops/Hop.java
+++ b/src/main/java/org/apache/sysml/hops/Hop.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,27 +23,27 @@
 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.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.lops.CSVReBlock;
-import com.ibm.bi.dml.lops.Checkpoint;
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.ReBlock;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.lops.CSVReBlock;
+import org.apache.sysml.lops.Checkpoint;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.ReBlock;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public abstract class Hop 
@@ -1100,180 +1100,180 @@ public enum Direction {
 		RowCol, Row, Col
 	};
 
-	protected static final HashMap HopsData2Lops;
+	protected static final HashMap HopsData2Lops;
 	static {
-		HopsData2Lops = new HashMap();
-		HopsData2Lops.put(DataOpTypes.PERSISTENTREAD, com.ibm.bi.dml.lops.Data.OperationTypes.READ);
-		HopsData2Lops.put(DataOpTypes.PERSISTENTWRITE, com.ibm.bi.dml.lops.Data.OperationTypes.WRITE);
-		HopsData2Lops.put(DataOpTypes.TRANSIENTWRITE, com.ibm.bi.dml.lops.Data.OperationTypes.WRITE);
-		HopsData2Lops.put(DataOpTypes.TRANSIENTREAD, com.ibm.bi.dml.lops.Data.OperationTypes.READ);
+		HopsData2Lops = new HashMap();
+		HopsData2Lops.put(DataOpTypes.PERSISTENTREAD, org.apache.sysml.lops.Data.OperationTypes.READ);
+		HopsData2Lops.put(DataOpTypes.PERSISTENTWRITE, org.apache.sysml.lops.Data.OperationTypes.WRITE);
+		HopsData2Lops.put(DataOpTypes.TRANSIENTWRITE, org.apache.sysml.lops.Data.OperationTypes.WRITE);
+		HopsData2Lops.put(DataOpTypes.TRANSIENTREAD, org.apache.sysml.lops.Data.OperationTypes.READ);
 	}
 
-	protected static final HashMap HopsAgg2Lops;
+	protected static final HashMap HopsAgg2Lops;
 	static {
-		HopsAgg2Lops = new HashMap();
-		HopsAgg2Lops.put(AggOp.SUM, com.ibm.bi.dml.lops.Aggregate.OperationTypes.KahanSum);
-		HopsAgg2Lops.put(AggOp.SUM_SQ, com.ibm.bi.dml.lops.Aggregate.OperationTypes.KahanSumSq);
-		HopsAgg2Lops.put(AggOp.TRACE, com.ibm.bi.dml.lops.Aggregate.OperationTypes.KahanTrace);
-		HopsAgg2Lops.put(AggOp.MIN, com.ibm.bi.dml.lops.Aggregate.OperationTypes.Min);
-		HopsAgg2Lops.put(AggOp.MAX, com.ibm.bi.dml.lops.Aggregate.OperationTypes.Max);
-		HopsAgg2Lops.put(AggOp.MAXINDEX, com.ibm.bi.dml.lops.Aggregate.OperationTypes.MaxIndex);
-		HopsAgg2Lops.put(AggOp.MININDEX, com.ibm.bi.dml.lops.Aggregate.OperationTypes.MinIndex);
-		HopsAgg2Lops.put(AggOp.PROD, com.ibm.bi.dml.lops.Aggregate.OperationTypes.Product);
-		HopsAgg2Lops.put(AggOp.MEAN, com.ibm.bi.dml.lops.Aggregate.OperationTypes.Mean);
-	}
-
-	protected static final HashMap HopsTransf2Lops;
+		HopsAgg2Lops = new HashMap();
+		HopsAgg2Lops.put(AggOp.SUM, org.apache.sysml.lops.Aggregate.OperationTypes.KahanSum);
+		HopsAgg2Lops.put(AggOp.SUM_SQ, org.apache.sysml.lops.Aggregate.OperationTypes.KahanSumSq);
+		HopsAgg2Lops.put(AggOp.TRACE, org.apache.sysml.lops.Aggregate.OperationTypes.KahanTrace);
+		HopsAgg2Lops.put(AggOp.MIN, org.apache.sysml.lops.Aggregate.OperationTypes.Min);
+		HopsAgg2Lops.put(AggOp.MAX, org.apache.sysml.lops.Aggregate.OperationTypes.Max);
+		HopsAgg2Lops.put(AggOp.MAXINDEX, org.apache.sysml.lops.Aggregate.OperationTypes.MaxIndex);
+		HopsAgg2Lops.put(AggOp.MININDEX, org.apache.sysml.lops.Aggregate.OperationTypes.MinIndex);
+		HopsAgg2Lops.put(AggOp.PROD, org.apache.sysml.lops.Aggregate.OperationTypes.Product);
+		HopsAgg2Lops.put(AggOp.MEAN, org.apache.sysml.lops.Aggregate.OperationTypes.Mean);
+	}
+
+	protected static final HashMap HopsTransf2Lops;
 	static {
-		HopsTransf2Lops = new HashMap();
-		HopsTransf2Lops.put(ReOrgOp.TRANSPOSE, com.ibm.bi.dml.lops.Transform.OperationTypes.Transpose);
-		HopsTransf2Lops.put(ReOrgOp.DIAG, com.ibm.bi.dml.lops.Transform.OperationTypes.Diag);
-		HopsTransf2Lops.put(ReOrgOp.RESHAPE, com.ibm.bi.dml.lops.Transform.OperationTypes.Reshape);
-		HopsTransf2Lops.put(ReOrgOp.SORT, com.ibm.bi.dml.lops.Transform.OperationTypes.Sort);
+		HopsTransf2Lops = new HashMap();
+		HopsTransf2Lops.put(ReOrgOp.TRANSPOSE, org.apache.sysml.lops.Transform.OperationTypes.Transpose);
+		HopsTransf2Lops.put(ReOrgOp.DIAG, org.apache.sysml.lops.Transform.OperationTypes.Diag);
+		HopsTransf2Lops.put(ReOrgOp.RESHAPE, org.apache.sysml.lops.Transform.OperationTypes.Reshape);
+		HopsTransf2Lops.put(ReOrgOp.SORT, org.apache.sysml.lops.Transform.OperationTypes.Sort);
 
 	}
 
-	protected static final HashMap HopsDirection2Lops;
+	protected static final HashMap HopsDirection2Lops;
 	static {
-		HopsDirection2Lops = new HashMap();
-		HopsDirection2Lops.put(Direction.RowCol, com.ibm.bi.dml.lops.PartialAggregate.DirectionTypes.RowCol);
-		HopsDirection2Lops.put(Direction.Col, com.ibm.bi.dml.lops.PartialAggregate.DirectionTypes.Col);
-		HopsDirection2Lops.put(Direction.Row, com.ibm.bi.dml.lops.PartialAggregate.DirectionTypes.Row);
+		HopsDirection2Lops = new HashMap();
+		HopsDirection2Lops.put(Direction.RowCol, org.apache.sysml.lops.PartialAggregate.DirectionTypes.RowCol);
+		HopsDirection2Lops.put(Direction.Col, org.apache.sysml.lops.PartialAggregate.DirectionTypes.Col);
+		HopsDirection2Lops.put(Direction.Row, org.apache.sysml.lops.PartialAggregate.DirectionTypes.Row);
 
 	}
 
-	protected static final HashMap HopsOpOp2LopsB;
+	protected static final HashMap HopsOpOp2LopsB;
 	static {
-		HopsOpOp2LopsB = new HashMap();
-		HopsOpOp2LopsB.put(OpOp2.PLUS, com.ibm.bi.dml.lops.Binary.OperationTypes.ADD);
-		HopsOpOp2LopsB.put(OpOp2.MINUS, com.ibm.bi.dml.lops.Binary.OperationTypes.SUBTRACT);
-		HopsOpOp2LopsB.put(OpOp2.MULT, com.ibm.bi.dml.lops.Binary.OperationTypes.MULTIPLY);
-		HopsOpOp2LopsB.put(OpOp2.DIV, com.ibm.bi.dml.lops.Binary.OperationTypes.DIVIDE);
-		HopsOpOp2LopsB.put(OpOp2.MODULUS, com.ibm.bi.dml.lops.Binary.OperationTypes.MODULUS);
-		HopsOpOp2LopsB.put(OpOp2.INTDIV, com.ibm.bi.dml.lops.Binary.OperationTypes.INTDIV);
-		HopsOpOp2LopsB.put(OpOp2.MINUS1_MULT, com.ibm.bi.dml.lops.Binary.OperationTypes.MINUS1_MULTIPLY);
-		HopsOpOp2LopsB.put(OpOp2.LESS, com.ibm.bi.dml.lops.Binary.OperationTypes.LESS_THAN);
-		HopsOpOp2LopsB.put(OpOp2.LESSEQUAL, com.ibm.bi.dml.lops.Binary.OperationTypes.LESS_THAN_OR_EQUALS);
-		HopsOpOp2LopsB.put(OpOp2.GREATER, com.ibm.bi.dml.lops.Binary.OperationTypes.GREATER_THAN);
-		HopsOpOp2LopsB.put(OpOp2.GREATEREQUAL, com.ibm.bi.dml.lops.Binary.OperationTypes.GREATER_THAN_OR_EQUALS);
-		HopsOpOp2LopsB.put(OpOp2.EQUAL, com.ibm.bi.dml.lops.Binary.OperationTypes.EQUALS);
-		HopsOpOp2LopsB.put(OpOp2.NOTEQUAL, com.ibm.bi.dml.lops.Binary.OperationTypes.NOT_EQUALS);
-		HopsOpOp2LopsB.put(OpOp2.MIN, com.ibm.bi.dml.lops.Binary.OperationTypes.MIN);
-		HopsOpOp2LopsB.put(OpOp2.MAX, com.ibm.bi.dml.lops.Binary.OperationTypes.MAX);
-		HopsOpOp2LopsB.put(OpOp2.AND, com.ibm.bi.dml.lops.Binary.OperationTypes.OR);
-		HopsOpOp2LopsB.put(OpOp2.OR, com.ibm.bi.dml.lops.Binary.OperationTypes.AND);
-		HopsOpOp2LopsB.put(OpOp2.SOLVE, com.ibm.bi.dml.lops.Binary.OperationTypes.SOLVE);
-		HopsOpOp2LopsB.put(OpOp2.POW, com.ibm.bi.dml.lops.Binary.OperationTypes.POW);
-		HopsOpOp2LopsB.put(OpOp2.LOG, com.ibm.bi.dml.lops.Binary.OperationTypes.NOTSUPPORTED);
-	}
-
-	protected static final HashMap HopsOpOp2LopsBS;
+		HopsOpOp2LopsB = new HashMap();
+		HopsOpOp2LopsB.put(OpOp2.PLUS, org.apache.sysml.lops.Binary.OperationTypes.ADD);
+		HopsOpOp2LopsB.put(OpOp2.MINUS, org.apache.sysml.lops.Binary.OperationTypes.SUBTRACT);
+		HopsOpOp2LopsB.put(OpOp2.MULT, org.apache.sysml.lops.Binary.OperationTypes.MULTIPLY);
+		HopsOpOp2LopsB.put(OpOp2.DIV, org.apache.sysml.lops.Binary.OperationTypes.DIVIDE);
+		HopsOpOp2LopsB.put(OpOp2.MODULUS, org.apache.sysml.lops.Binary.OperationTypes.MODULUS);
+		HopsOpOp2LopsB.put(OpOp2.INTDIV, org.apache.sysml.lops.Binary.OperationTypes.INTDIV);
+		HopsOpOp2LopsB.put(OpOp2.MINUS1_MULT, org.apache.sysml.lops.Binary.OperationTypes.MINUS1_MULTIPLY);
+		HopsOpOp2LopsB.put(OpOp2.LESS, org.apache.sysml.lops.Binary.OperationTypes.LESS_THAN);
+		HopsOpOp2LopsB.put(OpOp2.LESSEQUAL, org.apache.sysml.lops.Binary.OperationTypes.LESS_THAN_OR_EQUALS);
+		HopsOpOp2LopsB.put(OpOp2.GREATER, org.apache.sysml.lops.Binary.OperationTypes.GREATER_THAN);
+		HopsOpOp2LopsB.put(OpOp2.GREATEREQUAL, org.apache.sysml.lops.Binary.OperationTypes.GREATER_THAN_OR_EQUALS);
+		HopsOpOp2LopsB.put(OpOp2.EQUAL, org.apache.sysml.lops.Binary.OperationTypes.EQUALS);
+		HopsOpOp2LopsB.put(OpOp2.NOTEQUAL, org.apache.sysml.lops.Binary.OperationTypes.NOT_EQUALS);
+		HopsOpOp2LopsB.put(OpOp2.MIN, org.apache.sysml.lops.Binary.OperationTypes.MIN);
+		HopsOpOp2LopsB.put(OpOp2.MAX, org.apache.sysml.lops.Binary.OperationTypes.MAX);
+		HopsOpOp2LopsB.put(OpOp2.AND, org.apache.sysml.lops.Binary.OperationTypes.OR);
+		HopsOpOp2LopsB.put(OpOp2.OR, org.apache.sysml.lops.Binary.OperationTypes.AND);
+		HopsOpOp2LopsB.put(OpOp2.SOLVE, org.apache.sysml.lops.Binary.OperationTypes.SOLVE);
+		HopsOpOp2LopsB.put(OpOp2.POW, org.apache.sysml.lops.Binary.OperationTypes.POW);
+		HopsOpOp2LopsB.put(OpOp2.LOG, org.apache.sysml.lops.Binary.OperationTypes.NOTSUPPORTED);
+	}
+
+	protected static final HashMap HopsOpOp2LopsBS;
 	static {
-		HopsOpOp2LopsBS = new HashMap();
-		HopsOpOp2LopsBS.put(OpOp2.PLUS, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.ADD);	
-		HopsOpOp2LopsBS.put(OpOp2.MINUS, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.SUBTRACT);
-		HopsOpOp2LopsBS.put(OpOp2.MULT, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.MULTIPLY);
-		HopsOpOp2LopsBS.put(OpOp2.DIV, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.DIVIDE);
-		HopsOpOp2LopsBS.put(OpOp2.MODULUS, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.MODULUS);
-		HopsOpOp2LopsBS.put(OpOp2.INTDIV, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.INTDIV);
-		HopsOpOp2LopsBS.put(OpOp2.LESS, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.LESS_THAN);
-		HopsOpOp2LopsBS.put(OpOp2.LESSEQUAL, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.LESS_THAN_OR_EQUALS);
-		HopsOpOp2LopsBS.put(OpOp2.GREATER, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.GREATER_THAN);
-		HopsOpOp2LopsBS.put(OpOp2.GREATEREQUAL, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.GREATER_THAN_OR_EQUALS);
-		HopsOpOp2LopsBS.put(OpOp2.EQUAL, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.EQUALS);
-		HopsOpOp2LopsBS.put(OpOp2.NOTEQUAL, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.NOT_EQUALS);
-		HopsOpOp2LopsBS.put(OpOp2.MIN, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.MIN);
-		HopsOpOp2LopsBS.put(OpOp2.MAX, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.MAX);
-		HopsOpOp2LopsBS.put(OpOp2.AND, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.AND);
-		HopsOpOp2LopsBS.put(OpOp2.OR, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.OR);
-		HopsOpOp2LopsBS.put(OpOp2.LOG, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.LOG);
-		HopsOpOp2LopsBS.put(OpOp2.POW, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.POW);
-		HopsOpOp2LopsBS.put(OpOp2.PRINT, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.PRINT);
-		HopsOpOp2LopsBS.put(OpOp2.SEQINCR, com.ibm.bi.dml.lops.BinaryScalar.OperationTypes.SEQINCR);
-	}
-
-	protected static final HashMap HopsOpOp2LopsU;
+		HopsOpOp2LopsBS = new HashMap();
+		HopsOpOp2LopsBS.put(OpOp2.PLUS, org.apache.sysml.lops.BinaryScalar.OperationTypes.ADD);	
+		HopsOpOp2LopsBS.put(OpOp2.MINUS, org.apache.sysml.lops.BinaryScalar.OperationTypes.SUBTRACT);
+		HopsOpOp2LopsBS.put(OpOp2.MULT, org.apache.sysml.lops.BinaryScalar.OperationTypes.MULTIPLY);
+		HopsOpOp2LopsBS.put(OpOp2.DIV, org.apache.sysml.lops.BinaryScalar.OperationTypes.DIVIDE);
+		HopsOpOp2LopsBS.put(OpOp2.MODULUS, org.apache.sysml.lops.BinaryScalar.OperationTypes.MODULUS);
+		HopsOpOp2LopsBS.put(OpOp2.INTDIV, org.apache.sysml.lops.BinaryScalar.OperationTypes.INTDIV);
+		HopsOpOp2LopsBS.put(OpOp2.LESS, org.apache.sysml.lops.BinaryScalar.OperationTypes.LESS_THAN);
+		HopsOpOp2LopsBS.put(OpOp2.LESSEQUAL, org.apache.sysml.lops.BinaryScalar.OperationTypes.LESS_THAN_OR_EQUALS);
+		HopsOpOp2LopsBS.put(OpOp2.GREATER, org.apache.sysml.lops.BinaryScalar.OperationTypes.GREATER_THAN);
+		HopsOpOp2LopsBS.put(OpOp2.GREATEREQUAL, org.apache.sysml.lops.BinaryScalar.OperationTypes.GREATER_THAN_OR_EQUALS);
+		HopsOpOp2LopsBS.put(OpOp2.EQUAL, org.apache.sysml.lops.BinaryScalar.OperationTypes.EQUALS);
+		HopsOpOp2LopsBS.put(OpOp2.NOTEQUAL, org.apache.sysml.lops.BinaryScalar.OperationTypes.NOT_EQUALS);
+		HopsOpOp2LopsBS.put(OpOp2.MIN, org.apache.sysml.lops.BinaryScalar.OperationTypes.MIN);
+		HopsOpOp2LopsBS.put(OpOp2.MAX, org.apache.sysml.lops.BinaryScalar.OperationTypes.MAX);
+		HopsOpOp2LopsBS.put(OpOp2.AND, org.apache.sysml.lops.BinaryScalar.OperationTypes.AND);
+		HopsOpOp2LopsBS.put(OpOp2.OR, org.apache.sysml.lops.BinaryScalar.OperationTypes.OR);
+		HopsOpOp2LopsBS.put(OpOp2.LOG, org.apache.sysml.lops.BinaryScalar.OperationTypes.LOG);
+		HopsOpOp2LopsBS.put(OpOp2.POW, org.apache.sysml.lops.BinaryScalar.OperationTypes.POW);
+		HopsOpOp2LopsBS.put(OpOp2.PRINT, org.apache.sysml.lops.BinaryScalar.OperationTypes.PRINT);
+		HopsOpOp2LopsBS.put(OpOp2.SEQINCR, org.apache.sysml.lops.BinaryScalar.OperationTypes.SEQINCR);
+	}
+
+	protected static final HashMap HopsOpOp2LopsU;
 	static {
-		HopsOpOp2LopsU = new HashMap();
-		HopsOpOp2LopsU.put(OpOp2.PLUS, com.ibm.bi.dml.lops.Unary.OperationTypes.ADD);
-		HopsOpOp2LopsU.put(OpOp2.MINUS, com.ibm.bi.dml.lops.Unary.OperationTypes.SUBTRACT);
-		HopsOpOp2LopsU.put(OpOp2.MULT, com.ibm.bi.dml.lops.Unary.OperationTypes.MULTIPLY);
-		HopsOpOp2LopsU.put(OpOp2.DIV, com.ibm.bi.dml.lops.Unary.OperationTypes.DIVIDE);
-		HopsOpOp2LopsU.put(OpOp2.MODULUS, com.ibm.bi.dml.lops.Unary.OperationTypes.MODULUS);
-		HopsOpOp2LopsU.put(OpOp2.INTDIV, com.ibm.bi.dml.lops.Unary.OperationTypes.INTDIV);
-		HopsOpOp2LopsU.put(OpOp2.MINUS1_MULT, com.ibm.bi.dml.lops.Unary.OperationTypes.MINUS1_MULTIPLY);
-		HopsOpOp2LopsU.put(OpOp2.LESSEQUAL, com.ibm.bi.dml.lops.Unary.OperationTypes.LESS_THAN_OR_EQUALS);
-		HopsOpOp2LopsU.put(OpOp2.LESS, com.ibm.bi.dml.lops.Unary.OperationTypes.LESS_THAN);
-		HopsOpOp2LopsU.put(OpOp2.GREATEREQUAL, com.ibm.bi.dml.lops.Unary.OperationTypes.GREATER_THAN_OR_EQUALS);
-		HopsOpOp2LopsU.put(OpOp2.GREATER, com.ibm.bi.dml.lops.Unary.OperationTypes.GREATER_THAN);
-		HopsOpOp2LopsU.put(OpOp2.EQUAL, com.ibm.bi.dml.lops.Unary.OperationTypes.EQUALS);
-		HopsOpOp2LopsU.put(OpOp2.NOTEQUAL, com.ibm.bi.dml.lops.Unary.OperationTypes.NOT_EQUALS);
-		HopsOpOp2LopsU.put(OpOp2.AND, com.ibm.bi.dml.lops.Unary.OperationTypes.NOTSUPPORTED);
-		HopsOpOp2LopsU.put(OpOp2.OR, com.ibm.bi.dml.lops.Unary.OperationTypes.NOTSUPPORTED);
-		HopsOpOp2LopsU.put(OpOp2.MAX, com.ibm.bi.dml.lops.Unary.OperationTypes.MAX);
-		HopsOpOp2LopsU.put(OpOp2.MIN, com.ibm.bi.dml.lops.Unary.OperationTypes.MIN);
-		HopsOpOp2LopsU.put(OpOp2.LOG, com.ibm.bi.dml.lops.Unary.OperationTypes.LOG);
-		HopsOpOp2LopsU.put(OpOp2.POW, com.ibm.bi.dml.lops.Unary.OperationTypes.POW);
-		HopsOpOp2LopsU.put(OpOp2.MINUS_NZ, com.ibm.bi.dml.lops.Unary.OperationTypes.SUBTRACT_NZ);
-		HopsOpOp2LopsU.put(OpOp2.LOG_NZ, com.ibm.bi.dml.lops.Unary.OperationTypes.LOG_NZ);
-	}
-
-	protected static final HashMap HopsOpOp1LopsU;
+		HopsOpOp2LopsU = new HashMap();
+		HopsOpOp2LopsU.put(OpOp2.PLUS, org.apache.sysml.lops.Unary.OperationTypes.ADD);
+		HopsOpOp2LopsU.put(OpOp2.MINUS, org.apache.sysml.lops.Unary.OperationTypes.SUBTRACT);
+		HopsOpOp2LopsU.put(OpOp2.MULT, org.apache.sysml.lops.Unary.OperationTypes.MULTIPLY);
+		HopsOpOp2LopsU.put(OpOp2.DIV, org.apache.sysml.lops.Unary.OperationTypes.DIVIDE);
+		HopsOpOp2LopsU.put(OpOp2.MODULUS, org.apache.sysml.lops.Unary.OperationTypes.MODULUS);
+		HopsOpOp2LopsU.put(OpOp2.INTDIV, org.apache.sysml.lops.Unary.OperationTypes.INTDIV);
+		HopsOpOp2LopsU.put(OpOp2.MINUS1_MULT, org.apache.sysml.lops.Unary.OperationTypes.MINUS1_MULTIPLY);
+		HopsOpOp2LopsU.put(OpOp2.LESSEQUAL, org.apache.sysml.lops.Unary.OperationTypes.LESS_THAN_OR_EQUALS);
+		HopsOpOp2LopsU.put(OpOp2.LESS, org.apache.sysml.lops.Unary.OperationTypes.LESS_THAN);
+		HopsOpOp2LopsU.put(OpOp2.GREATEREQUAL, org.apache.sysml.lops.Unary.OperationTypes.GREATER_THAN_OR_EQUALS);
+		HopsOpOp2LopsU.put(OpOp2.GREATER, org.apache.sysml.lops.Unary.OperationTypes.GREATER_THAN);
+		HopsOpOp2LopsU.put(OpOp2.EQUAL, org.apache.sysml.lops.Unary.OperationTypes.EQUALS);
+		HopsOpOp2LopsU.put(OpOp2.NOTEQUAL, org.apache.sysml.lops.Unary.OperationTypes.NOT_EQUALS);
+		HopsOpOp2LopsU.put(OpOp2.AND, org.apache.sysml.lops.Unary.OperationTypes.NOTSUPPORTED);
+		HopsOpOp2LopsU.put(OpOp2.OR, org.apache.sysml.lops.Unary.OperationTypes.NOTSUPPORTED);
+		HopsOpOp2LopsU.put(OpOp2.MAX, org.apache.sysml.lops.Unary.OperationTypes.MAX);
+		HopsOpOp2LopsU.put(OpOp2.MIN, org.apache.sysml.lops.Unary.OperationTypes.MIN);
+		HopsOpOp2LopsU.put(OpOp2.LOG, org.apache.sysml.lops.Unary.OperationTypes.LOG);
+		HopsOpOp2LopsU.put(OpOp2.POW, org.apache.sysml.lops.Unary.OperationTypes.POW);
+		HopsOpOp2LopsU.put(OpOp2.MINUS_NZ, org.apache.sysml.lops.Unary.OperationTypes.SUBTRACT_NZ);
+		HopsOpOp2LopsU.put(OpOp2.LOG_NZ, org.apache.sysml.lops.Unary.OperationTypes.LOG_NZ);
+	}
+
+	protected static final HashMap HopsOpOp1LopsU;
 	static {
-		HopsOpOp1LopsU = new HashMap();
-		HopsOpOp1LopsU.put(OpOp1.NOT, com.ibm.bi.dml.lops.Unary.OperationTypes.NOT);
-		HopsOpOp1LopsU.put(OpOp1.ABS, com.ibm.bi.dml.lops.Unary.OperationTypes.ABS);
-		HopsOpOp1LopsU.put(OpOp1.SIN, com.ibm.bi.dml.lops.Unary.OperationTypes.SIN);
-		HopsOpOp1LopsU.put(OpOp1.COS, com.ibm.bi.dml.lops.Unary.OperationTypes.COS);
-		HopsOpOp1LopsU.put(OpOp1.TAN, com.ibm.bi.dml.lops.Unary.OperationTypes.TAN);
-		HopsOpOp1LopsU.put(OpOp1.ASIN, com.ibm.bi.dml.lops.Unary.OperationTypes.ASIN);
-		HopsOpOp1LopsU.put(OpOp1.ACOS, com.ibm.bi.dml.lops.Unary.OperationTypes.ACOS);
-		HopsOpOp1LopsU.put(OpOp1.ATAN, com.ibm.bi.dml.lops.Unary.OperationTypes.ATAN);
-		HopsOpOp1LopsU.put(OpOp1.SQRT, com.ibm.bi.dml.lops.Unary.OperationTypes.SQRT);
-		HopsOpOp1LopsU.put(OpOp1.EXP, com.ibm.bi.dml.lops.Unary.OperationTypes.EXP);
-		HopsOpOp1LopsU.put(OpOp1.LOG, com.ibm.bi.dml.lops.Unary.OperationTypes.LOG);
-		HopsOpOp1LopsU.put(OpOp1.ROUND, com.ibm.bi.dml.lops.Unary.OperationTypes.ROUND);
-		HopsOpOp1LopsU.put(OpOp1.CEIL, com.ibm.bi.dml.lops.Unary.OperationTypes.CEIL);
-		HopsOpOp1LopsU.put(OpOp1.FLOOR, com.ibm.bi.dml.lops.Unary.OperationTypes.FLOOR);
-		HopsOpOp1LopsU.put(OpOp1.CUMSUM, com.ibm.bi.dml.lops.Unary.OperationTypes.CUMSUM);
-		HopsOpOp1LopsU.put(OpOp1.CUMPROD, com.ibm.bi.dml.lops.Unary.OperationTypes.CUMPROD);
-		HopsOpOp1LopsU.put(OpOp1.CUMMIN, com.ibm.bi.dml.lops.Unary.OperationTypes.CUMMIN);
-		HopsOpOp1LopsU.put(OpOp1.CUMMAX, com.ibm.bi.dml.lops.Unary.OperationTypes.CUMMAX);
-		HopsOpOp1LopsU.put(OpOp1.INVERSE, com.ibm.bi.dml.lops.Unary.OperationTypes.INVERSE);
-		HopsOpOp1LopsU.put(OpOp1.CAST_AS_SCALAR, com.ibm.bi.dml.lops.Unary.OperationTypes.NOTSUPPORTED);
-		HopsOpOp1LopsU.put(OpOp1.CAST_AS_MATRIX, com.ibm.bi.dml.lops.Unary.OperationTypes.NOTSUPPORTED);
-		HopsOpOp1LopsU.put(OpOp1.SPROP, com.ibm.bi.dml.lops.Unary.OperationTypes.SPROP);
-		HopsOpOp1LopsU.put(OpOp1.SIGMOID, com.ibm.bi.dml.lops.Unary.OperationTypes.SIGMOID);
-		HopsOpOp1LopsU.put(OpOp1.SELP, com.ibm.bi.dml.lops.Unary.OperationTypes.SELP);
-	}
-
-	protected static final HashMap HopsOpOp1LopsUS;
+		HopsOpOp1LopsU = new HashMap();
+		HopsOpOp1LopsU.put(OpOp1.NOT, org.apache.sysml.lops.Unary.OperationTypes.NOT);
+		HopsOpOp1LopsU.put(OpOp1.ABS, org.apache.sysml.lops.Unary.OperationTypes.ABS);
+		HopsOpOp1LopsU.put(OpOp1.SIN, org.apache.sysml.lops.Unary.OperationTypes.SIN);
+		HopsOpOp1LopsU.put(OpOp1.COS, org.apache.sysml.lops.Unary.OperationTypes.COS);
+		HopsOpOp1LopsU.put(OpOp1.TAN, org.apache.sysml.lops.Unary.OperationTypes.TAN);
+		HopsOpOp1LopsU.put(OpOp1.ASIN, org.apache.sysml.lops.Unary.OperationTypes.ASIN);
+		HopsOpOp1LopsU.put(OpOp1.ACOS, org.apache.sysml.lops.Unary.OperationTypes.ACOS);
+		HopsOpOp1LopsU.put(OpOp1.ATAN, org.apache.sysml.lops.Unary.OperationTypes.ATAN);
+		HopsOpOp1LopsU.put(OpOp1.SQRT, org.apache.sysml.lops.Unary.OperationTypes.SQRT);
+		HopsOpOp1LopsU.put(OpOp1.EXP, org.apache.sysml.lops.Unary.OperationTypes.EXP);
+		HopsOpOp1LopsU.put(OpOp1.LOG, org.apache.sysml.lops.Unary.OperationTypes.LOG);
+		HopsOpOp1LopsU.put(OpOp1.ROUND, org.apache.sysml.lops.Unary.OperationTypes.ROUND);
+		HopsOpOp1LopsU.put(OpOp1.CEIL, org.apache.sysml.lops.Unary.OperationTypes.CEIL);
+		HopsOpOp1LopsU.put(OpOp1.FLOOR, org.apache.sysml.lops.Unary.OperationTypes.FLOOR);
+		HopsOpOp1LopsU.put(OpOp1.CUMSUM, org.apache.sysml.lops.Unary.OperationTypes.CUMSUM);
+		HopsOpOp1LopsU.put(OpOp1.CUMPROD, org.apache.sysml.lops.Unary.OperationTypes.CUMPROD);
+		HopsOpOp1LopsU.put(OpOp1.CUMMIN, org.apache.sysml.lops.Unary.OperationTypes.CUMMIN);
+		HopsOpOp1LopsU.put(OpOp1.CUMMAX, org.apache.sysml.lops.Unary.OperationTypes.CUMMAX);
+		HopsOpOp1LopsU.put(OpOp1.INVERSE, org.apache.sysml.lops.Unary.OperationTypes.INVERSE);
+		HopsOpOp1LopsU.put(OpOp1.CAST_AS_SCALAR, org.apache.sysml.lops.Unary.OperationTypes.NOTSUPPORTED);
+		HopsOpOp1LopsU.put(OpOp1.CAST_AS_MATRIX, org.apache.sysml.lops.Unary.OperationTypes.NOTSUPPORTED);
+		HopsOpOp1LopsU.put(OpOp1.SPROP, org.apache.sysml.lops.Unary.OperationTypes.SPROP);
+		HopsOpOp1LopsU.put(OpOp1.SIGMOID, org.apache.sysml.lops.Unary.OperationTypes.SIGMOID);
+		HopsOpOp1LopsU.put(OpOp1.SELP, org.apache.sysml.lops.Unary.OperationTypes.SELP);
+	}
+
+	protected static final HashMap HopsOpOp1LopsUS;
 	static {
-		HopsOpOp1LopsUS = new HashMap();
-		HopsOpOp1LopsUS.put(OpOp1.NOT, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.NOT);
-		HopsOpOp1LopsUS.put(OpOp1.ABS, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.ABS);
-		HopsOpOp1LopsUS.put(OpOp1.SIN, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.SIN);
-		HopsOpOp1LopsUS.put(OpOp1.COS, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.COS);
-		HopsOpOp1LopsUS.put(OpOp1.TAN, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.TAN);
-		HopsOpOp1LopsUS.put(OpOp1.ASIN, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.ASIN);
-		HopsOpOp1LopsUS.put(OpOp1.ACOS, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.ACOS);
-		HopsOpOp1LopsUS.put(OpOp1.ATAN, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.ATAN);
-		HopsOpOp1LopsUS.put(OpOp1.SQRT, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.SQRT);
-		HopsOpOp1LopsUS.put(OpOp1.EXP, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.EXP);
-		HopsOpOp1LopsUS.put(OpOp1.LOG, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.LOG);
-		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_SCALAR, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.CAST_AS_SCALAR);
-		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_MATRIX, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.CAST_AS_MATRIX);
-		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_DOUBLE, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.CAST_AS_DOUBLE);
-		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_INT, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.CAST_AS_INT);
-		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_BOOLEAN, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.CAST_AS_BOOLEAN);
-		HopsOpOp1LopsUS.put(OpOp1.NROW, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.NROW);
-		HopsOpOp1LopsUS.put(OpOp1.NCOL, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.NCOL);
-		HopsOpOp1LopsUS.put(OpOp1.LENGTH, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.LENGTH);
-		HopsOpOp1LopsUS.put(OpOp1.PRINT, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.PRINT);
-		HopsOpOp1LopsUS.put(OpOp1.ROUND, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.ROUND);
-		HopsOpOp1LopsUS.put(OpOp1.CEIL, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.CEIL);
-		HopsOpOp1LopsUS.put(OpOp1.FLOOR, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.FLOOR);
-		HopsOpOp1LopsUS.put(OpOp1.STOP, com.ibm.bi.dml.lops.UnaryCP.OperationTypes.STOP);
+		HopsOpOp1LopsUS = new HashMap();
+		HopsOpOp1LopsUS.put(OpOp1.NOT, org.apache.sysml.lops.UnaryCP.OperationTypes.NOT);
+		HopsOpOp1LopsUS.put(OpOp1.ABS, org.apache.sysml.lops.UnaryCP.OperationTypes.ABS);
+		HopsOpOp1LopsUS.put(OpOp1.SIN, org.apache.sysml.lops.UnaryCP.OperationTypes.SIN);
+		HopsOpOp1LopsUS.put(OpOp1.COS, org.apache.sysml.lops.UnaryCP.OperationTypes.COS);
+		HopsOpOp1LopsUS.put(OpOp1.TAN, org.apache.sysml.lops.UnaryCP.OperationTypes.TAN);
+		HopsOpOp1LopsUS.put(OpOp1.ASIN, org.apache.sysml.lops.UnaryCP.OperationTypes.ASIN);
+		HopsOpOp1LopsUS.put(OpOp1.ACOS, org.apache.sysml.lops.UnaryCP.OperationTypes.ACOS);
+		HopsOpOp1LopsUS.put(OpOp1.ATAN, org.apache.sysml.lops.UnaryCP.OperationTypes.ATAN);
+		HopsOpOp1LopsUS.put(OpOp1.SQRT, org.apache.sysml.lops.UnaryCP.OperationTypes.SQRT);
+		HopsOpOp1LopsUS.put(OpOp1.EXP, org.apache.sysml.lops.UnaryCP.OperationTypes.EXP);
+		HopsOpOp1LopsUS.put(OpOp1.LOG, org.apache.sysml.lops.UnaryCP.OperationTypes.LOG);
+		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_SCALAR, org.apache.sysml.lops.UnaryCP.OperationTypes.CAST_AS_SCALAR);
+		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_MATRIX, org.apache.sysml.lops.UnaryCP.OperationTypes.CAST_AS_MATRIX);
+		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_DOUBLE, org.apache.sysml.lops.UnaryCP.OperationTypes.CAST_AS_DOUBLE);
+		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_INT, org.apache.sysml.lops.UnaryCP.OperationTypes.CAST_AS_INT);
+		HopsOpOp1LopsUS.put(OpOp1.CAST_AS_BOOLEAN, org.apache.sysml.lops.UnaryCP.OperationTypes.CAST_AS_BOOLEAN);
+		HopsOpOp1LopsUS.put(OpOp1.NROW, org.apache.sysml.lops.UnaryCP.OperationTypes.NROW);
+		HopsOpOp1LopsUS.put(OpOp1.NCOL, org.apache.sysml.lops.UnaryCP.OperationTypes.NCOL);
+		HopsOpOp1LopsUS.put(OpOp1.LENGTH, org.apache.sysml.lops.UnaryCP.OperationTypes.LENGTH);
+		HopsOpOp1LopsUS.put(OpOp1.PRINT, org.apache.sysml.lops.UnaryCP.OperationTypes.PRINT);
+		HopsOpOp1LopsUS.put(OpOp1.ROUND, org.apache.sysml.lops.UnaryCP.OperationTypes.ROUND);
+		HopsOpOp1LopsUS.put(OpOp1.CEIL, org.apache.sysml.lops.UnaryCP.OperationTypes.CEIL);
+		HopsOpOp1LopsUS.put(OpOp1.FLOOR, org.apache.sysml.lops.UnaryCP.OperationTypes.FLOOR);
+		HopsOpOp1LopsUS.put(OpOp1.STOP, org.apache.sysml.lops.UnaryCP.OperationTypes.STOP);
 	}
 
 	protected static final HashMap HopsOpOp12String;
@@ -1305,15 +1305,15 @@ public enum Direction {
 		HopsOpOp12String.put(OpOp1.SIGMOID, "sigmoid");
 	}
 	
-	protected static final HashMap HopsParameterizedBuiltinLops;
+	protected static final HashMap HopsParameterizedBuiltinLops;
 	static {
-		HopsParameterizedBuiltinLops = new HashMap();
-		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.CDF, com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.CDF);
-		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.INVCDF, com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.INVCDF);
-		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.RMEMPTY, com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.RMEMPTY);
-		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.REPLACE, com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.REPLACE);
-		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.REXPAND, com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.REXPAND);
-		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.TRANSFORM, com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM);
+		HopsParameterizedBuiltinLops = new HashMap();
+		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.CDF, org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.CDF);
+		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.INVCDF, org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.INVCDF);
+		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.RMEMPTY, org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.RMEMPTY);
+		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.REPLACE, org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.REPLACE);
+		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.REXPAND, org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.REXPAND);
+		HopsParameterizedBuiltinLops.put(ParamBuiltinOp.TRANSFORM, org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM);
 	}
 
 	protected static final HashMap HopsOpOp2String;
diff --git a/src/main/java/com/ibm/bi/dml/hops/HopsException.java b/src/main/java/org/apache/sysml/hops/HopsException.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/HopsException.java
rename to src/main/java/org/apache/sysml/hops/HopsException.java
index d1c490162d6..2fb12750dd7 100644
--- a/src/main/java/com/ibm/bi/dml/hops/HopsException.java
+++ b/src/main/java/org/apache/sysml/hops/HopsException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.api.DMLException;
+import org.apache.sysml.api.DMLException;
 
 /**
  * 
Exception occurring in the HOP level.

diff --git a/src/main/java/com/ibm/bi/dml/hops/IndexingOp.java b/src/main/java/org/apache/sysml/hops/IndexingOp.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/hops/IndexingOp.java
rename to src/main/java/org/apache/sysml/hops/IndexingOp.java
index b351d61023f..9ef0607a53b 100644
--- a/src/main/java/com/ibm/bi/dml/hops/IndexingOp.java
+++ b/src/main/java/org/apache/sysml/hops/IndexingOp.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.RangeBasedReIndex;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.RangeBasedReIndex;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 //for now only works for range based indexing op
 public class IndexingOp extends Hop 
diff --git a/src/main/java/com/ibm/bi/dml/hops/LeftIndexingOp.java b/src/main/java/org/apache/sysml/hops/LeftIndexingOp.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/hops/LeftIndexingOp.java
rename to src/main/java/org/apache/sysml/hops/LeftIndexingOp.java
index d22cf67a221..77ffaa41cec 100644
--- a/src/main/java/com/ibm/bi/dml/hops/LeftIndexingOp.java
+++ b/src/main/java/org/apache/sysml/hops/LeftIndexingOp.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.lops.Binary;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.LeftIndex;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.RangeBasedReIndex;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.lops.ZeroOut;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.UnaryCP.OperationTypes;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.lops.Binary;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.LeftIndex;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.RangeBasedReIndex;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.lops.ZeroOut;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.UnaryCP.OperationTypes;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 public class LeftIndexingOp  extends Hop 
 {	
diff --git a/src/main/java/com/ibm/bi/dml/hops/LiteralOp.java b/src/main/java/org/apache/sysml/hops/LiteralOp.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/LiteralOp.java
rename to src/main/java/org/apache/sysml/hops/LiteralOp.java
index 0ed419d33f0..3683a26b6b4 100644
--- a/src/main/java/com/ibm/bi/dml/hops/LiteralOp.java
+++ b/src/main/java/org/apache/sysml/hops/LiteralOp.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class LiteralOp extends Hop 
diff --git a/src/main/java/com/ibm/bi/dml/hops/MemoTable.java b/src/main/java/org/apache/sysml/hops/MemoTable.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/MemoTable.java
rename to src/main/java/org/apache/sysml/hops/MemoTable.java
index 428d3e938ed..e8e2e5cf95c 100644
--- a/src/main/java/com/ibm/bi/dml/hops/MemoTable.java
+++ b/src/main/java/org/apache/sysml/hops/MemoTable.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.recompile.RecompileStatus;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.recompile.RecompileStatus;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 /**
  * Memoization Table (hop id, worst-case matrix characteristics).
diff --git a/src/main/java/com/ibm/bi/dml/hops/OptimizerUtils.java b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/OptimizerUtils.java
rename to src/main/java/org/apache/sysml/hops/OptimizerUtils.java
index 136abd07cf6..35642200689 100644
--- a/src/main/java/com/ibm/bi/dml/hops/OptimizerUtils.java
+++ b/src/main/java/org/apache/sysml/hops/OptimizerUtils.java
@@ -15,34 +15,34 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 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.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 public class OptimizerUtils 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/ParameterizedBuiltinOp.java b/src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/ParameterizedBuiltinOp.java
rename to src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java
index 83877367e85..e0653aa055c 100644
--- a/src/main/java/com/ibm/bi/dml/hops/ParameterizedBuiltinOp.java
+++ b/src/main/java/org/apache/sysml/hops/ParameterizedBuiltinOp.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.GroupedAggregate;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.OutputParameters.Format;
-import com.ibm.bi.dml.lops.ParameterizedBuiltin;
-import com.ibm.bi.dml.lops.RepMat;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.GroupedAggregate;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.OutputParameters.Format;
+import org.apache.sysml.lops.ParameterizedBuiltin;
+import org.apache.sysml.lops.RepMat;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/hops/QuaternaryOp.java b/src/main/java/org/apache/sysml/hops/QuaternaryOp.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/QuaternaryOp.java
rename to src/main/java/org/apache/sysml/hops/QuaternaryOp.java
index fd329f02189..4bb2c8cc81b 100644
--- a/src/main/java/com/ibm/bi/dml/hops/QuaternaryOp.java
+++ b/src/main/java/org/apache/sysml/hops/QuaternaryOp.java
@@ -15,41 +15,41 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.hops.Hop.MultiThreadedHop;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.DataPartition;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.RepMat;
-import com.ibm.bi.dml.lops.Transform;
-import com.ibm.bi.dml.lops.Unary;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy;
-import com.ibm.bi.dml.lops.WeightedCrossEntropyR;
-import com.ibm.bi.dml.lops.WeightedDivMM;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy.WCeMMType;
-import com.ibm.bi.dml.lops.WeightedDivMM.WDivMMType;
-import com.ibm.bi.dml.lops.WeightedDivMMR;
-import com.ibm.bi.dml.lops.WeightedSigmoid;
-import com.ibm.bi.dml.lops.WeightedSigmoid.WSigmoidType;
-import com.ibm.bi.dml.lops.WeightedSigmoidR;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss.WeightsType;
-import com.ibm.bi.dml.lops.WeightedSquaredLossR;
-import com.ibm.bi.dml.lops.WeightedUnaryMM;
-import com.ibm.bi.dml.lops.WeightedUnaryMM.WUMMType;
-import com.ibm.bi.dml.lops.WeightedUnaryMMR;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.hops.Hop.MultiThreadedHop;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.DataPartition;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.RepMat;
+import org.apache.sysml.lops.Transform;
+import org.apache.sysml.lops.Unary;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.lops.WeightedCrossEntropy;
+import org.apache.sysml.lops.WeightedCrossEntropyR;
+import org.apache.sysml.lops.WeightedDivMM;
+import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType;
+import org.apache.sysml.lops.WeightedDivMM.WDivMMType;
+import org.apache.sysml.lops.WeightedDivMMR;
+import org.apache.sysml.lops.WeightedSigmoid;
+import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType;
+import org.apache.sysml.lops.WeightedSigmoidR;
+import org.apache.sysml.lops.WeightedSquaredLoss;
+import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType;
+import org.apache.sysml.lops.WeightedSquaredLossR;
+import org.apache.sysml.lops.WeightedUnaryMM;
+import org.apache.sysml.lops.WeightedUnaryMM.WUMMType;
+import org.apache.sysml.lops.WeightedUnaryMMR;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
 
 /** 
  * Note: this hop should be called AggQuaternaryOp in consistency with AggUnaryOp and AggBinaryOp;
diff --git a/src/main/java/com/ibm/bi/dml/hops/ReorgOp.java b/src/main/java/org/apache/sysml/hops/ReorgOp.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/ReorgOp.java
rename to src/main/java/org/apache/sysml/hops/ReorgOp.java
index 703fb4ac7c6..fb2679bbfef 100644
--- a/src/main/java/com/ibm/bi/dml/hops/ReorgOp.java
+++ b/src/main/java/org/apache/sysml/hops/ReorgOp.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.lops.Transform;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.lops.Transform;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 /**
  *  Reorg (cell) operation: aij
diff --git a/src/main/java/com/ibm/bi/dml/hops/TernaryOp.java b/src/main/java/org/apache/sysml/hops/TernaryOp.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/TernaryOp.java
rename to src/main/java/org/apache/sysml/hops/TernaryOp.java
index c1cb96b0925..33270c04894 100644
--- a/src/main/java/com/ibm/bi/dml/hops/TernaryOp.java
+++ b/src/main/java/org/apache/sysml/hops/TernaryOp.java
@@ -15,28 +15,28 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.CentralMoment;
-import com.ibm.bi.dml.lops.CoVariance;
-import com.ibm.bi.dml.lops.CombineBinary;
-import com.ibm.bi.dml.lops.CombineTernary;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.PickByCount;
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.lops.Ternary;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.lops.CombineBinary.OperationTypes;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.CentralMoment;
+import org.apache.sysml.lops.CoVariance;
+import org.apache.sysml.lops.CombineBinary;
+import org.apache.sysml.lops.CombineTernary;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.PickByCount;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.lops.Ternary;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.lops.CombineBinary.OperationTypes;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 /* Primary use cases for now, are
  * 		quantile (, , ):      quantile (A, w, 0.5)
diff --git a/src/main/java/com/ibm/bi/dml/hops/UnaryOp.java b/src/main/java/org/apache/sysml/hops/UnaryOp.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/hops/UnaryOp.java
rename to src/main/java/org/apache/sysml/hops/UnaryOp.java
index 71af54f0452..e770425004c 100644
--- a/src/main/java/com/ibm/bi/dml/hops/UnaryOp.java
+++ b/src/main/java/org/apache/sysml/hops/UnaryOp.java
@@ -15,30 +15,30 @@
  * 
  */
 
-package com.ibm.bi.dml.hops;
+package org.apache.sysml.hops;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.Aggregate;
-import com.ibm.bi.dml.lops.Aggregate.OperationTypes;
-import com.ibm.bi.dml.lops.CombineUnary;
-import com.ibm.bi.dml.lops.CumulativeOffsetBinary;
-import com.ibm.bi.dml.lops.CumulativePartialAggregate;
-import com.ibm.bi.dml.lops.CumulativeSplitAggregate;
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.Group;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.PartialAggregate;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.lops.PickByCount;
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.lops.Unary;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.lops.Aggregate;
+import org.apache.sysml.lops.Aggregate.OperationTypes;
+import org.apache.sysml.lops.CombineUnary;
+import org.apache.sysml.lops.CumulativeOffsetBinary;
+import org.apache.sysml.lops.CumulativePartialAggregate;
+import org.apache.sysml.lops.CumulativeSplitAggregate;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.Group;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.PartialAggregate;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.lops.PickByCount;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.lops.Unary;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 
 /* Unary (cell operations): e.g, b_ij = round(a_ij)
diff --git a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimationWrapper.java b/src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/hops/cost/CostEstimationWrapper.java
rename to src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java
index b4c669bdad5..024fe950b9a 100644
--- a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimationWrapper.java
+++ b/src/main/java/org/apache/sysml/hops/cost/CostEstimationWrapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.cost;
+package org.apache.sysml.hops.cost;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,16 +26,16 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
 
 public class CostEstimationWrapper 
 {
@@ -57,7 +57,7 @@ public enum CostType {
 	{	
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.hops.cost")
+			Logger.getLogger("org.apache.sysml.hops.cost")
 				  .setLevel((Level) Level.DEBUG);
 		}
 		
diff --git a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimator.java b/src/main/java/org/apache/sysml/hops/cost/CostEstimator.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/hops/cost/CostEstimator.java
rename to src/main/java/org/apache/sysml/hops/cost/CostEstimator.java
index 1f6d947a001..33498925aa8 100644
--- a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimator.java
+++ b/src/main/java/org/apache/sysml/hops/cost/CostEstimator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.cost;
+package org.apache.sysml.hops.cost;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,47 +27,47 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.AggregateTernaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.AggregateUnaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BinaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.DataGenCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.MMTSJCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.MultiReturnBuiltinCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.StringInitCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.UnaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.AggregateTernaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.AggregateUnaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.BinaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.DataGenCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.MMTSJCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.MultiReturnBuiltinCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.StringInitCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.UnaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public abstract class CostEstimator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimatorNumMRJobs.java b/src/main/java/org/apache/sysml/hops/cost/CostEstimatorNumMRJobs.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/hops/cost/CostEstimatorNumMRJobs.java
rename to src/main/java/org/apache/sysml/hops/cost/CostEstimatorNumMRJobs.java
index 4c9e78fab68..61919542121 100644
--- a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimatorNumMRJobs.java
+++ b/src/main/java/org/apache/sysml/hops/cost/CostEstimatorNumMRJobs.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.cost;
+package org.apache.sysml.hops.cost;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimatorStaticRuntime.java b/src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/cost/CostEstimatorStaticRuntime.java
rename to src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java
index 67d9cb2c1cd..ff360c15682 100644
--- a/src/main/java/com/ibm/bi/dml/hops/cost/CostEstimatorStaticRuntime.java
+++ b/src/main/java/org/apache/sysml/hops/cost/CostEstimatorStaticRuntime.java
@@ -15,53 +15,53 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.cost;
+package org.apache.sysml.hops.cost;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.MapMult;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.caching.LazyWriteBuffer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.CPInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryMRInstructionBase;
-import com.ibm.bi.dml.runtime.instructions.mr.CM_N_COVInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.IDistributedCacheConsumer;
-import com.ibm.bi.dml.runtime.instructions.mr.MMTSJMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MapMultChainInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.PickByCountInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RemoveEmptyMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.TernaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UnaryMRInstructionBase;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
-import com.ibm.bi.dml.yarn.ropt.MRJobResourceInstruction;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.MapMult;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.caching.LazyWriteBuffer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.CPInstructionParser;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryMRInstructionBase;
+import org.apache.sysml.runtime.instructions.mr.CM_N_COVInstruction;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.IDistributedCacheConsumer;
+import org.apache.sysml.runtime.instructions.mr.MMTSJMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MapMultChainInstruction;
+import org.apache.sysml.runtime.instructions.mr.PickByCountInstruction;
+import org.apache.sysml.runtime.instructions.mr.RemoveEmptyMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.TernaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.UnaryMRInstructionBase;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.yarn.ropt.MRJobResourceInstruction;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/hops/cost/VarStats.java b/src/main/java/org/apache/sysml/hops/cost/VarStats.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/cost/VarStats.java
rename to src/main/java/org/apache/sysml/hops/cost/VarStats.java
index b1d9671d0f1..ebee6b7f4e9 100644
--- a/src/main/java/com/ibm/bi/dml/hops/cost/VarStats.java
+++ b/src/main/java/org/apache/sysml/hops/cost/VarStats.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.cost;
+package org.apache.sysml.hops.cost;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/GDFEnumOptimizer.java b/src/main/java/org/apache/sysml/hops/globalopt/GDFEnumOptimizer.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/GDFEnumOptimizer.java
rename to src/main/java/org/apache/sysml/hops/globalopt/GDFEnumOptimizer.java
index d5d005b6b6f..b9272a7b314 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/GDFEnumOptimizer.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/GDFEnumOptimizer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,34 +23,34 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.cost.CostEstimationWrapper;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFGraph;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFLoopNode;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode.NodeType;
-import com.ibm.bi.dml.hops.globalopt.gdfresolve.GDFMismatchHeuristic;
-import com.ibm.bi.dml.hops.globalopt.gdfresolve.GDFMismatchHeuristic.MismatchHeuristicType;
-import com.ibm.bi.dml.hops.globalopt.gdfresolve.MismatchHeuristicFactory;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.cost.CostEstimationWrapper;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFGraph;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFLoopNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode.NodeType;
+import org.apache.sysml.hops.globalopt.gdfresolve.GDFMismatchHeuristic;
+import org.apache.sysml.hops.globalopt.gdfresolve.GDFMismatchHeuristic.MismatchHeuristicType;
+import org.apache.sysml.hops.globalopt.gdfresolve.MismatchHeuristicFactory;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
 
 /**
  * Global data flow optimization via enumeration-based optimizer (dynamic programming). 
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/GlobalOptimizer.java b/src/main/java/org/apache/sysml/hops/globalopt/GlobalOptimizer.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/GlobalOptimizer.java
rename to src/main/java/org/apache/sysml/hops/globalopt/GlobalOptimizer.java
index f48ad3391d2..bc5ed6a7741 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/GlobalOptimizer.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/GlobalOptimizer.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFGraph;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFGraph;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
 
 /**
  * Super class for all optimizers (e.g., transformation-based, and enumeration-based)
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/GlobalOptimizerWrapper.java b/src/main/java/org/apache/sysml/hops/globalopt/GlobalOptimizerWrapper.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/GlobalOptimizerWrapper.java
rename to src/main/java/org/apache/sysml/hops/globalopt/GlobalOptimizerWrapper.java
index be15d0757c0..dc86e61789b 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/GlobalOptimizerWrapper.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/GlobalOptimizerWrapper.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFGraph;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GraphBuilder;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.utils.Explain;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFGraph;
+import org.apache.sysml.hops.globalopt.gdfgraph.GraphBuilder;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.utils.Explain;
 
 /**
  * Main entry point for Global Data Flow Optimization. It is intended to be invoked after 
@@ -58,7 +58,7 @@ public enum GlobalOptimizerType{
 	{
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.hops.globalopt")
+			Logger.getLogger("org.apache.sysml.hops.globalopt")
 			      .setLevel((Level) Level.DEBUG);
 		}
 	}
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/InterestingProperties.java b/src/main/java/org/apache/sysml/hops/globalopt/InterestingProperties.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/InterestingProperties.java
rename to src/main/java/org/apache/sysml/hops/globalopt/InterestingProperties.java
index 7f58b095bbe..acc196ef399 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/InterestingProperties.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/InterestingProperties.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
 import com.google.common.base.Objects;
 
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/MemoStructure.java b/src/main/java/org/apache/sysml/hops/globalopt/MemoStructure.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/MemoStructure.java
rename to src/main/java/org/apache/sysml/hops/globalopt/MemoStructure.java
index 0cdd576da2d..b35e313c51a 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/MemoStructure.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/MemoStructure.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode;
 
 /**
  * This MemoStructure is the central location for storing enumerated plans (configurations) and serves
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/Plan.java b/src/main/java/org/apache/sysml/hops/globalopt/Plan.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/Plan.java
rename to src/main/java/org/apache/sysml/hops/globalopt/Plan.java
index aa9b29e411b..1e772ac0f91 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/Plan.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/Plan.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode.NodeType;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode.NodeType;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
 
 
 public class Plan 
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/PlanSet.java b/src/main/java/org/apache/sysml/hops/globalopt/PlanSet.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/PlanSet.java
rename to src/main/java/org/apache/sysml/hops/globalopt/PlanSet.java
index cf1897d5351..276657b468f 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/PlanSet.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/PlanSet.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFCrossBlockNode;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode.NodeType;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFCrossBlockNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode.NodeType;
 
 public class PlanSet 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/RewriteConfig.java b/src/main/java/org/apache/sysml/hops/globalopt/RewriteConfig.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/RewriteConfig.java
rename to src/main/java/org/apache/sysml/hops/globalopt/RewriteConfig.java
index a202a8abff3..417cd43be1c 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/RewriteConfig.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/RewriteConfig.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.globalopt.InterestingProperties.Location;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.globalopt.InterestingProperties.Location;
+import org.apache.sysml.lops.LopProperties.ExecType;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/Summary.java b/src/main/java/org/apache/sysml/hops/globalopt/Summary.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/Summary.java
rename to src/main/java/org/apache/sysml/hops/globalopt/Summary.java
index 2814a61a2d9..361dd80000f 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/Summary.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/Summary.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt;
+package org.apache.sysml.hops.globalopt;
 
 public class Summary
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFCrossBlockNode.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFCrossBlockNode.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFCrossBlockNode.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFCrossBlockNode.java
index 60d95ce7f8b..232698d6a6f 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFCrossBlockNode.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFCrossBlockNode.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfgraph;
+package org.apache.sysml.hops.globalopt.gdfgraph;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 /**
  * Crossblock operators represent 
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFGraph.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFGraph.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFGraph.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFGraph.java
index 99b177d3ff5..d2ccc4de362 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFGraph.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFGraph.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfgraph;
+package org.apache.sysml.hops.globalopt.gdfgraph;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.Program;
 
 public class GDFGraph 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFLoopNode.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFLoopNode.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFLoopNode.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFLoopNode.java
index 55c3ed137f4..4d7140565d1 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFLoopNode.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFLoopNode.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfgraph;
+package org.apache.sysml.hops.globalopt.gdfgraph;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 public class GDFLoopNode extends GDFNode
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFNode.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFNode.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFNode.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFNode.java
index 8a048cd823a..0de53b4b06e 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GDFNode.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GDFNode.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfgraph;
+package org.apache.sysml.hops.globalopt.gdfgraph;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.AggUnaryOp;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.hops.Hop.Direction;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.hops.Hop.ReOrgOp;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.hops.AggUnaryOp;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.hops.Hop.Direction;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.hops.Hop.ReOrgOp;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
 
 /**
  * The reason of a custom graph structure is to unify both within DAG
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GraphBuilder.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GraphBuilder.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GraphBuilder.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GraphBuilder.java
index 6507faa7331..39627074513 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfgraph/GraphBuilder.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfgraph/GraphBuilder.java
@@ -15,31 +15,31 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfgraph;
+package org.apache.sysml.hops.globalopt.gdfgraph;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.globalopt.Summary;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.utils.Explain;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.globalopt.Summary;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.utils.Explain;
 
 /**
  * GENERAL 'GDF GRAPH' STRUCTURE, by MB:
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristic.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristic.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristic.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristic.java
index 10f4df1122c..55a4403f0c7 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristic.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristic.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfresolve;
+package org.apache.sysml.hops.globalopt.gdfresolve;
 
-import com.ibm.bi.dml.hops.globalopt.RewriteConfig;
+import org.apache.sysml.hops.globalopt.RewriteConfig;
 
 public abstract class GDFMismatchHeuristic 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristicBlocksizeOrFirst.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristicBlocksizeOrFirst.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristicBlocksizeOrFirst.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristicBlocksizeOrFirst.java
index b9604f429d8..ef9caa92203 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristicBlocksizeOrFirst.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristicBlocksizeOrFirst.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfresolve;
+package org.apache.sysml.hops.globalopt.gdfresolve;
 
-import com.ibm.bi.dml.hops.globalopt.RewriteConfig;
+import org.apache.sysml.hops.globalopt.RewriteConfig;
 
 public class GDFMismatchHeuristicBlocksizeOrFirst extends GDFMismatchHeuristic
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristicFirst.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristicFirst.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristicFirst.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristicFirst.java
index d069aa8d2ec..3fb1bbd7cfd 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/GDFMismatchHeuristicFirst.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/GDFMismatchHeuristicFirst.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfresolve;
+package org.apache.sysml.hops.globalopt.gdfresolve;
 
-import com.ibm.bi.dml.hops.globalopt.RewriteConfig;
+import org.apache.sysml.hops.globalopt.RewriteConfig;
 
 public class GDFMismatchHeuristicFirst extends GDFMismatchHeuristic
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/MismatchHeuristicFactory.java b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/MismatchHeuristicFactory.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/MismatchHeuristicFactory.java
rename to src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/MismatchHeuristicFactory.java
index 0031a87fc73..6bb64f01041 100644
--- a/src/main/java/com/ibm/bi/dml/hops/globalopt/gdfresolve/MismatchHeuristicFactory.java
+++ b/src/main/java/org/apache/sysml/hops/globalopt/gdfresolve/MismatchHeuristicFactory.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.globalopt.gdfresolve;
+package org.apache.sysml.hops.globalopt.gdfresolve;
 
-import com.ibm.bi.dml.hops.globalopt.gdfresolve.GDFMismatchHeuristic.MismatchHeuristicType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
+import org.apache.sysml.hops.globalopt.gdfresolve.GDFMismatchHeuristic.MismatchHeuristicType;
+import org.apache.sysml.runtime.DMLRuntimeException;
 
 public abstract class MismatchHeuristicFactory 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/ipa/InterProceduralAnalysis.java b/src/main/java/org/apache/sysml/hops/ipa/InterProceduralAnalysis.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/hops/ipa/InterProceduralAnalysis.java
rename to src/main/java/org/apache/sysml/hops/ipa/InterProceduralAnalysis.java
index 744c22f7588..e21f17184d1 100644
--- a/src/main/java/com/ibm/bi/dml/hops/ipa/InterProceduralAnalysis.java
+++ b/src/main/java/org/apache/sysml/hops/ipa/InterProceduralAnalysis.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.ipa;
+package org.apache.sysml.hops.ipa;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,52 +30,52 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.FunctionOp.FunctionType;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.parser.DMLProgram;
-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.parser.ForStatement;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.FunctionStatement;
-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.LanguageException;
-import com.ibm.bi.dml.parser.ParseException;
-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.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-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.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.udf.lib.DeNaNWrapper;
-import com.ibm.bi.dml.udf.lib.DeNegInfinityWrapper;
-import com.ibm.bi.dml.udf.lib.DynamicReadMatrixCP;
-import com.ibm.bi.dml.udf.lib.DynamicReadMatrixRcCP;
-import com.ibm.bi.dml.udf.lib.OrderWrapper;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.FunctionOp.FunctionType;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.parser.DMLProgram;
+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.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.FunctionStatement;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+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.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.udf.lib.DeNaNWrapper;
+import org.apache.sysml.udf.lib.DeNegInfinityWrapper;
+import org.apache.sysml.udf.lib.DynamicReadMatrixCP;
+import org.apache.sysml.udf.lib.DynamicReadMatrixRcCP;
+import org.apache.sysml.udf.lib.OrderWrapper;
 
 /**
  * This Inter Procedural Analysis (IPA) serves two major purposes:
@@ -103,7 +103,7 @@
  *     If ALLOW_MULTIPLE_FUNCTION_CALLS is enabled we treat multiple calls with the same sizes
  *     as one call and hence, propagate those statistics into the function as well.
  *   * Output size inference happens for DML-bodied functions that are invoked exactly once
- *     and for external functions that are known in advance (see UDFs in com.ibm.bi.dml.udf).
+ *     and for external functions that are known in advance (see UDFs in org.apache.sysml.udf).
  *   * Size propagation across DAGs requires control flow awareness:
  *     - Generic statement blocks: updated variables -> old stats in; new stats out
  *     - While/for statement blocks: updated variables -> old stats in/out if loop insensitive; otherwise unknown
@@ -129,7 +129,7 @@ public class InterProceduralAnalysis
 	static {
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.parser.InterProceduralAnalysis")
+			Logger.getLogger("org.apache.sysml.parser.InterProceduralAnalysis")
 				  .setLevel((Level) Level.DEBUG);
 		}
 	}
@@ -831,14 +831,14 @@ private void extractExternalFunctionCallReturnStatistics( ExternalFunctionStatem
 			MatrixObject moOut = createOutputMatrix(input.getDim1(), input.getDim2(),lnnz);
 			callVars.put(fop.getOutputVariableNames()[0], moOut);
 		}
-		else if( className.equals("com.ibm.bi.dml.udf.lib.EigenWrapper") ) 
+		else if( className.equals("org.apache.sysml.udf.lib.EigenWrapper") ) 
 		//else if( className.equals(EigenWrapper.class.getName()) ) //string ref for build flexibility
 		{
 			Hop input = fop.getInput().get(0);
 			callVars.put(fop.getOutputVariableNames()[0], createOutputMatrix(input.getDim1(), 1, -1));
 			callVars.put(fop.getOutputVariableNames()[1], createOutputMatrix(input.getDim1(), input.getDim1(),-1));			
 		}
-		else if( className.equals("com.ibm.bi.dml.udf.lib.LinearSolverWrapperCP") ) 
+		else if( className.equals("org.apache.sysml.udf.lib.LinearSolverWrapperCP") ) 
 		//else if( className.equals(LinearSolverWrapperCP.class.getName()) ) //string ref for build flexibility
 		{
 			Hop input = fop.getInput().get(1);
diff --git a/src/main/java/com/ibm/bi/dml/hops/recompile/LiteralReplacement.java b/src/main/java/org/apache/sysml/hops/recompile/LiteralReplacement.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/hops/recompile/LiteralReplacement.java
rename to src/main/java/org/apache/sysml/hops/recompile/LiteralReplacement.java
index 9610be3d38d..acb6e010ffa 100644
--- a/src/main/java/com/ibm/bi/dml/hops/recompile/LiteralReplacement.java
+++ b/src/main/java/org/apache/sysml/hops/recompile/LiteralReplacement.java
@@ -15,32 +15,32 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.recompile;
+package org.apache.sysml.hops.recompile;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.AggUnaryOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.hops.Hop.AggOp;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.Direction;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.AggUnaryOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.hops.Hop.AggOp;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.Direction;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.utils.Statistics;
 
 public class LiteralReplacement 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/recompile/RecompileStatus.java b/src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/hops/recompile/RecompileStatus.java
rename to src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java
index e6b84263208..2c80fc9f135 100644
--- a/src/main/java/com/ibm/bi/dml/hops/recompile/RecompileStatus.java
+++ b/src/main/java/org/apache/sysml/hops/recompile/RecompileStatus.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.recompile;
+package org.apache.sysml.hops.recompile;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.parser.VariableSet;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.parser.VariableSet;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 public class RecompileStatus 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/recompile/Recompiler.java b/src/main/java/org/apache/sysml/hops/recompile/Recompiler.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/recompile/Recompiler.java
rename to src/main/java/org/apache/sysml/hops/recompile/Recompiler.java
index b8e894e2d0c..ac6c1b9dfdc 100644
--- a/src/main/java/com/ibm/bi/dml/hops/recompile/Recompiler.java
+++ b/src/main/java/org/apache/sysml/hops/recompile/Recompiler.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.recompile;
+package org.apache.sysml.hops.recompile;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -31,76 +31,76 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.wink.json4j.JSONObject;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.FunctionOp.FunctionType;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.MemoTable;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.hops.rewrite.ProgramRewriter;
-import com.ibm.bi.dml.lops.CSVReBlock;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.ReBlock;
-import com.ibm.bi.dml.lops.compile.Dag;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-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.ProgramConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptTreeConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-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.mr.RandInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.SeqInstruction;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Explain;
-import com.ibm.bi.dml.utils.Explain.ExplainType;
-import com.ibm.bi.dml.utils.JSONHelper;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.FunctionOp.FunctionType;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.MemoTable;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.hops.rewrite.ProgramRewriter;
+import org.apache.sysml.lops.CSVReBlock;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.ReBlock;
+import org.apache.sysml.lops.compile.Dag;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptTreeConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.instructions.mr.RandInstruction;
+import org.apache.sysml.runtime.instructions.mr.SeqInstruction;
+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.MatrixBlock;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Explain;
+import org.apache.sysml.utils.Explain.ExplainType;
+import org.apache.sysml.utils.JSONHelper;
 
 /**
  * Dynamic recompilation of hop dags to runtime instructions, which includes the 
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/HopDagValidator.java b/src/main/java/org/apache/sysml/hops/rewrite/HopDagValidator.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/HopDagValidator.java
rename to src/main/java/org/apache/sysml/hops/rewrite/HopDagValidator.java
index 3ea68c2050b..15a106ff011 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/HopDagValidator.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/HopDagValidator.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.utils.Explain;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.utils.Explain;
 
 /**
  * This class allows to check hop dags for validity, e.g., parent-child linking.
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/HopRewriteRule.java b/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteRule.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/HopRewriteRule.java
rename to src/main/java/org/apache/sysml/hops/rewrite/HopRewriteRule.java
index 65bb5ad3c34..e5176e71aa8 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/HopRewriteRule.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteRule.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
 
 /**
  * Base class for all hop rewrites in order to enable generic
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/HopRewriteUtils.java b/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/HopRewriteUtils.java
rename to src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java
index 6da131cfa07..6648f7ad7f1 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/HopRewriteUtils.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/HopRewriteUtils.java
@@ -15,46 +15,46 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.AggOp;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.Hop.ParamBuiltinOp;
-import com.ibm.bi.dml.hops.Hop.ReOrgOp;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.MemoTable;
-import com.ibm.bi.dml.hops.ParameterizedBuiltinOp;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanObject;
-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.util.UtilFunctions;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.AggOp;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.Hop.ParamBuiltinOp;
+import org.apache.sysml.hops.Hop.ReOrgOp;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.MemoTable;
+import org.apache.sysml.hops.ParameterizedBuiltinOp;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.BooleanObject;
+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.util.UtilFunctions;
 
 public class HopRewriteUtils 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/ProgramRewriteStatus.java b/src/main/java/org/apache/sysml/hops/rewrite/ProgramRewriteStatus.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/ProgramRewriteStatus.java
rename to src/main/java/org/apache/sysml/hops/rewrite/ProgramRewriteStatus.java
index 535f68c4f73..0d3b70799b1 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/ProgramRewriteStatus.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/ProgramRewriteStatus.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 public class ProgramRewriteStatus 
 {
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/ProgramRewriter.java b/src/main/java/org/apache/sysml/hops/rewrite/ProgramRewriter.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/ProgramRewriter.java
rename to src/main/java/org/apache/sysml/hops/rewrite/ProgramRewriter.java
index 9c383e9fd33..74f048bb418 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/ProgramRewriter.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/ProgramRewriter.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
@@ -24,21 +24,21 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-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.parser.DMLProgram;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.FunctionStatement;
-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.LanguageException;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatement;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.FunctionStatement;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
 
 /**
  * This program rewriter applies a variety of rule-based rewrites
@@ -60,7 +60,7 @@ public class ProgramRewriter
 	static{
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.hops.rewrite")
+			Logger.getLogger("org.apache.sysml.hops.rewrite")
 				  .setLevel((Level) Level.DEBUG);
 		}
 		
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationDynamic.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationDynamic.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationDynamic.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationDynamic.java
index 5b1111a5f66..175d4d70e46 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationDynamic.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationDynamic.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,30 +23,30 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.AggUnaryOp;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.QuaternaryOp;
-import com.ibm.bi.dml.hops.Hop.AggOp;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.hops.Hop.Direction;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.hops.Hop.OpOp4;
-import com.ibm.bi.dml.hops.Hop.ReOrgOp;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.lops.MapMultChain.ChainType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.AggUnaryOp;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.QuaternaryOp;
+import org.apache.sysml.hops.Hop.AggOp;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.hops.Hop.Direction;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.hops.Hop.OpOp4;
+import org.apache.sysml.hops.Hop.ReOrgOp;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.lops.MapMultChain.ChainType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * Rule: Algebraic Simplifications. Simplifies binary expressions
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
index 4a7b2d435a2..bdd8d8b3d12 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteAlgebraicSimplificationStatic.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,29 +23,29 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.AggUnaryOp;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.TernaryOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.hops.Hop.AggOp;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.hops.Hop.Direction;
-import com.ibm.bi.dml.hops.Hop.ParamBuiltinOp;
-import com.ibm.bi.dml.hops.Hop.ReOrgOp;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.ParameterizedBuiltinOp;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.AggUnaryOp;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.TernaryOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.hops.Hop.AggOp;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.hops.Hop.Direction;
+import org.apache.sysml.hops.Hop.ParamBuiltinOp;
+import org.apache.sysml.hops.Hop.ReOrgOp;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.ParameterizedBuiltinOp;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * Rule: Algebraic Simplifications. Simplifies binary expressions
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteBlockSizeAndReblock.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteBlockSizeAndReblock.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteBlockSizeAndReblock.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteBlockSizeAndReblock.java
index bb4260e2b38..be41de2b910 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteBlockSizeAndReblock.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteBlockSizeAndReblock.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.Hop.ParamBuiltinOp;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.ParameterizedBuiltinOp;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.DataType;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.Hop.ParamBuiltinOp;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.ParameterizedBuiltinOp;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.DataType;
 
 /**
  * Rule: BlockSizeAndReblock. For all statement blocks, determine
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteCommonSubexpressionElimination.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteCommonSubexpressionElimination.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteCommonSubexpressionElimination.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteCommonSubexpressionElimination.java
index 9bb12f21c81..8dae18fcb89 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteCommonSubexpressionElimination.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteCommonSubexpressionElimination.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
 
 /**
  * Rule: CommonSubexpressionElimination. For all statement blocks, 
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteConstantFolding.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteConstantFolding.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteConstantFolding.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteConstantFolding.java
index 8b1bf5b1e0f..35dd07ba015 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteConstantFolding.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteConstantFolding.java
@@ -15,34 +15,34 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.compile.Dag;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.compile.Dag;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
 
 /**
  * Rule: Constant Folding. For all statement blocks, 
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteForLoopVectorization.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteForLoopVectorization.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteForLoopVectorization.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteForLoopVectorization.java
index 49af864ffbc..d126fac3a3e 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteForLoopVectorization.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteForLoopVectorization.java
@@ -15,30 +15,30 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.AggUnaryOp;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.AggOp;
-import com.ibm.bi.dml.hops.Hop.Direction;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.AggUnaryOp;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.AggOp;
+import org.apache.sysml.hops.Hop.Direction;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * Rule: Simplify program structure by pulling if or else statement body out
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteIndexingVectorization.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteIndexingVectorization.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteIndexingVectorization.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteIndexingVectorization.java
index 226812d7f03..d0dbb078711 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteIndexingVectorization.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteIndexingVectorization.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-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.IndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * Rule: Indexing vectorization. This rewrite rule set simplifies
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteInjectSparkLoopCheckpointing.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteInjectSparkLoopCheckpointing.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteInjectSparkLoopCheckpointing.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteInjectSparkLoopCheckpointing.java
index 5e0e54f0196..69287a73721 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteInjectSparkLoopCheckpointing.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteInjectSparkLoopCheckpointing.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.VariableSet;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.VariableSet;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * Rule: Insert checkpointing operations for caching purposes. Currently, we
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteInjectSparkPReadCheckpointing.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteInjectSparkPReadCheckpointing.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteInjectSparkPReadCheckpointing.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteInjectSparkPReadCheckpointing.java
index 71d913de5ee..db81f136b42 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteInjectSparkPReadCheckpointing.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteInjectSparkPReadCheckpointing.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
 
 /**
  * Rule: BlockSizeAndReblock. For all statement blocks, determine
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteMatrixMultChainOptimization.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteMatrixMultChainOptimization.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteMatrixMultChainOptimization.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteMatrixMultChainOptimization.java
index c656f874b39..2e9b329ef34 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteMatrixMultChainOptimization.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteMatrixMultChainOptimization.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,10 +25,10 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.utils.Explain;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.utils.Explain;
 
 /**
  * Rule: Determine the optimal order of execution for a chain of
@@ -47,7 +47,7 @@ public class RewriteMatrixMultChainOptimization extends HopRewriteRule
 	{
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.hops.rewrite.RewriteMatrixMultChainOptimization")
+			Logger.getLogger("org.apache.sysml.hops.rewrite.RewriteMatrixMultChainOptimization")
 				  .setLevel((Level) Level.TRACE);
 		}
 	}
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemovePersistentReadWrite.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemovePersistentReadWrite.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemovePersistentReadWrite.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteRemovePersistentReadWrite.java
index 4eb67b668b0..70a294b5655 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemovePersistentReadWrite.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemovePersistentReadWrite.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.Hop.VisitStatus;
 
 /**
  * This rewrite is a custom rewrite for JMLC in order to replace all persistent reads
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveReadAfterWrite.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveReadAfterWrite.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveReadAfterWrite.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveReadAfterWrite.java
index a37c54ae9f0..82f95baebb6 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveReadAfterWrite.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveReadAfterWrite.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.parser.DataExpression;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.parser.DataExpression;
 
 /**
  * Rule: RemoveReadAfterWrite. If there is a persistent read with the same filename
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveUnnecessaryBranches.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveUnnecessaryBranches.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveUnnecessaryBranches.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveUnnecessaryBranches.java
index 058772942d4..8e09e877a22 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveUnnecessaryBranches.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveUnnecessaryBranches.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.parser.IfStatement;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
 
 /**
  * Rule: Simplify program structure by pulling if or else statement body out
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveUnnecessaryCasts.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveUnnecessaryCasts.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveUnnecessaryCasts.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveUnnecessaryCasts.java
index 011f67ec6e7..6df1b8974c2 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteRemoveUnnecessaryCasts.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteRemoveUnnecessaryCasts.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.UnaryOp;
-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.Hop.VisitStatus;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * Rule: RemoveUnnecessaryCasts. For all value type casts check
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteSplitDagDataDependentOperators.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteSplitDagDataDependentOperators.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteSplitDagDataDependentOperators.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteSplitDagDataDependentOperators.java
index 2920853a5af..4300119b497 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteSplitDagDataDependentOperators.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteSplitDagDataDependentOperators.java
@@ -15,33 +15,33 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.OpOp1;
-import com.ibm.bi.dml.hops.Hop.OpOp3;
-import com.ibm.bi.dml.hops.Hop.ParamBuiltinOp;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.ReOrgOp;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.ParameterizedBuiltinOp;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.hops.TernaryOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.VariableSet;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.OpOp1;
+import org.apache.sysml.hops.Hop.OpOp3;
+import org.apache.sysml.hops.Hop.ParamBuiltinOp;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.ReOrgOp;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.ParameterizedBuiltinOp;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.hops.TernaryOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.VariableSet;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 /**
  * Rule: Split Hop DAG after specific data-dependent operators. This is
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteSplitDagUnknownCSVRead.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteSplitDagUnknownCSVRead.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteSplitDagUnknownCSVRead.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteSplitDagUnknownCSVRead.java
index 799f8ab12f4..1cffee1e742 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteSplitDagUnknownCSVRead.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteSplitDagUnknownCSVRead.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.VariableSet;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.VariableSet;
 
 /**
  * Rule: Split Hop DAG after CSV reads with unknown size. This is
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteTransientWriteParentHandling.java b/src/main/java/org/apache/sysml/hops/rewrite/RewriteTransientWriteParentHandling.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteTransientWriteParentHandling.java
rename to src/main/java/org/apache/sysml/hops/rewrite/RewriteTransientWriteParentHandling.java
index ee9c010fe9b..d9e841ee57a 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/RewriteTransientWriteParentHandling.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/RewriteTransientWriteParentHandling.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.Hop.DataOpTypes;
 
 /**
  * Rule: Eliminate for Transient Write DataHops to have no parents
diff --git a/src/main/java/com/ibm/bi/dml/hops/rewrite/StatementBlockRewriteRule.java b/src/main/java/org/apache/sysml/hops/rewrite/StatementBlockRewriteRule.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/hops/rewrite/StatementBlockRewriteRule.java
rename to src/main/java/org/apache/sysml/hops/rewrite/StatementBlockRewriteRule.java
index 0e4c7b859df..9d84f2f8201 100644
--- a/src/main/java/com/ibm/bi/dml/hops/rewrite/StatementBlockRewriteRule.java
+++ b/src/main/java/org/apache/sysml/hops/rewrite/StatementBlockRewriteRule.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.hops.rewrite;
+package org.apache.sysml.hops.rewrite;
 
 import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.parser.StatementBlock;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.parser.StatementBlock;
 
 /**
  * Base class for all hop rewrites in order to enable generic
diff --git a/src/main/java/com/ibm/bi/dml/lops/Aggregate.java b/src/main/java/org/apache/sysml/lops/Aggregate.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/Aggregate.java
rename to src/main/java/org/apache/sysml/lops/Aggregate.java
index 88d57e7655f..5149677c3ee 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Aggregate.java
+++ b/src/main/java/org/apache/sysml/lops/Aggregate.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/AppendCP.java b/src/main/java/org/apache/sysml/lops/AppendCP.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/lops/AppendCP.java
rename to src/main/java/org/apache/sysml/lops/AppendCP.java
index f3108e5febf..b98db98e658 100644
--- a/src/main/java/com/ibm/bi/dml/lops/AppendCP.java
+++ b/src/main/java/org/apache/sysml/lops/AppendCP.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 public class AppendCP extends Lop
diff --git a/src/main/java/com/ibm/bi/dml/lops/AppendG.java b/src/main/java/org/apache/sysml/lops/AppendG.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/AppendG.java
rename to src/main/java/org/apache/sysml/lops/AppendG.java
index f254aa0b245..05f2a3295d3 100644
--- a/src/main/java/com/ibm/bi/dml/lops/AppendG.java
+++ b/src/main/java/org/apache/sysml/lops/AppendG.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 /**
  * TODO Additional compiler enhancements:
diff --git a/src/main/java/com/ibm/bi/dml/lops/AppendGAlignedSP.java b/src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/lops/AppendGAlignedSP.java
rename to src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java
index b1b86c186fa..703a680a40c 100644
--- a/src/main/java/com/ibm/bi/dml/lops/AppendGAlignedSP.java
+++ b/src/main/java/org/apache/sysml/lops/AppendGAlignedSP.java
@@ -1,10 +1,10 @@
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 public class AppendGAlignedSP extends Lop
 {
diff --git a/src/main/java/com/ibm/bi/dml/lops/AppendM.java b/src/main/java/org/apache/sysml/lops/AppendM.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/AppendM.java
rename to src/main/java/org/apache/sysml/lops/AppendM.java
index ab364cac37a..812e7d198f6 100644
--- a/src/main/java/com/ibm/bi/dml/lops/AppendM.java
+++ b/src/main/java/org/apache/sysml/lops/AppendM.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 public class AppendM extends Lop
diff --git a/src/main/java/com/ibm/bi/dml/lops/AppendR.java b/src/main/java/org/apache/sysml/lops/AppendR.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/AppendR.java
rename to src/main/java/org/apache/sysml/lops/AppendR.java
index 94b83bf7a8a..dd696071a5a 100644
--- a/src/main/java/com/ibm/bi/dml/lops/AppendR.java
+++ b/src/main/java/org/apache/sysml/lops/AppendR.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 public class AppendR extends Lop
diff --git a/src/main/java/com/ibm/bi/dml/lops/Binary.java b/src/main/java/org/apache/sysml/lops/Binary.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/lops/Binary.java
rename to src/main/java/org/apache/sysml/lops/Binary.java
index 1ceabda97a3..39104ef0ff0 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Binary.java
+++ b/src/main/java/org/apache/sysml/lops/Binary.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/BinaryM.java b/src/main/java/org/apache/sysml/lops/BinaryM.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/BinaryM.java
rename to src/main/java/org/apache/sysml/lops/BinaryM.java
index 5b03008512f..34ede22d58d 100644
--- a/src/main/java/com/ibm/bi/dml/lops/BinaryM.java
+++ b/src/main/java/org/apache/sysml/lops/BinaryM.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.Binary.OperationTypes;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.Binary.OperationTypes;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/BinaryScalar.java b/src/main/java/org/apache/sysml/lops/BinaryScalar.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/BinaryScalar.java
rename to src/main/java/org/apache/sysml/lops/BinaryScalar.java
index 6fbe4a54763..cdab353474b 100644
--- a/src/main/java/com/ibm/bi/dml/lops/BinaryScalar.java
+++ b/src/main/java/org/apache/sysml/lops/BinaryScalar.java
@@ -15,14 +15,14 @@
  *
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 
  
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 /**
  * Lop to perform binary scalar operations. Both inputs must be scalars.
diff --git a/src/main/java/com/ibm/bi/dml/lops/BinaryUAggChain.java b/src/main/java/org/apache/sysml/lops/BinaryUAggChain.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/BinaryUAggChain.java
rename to src/main/java/org/apache/sysml/lops/BinaryUAggChain.java
index d6b9171f477..92e4663971c 100644
--- a/src/main/java/com/ibm/bi/dml/lops/BinaryUAggChain.java
+++ b/src/main/java/org/apache/sysml/lops/BinaryUAggChain.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class BinaryUAggChain extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/CSVReBlock.java b/src/main/java/org/apache/sysml/lops/CSVReBlock.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/CSVReBlock.java
rename to src/main/java/org/apache/sysml/lops/CSVReBlock.java
index e856de6794d..b20c6b87500 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CSVReBlock.java
+++ b/src/main/java/org/apache/sysml/lops/CSVReBlock.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ParameterizedBuiltinFunctionExpression;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/CentralMoment.java b/src/main/java/org/apache/sysml/lops/CentralMoment.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/lops/CentralMoment.java
rename to src/main/java/org/apache/sysml/lops/CentralMoment.java
index b7ab6855c57..ff9862c09e1 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CentralMoment.java
+++ b/src/main/java/org/apache/sysml/lops/CentralMoment.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/Checkpoint.java b/src/main/java/org/apache/sysml/lops/Checkpoint.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/Checkpoint.java
rename to src/main/java/org/apache/sysml/lops/Checkpoint.java
index e74699b53f2..f9bf65742b1 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Checkpoint.java
+++ b/src/main/java/org/apache/sysml/lops/Checkpoint.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import org.apache.spark.storage.StorageLevel;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/CoVariance.java b/src/main/java/org/apache/sysml/lops/CoVariance.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/CoVariance.java
rename to src/main/java/org/apache/sysml/lops/CoVariance.java
index 2d1626e36bf..62112af7453 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CoVariance.java
+++ b/src/main/java/org/apache/sysml/lops/CoVariance.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * Lop to compute covariance between two 1D matrices
diff --git a/src/main/java/com/ibm/bi/dml/lops/CombineBinary.java b/src/main/java/org/apache/sysml/lops/CombineBinary.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/CombineBinary.java
rename to src/main/java/org/apache/sysml/lops/CombineBinary.java
index 81fafef14c9..cedf0de3781 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CombineBinary.java
+++ b/src/main/java/org/apache/sysml/lops/CombineBinary.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashSet;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/CombineTernary.java b/src/main/java/org/apache/sysml/lops/CombineTernary.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/CombineTernary.java
rename to src/main/java/org/apache/sysml/lops/CombineTernary.java
index 529d57b1266..0c536774bc0 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CombineTernary.java
+++ b/src/main/java/org/apache/sysml/lops/CombineTernary.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashSet;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/CombineUnary.java b/src/main/java/org/apache/sysml/lops/CombineUnary.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/CombineUnary.java
rename to src/main/java/org/apache/sysml/lops/CombineUnary.java
index da843e1da33..d5ac845fe0c 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CombineUnary.java
+++ b/src/main/java/org/apache/sysml/lops/CombineUnary.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashSet;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/CumulativeOffsetBinary.java b/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/CumulativeOffsetBinary.java
rename to src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java
index 290824abd02..3e530c5f8eb 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CumulativeOffsetBinary.java
+++ b/src/main/java/org/apache/sysml/lops/CumulativeOffsetBinary.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.Aggregate.OperationTypes;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.Aggregate.OperationTypes;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/CumulativePartialAggregate.java b/src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/CumulativePartialAggregate.java
rename to src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java
index 759031648f4..58c7060d50b 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CumulativePartialAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/CumulativePartialAggregate.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.Aggregate.OperationTypes;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.Aggregate.OperationTypes;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/CumulativeSplitAggregate.java b/src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/lops/CumulativeSplitAggregate.java
rename to src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java
index fc22c5e7839..9c3fb942016 100644
--- a/src/main/java/com/ibm/bi/dml/lops/CumulativeSplitAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/CumulativeSplitAggregate.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/Data.java b/src/main/java/org/apache/sysml/lops/Data.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/Data.java
rename to src/main/java/org/apache/sysml/lops/Data.java
index eca031d879a..ff8f1e7be7f 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Data.java
+++ b/src/main/java/org/apache/sysml/lops/Data.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.OutputParameters.Format;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.OutputParameters.Format;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 
@@ -140,7 +140,7 @@ private void setLopProperties() {
 			// If the input is data transform, then csv write can be piggybacked onto TRANSFORM job.
 			// Otherwise, the input must be converted to csv format via WriteCSV MR job.
 			if ( input instanceof ParameterizedBuiltin 
-					&& ((ParameterizedBuiltin)input).getOp() == com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM ) {
+					&& ((ParameterizedBuiltin)input).getOp() == org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM ) {
 				lps.addCompatibility(JobType.TRANSFORM);
 				definesMRJob = false;
 			}
diff --git a/src/main/java/com/ibm/bi/dml/lops/DataGen.java b/src/main/java/org/apache/sysml/lops/DataGen.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/DataGen.java
rename to src/main/java/org/apache/sysml/lops/DataGen.java
index 9cea4406d63..45df30219e0 100644
--- a/src/main/java/com/ibm/bi/dml/lops/DataGen.java
+++ b/src/main/java/org/apache/sysml/lops/DataGen.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.OutputParameters.Format;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.OutputParameters.Format;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/DataPartition.java b/src/main/java/org/apache/sysml/lops/DataPartition.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/lops/DataPartition.java
rename to src/main/java/org/apache/sysml/lops/DataPartition.java
index 1434611d9bf..c06cc5c6cd6 100644
--- a/src/main/java/com/ibm/bi/dml/lops/DataPartition.java
+++ b/src/main/java/org/apache/sysml/lops/DataPartition.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/FunctionCallCP.java b/src/main/java/org/apache/sysml/lops/FunctionCallCP.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/FunctionCallCP.java
rename to src/main/java/org/apache/sysml/lops/FunctionCallCP.java
index e5ee9bef7fe..12ea1676829 100644
--- a/src/main/java/com/ibm/bi/dml/lops/FunctionCallCP.java
+++ b/src/main/java/org/apache/sysml/lops/FunctionCallCP.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.DMLProgram;
-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.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/Group.java b/src/main/java/org/apache/sysml/lops/Group.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/lops/Group.java
rename to src/main/java/org/apache/sysml/lops/Group.java
index 7af0ca16215..255574810bc 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Group.java
+++ b/src/main/java/org/apache/sysml/lops/Group.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 /**
  * Lop to represent a grouping operation.
diff --git a/src/main/java/com/ibm/bi/dml/lops/GroupedAggregate.java b/src/main/java/org/apache/sysml/lops/GroupedAggregate.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/lops/GroupedAggregate.java
rename to src/main/java/org/apache/sysml/lops/GroupedAggregate.java
index 974844b2e4b..ca06bdbd402 100644
--- a/src/main/java/com/ibm/bi/dml/lops/GroupedAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/GroupedAggregate.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/LeftIndex.java b/src/main/java/org/apache/sysml/lops/LeftIndex.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/LeftIndex.java
rename to src/main/java/org/apache/sysml/lops/LeftIndex.java
index d81b250b600..46c2f689725 100644
--- a/src/main/java/com/ibm/bi/dml/lops/LeftIndex.java
+++ b/src/main/java/org/apache/sysml/lops/LeftIndex.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class LeftIndex extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/Lop.java b/src/main/java/org/apache/sysml/lops/Lop.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/lops/Lop.java
rename to src/main/java/org/apache/sysml/lops/Lop.java
index 751ca1fde06..45a88100101 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Lop.java
+++ b/src/main/java/org/apache/sysml/lops/Lop.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.Dag;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.Dag;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/LopProperties.java b/src/main/java/org/apache/sysml/lops/LopProperties.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/lops/LopProperties.java
rename to src/main/java/org/apache/sysml/lops/LopProperties.java
index 3268e1d182a..75ac5082088 100644
--- a/src/main/java/com/ibm/bi/dml/lops/LopProperties.java
+++ b/src/main/java/org/apache/sysml/lops/LopProperties.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
 
 public class LopProperties 
 {
diff --git a/src/main/java/com/ibm/bi/dml/lops/LopsException.java b/src/main/java/org/apache/sysml/lops/LopsException.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/LopsException.java
rename to src/main/java/org/apache/sysml/lops/LopsException.java
index 762a3e79d8f..af0ed842a85 100644
--- a/src/main/java/com/ibm/bi/dml/lops/LopsException.java
+++ b/src/main/java/org/apache/sysml/lops/LopsException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.api.DMLException;
+import org.apache.sysml.api.DMLException;
 
 public class LopsException extends DMLException 
 {
diff --git a/src/main/java/com/ibm/bi/dml/lops/MMCJ.java b/src/main/java/org/apache/sysml/lops/MMCJ.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/MMCJ.java
rename to src/main/java/org/apache/sysml/lops/MMCJ.java
index dc37667dd60..66faba73c93 100644
--- a/src/main/java/com/ibm/bi/dml/lops/MMCJ.java
+++ b/src/main/java/org/apache/sysml/lops/MMCJ.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/MMRJ.java b/src/main/java/org/apache/sysml/lops/MMRJ.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/MMRJ.java
rename to src/main/java/org/apache/sysml/lops/MMRJ.java
index 8722526e055..6cbdf1f63a4 100644
--- a/src/main/java/com/ibm/bi/dml/lops/MMRJ.java
+++ b/src/main/java/org/apache/sysml/lops/MMRJ.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/MMTSJ.java b/src/main/java/org/apache/sysml/lops/MMTSJ.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/MMTSJ.java
rename to src/main/java/org/apache/sysml/lops/MMTSJ.java
index d1d30532058..9e051ba7ff2 100644
--- a/src/main/java/com/ibm/bi/dml/lops/MMTSJ.java
+++ b/src/main/java/org/apache/sysml/lops/MMTSJ.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/MMZip.java b/src/main/java/org/apache/sysml/lops/MMZip.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/lops/MMZip.java
rename to src/main/java/org/apache/sysml/lops/MMZip.java
index b8875fb3322..0a8b246f994 100644
--- a/src/main/java/com/ibm/bi/dml/lops/MMZip.java
+++ b/src/main/java/org/apache/sysml/lops/MMZip.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/MapMult.java b/src/main/java/org/apache/sysml/lops/MapMult.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/MapMult.java
rename to src/main/java/org/apache/sysml/lops/MapMult.java
index e3d4d2e6ec9..65727e28113 100644
--- a/src/main/java/com/ibm/bi/dml/lops/MapMult.java
+++ b/src/main/java/org/apache/sysml/lops/MapMult.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class MapMult extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/MapMultChain.java b/src/main/java/org/apache/sysml/lops/MapMultChain.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/lops/MapMultChain.java
rename to src/main/java/org/apache/sysml/lops/MapMultChain.java
index 8badbc02de6..b181d4996f9 100644
--- a/src/main/java/com/ibm/bi/dml/lops/MapMultChain.java
+++ b/src/main/java/org/apache/sysml/lops/MapMultChain.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class MapMultChain extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/OutputParameters.java b/src/main/java/org/apache/sysml/lops/OutputParameters.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/OutputParameters.java
rename to src/main/java/org/apache/sysml/lops/OutputParameters.java
index 3772f680efe..c99291985d2 100644
--- a/src/main/java/com/ibm/bi/dml/lops/OutputParameters.java
+++ b/src/main/java/org/apache/sysml/lops/OutputParameters.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.hops.HopsException;
+import org.apache.sysml.hops.HopsException;
 
 /**
  * class to maintain output parameters for a lop.
diff --git a/src/main/java/com/ibm/bi/dml/lops/PMMJ.java b/src/main/java/org/apache/sysml/lops/PMMJ.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/PMMJ.java
rename to src/main/java/org/apache/sysml/lops/PMMJ.java
index c540256ac8c..49f561ef769 100644
--- a/src/main/java/com/ibm/bi/dml/lops/PMMJ.java
+++ b/src/main/java/org/apache/sysml/lops/PMMJ.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  *
diff --git a/src/main/java/com/ibm/bi/dml/lops/PMapMult.java b/src/main/java/org/apache/sysml/lops/PMapMult.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/lops/PMapMult.java
rename to src/main/java/org/apache/sysml/lops/PMapMult.java
index cb129997014..db81d636822 100644
--- a/src/main/java/com/ibm/bi/dml/lops/PMapMult.java
+++ b/src/main/java/org/apache/sysml/lops/PMapMult.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class PMapMult extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/ParameterizedBuiltin.java b/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/ParameterizedBuiltin.java
rename to src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java
index c67a92ba0c9..5facd876966 100644
--- a/src/main/java/com/ibm/bi/dml/lops/ParameterizedBuiltin.java
+++ b/src/main/java/org/apache/sysml/lops/ParameterizedBuiltin.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ParameterizedBuiltinFunctionExpression;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/PartialAggregate.java b/src/main/java/org/apache/sysml/lops/PartialAggregate.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/PartialAggregate.java
rename to src/main/java/org/apache/sysml/lops/PartialAggregate.java
index 68f4b747689..34d2ed1ec8f 100644
--- a/src/main/java/com/ibm/bi/dml/lops/PartialAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/PartialAggregate.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/PickByCount.java b/src/main/java/org/apache/sysml/lops/PickByCount.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/PickByCount.java
rename to src/main/java/org/apache/sysml/lops/PickByCount.java
index f0cca24d7fd..b3c687428d3 100644
--- a/src/main/java/com/ibm/bi/dml/lops/PickByCount.java
+++ b/src/main/java/org/apache/sysml/lops/PickByCount.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class PickByCount extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/RangeBasedReIndex.java b/src/main/java/org/apache/sysml/lops/RangeBasedReIndex.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/RangeBasedReIndex.java
rename to src/main/java/org/apache/sysml/lops/RangeBasedReIndex.java
index a36c0d36e90..78a4340e90c 100644
--- a/src/main/java/com/ibm/bi/dml/lops/RangeBasedReIndex.java
+++ b/src/main/java/org/apache/sysml/lops/RangeBasedReIndex.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class RangeBasedReIndex extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/ReBlock.java b/src/main/java/org/apache/sysml/lops/ReBlock.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/ReBlock.java
rename to src/main/java/org/apache/sysml/lops/ReBlock.java
index a442fa6b8be..300587cf0a0 100644
--- a/src/main/java/com/ibm/bi/dml/lops/ReBlock.java
+++ b/src/main/java/org/apache/sysml/lops/ReBlock.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.OutputParameters.Format;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.OutputParameters.Format;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/RepMat.java b/src/main/java/org/apache/sysml/lops/RepMat.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/lops/RepMat.java
rename to src/main/java/org/apache/sysml/lops/RepMat.java
index b8385395f95..fdbe7fbefaa 100644
--- a/src/main/java/com/ibm/bi/dml/lops/RepMat.java
+++ b/src/main/java/org/apache/sysml/lops/RepMat.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class RepMat extends Lop 
diff --git a/src/main/java/com/ibm/bi/dml/lops/SortKeys.java b/src/main/java/org/apache/sysml/lops/SortKeys.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/SortKeys.java
rename to src/main/java/org/apache/sysml/lops/SortKeys.java
index 39b0ea75f98..17031b5d067 100644
--- a/src/main/java/com/ibm/bi/dml/lops/SortKeys.java
+++ b/src/main/java/org/apache/sysml/lops/SortKeys.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
 import java.util.HashSet;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 public class SortKeys extends Lop 
 {
diff --git a/src/main/java/com/ibm/bi/dml/lops/Ternary.java b/src/main/java/org/apache/sysml/lops/Ternary.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/lops/Ternary.java
rename to src/main/java/org/apache/sysml/lops/Ternary.java
index 2feeaacaf93..e02c840a140 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Ternary.java
+++ b/src/main/java/org/apache/sysml/lops/Ternary.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/TernaryAggregate.java b/src/main/java/org/apache/sysml/lops/TernaryAggregate.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/TernaryAggregate.java
rename to src/main/java/org/apache/sysml/lops/TernaryAggregate.java
index 2687b98e11d..8d60e079b16 100644
--- a/src/main/java/com/ibm/bi/dml/lops/TernaryAggregate.java
+++ b/src/main/java/org/apache/sysml/lops/TernaryAggregate.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/Transform.java b/src/main/java/org/apache/sysml/lops/Transform.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/Transform.java
rename to src/main/java/org/apache/sysml/lops/Transform.java
index b4e6d138d48..807fde8d9d2 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Transform.java
+++ b/src/main/java/org/apache/sysml/lops/Transform.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /*
diff --git a/src/main/java/com/ibm/bi/dml/lops/UAggOuterChain.java b/src/main/java/org/apache/sysml/lops/UAggOuterChain.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/UAggOuterChain.java
rename to src/main/java/org/apache/sysml/lops/UAggOuterChain.java
index fd36c9bd03d..66ad4283c95 100644
--- a/src/main/java/com/ibm/bi/dml/lops/UAggOuterChain.java
+++ b/src/main/java/org/apache/sysml/lops/UAggOuterChain.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/Unary.java b/src/main/java/org/apache/sysml/lops/Unary.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/Unary.java
rename to src/main/java/org/apache/sysml/lops/Unary.java
index b29e822799d..8519e58e89f 100644
--- a/src/main/java/com/ibm/bi/dml/lops/Unary.java
+++ b/src/main/java/org/apache/sysml/lops/Unary.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/UnaryCP.java b/src/main/java/org/apache/sysml/lops/UnaryCP.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/lops/UnaryCP.java
rename to src/main/java/org/apache/sysml/lops/UnaryCP.java
index c92fbfc9105..bdb14016e5b 100644
--- a/src/main/java/com/ibm/bi/dml/lops/UnaryCP.java
+++ b/src/main/java/org/apache/sysml/lops/UnaryCP.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.*;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.*;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedCrossEntropy.java b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedCrossEntropy.java
rename to src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java
index df131c92bf8..e8aabfb9e45 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedCrossEntropy.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropy.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedCrossEntropyR.java b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedCrossEntropyR.java
rename to src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java
index 58f3cc73bd6..cd94f49d92e 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedCrossEntropyR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedCrossEntropyR.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy.WCeMMType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedDivMM.java b/src/main/java/org/apache/sysml/lops/WeightedDivMM.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedDivMM.java
rename to src/main/java/org/apache/sysml/lops/WeightedDivMM.java
index ab6a858f6cf..c88bab33b39 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedDivMM.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedDivMM.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedDivMMR.java b/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedDivMMR.java
rename to src/main/java/org/apache/sysml/lops/WeightedDivMMR.java
index 8f8522f07e5..89517b6c336 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedDivMMR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedDivMMR.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedDivMM.WDivMMType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedDivMM.WDivMMType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedSigmoid.java b/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedSigmoid.java
rename to src/main/java/org/apache/sysml/lops/WeightedSigmoid.java
index 310ae377ebf..b069fa51326 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedSigmoid.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSigmoid.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedSigmoidR.java b/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedSigmoidR.java
rename to src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java
index de99bfdffc3..6f718869037 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedSigmoidR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSigmoidR.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedSigmoid.WSigmoidType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedSquaredLoss.java b/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedSquaredLoss.java
rename to src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java
index 59b7630b20e..77c99ecfb87 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedSquaredLoss.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSquaredLoss.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedSquaredLossR.java b/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedSquaredLossR.java
rename to src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java
index dcf87a76e09..53aaaae0627 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedSquaredLossR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedSquaredLossR.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss.WeightsType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedUnaryMM.java b/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedUnaryMM.java
rename to src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java
index 48269df999a..b271fb69ff8 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedUnaryMM.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedUnaryMM.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.Unary.OperationTypes;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.Unary.OperationTypes;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/WeightedUnaryMMR.java b/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/lops/WeightedUnaryMMR.java
rename to src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java
index 362cb4d37c6..8b6f5b7ba2b 100644
--- a/src/main/java/com/ibm/bi/dml/lops/WeightedUnaryMMR.java
+++ b/src/main/java/org/apache/sysml/lops/WeightedUnaryMMR.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.Unary.OperationTypes;
-import com.ibm.bi.dml.lops.WeightedUnaryMM.WUMMType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.Unary.OperationTypes;
+import org.apache.sysml.lops.WeightedUnaryMM.WUMMType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/lops/ZeroOut.java b/src/main/java/org/apache/sysml/lops/ZeroOut.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/lops/ZeroOut.java
rename to src/main/java/org/apache/sysml/lops/ZeroOut.java
index 6494c3eb085..f833d8ac406 100644
--- a/src/main/java/com/ibm/bi/dml/lops/ZeroOut.java
+++ b/src/main/java/org/apache/sysml/lops/ZeroOut.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops;
+package org.apache.sysml.lops;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 public class ZeroOut  extends Lop 
 {
diff --git a/src/main/java/com/ibm/bi/dml/lops/compile/Dag.java b/src/main/java/org/apache/sysml/lops/compile/Dag.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/lops/compile/Dag.java
rename to src/main/java/org/apache/sysml/lops/compile/Dag.java
index e5b63f520e4..c3881f709ed 100644
--- a/src/main/java/com/ibm/bi/dml/lops/compile/Dag.java
+++ b/src/main/java/org/apache/sysml/lops/compile/Dag.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.lops.compile;
+package org.apache.sysml.lops.compile;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,56 +30,56 @@
 import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.mapred.SequenceFileInputFormat;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.AppendM;
-import com.ibm.bi.dml.lops.BinaryM;
-import com.ibm.bi.dml.lops.CombineBinary;
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.PMMJ;
-import com.ibm.bi.dml.lops.ParameterizedBuiltin;
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.lops.Data.OperationTypes;
-import com.ibm.bi.dml.lops.FunctionCallCP;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.Lop.Type;
-import com.ibm.bi.dml.lops.LopProperties.ExecLocation;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.MapMult;
-import com.ibm.bi.dml.lops.OutputParameters;
-import com.ibm.bi.dml.lops.OutputParameters.Format;
-import com.ibm.bi.dml.lops.PickByCount;
-import com.ibm.bi.dml.lops.Unary;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression;
-import com.ibm.bi.dml.parser.ParameterizedBuiltinFunctionExpression;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.instructions.CPInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.Instruction.INSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.InstructionParser;
-import com.ibm.bi.dml.runtime.instructions.SPInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.sort.PickFromCompactInputFormat;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.AppendM;
+import org.apache.sysml.lops.BinaryM;
+import org.apache.sysml.lops.CombineBinary;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.PMMJ;
+import org.apache.sysml.lops.ParameterizedBuiltin;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.lops.Data.OperationTypes;
+import org.apache.sysml.lops.FunctionCallCP;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.Lop.Type;
+import org.apache.sysml.lops.LopProperties.ExecLocation;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.MapMult;
+import org.apache.sysml.lops.OutputParameters;
+import org.apache.sysml.lops.OutputParameters.Format;
+import org.apache.sysml.lops.PickByCount;
+import org.apache.sysml.lops.Unary;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression;
+import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.CPInstructionParser;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.Instruction.INSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.InstructionParser;
+import org.apache.sysml.runtime.instructions.SPInstructionParser;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.sort.PickFromCompactInputFormat;
 
 
 
@@ -2775,12 +2775,12 @@ else if ( oparams.getFormat() == Format.CSV ) {
 		} else if (node.getType() == Type.CombineBinary) {
 			// Output format of CombineBinary (CB) depends on how the output is consumed
 			CombineBinary combine = (CombineBinary) node;
-			if ( combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreSort ) {
+			if ( combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreSort ) {
 				oinfo = OutputInfo.OutputInfoForSortInput; 
 			}
-			else if ( combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreCentralMoment 
-					  || combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreCovUnweighted 
-					  || combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreGroupedAggUnweighted ) {
+			else if ( combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreCentralMoment 
+					  || combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreCovUnweighted 
+					  || combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreGroupedAggUnweighted ) {
 				oinfo = OutputInfo.WeightedPairOutputInfo;
 			}
 		} else if ( node.getType() == Type.CombineTernary) {
@@ -2861,7 +2861,7 @@ private NodeOutput setupNodeOutputs(N node, ExecType et, boolean cellModeOverrid
 				out.addLastInstruction(currInstr);
 			}
 			else if(node instanceof ParameterizedBuiltin 
-					&& ((ParameterizedBuiltin)node).getOp() == com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM) {
+					&& ((ParameterizedBuiltin)node).getOp() == org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM) {
 				
 				ParameterizedBuiltin pbi = (ParameterizedBuiltin)node;
 				Lop input = pbi.getNamedInput(ParameterizedBuiltinFunctionExpression.TF_FN_PARAM_DATA);
@@ -3661,7 +3661,7 @@ private int getAggAndOtherInstructions(N node, ArrayList execNodes,
 		if (node.getExecLocation() == ExecLocation.Data ) {
 			if ( ((Data)node).getFileFormatType() == FileFormatTypes.CSV 
 					&& !(node.getInputs().get(0) instanceof ParameterizedBuiltin 
-							&& ((ParameterizedBuiltin)node.getInputs().get(0)).getOp() == com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM)) {
+							&& ((ParameterizedBuiltin)node.getInputs().get(0)).getOp() == org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM)) {
 				// Generate write instruction, which goes into CSV_WRITE Job
 				int output_index = start_index[0];
 				shuffleInstructions.add(node.getInstructions(inputIndices.get(0), output_index));
@@ -3701,7 +3701,7 @@ private int getAggAndOtherInstructions(N node, ArrayList execNodes,
 				break;
 				
 			case ParameterizedBuiltin:
-				if( ((ParameterizedBuiltin)node).getOp() == com.ibm.bi.dml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM ) {
+				if( ((ParameterizedBuiltin)node).getOp() == org.apache.sysml.lops.ParameterizedBuiltin.OperationTypes.TRANSFORM ) {
 					shuffleInstructions.add(node.getInstructions(output_index));
 					if(DMLScript.ENABLE_DEBUG_MODE) {
 						MRJobLineNumbers.add(node._beginLine);
@@ -4239,13 +4239,13 @@ private void getInputPathsAndParameters(N node, ArrayList execNodes,
 				// InputInfo of L is the ouputInfo of CombineBinary
 				// And, the outputInfo of CombineBinary depends on the operation!
 				CombineBinary combine = (CombineBinary) node;
-				if ( combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreSort ) {
+				if ( combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreSort ) {
 					nodeInputInfo = new InputInfo(SequenceFileInputFormat.class,
 							DoubleWritable.class, IntWritable.class);
 				}
-				else if ( combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreCentralMoment 
-						  || combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreCovUnweighted
-						  || combine.getOperation() == com.ibm.bi.dml.lops.CombineBinary.OperationTypes.PreGroupedAggUnweighted ) {
+				else if ( combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreCentralMoment 
+						  || combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreCovUnweighted
+						  || combine.getOperation() == org.apache.sysml.lops.CombineBinary.OperationTypes.PreGroupedAggUnweighted ) {
 					nodeInputInfo = InputInfo.WeightedPairInputInfo;
 				}
 			} else if ( node.getType() == Type.CombineTernary ) {
diff --git a/src/main/java/com/ibm/bi/dml/lops/compile/JobType.java b/src/main/java/org/apache/sysml/lops/compile/JobType.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/lops/compile/JobType.java
rename to src/main/java/org/apache/sysml/lops/compile/JobType.java
index f8ce6f1693f..e6c6e9c1dc5 100644
--- a/src/main/java/com/ibm/bi/dml/lops/compile/JobType.java
+++ b/src/main/java/org/apache/sysml/lops/compile/JobType.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.lops.compile;
+package org.apache.sysml.lops.compile;
 
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.Data;
-import com.ibm.bi.dml.lops.ParameterizedBuiltin;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.Data;
+import org.apache.sysml.lops.ParameterizedBuiltin;
+import org.apache.sysml.runtime.DMLRuntimeException;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/compile/LopComparator.java b/src/main/java/org/apache/sysml/lops/compile/LopComparator.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/lops/compile/LopComparator.java
rename to src/main/java/org/apache/sysml/lops/compile/LopComparator.java
index c5099af7493..01395f765e7 100644
--- a/src/main/java/com/ibm/bi/dml/lops/compile/LopComparator.java
+++ b/src/main/java/org/apache/sysml/lops/compile/LopComparator.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.lops.compile;
+package org.apache.sysml.lops.compile;
 
 import java.util.Comparator;
 
-import com.ibm.bi.dml.lops.Lop;
+import org.apache.sysml.lops.Lop;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/lops/runtime/RunMRJobs.java b/src/main/java/org/apache/sysml/lops/runtime/RunMRJobs.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/lops/runtime/RunMRJobs.java
rename to src/main/java/org/apache/sysml/lops/runtime/RunMRJobs.java
index 804fe2f5fe1..5d68ec545bb 100644
--- a/src/main/java/com/ibm/bi/dml/lops/runtime/RunMRJobs.java
+++ b/src/main/java/org/apache/sysml/lops/runtime/RunMRJobs.java
@@ -15,62 +15,62 @@
  * 
  */
 
-package com.ibm.bi.dml.lops.runtime;
+package org.apache.sysml.lops.runtime;
 
 import java.io.IOException;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.wink.json4j.JSONException;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-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.lops.compile.JobType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-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.mqo.RuntimePiggybacking;
-import com.ibm.bi.dml.runtime.instructions.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RandInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.SeqInstruction;
-import com.ibm.bi.dml.runtime.io.MatrixWriter;
-import com.ibm.bi.dml.runtime.io.MatrixWriterFactory;
-import com.ibm.bi.dml.runtime.matrix.CMCOVMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CombineMR;
-import com.ibm.bi.dml.runtime.matrix.DataGenMR;
-import com.ibm.bi.dml.runtime.matrix.DataPartitionMR;
-import com.ibm.bi.dml.runtime.matrix.GMR;
-import com.ibm.bi.dml.runtime.matrix.GroupedAggMR;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.MMCJMR;
-import com.ibm.bi.dml.runtime.matrix.MMRJMR;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.ReblockMR;
-import com.ibm.bi.dml.runtime.matrix.SortMR;
-import com.ibm.bi.dml.runtime.matrix.WriteCSVMR;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixDatagen;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.RandomMatrixGenerator;
-import com.ibm.bi.dml.runtime.transform.DataTransform;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.mqo.RuntimePiggybacking;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.RandInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.SeqInstruction;
+import org.apache.sysml.runtime.io.MatrixWriter;
+import org.apache.sysml.runtime.io.MatrixWriterFactory;
+import org.apache.sysml.runtime.matrix.CMCOVMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CombineMR;
+import org.apache.sysml.runtime.matrix.DataGenMR;
+import org.apache.sysml.runtime.matrix.DataPartitionMR;
+import org.apache.sysml.runtime.matrix.GMR;
+import org.apache.sysml.runtime.matrix.GroupedAggMR;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.MMCJMR;
+import org.apache.sysml.runtime.matrix.MMRJMR;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.ReblockMR;
+import org.apache.sysml.runtime.matrix.SortMR;
+import org.apache.sysml.runtime.matrix.WriteCSVMR;
+import org.apache.sysml.runtime.matrix.data.LibMatrixDatagen;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.RandomMatrixGenerator;
+import org.apache.sysml.runtime.transform.DataTransform;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Statistics;
 
 
 public class RunMRJobs 
diff --git a/src/main/java/com/ibm/bi/dml/parser/AParserWrapper.java b/src/main/java/org/apache/sysml/parser/AParserWrapper.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/parser/AParserWrapper.java
rename to src/main/java/org/apache/sysml/parser/AParserWrapper.java
index d392357357e..ead945191c6 100644
--- a/src/main/java/com/ibm/bi/dml/parser/AParserWrapper.java
+++ b/src/main/java/org/apache/sysml/parser/AParserWrapper.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.parser.antlr4.DMLParserWrapper;
-import com.ibm.bi.dml.parser.python.PyDMLParserWrapper;
+import org.apache.sysml.parser.antlr4.DMLParserWrapper;
+import org.apache.sysml.parser.python.PyDMLParserWrapper;
 
 /**
  * Base class for all dml parsers in order to make the various compilation chains
diff --git a/src/main/java/com/ibm/bi/dml/parser/AssignmentStatement.java b/src/main/java/org/apache/sysml/parser/AssignmentStatement.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/parser/AssignmentStatement.java
rename to src/main/java/org/apache/sysml/parser/AssignmentStatement.java
index 870cbe3d776..b343ac08290 100644
--- a/src/main/java/com/ibm/bi/dml/parser/AssignmentStatement.java
+++ b/src/main/java/org/apache/sysml/parser/AssignmentStatement.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;
 
 
 public class AssignmentStatement extends Statement
diff --git a/src/main/java/com/ibm/bi/dml/parser/BinaryExpression.java b/src/main/java/org/apache/sysml/parser/BinaryExpression.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/BinaryExpression.java
rename to src/main/java/org/apache/sysml/parser/BinaryExpression.java
index 38f7fb9ca14..6ae2f995ca4 100644
--- a/src/main/java/com/ibm/bi/dml/parser/BinaryExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BinaryExpression.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/BooleanExpression.java b/src/main/java/org/apache/sysml/parser/BooleanExpression.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/BooleanExpression.java
rename to src/main/java/org/apache/sysml/parser/BooleanExpression.java
index 30f154d2fe5..dc9e8fbf8de 100644
--- a/src/main/java/com/ibm/bi/dml/parser/BooleanExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BooleanExpression.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/BooleanIdentifier.java b/src/main/java/org/apache/sysml/parser/BooleanIdentifier.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/BooleanIdentifier.java
rename to src/main/java/org/apache/sysml/parser/BooleanIdentifier.java
index ac5cb92bbc4..7fb76e3d66a 100644
--- a/src/main/java/com/ibm/bi/dml/parser/BooleanIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/BooleanIdentifier.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/BuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/BuiltinFunctionExpression.java
rename to src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java
index 2f397970eda..31886e247c4 100644
--- a/src/main/java/com/ibm/bi/dml/parser/BuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.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.parser.LanguageException.LanguageErrorCodes;
+import org.apache.sysml.parser.LanguageException.LanguageErrorCodes;
 
 public class BuiltinFunctionExpression extends DataIdentifier 
 {
diff --git a/src/main/java/com/ibm/bi/dml/parser/ConditionalPredicate.java b/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/ConditionalPredicate.java
rename to src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
index 0b76aaa2344..685636fe5b2 100644
--- a/src/main/java/com/ibm/bi/dml/parser/ConditionalPredicate.java
+++ b/src/main/java/org/apache/sysml/parser/ConditionalPredicate.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 public class ConditionalPredicate 
 {
diff --git a/src/main/java/com/ibm/bi/dml/parser/ConstIdentifier.java b/src/main/java/org/apache/sysml/parser/ConstIdentifier.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/parser/ConstIdentifier.java
rename to src/main/java/org/apache/sysml/parser/ConstIdentifier.java
index 947484ea512..dc9c0c872f8 100644
--- a/src/main/java/com/ibm/bi/dml/parser/ConstIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/ConstIdentifier.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 public abstract class ConstIdentifier extends Identifier 
 {
diff --git a/src/main/java/com/ibm/bi/dml/parser/DMLParseException.java b/src/main/java/org/apache/sysml/parser/DMLParseException.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/DMLParseException.java
rename to src/main/java/org/apache/sysml/parser/DMLParseException.java
index 8baad0c8fc1..6d138ddde3c 100644
--- a/src/main/java/com/ibm/bi/dml/parser/DMLParseException.java
+++ b/src/main/java/org/apache/sysml/parser/DMLParseException.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/DMLProgram.java b/src/main/java/org/apache/sysml/parser/DMLProgram.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/parser/DMLProgram.java
rename to src/main/java/org/apache/sysml/parser/DMLProgram.java
index 104c23137cf..885972d37f9 100644
--- a/src/main/java/com/ibm/bi/dml/parser/DMLProgram.java
+++ b/src/main/java/org/apache/sysml/parser/DMLProgram.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,27 +24,27 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.lops.LopProperties;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.compile.Dag;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.instructions.CPInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.lops.LopProperties;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.compile.Dag;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.instructions.CPInstructionParser;
+import org.apache.sysml.runtime.instructions.Instruction;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java b/src/main/java/org/apache/sysml/parser/DMLTranslator.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java
rename to src/main/java/org/apache/sysml/parser/DMLTranslator.java
index ed6f9551422..bc664ba7aaa 100644
--- a/src/main/java/com/ibm/bi/dml/parser/DMLTranslator.java
+++ b/src/main/java/org/apache/sysml/parser/DMLTranslator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25,45 +25,45 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.AggUnaryOp;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.FunctionOp.FunctionType;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.AggOp;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.Hop.Direction;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.Hop.OpOp3;
-import com.ibm.bi.dml.hops.Hop.ParamBuiltinOp;
-import com.ibm.bi.dml.hops.Hop.ReOrgOp;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.MemoTable;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.ParameterizedBuiltinOp;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.hops.TernaryOp;
-import com.ibm.bi.dml.hops.UnaryOp;
-import com.ibm.bi.dml.hops.ipa.InterProceduralAnalysis;
-import com.ibm.bi.dml.hops.rewrite.ProgramRewriter;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.FormatType;
-import com.ibm.bi.dml.parser.Expression.ParameterizedBuiltinFunctionOp;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.PrintStatement.PRINTTYPE;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.AggUnaryOp;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.FunctionOp.FunctionType;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.AggOp;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.Hop.Direction;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.Hop.OpOp3;
+import org.apache.sysml.hops.Hop.ParamBuiltinOp;
+import org.apache.sysml.hops.Hop.ReOrgOp;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.MemoTable;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.ParameterizedBuiltinOp;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.hops.TernaryOp;
+import org.apache.sysml.hops.UnaryOp;
+import org.apache.sysml.hops.ipa.InterProceduralAnalysis;
+import org.apache.sysml.hops.rewrite.ProgramRewriter;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.FormatType;
+import org.apache.sysml.parser.Expression.ParameterizedBuiltinFunctionOp;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.PrintStatement.PRINTTYPE;
+import org.apache.sysml.runtime.DMLRuntimeException;
 
 
 public class DMLTranslator 
diff --git a/src/main/java/com/ibm/bi/dml/parser/DataExpression.java b/src/main/java/org/apache/sysml/parser/DataExpression.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/DataExpression.java
rename to src/main/java/org/apache/sysml/parser/DataExpression.java
index d64910ebbc7..6bbc3c86cf5 100644
--- a/src/main/java/com/ibm/bi/dml/parser/DataExpression.java
+++ b/src/main/java/org/apache/sysml/parser/DataExpression.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -30,12 +30,12 @@
 import org.apache.wink.json4j.JSONArray;
 import org.apache.wink.json4j.JSONObject;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.parser.LanguageException.LanguageErrorCodes;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.utils.JSONHelper;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.parser.LanguageException.LanguageErrorCodes;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.utils.JSONHelper;
 
 
 public class DataExpression extends DataIdentifier 
diff --git a/src/main/java/com/ibm/bi/dml/parser/DataIdentifier.java b/src/main/java/org/apache/sysml/parser/DataIdentifier.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/DataIdentifier.java
rename to src/main/java/org/apache/sysml/parser/DataIdentifier.java
index 709be3fdad4..cd9e452d6ad 100644
--- a/src/main/java/com/ibm/bi/dml/parser/DataIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/DataIdentifier.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 
 public class DataIdentifier extends Identifier 
diff --git a/src/main/java/com/ibm/bi/dml/parser/DoubleIdentifier.java b/src/main/java/org/apache/sysml/parser/DoubleIdentifier.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/parser/DoubleIdentifier.java
rename to src/main/java/org/apache/sysml/parser/DoubleIdentifier.java
index 257f6524800..9e2e7243b88 100644
--- a/src/main/java/com/ibm/bi/dml/parser/DoubleIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/DoubleIdentifier.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/Expression.java b/src/main/java/org/apache/sysml/parser/Expression.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/Expression.java
rename to src/main/java/org/apache/sysml/parser/Expression.java
index 478b099b5e5..af42375172e 100644
--- a/src/main/java/com/ibm/bi/dml/parser/Expression.java
+++ b/src/main/java/org/apache/sysml/parser/Expression.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.Hop.FileFormatTypes;
+import org.apache.sysml.hops.Hop.FileFormatTypes;
 
 
 public abstract class Expression 
diff --git a/src/main/java/com/ibm/bi/dml/parser/ExternalFunctionStatement.java b/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/ExternalFunctionStatement.java
rename to src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
index 65bd8789465..ef363a842aa 100644
--- a/src/main/java/com/ibm/bi/dml/parser/ExternalFunctionStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ExternalFunctionStatement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/ibm/bi/dml/parser/ForStatement.java b/src/main/java/org/apache/sysml/parser/ForStatement.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/ForStatement.java
rename to src/main/java/org/apache/sysml/parser/ForStatement.java
index b6c6ce4f797..ce441389956 100644
--- a/src/main/java/com/ibm/bi/dml/parser/ForStatement.java
+++ b/src/main/java/org/apache/sysml/parser/ForStatement.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/ForStatementBlock.java b/src/main/java/org/apache/sysml/parser/ForStatementBlock.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/ForStatementBlock.java
rename to src/main/java/org/apache/sysml/parser/ForStatementBlock.java
index 0e4c05c151e..d3462ea5ed2 100644
--- a/src/main/java/com/ibm/bi/dml/parser/ForStatementBlock.java
+++ b/src/main/java/org/apache/sysml/parser/ForStatementBlock.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 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.runtime.instructions.cp.BooleanObject;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
+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.runtime.instructions.cp.BooleanObject;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
 
 
 public class ForStatementBlock extends StatementBlock 
diff --git a/src/main/java/com/ibm/bi/dml/parser/FunctionCallIdentifier.java b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/FunctionCallIdentifier.java
rename to src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
index 2e67f0165d4..a9882707f56 100644
--- a/src/main/java/com/ibm/bi/dml/parser/FunctionCallIdentifier.java
+++ b/src/main/java/org/apache/sysml/parser/FunctionCallIdentifier.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.parser;
+package org.apache.sysml.parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/ibm/bi/dml/parser/FunctionStatement.java b/src/main/java/org/apache/sysml/parser/FunctionStatement.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/FunctionStatement.java
rename to src/main/java/org/apache/sysml/parser/FunctionStatement.java
index 98d58d05241..ddad0cccc54 100644
--- a/src/main/java/com/ibm/bi/dml/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
diff --git a/src/main/java/com/ibm/bi/dml/parser/FunctionStatementBlock.java b/src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/FunctionStatementBlock.java
rename to src/main/java/org/apache/sysml/parser/FunctionStatementBlock.java
index faf9ac5e891..583501f8706 100644
--- a/src/main/java/com/ibm/bi/dml/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 
diff --git a/src/main/java/com/ibm/bi/dml/parser/Identifier.java b/src/main/java/org/apache/sysml/parser/Identifier.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/Identifier.java
rename to src/main/java/org/apache/sysml/parser/Identifier.java
index 522b513216a..774d7f03afa 100644
--- a/src/main/java/com/ibm/bi/dml/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
 {
diff --git a/src/main/java/com/ibm/bi/dml/parser/IfStatement.java b/src/main/java/org/apache/sysml/parser/IfStatement.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/IfStatement.java
rename to src/main/java/org/apache/sysml/parser/IfStatement.java
index 620d9dec6df..95d2dd43b1d 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/IfStatementBlock.java b/src/main/java/org/apache/sysml/parser/IfStatementBlock.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/IfStatementBlock.java
rename to src/main/java/org/apache/sysml/parser/IfStatementBlock.java
index 4de36e50a18..1fc904c242e 100644
--- a/src/main/java/com/ibm/bi/dml/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 
diff --git a/src/main/java/com/ibm/bi/dml/parser/ImportStatement.java b/src/main/java/org/apache/sysml/parser/ImportStatement.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/ImportStatement.java
rename to src/main/java/org/apache/sysml/parser/ImportStatement.java
index 87c9a4df2ca..4f7414bcb69 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 
  
diff --git a/src/main/java/com/ibm/bi/dml/parser/IndexedIdentifier.java b/src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/IndexedIdentifier.java
rename to src/main/java/org/apache/sysml/parser/IndexedIdentifier.java
index a23c6631b9e..c8a5446266a 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/IntIdentifier.java b/src/main/java/org/apache/sysml/parser/IntIdentifier.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/IntIdentifier.java
rename to src/main/java/org/apache/sysml/parser/IntIdentifier.java
index cb5446c06e1..f5bb820f9bc 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/IterablePredicate.java b/src/main/java/org/apache/sysml/parser/IterablePredicate.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/IterablePredicate.java
rename to src/main/java/org/apache/sysml/parser/IterablePredicate.java
index 0fab6db3dc6..b84fda04d2d 100644
--- a/src/main/java/com/ibm/bi/dml/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 
diff --git a/src/main/java/com/ibm/bi/dml/parser/LanguageException.java b/src/main/java/org/apache/sysml/parser/LanguageException.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/parser/LanguageException.java
rename to src/main/java/org/apache/sysml/parser/LanguageException.java
index 6fd636a40d2..13002ae5a60 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 /**
  * 
Exception occurring at the Language level.

diff --git a/src/main/java/com/ibm/bi/dml/parser/LiveVariableAnalysis.java b/src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/LiveVariableAnalysis.java
rename to src/main/java/org/apache/sysml/parser/LiveVariableAnalysis.java
index 735dc92a3c4..338ced2798e 100644
--- a/src/main/java/com/ibm/bi/dml/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 
diff --git a/src/main/java/com/ibm/bi/dml/parser/MultiAssignmentStatement.java b/src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/MultiAssignmentStatement.java
rename to src/main/java/org/apache/sysml/parser/MultiAssignmentStatement.java
index 66e48b1e053..71394325737 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/OutputStatement.java b/src/main/java/org/apache/sysml/parser/OutputStatement.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/OutputStatement.java
rename to src/main/java/org/apache/sysml/parser/OutputStatement.java
index 3b9d6d6d054..8a2aff739a7 100644
--- a/src/main/java/com/ibm/bi/dml/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
diff --git a/src/main/java/com/ibm/bi/dml/parser/ParForStatement.java b/src/main/java/org/apache/sysml/parser/ParForStatement.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/ParForStatement.java
rename to src/main/java/org/apache/sysml/parser/ParForStatement.java
index c8b1bf60e91..0e2feee618e 100644
--- a/src/main/java/com/ibm/bi/dml/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
diff --git a/src/main/java/com/ibm/bi/dml/parser/ParForStatementBlock.java b/src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/ParForStatementBlock.java
rename to src/main/java/org/apache/sysml/parser/ParForStatementBlock.java
index e2ae2d79018..58bed915dda 100644
--- a/src/main/java/com/ibm/bi/dml/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.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);
 		}
 	}
diff --git a/src/main/java/com/ibm/bi/dml/parser/ParameterExpression.java b/src/main/java/org/apache/sysml/parser/ParameterExpression.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/ParameterExpression.java
rename to src/main/java/org/apache/sysml/parser/ParameterExpression.java
index 27453848cf5..75b746a46da 100644
--- a/src/main/java/com/ibm/bi/dml/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 
 {
diff --git a/src/main/java/com/ibm/bi/dml/parser/ParameterizedBuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/ParameterizedBuiltinFunctionExpression.java
rename to src/main/java/org/apache/sysml/parser/ParameterizedBuiltinFunctionExpression.java
index 979cd228b54..13700bfc453 100644
--- a/src/main/java/com/ibm/bi/dml/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 
diff --git a/src/main/java/com/ibm/bi/dml/parser/ParseException.java b/src/main/java/org/apache/sysml/parser/ParseException.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/ParseException.java
rename to src/main/java/org/apache/sysml/parser/ParseException.java
index 86ff297ada9..db41bd0a903 100644
--- a/src/main/java/com/ibm/bi/dml/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.
diff --git a/src/main/java/com/ibm/bi/dml/parser/PathStatement.java b/src/main/java/org/apache/sysml/parser/PathStatement.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/PathStatement.java
rename to src/main/java/org/apache/sysml/parser/PathStatement.java
index 9a9280e8f24..d8203457634 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 
  
diff --git a/src/main/java/com/ibm/bi/dml/parser/PrintStatement.java b/src/main/java/org/apache/sysml/parser/PrintStatement.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/parser/PrintStatement.java
rename to src/main/java/org/apache/sysml/parser/PrintStatement.java
index aac58eacf15..b74128d4581 100644
--- a/src/main/java/com/ibm/bi/dml/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
diff --git a/src/main/java/com/ibm/bi/dml/parser/RelationalExpression.java b/src/main/java/org/apache/sysml/parser/RelationalExpression.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/RelationalExpression.java
rename to src/main/java/org/apache/sysml/parser/RelationalExpression.java
index 06f76f2b8a2..d3d61072b72 100644
--- a/src/main/java/com/ibm/bi/dml/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
 {
diff --git a/src/main/java/com/ibm/bi/dml/parser/Statement.java b/src/main/java/org/apache/sysml/parser/Statement.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/Statement.java
rename to src/main/java/org/apache/sysml/parser/Statement.java
index bf76ce03a6c..00ac23681ae 100644
--- a/src/main/java/com/ibm/bi/dml/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;
diff --git a/src/main/java/com/ibm/bi/dml/parser/StatementBlock.java b/src/main/java/org/apache/sysml/parser/StatementBlock.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/StatementBlock.java
rename to src/main/java/org/apache/sysml/parser/StatementBlock.java
index 437d859d801..b9d129ee51b 100644
--- a/src/main/java/com/ibm/bi/dml/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 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
diff --git a/src/main/java/com/ibm/bi/dml/parser/StringIdentifier.java b/src/main/java/org/apache/sysml/parser/StringIdentifier.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/StringIdentifier.java
rename to src/main/java/org/apache/sysml/parser/StringIdentifier.java
index 260cfe677a2..1add2751dde 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/Token.java b/src/main/java/org/apache/sysml/parser/Token.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/parser/Token.java
rename to src/main/java/org/apache/sysml/parser/Token.java
index a0b0bef90f7..372ced91b28 100644
--- a/src/main/java/com/ibm/bi/dml/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.
diff --git a/src/main/java/com/ibm/bi/dml/parser/VariableSet.java b/src/main/java/org/apache/sysml/parser/VariableSet.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/VariableSet.java
rename to src/main/java/org/apache/sysml/parser/VariableSet.java
index f99ca5ff5ab..675dfef2dbd 100644
--- a/src/main/java/com/ibm/bi/dml/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;
diff --git a/src/main/java/com/ibm/bi/dml/parser/WhileStatement.java b/src/main/java/org/apache/sysml/parser/WhileStatement.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/parser/WhileStatement.java
rename to src/main/java/org/apache/sysml/parser/WhileStatement.java
index 740b31b4fc4..d01da06326d 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/WhileStatementBlock.java b/src/main/java/org/apache/sysml/parser/WhileStatementBlock.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/WhileStatementBlock.java
rename to src/main/java/org/apache/sysml/parser/WhileStatementBlock.java
index 679fbeed7dd..c0890018143 100644
--- a/src/main/java/com/ibm/bi/dml/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 
diff --git a/src/main/java/com/ibm/bi/dml/parser/antlr4/DMLParserWrapper.java b/src/main/java/org/apache/sysml/parser/antlr4/DMLParserWrapper.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/parser/antlr4/DMLParserWrapper.java
rename to src/main/java/org/apache/sysml/parser/antlr4/DMLParserWrapper.java
index 5cf6cdd1331..a967132a4d8 100644
--- a/src/main/java/com/ibm/bi/dml/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.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 @@ private DMLProgram createDMLProgram(DmlprogramContext ast) {
 
 		// 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;
diff --git a/src/main/java/com/ibm/bi/dml/parser/antlr4/Dml.g4 b/src/main/java/org/apache/sysml/parser/antlr4/Dml.g4
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/parser/antlr4/Dml.g4
rename to src/main/java/org/apache/sysml/parser/antlr4/Dml.g4
index 491108862c9..7c52c472edb 100644
--- a/src/main/java/com/ibm/bi/dml/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
diff --git a/src/main/java/com/ibm/bi/dml/parser/antlr4/DmlSyntacticErrorListener.java b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticErrorListener.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/antlr4/DmlSyntacticErrorListener.java
rename to src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticErrorListener.java
index 5fdf2d8e97b..fa6489ae51b 100644
--- a/src/main/java/com/ibm/bi/dml/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.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;
 
diff --git a/src/main/java/com/ibm/bi/dml/parser/antlr4/DmlSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidator.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/parser/antlr4/DmlSyntacticValidator.java
rename to src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidator.java
index f19f618e93f..521a0f8c9f5 100644
--- a/src/main/java/com/ibm/bi/dml/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.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
 {	
diff --git a/src/main/java/com/ibm/bi/dml/parser/antlr4/DmlSyntacticValidatorHelper.java b/src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidatorHelper.java
similarity index 52%
rename from src/main/java/com/ibm/bi/dml/parser/antlr4/DmlSyntacticValidatorHelper.java
rename to src/main/java/org/apache/sysml/parser/antlr4/DmlSyntacticValidatorHelper.java
index 1d0f675e040..33ad63daec5 100644
--- a/src/main/java/com/ibm/bi/dml/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 String getCurrentFileName() {
 		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 String getCurrentFileName() {
 //		}
 //	}
 	
-//	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 @@ private boolean validateBuiltinWriteFunction(FunctionCallAssignmentStatementCont
 		return true;
 	}
 	
-	public ArrayList getParameterExpressionList(List paramExprs) {
-		ArrayList retVal = new ArrayList();
+	public ArrayList getParameterExpressionList(List paramExprs) {
+		ArrayList retVal = new ArrayList();
 		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;
diff --git a/src/main/java/com/ibm/bi/dml/parser/antlr4/ExpressionInfo.java b/src/main/java/org/apache/sysml/parser/antlr4/ExpressionInfo.java
similarity index 71%
rename from src/main/java/com/ibm/bi/dml/parser/antlr4/ExpressionInfo.java
rename to src/main/java/org/apache/sysml/parser/antlr4/ExpressionInfo.java
index d7ea7eb5ea3..c08badadf86 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 }
diff --git a/src/main/java/com/ibm/bi/dml/parser/antlr4/StatementInfo.java b/src/main/java/org/apache/sysml/parser/antlr4/StatementInfo.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/parser/antlr4/StatementInfo.java
rename to src/main/java/org/apache/sysml/parser/antlr4/StatementInfo.java
index e32e21ab7d7..0037862230b 100644
--- a/src/main/java/com/ibm/bi/dml/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 namespaces = null;
diff --git a/src/main/java/com/ibm/bi/dml/parser/python/ExpressionInfo.java b/src/main/java/org/apache/sysml/parser/python/ExpressionInfo.java
similarity index 71%
rename from src/main/java/com/ibm/bi/dml/parser/python/ExpressionInfo.java
rename to src/main/java/org/apache/sysml/parser/python/ExpressionInfo.java
index 09e8c27939e..6e4a4649559 100644
--- a/src/main/java/com/ibm/bi/dml/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 @@
  * (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 {
 
 }
diff --git a/src/main/java/com/ibm/bi/dml/parser/python/PyDMLParserWrapper.java b/src/main/java/org/apache/sysml/parser/python/PyDMLParserWrapper.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/parser/python/PyDMLParserWrapper.java
rename to src/main/java/org/apache/sysml/parser/python/PyDMLParserWrapper.java
index 69fb746b5e8..f57c3ac10a5 100644
--- a/src/main/java/com/ibm/bi/dml/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.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();
diff --git a/src/main/java/com/ibm/bi/dml/parser/python/Pydml.g4 b/src/main/java/org/apache/sysml/parser/python/Pydml.g4
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/python/Pydml.g4
rename to src/main/java/org/apache/sysml/parser/python/Pydml.g4
index 821ca29c746..b03e3ec9423 100644
--- a/src/main/java/com/ibm/bi/dml/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
diff --git a/src/main/java/com/ibm/bi/dml/parser/python/PydmlSyntacticErrorListener.java b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticErrorListener.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/parser/python/PydmlSyntacticErrorListener.java
rename to src/main/java/org/apache/sysml/parser/python/PydmlSyntacticErrorListener.java
index 8a29038c7fe..c3e88d0974d 100644
--- a/src/main/java/com/ibm/bi/dml/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.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 {
 	
diff --git a/src/main/java/com/ibm/bi/dml/parser/python/PydmlSyntacticValidator.java b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidator.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/parser/python/PydmlSyntacticValidator.java
rename to src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidator.java
index 88b613862be..1fb5e8bacfb 100644
--- a/src/main/java/com/ibm/bi/dml/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.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 @@ else if(inDefaultNamespace(namespace) && functionName.compareTo("random.normal")
 			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 @@ else if(inDefaultNamespace(namespace) && functionName.compareTo("random.uniform"
 			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;
 		}
diff --git a/src/main/java/com/ibm/bi/dml/parser/python/PydmlSyntacticValidatorHelper.java b/src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidatorHelper.java
similarity index 59%
rename from src/main/java/com/ibm/bi/dml/parser/python/PydmlSyntacticValidatorHelper.java
rename to src/main/java/org/apache/sysml/parser/python/PydmlSyntacticValidatorHelper.java
index 2805d9ce93c..68bfa9372bc 100644
--- a/src/main/java/com/ibm/bi/dml/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 @@ else if(fnNames.length == 2) {
 		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 @@ else if(fnNames.length == 2) {
 //		}
 //	}
 	
-//	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 @@ private boolean validateBuiltinWriteFunction(FunctionCallAssignmentStatementCont
 		return true;
 	}
 	
-	public ArrayList getParameterExpressionList(List paramExprs) {
-		ArrayList retVal = new ArrayList();
+	public ArrayList getParameterExpressionList(List paramExprs) {
+		ArrayList retVal = new ArrayList();
 		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;
diff --git a/src/main/java/com/ibm/bi/dml/parser/python/StatementInfo.java b/src/main/java/org/apache/sysml/parser/python/StatementInfo.java
similarity index 71%
rename from src/main/java/com/ibm/bi/dml/parser/python/StatementInfo.java
rename to src/main/java/org/apache/sysml/parser/python/StatementInfo.java
index 82417a53024..d0f07c27d73 100644
--- a/src/main/java/com/ibm/bi/dml/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 @@
  * (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 {
 
 }
diff --git a/src/main/java/com/ibm/bi/dml/runtime/DMLRuntimeException.java b/src/main/java/org/apache/sysml/runtime/DMLRuntimeException.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/DMLRuntimeException.java
rename to src/main/java/org/apache/sysml/runtime/DMLRuntimeException.java
index 2bee04c98d3..3a5ae4912e9 100644
--- a/src/main/java/com/ibm/bi/dml/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.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/DMLScriptException.java b/src/main/java/org/apache/sysml/runtime/DMLScriptException.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/DMLScriptException.java
rename to src/main/java/org/apache/sysml/runtime/DMLScriptException.java
index 8caa3e4b229..30c29f0ca8d 100644
--- a/src/main/java/com/ibm/bi/dml/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;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/DMLUnsupportedOperationException.java b/src/main/java/org/apache/sysml/runtime/DMLUnsupportedOperationException.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/DMLUnsupportedOperationException.java
rename to src/main/java/org/apache/sysml/runtime/DMLUnsupportedOperationException.java
index c968a0376de..7096a53b9d0 100644
--- a/src/main/java/com/ibm/bi/dml/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 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ExternalFunctionProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/ExternalFunctionProgramBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlock.java
index b48472c19c0..07ae9b64e10 100644
--- a/src/main/java/com/ibm/bi/dml/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.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 @@ protected String getMatrixValueTypeString(Matrix.ValueType t) {
 	 * @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;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ExternalFunctionProgramBlockCP.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlockCP.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/ExternalFunctionProgramBlockCP.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlockCP.java
index ebbd53d50fa..3c1b8f8794a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ExternalFunctionProgramBlockCP.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ExternalFunctionProgramBlockCP.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.ExternalFunctionStatement;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-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.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.Matrix;
-import com.ibm.bi.dml.udf.PackageRuntimeException;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.ExternalFunctionStatement;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+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.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.Matrix;
+import org.apache.sysml.udf.PackageRuntimeException;
 
 /**
  * CP external function program block, that overcomes the need for 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ForProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/ForProgramBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java
index c40420c2f63..d9628822c28 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ForProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ForProgramBlock.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 public class ForProgramBlock extends ProgramBlock
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/FunctionProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/FunctionProgramBlock.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/FunctionProgramBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/FunctionProgramBlock.java
index 9785a387685..42f917c38f6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/FunctionProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/FunctionProgramBlock.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.utils.Statistics;
 
 
 public class FunctionProgramBlock extends ProgramBlock 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/IfProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/IfProgramBlock.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/IfProgramBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/IfProgramBlock.java
index 925b4268c5a..4b931b5fdca 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/IfProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/IfProgramBlock.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.Instruction.INSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanObject;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ComputationCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-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.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.Instruction.INSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.cp.BooleanObject;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.ComputationCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+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.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 
 public class IfProgramBlock extends ProgramBlock 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/LocalVariableMap.java b/src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/LocalVariableMap.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java
index 5c5132d0392..76cb77eb504 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/LocalVariableMap.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/LocalVariableMap.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LineageObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.spark.data.LineageObject;
 
 import java.util.HashMap;
 import java.util.StringTokenizer;
@@ -37,7 +37,7 @@
 public class LocalVariableMap implements Cloneable
 {	
 	private static String eol = System.getProperty ("line.separator");
-	private static String ELEMENT_DELIM = com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter.ELEMENT_DELIM;
+	private static String ELEMENT_DELIM = org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter.ELEMENT_DELIM;
 	private static IDSequence _seq = new IDSequence();
 	
 	private HashMap  localMap = null;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ParForProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ParForProgramBlock.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/ParForProgramBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/ParForProgramBlock.java
index faf85c99dd3..cb5c9a6838f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ParForProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ParForProgramBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -30,78 +30,78 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.log4j.Level;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-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.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.DMLProgram;
-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.ParForStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.VariableSet;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.DataPartitioner;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.DataPartitionerLocal;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.DataPartitionerRemoteMR;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.DataPartitionerRemoteSpark;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.LocalParWorker;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.LocalTaskQueue;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ParForBody;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.RemoteDPParForMR;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.RemoteDPParForSpark;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.RemoteParForJobReturn;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.RemoteParForMR;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.RemoteParForSpark;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ResultMerge;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ResultMergeLocalAutomatic;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ResultMergeLocalFile;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ResultMergeLocalMemory;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ResultMergeRemoteMR;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ResultMergeRemoteSpark;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.Task;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.TaskPartitioner;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.TaskPartitionerFactoring;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.TaskPartitionerFactoringCmax;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.TaskPartitionerFactoringCmin;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.TaskPartitionerFixedsize;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.TaskPartitionerNaive;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.TaskPartitionerStatic;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.mqo.RuntimePiggybacking;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.CostEstimator;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.CostEstimatorHops;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptTree;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptTreeConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptimizationWrapper;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptimizerRuleBased;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.ProgramRecompiler;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Stat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.StatisticMonitor;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-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.StringObject;
-import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.utils.Statistics;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.DMLProgram;
+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.ParForStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.VariableSet;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+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.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.DataPartitioner;
+import org.apache.sysml.runtime.controlprogram.parfor.DataPartitionerLocal;
+import org.apache.sysml.runtime.controlprogram.parfor.DataPartitionerRemoteMR;
+import org.apache.sysml.runtime.controlprogram.parfor.DataPartitionerRemoteSpark;
+import org.apache.sysml.runtime.controlprogram.parfor.LocalParWorker;
+import org.apache.sysml.runtime.controlprogram.parfor.LocalTaskQueue;
+import org.apache.sysml.runtime.controlprogram.parfor.ParForBody;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.RemoteDPParForMR;
+import org.apache.sysml.runtime.controlprogram.parfor.RemoteDPParForSpark;
+import org.apache.sysml.runtime.controlprogram.parfor.RemoteParForJobReturn;
+import org.apache.sysml.runtime.controlprogram.parfor.RemoteParForMR;
+import org.apache.sysml.runtime.controlprogram.parfor.RemoteParForSpark;
+import org.apache.sysml.runtime.controlprogram.parfor.ResultMerge;
+import org.apache.sysml.runtime.controlprogram.parfor.ResultMergeLocalAutomatic;
+import org.apache.sysml.runtime.controlprogram.parfor.ResultMergeLocalFile;
+import org.apache.sysml.runtime.controlprogram.parfor.ResultMergeLocalMemory;
+import org.apache.sysml.runtime.controlprogram.parfor.ResultMergeRemoteMR;
+import org.apache.sysml.runtime.controlprogram.parfor.ResultMergeRemoteSpark;
+import org.apache.sysml.runtime.controlprogram.parfor.Task;
+import org.apache.sysml.runtime.controlprogram.parfor.TaskPartitioner;
+import org.apache.sysml.runtime.controlprogram.parfor.TaskPartitionerFactoring;
+import org.apache.sysml.runtime.controlprogram.parfor.TaskPartitionerFactoringCmax;
+import org.apache.sysml.runtime.controlprogram.parfor.TaskPartitionerFactoringCmin;
+import org.apache.sysml.runtime.controlprogram.parfor.TaskPartitionerFixedsize;
+import org.apache.sysml.runtime.controlprogram.parfor.TaskPartitionerNaive;
+import org.apache.sysml.runtime.controlprogram.parfor.TaskPartitionerStatic;
+import org.apache.sysml.runtime.controlprogram.parfor.mqo.RuntimePiggybacking;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.CostEstimator;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.CostEstimatorHops;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptTree;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptTreeConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptimizationWrapper;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptimizerRuleBased;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.ProgramRecompiler;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Stat;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.StatisticMonitor;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+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.StringObject;
+import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.utils.Statistics;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/Program.java b/src/main/java/org/apache/sysml/runtime/controlprogram/Program.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/Program.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/Program.java
index 08d79588bd1..02e5d9cb1aa 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/Program.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/Program.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
 
 
 public class Program 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/ProgramBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java
index b0cb2afb208..4d7a3cff2d8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/ProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/ProgramBlock.java
@@ -15,37 +15,37 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 
 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.OptimizerUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanObject;
-import com.ibm.bi.dml.runtime.instructions.cp.ComputationCPInstruction;
-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.data.MatrixBlock;
-import com.ibm.bi.dml.utils.Statistics;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.MLContextProxy;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.cp.BooleanObject;
+import org.apache.sysml.runtime.instructions.cp.ComputationCPInstruction;
+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.data.MatrixBlock;
+import org.apache.sysml.utils.Statistics;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 
 public class ProgramBlock 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/WhileProgramBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/WhileProgramBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java
index cea071c377c..131cddc2e1e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/WhileProgramBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/WhileProgramBlock.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram;
+package org.apache.sysml.runtime.controlprogram;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.Instruction.INSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanObject;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ComputationCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-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.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.Instruction.INSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.cp.BooleanObject;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.ComputationCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+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.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 
 public class WhileProgramBlock extends ProgramBlock 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/ByteBuffer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/ByteBuffer.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/ByteBuffer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/ByteBuffer.java
index 97b6a186914..6df357766bb 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/ByteBuffer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/ByteBuffer.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.io.DataOutput;
 import java.io.IOException;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 /**
  * Wrapper for WriteBuffer byte array per matrix in order to
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheDataInput.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheDataInput.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheDataInput.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheDataInput.java
index f2802a34a12..01f7dcfdd5a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheDataInput.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheDataInput.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.io.DataInput;
 import java.io.IOException;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlockDataInput;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.matrix.data.MatrixBlockDataInput;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
 
 public class CacheDataInput implements DataInput, MatrixBlockDataInput
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheDataOutput.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheDataOutput.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheDataOutput.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheDataOutput.java
index d8213196a5a..ce13cff25f5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheDataOutput.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheDataOutput.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.io.DataOutput;
 import java.io.IOException;
 
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlockDataOutput;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.matrix.data.MatrixBlockDataOutput;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
 
 /**
  * Customer DataOutput to serialize directly into the given byte array.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheException.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheException.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheException.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheException.java
index 3516b8bb39c..cc05cbc62bb 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheException.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLRuntimeException;
 
 public class CacheException extends DMLRuntimeException
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheIOException.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheIOException.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheIOException.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheIOException.java
index 6efda8deb53..edcc16d6d15 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheIOException.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheIOException.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 
 public class CacheIOException extends CacheException
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheStatistics.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheStatistics.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java
index e12b586c6ba..d7ca0273baf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheStatistics.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatistics.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.util.concurrent.atomic.AtomicLong;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheStatusException.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatusException.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheStatusException.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatusException.java
index 1cefff70085..978308774be 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheStatusException.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheStatusException.java
@@ -1,4 +1,4 @@
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 
 public class CacheStatusException extends CacheException
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheableData.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheableData.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java
index 2785e64b5e8..b98a5d0eac5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/CacheableData.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,15 +23,15 @@
 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.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.LazyWriteBuffer.RPolicy;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.LazyWriteBuffer.RPolicy;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/LazyWriteBuffer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/LazyWriteBuffer.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/LazyWriteBuffer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/LazyWriteBuffer.java
index 3d60788cdd7..ea7606127d5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/LazyWriteBuffer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/LazyWriteBuffer.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/MatrixObject.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/MatrixObject.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java
index 839a8307102..981bee2f52f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/MatrixObject.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java
@@ -15,38 +15,38 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.io.IOException;
 import java.lang.ref.SoftReference;
 
 import org.apache.commons.lang.mutable.MutableBoolean;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.spark.data.BroadcastObject;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDObject;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDProperties;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.MetaData;
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.spark.data.BroadcastObject;
+import org.apache.sysml.runtime.instructions.spark.data.RDDObject;
+import org.apache.sysml.runtime.instructions.spark.data.RDDProperties;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.MetaData;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/PageCache.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/PageCache.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/PageCache.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/caching/PageCache.java
index 2219f58cdf5..d60f2faf7f6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/caching/PageCache.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/PageCache.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.caching;
+package org.apache.sysml.runtime.controlprogram.caching;
 
 import java.lang.ref.SoftReference;
 import java.util.HashMap;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/ExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/ExecutionContext.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
index 8bdfed84502..3cdb3803383 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/ExecutionContext.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java
@@ -15,37 +15,37 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.context;
+package org.apache.sysml.runtime.controlprogram.context;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.debug.DMLFrame;
-import com.ibm.bi.dml.debug.DMLProgramCounter;
-import com.ibm.bi.dml.debug.DebugState;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-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.FunctionCallCPInstruction;
-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.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
-import com.ibm.bi.dml.runtime.matrix.MetaData;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.debug.DMLFrame;
+import org.apache.sysml.debug.DMLProgramCounter;
+import org.apache.sysml.debug.DebugState;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.caching.CacheException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.instructions.Instruction;
+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.FunctionCallCPInstruction;
+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.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.runtime.matrix.MetaData;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class ExecutionContext 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/ExecutionContextFactory.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContextFactory.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/ExecutionContextFactory.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContextFactory.java
index 62b517c5ef7..e5c4a98fe5f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/ExecutionContextFactory.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContextFactory.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.context;
+package org.apache.sysml.runtime.controlprogram.context;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.runtime.controlprogram.Program;
 
 public class ExecutionContextFactory 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/SparkExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/SparkExecutionContext.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
index 48b46994f6f..e4a5a5fb829 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/context/SparkExecutionContext.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/SparkExecutionContext.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.context;
+package org.apache.sysml.runtime.controlprogram.context;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -34,38 +34,38 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.MLContext;
-import com.ibm.bi.dml.api.MLContextProxy;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.Checkpoint;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.spark.CheckpointSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.data.BlockPartitioner;
-import com.ibm.bi.dml.runtime.instructions.spark.data.BroadcastObject;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LineageObject;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedMatrixBlock;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDObject;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyBinaryCellFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyBlockPairFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyTextInputFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.MLContext;
+import org.apache.sysml.api.MLContextProxy;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.Checkpoint;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.spark.CheckpointSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.runtime.instructions.spark.data.BlockPartitioner;
+import org.apache.sysml.runtime.instructions.spark.data.BroadcastObject;
+import org.apache.sysml.runtime.instructions.spark.data.LineageObject;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedMatrixBlock;
+import org.apache.sysml.runtime.instructions.spark.data.RDDObject;
+import org.apache.sysml.runtime.instructions.spark.functions.CopyBinaryCellFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.CopyBlockPairFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.CopyTextInputFunction;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Statistics;
 
 
 public class SparkExecutionContext extends ExecutionContext
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitioner.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitioner.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitioner.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitioner.java
index a5c05e08b46..2ccb5af3c11 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitioner.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitioner.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerLocal.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerLocal.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerLocal.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerLocal.java
index b3a50752203..7ccbbf7e450 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerLocal.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerLocal.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -37,24 +37,24 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.Cell;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.StagingFileUtils;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.util.Cell;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.controlprogram.parfor.util.StagingFileUtils;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 /**
  * Partitions a given matrix into row or column partitions with a two pass-approach.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteMR.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteMR.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteMR.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteMR.java
index d0cb7fcde6f..ab6740310c8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteMR.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
@@ -24,20 +24,20 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
 
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableCell;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Statistics;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableCell;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Statistics;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 /**
  * MR job class for submitting parfor remote partitioning MR jobs.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteMapper.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteMapper.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteMapper.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteMapper.java
index a78739c1c47..83da2864148 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 
@@ -26,19 +26,19 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableCell;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableCell;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * Remote data partitioner mapper implementation that does the actual
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteReducer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteReducer.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteReducer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteReducer.java
index 27d858fca7b..e33a62ce11f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -32,13 +32,13 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableCell;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 /**
  * Remote data partitioner reducer implementation that takes the given
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSpark.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSpark.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSpark.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSpark.java
index 41bda63be7c..a917b05e232 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSpark.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSpark.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import org.apache.spark.api.java.JavaPairRDD;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * MR job class for submitting parfor remote partitioning MR jobs.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkMapper.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkMapper.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkMapper.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkMapper.java
index 6210c94b4b8..0e049b971ba 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -24,16 +24,16 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.spark.api.java.function.PairFlatMapFunction;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
 
 import scala.Tuple2;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkReducer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkReducer.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkReducer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkReducer.java
index 8207d8a9ba9..bdd00413386 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/DataPartitionerRemoteSparkReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.File;
 import java.util.Iterator;
@@ -27,13 +27,13 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.spark.api.java.function.VoidFunction;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
 
 import scala.Tuple2;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/LocalParWorker.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/LocalParWorker.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/LocalParWorker.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/LocalParWorker.java
index 08c473312f7..9a0e4d1c0dc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/LocalParWorker.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/LocalParWorker.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.Collection;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Stat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.StatisticMonitor;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Stat;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.StatisticMonitor;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
 
 /**
  * Instances of this class can be used to execute tasks in parallel. Within each ParWorker 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/LocalTaskQueue.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/LocalTaskQueue.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/LocalTaskQueue.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/LocalTaskQueue.java
index 859044a9ab8..9151b59cbc0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/LocalTaskQueue.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/LocalTaskQueue.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.LinkedList;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ParForBody.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ParForBody.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ParForBody.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ParForBody.java
index d60e72bc70e..a5bbfbdfebc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ParForBody.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ParForBody.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
 
 /**
  * Wrapper for exchanging parfor body data structures.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ParWorker.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ParWorker.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ParWorker.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ParWorker.java
index 6be0527b7d0..4f9eb3896a8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ParWorker.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ParWorker.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,17 +23,17 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-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.stat.Stat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.StatisticMonitor;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Stat;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.StatisticMonitor;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * Super class for master/worker pattern implementations. Central place to
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ProgramConverter.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ProgramConverter.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java
index 1077d3eea32..70560e53735 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ProgramConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ProgramConverter.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,60 +28,60 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.mapred.JobConf;
 
-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.hops.Hop;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-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.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.CPInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionParser;
-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.CPInstruction;
-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.FunctionCallCPInstruction;
-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.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.udf.ExternalFunctionInvocationInstruction;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.CPInstructionParser;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.BooleanObject;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+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.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.udf.ExternalFunctionInvocationInstruction;
 
 /**
  * Static functionalities for 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForMR.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForMR.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForMR.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForMR.java
index 2ee96809338..3f8ba1b11b1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForMR.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -35,28 +35,28 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheStatistics;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Stat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableCell;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Statistics;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.CacheStatistics;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Stat;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableCell;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Statistics;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 /**
  * MR job class for submitting parfor remote MR jobs, controlling its execution and obtaining results.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForSpark.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForSpark.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForSpark.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForSpark.java
index f92b50ae2ce..997cddabaea 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForSpark.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForSpark.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.List;
 
@@ -27,21 +27,21 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * TODO robustness on failures (cleanup files)
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForSparkWorker.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForSparkWorker.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForSparkWorker.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForSparkWorker.java
index 1338acbff93..01d3f09a66e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParForSparkWorker.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParForSparkWorker.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,20 +26,20 @@
 import org.apache.spark.TaskContext;
 import org.apache.spark.api.java.function.PairFlatMapFunction;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.Task.TaskType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableCell;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.Task.TaskType;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableCell;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 import scala.Tuple2;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParWorkerReducer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParWorkerReducer.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParWorkerReducer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParWorkerReducer.java
index 6aec0021aee..d9821935f81 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteDPParWorkerReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteDPParWorkerReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -28,25 +28,25 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheStatistics;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.Task.TaskType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.StatisticMonitor;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.PairWritableCell;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.CacheStatistics;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.Task.TaskType;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.StatisticMonitor;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.util.PairWritableCell;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  *
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForColocatedFileSplit.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForColocatedFileSplit.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForColocatedFileSplit.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForColocatedFileSplit.java
index 580a4e32725..4d6dd5c7701 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForColocatedFileSplit.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForColocatedFileSplit.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -34,9 +34,9 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.lib.NLineInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.Task.TaskType;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.controlprogram.parfor.Task.TaskType;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForColocatedNLineInputFormat.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForColocatedNLineInputFormat.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForColocatedNLineInputFormat.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForColocatedNLineInputFormat.java
index 8243b6d11e8..3960b05ae10 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForColocatedNLineInputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForColocatedNLineInputFormat.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 
@@ -24,8 +24,8 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.lib.NLineInputFormat;
 
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 /**
  * Specific extension of NLineInputFormat in order to ensure data colocation
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForJobReturn.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForJobReturn.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForJobReturn.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForJobReturn.java
index e052f411194..bef90696e47 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForJobReturn.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForJobReturn.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
 
 /**
  * Wrapper for job return of ParFor REMOTE for transferring statistics and result symbol table.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForMR.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForMR.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForMR.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForMR.java
index b74ae1f6dd9..a5587c49593 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForMR.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -36,24 +36,24 @@
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.hadoop.mapred.lib.NLineInputFormat;
 
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheStatistics;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Stat;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Statistics;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.CacheStatistics;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Stat;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Statistics;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 /**
  * MR job class for submitting parfor remote MR jobs, controlling its execution and obtaining results.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForSpark.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForSpark.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForSpark.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForSpark.java
index 255ad155f35..f65c755d367 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForSpark.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForSpark.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.List;
 
@@ -26,13 +26,13 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * This class serves two purposes: (1) isolating Spark imports to enable running in 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForSparkWorker.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForSparkWorker.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForSparkWorker.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForSparkWorker.java
index bfa7e961741..9186876f9f3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForSparkWorker.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForSparkWorker.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,11 +24,11 @@
 import org.apache.spark.TaskContext;
 import org.apache.spark.api.java.function.PairFlatMapFunction;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 import scala.Tuple2;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForUtils.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForUtils.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForUtils.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForUtils.java
index 78c884bea77..92f1959eead 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParForUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParForUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -32,20 +32,20 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheStatistics;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Stat;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.CacheStatistics;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Stat;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * Common functionalities for parfor workers in MR jobs. Used by worker wrappers in
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParWorkerMapper.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParWorkerMapper.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParWorkerMapper.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParWorkerMapper.java
index 9d6f3204abb..dcf227b0080 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/RemoteParWorkerMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/RemoteParWorkerMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -28,20 +28,20 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheStatistics;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheableData;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.StatisticMonitor;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.CacheStatistics;
+import org.apache.sysml.runtime.controlprogram.caching.CacheableData;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.StatisticMonitor;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * Remote ParWorker implementation, realized as MR mapper.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMerge.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMerge.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMerge.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMerge.java
index c4ff3c542bf..d20b46f637b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMerge.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMerge.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 /**
  * Due to independence of all iterations, any result has the following properties:
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalAutomatic.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalAutomatic.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalAutomatic.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalAutomatic.java
index 745ae085398..6934ab60a7d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalAutomatic.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalAutomatic.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptimizerRuleBased;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptimizerRuleBased;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalFile.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalFile.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalFile.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalFile.java
index 80207197c5e..621853ad7d5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalFile.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalFile.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -38,29 +38,29 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-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.parfor.util.Cell;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.StagingFileUtils;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+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.parfor.util.Cell;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.controlprogram.parfor.util.StagingFileUtils;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalMemory.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalMemory.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalMemory.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalMemory.java
index 77b3bb5c1db..cd7fc187fed 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeLocalMemory.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeLocalMemory.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
 
 /**
  * Local in-memory realization of result merge. If the resulting matrix is
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteGrouping.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteGrouping.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteGrouping.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteGrouping.java
index 041b0bda32b..3bfee4b0615 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteGrouping.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteGrouping.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 
 import org.apache.hadoop.io.WritableComparable;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteMR.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteMR.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteMR.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteMR.java
index 0a406e30f45..e952556e9c8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteMR.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,26 +30,26 @@
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.StagingFileUtils;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixCell;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.util.StagingFileUtils;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixCell;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * MR job class for submitting parfor result merge MR jobs.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteMapper.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteMapper.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteMapper.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteMapper.java
index 52690ee8e14..e8cb85ba83a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 
@@ -25,15 +25,15 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixCell;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixCell;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * Remote resultmerge mapper implementation that does the preprocessing
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemotePartitioning.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemotePartitioning.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemotePartitioning.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemotePartitioning.java
index d93949f1d8b..9c0cb76ee4f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemotePartitioning.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemotePartitioning.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Partitioner;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 public class ResultMergeRemotePartitioning implements Partitioner 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteReducer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteReducer.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteReducer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteReducer.java
index 5066a8291f8..0cf16429b50 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -30,16 +30,16 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixCell;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixCell;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.DataConverter;
 
 /**
  * Remote result merge reducer that receives all worker results partitioned by
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSorting.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSorting.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSorting.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSorting.java
index 4f81764c895..67f9e6bfc7e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSorting.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSorting.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.WritableComparator;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSpark.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSpark.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSpark.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSpark.java
index 6765bc3a811..9eeb84a6eeb 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSpark.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSpark.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 
 import org.apache.spark.api.java.JavaPairRDD;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDObject;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.spark.data.RDDObject;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * MR job class for submitting parfor result merge MR jobs.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSparkWCompare.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSparkWCompare.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSparkWCompare.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSparkWCompare.java
index 7df2cd19edc..3f5a83478d0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeRemoteSparkWCompare.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeRemoteSparkWCompare.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.Iterator;
 
@@ -23,11 +23,11 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.util.DataConverter;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
index af87aa37c0b..86b66bc9df5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/ResultMergeTaggedMatrixIndexes.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -23,7 +23,7 @@
 
 import org.apache.hadoop.io.WritableComparable;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * This class serves as composite key for the remote result merge job
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/Task.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/Task.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/Task.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/Task.java
index c2ff9ac6d66..9a99101c258 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/Task.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/Task.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * A task is a logical group of one or multiple iterations (each iteration is assigned to exactly one task).
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitioner.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitioner.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitioner.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitioner.java
index 0b7eb4ee14a..da60c5c9c55 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitioner.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitioner.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.List;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * This is the base class for all task partitioner. For this purpose it stores relevant information such as
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoring.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoring.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoring.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoring.java
index cd0354429ff..adc19413ff5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoring.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoring.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.Task.TaskType;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.Task.TaskType;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * This factoring task partitioner virtually iterates over the given FOR loop (from, to, incr),
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmax.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmax.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmax.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmax.java
index 914f3870ef2..5772a9cd590 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmax.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmax.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * Factoring with maximum constraint (e.g., if LIX matrix out-of-core and we need
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmin.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmin.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmin.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmin.java
index 0d1c0223450..a014c67aa81 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmin.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFactoringCmin.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * Factoring with minimum constraint (e.g., if communication is expensive)
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFixedsize.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFixedsize.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFixedsize.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFixedsize.java
index 54fc72ada84..9456e57b881 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerFixedsize.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerFixedsize.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.Task.TaskType;
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.Task.TaskType;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * This naive task partitioner virtually iterates over the given FOR loop (from, to, incr),
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerNaive.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerNaive.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerNaive.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerNaive.java
index 2ad48064060..3a68f1fba64 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerNaive.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerNaive.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * This static task partitioner virtually iterates over the given FOR loop (from, to, incr),
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerStatic.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerStatic.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerStatic.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerStatic.java
index 20be635ab9c..03523d9767e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/TaskPartitionerStatic.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/TaskPartitionerStatic.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor;
+package org.apache.sysml.runtime.controlprogram.parfor;
 
-import com.ibm.bi.dml.runtime.instructions.cp.IntObject;
+import org.apache.sysml.runtime.instructions.cp.IntObject;
 
 /**
  * This static task partitioner virtually iterates over the given FOR loop (from, to, incr),
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/MergedMRJobInstruction.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/MergedMRJobInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/MergedMRJobInstruction.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/MergedMRJobInstruction.java
index 7b3423aa7a8..53d92cb0472 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/MergedMRJobInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/MergedMRJobInstruction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.mqo;
+package org.apache.sysml.runtime.controlprogram.parfor.mqo;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.MetaData;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.MetaData;
 
 /**
  * Merged MR Job instruction to hold the actually merged instruction as well as offsets of
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorker.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorker.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorker.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorker.java
index f76f515db88..3680002e808 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorker.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorker.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.mqo;
+package org.apache.sysml.runtime.controlprogram.parfor.mqo;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -23,10 +23,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerTimeSequential.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerTimeSequential.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerTimeSequential.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerTimeSequential.java
index d385fc7aa20..85f9fb580d3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerTimeSequential.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerTimeSequential.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.mqo;
+package org.apache.sysml.runtime.controlprogram.parfor.mqo;
 
 import java.util.LinkedList;
 
-import com.ibm.bi.dml.lops.runtime.RunMRJobs;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.lops.runtime.RunMRJobs;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.utils.Statistics;
 
 public class PiggybackingWorkerTimeSequential extends PiggybackingWorker
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilDecayParallel.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilDecayParallel.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilDecayParallel.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilDecayParallel.java
index cad9967a68f..908f1330237 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilDecayParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilDecayParallel.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.mqo;
+package org.apache.sysml.runtime.controlprogram.parfor.mqo;
 
 import java.util.LinkedList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import com.ibm.bi.dml.lops.runtime.RunMRJobs;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.lops.runtime.RunMRJobs;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilTimeParallel.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilTimeParallel.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilTimeParallel.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilTimeParallel.java
index 9c895325c4f..17608f4a556 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilTimeParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/PiggybackingWorkerUtilTimeParallel.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.mqo;
+package org.apache.sysml.runtime.controlprogram.parfor.mqo;
 
 import java.util.LinkedList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import com.ibm.bi.dml.lops.runtime.RunMRJobs;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.lops.runtime.RunMRJobs;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/RuntimePiggybacking.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/RuntimePiggybacking.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/RuntimePiggybacking.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/RuntimePiggybacking.java
index 1c5024c935f..f2a03239423 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/RuntimePiggybacking.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/RuntimePiggybacking.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.mqo;
+package org.apache.sysml.runtime.controlprogram.parfor.mqo;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 
 
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/RuntimePiggybackingUtils.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/RuntimePiggybackingUtils.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/RuntimePiggybackingUtils.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/RuntimePiggybackingUtils.java
index ede22dc8551..c637f15ddb4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/mqo/RuntimePiggybackingUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/mqo/RuntimePiggybackingUtils.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.mqo;
+package org.apache.sysml.runtime.controlprogram.parfor.mqo;
 
 import java.io.IOException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 public class RuntimePiggybackingUtils 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimator.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimator.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimator.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimator.java
index 3e1f07fc888..0bc2931f83c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimator.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimator.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
 
 /**
  * Base class for all potential cost estimators
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimatorHops.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimatorHops.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimatorHops.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimatorHops.java
index d4a8716b92a..19f78e46eb5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimatorHops.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimatorHops.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.Optimizer.CostModelType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.Optimizer.CostModelType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimatorRuntime.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimatorRuntime.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimatorRuntime.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimatorRuntime.java
index c78777a2388..92ca2ca1379 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostEstimatorRuntime.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostEstimatorRuntime.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestVariable;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestVariable;
 
 /**
  * Cost Estimator for runtime programs. It uses a offline created performance profile
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostFunction.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostFunction.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostFunction.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostFunction.java
index 747c757d729..3a1c143eff3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/CostFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/CostFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/MemoTable.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/MemoTable.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/MemoTable.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/MemoTable.java
index f083d49e7d4..39edb196ecf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/MemoTable.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/MemoTable.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/MemoTableEntry.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/MemoTableEntry.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/MemoTableEntry.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/MemoTableEntry.java
index 0c092408b1a..97a533d18e9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/MemoTableEntry.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/MemoTableEntry.java
@@ -16,9 +16,9 @@
  */
 
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptNode.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptNode.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptNode.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptNode.java
index 1fdcbdeaef6..23b52d8487e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptNode.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptNode.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,11 +23,11 @@
 import java.util.LinkedList;
 import java.util.Set;
 
-import com.ibm.bi.dml.lops.LopProperties;
-import com.ibm.bi.dml.lops.Lop;
+import org.apache.sysml.lops.LopProperties;
+import org.apache.sysml.lops.Lop;
 
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
 
 /**
  * Internal representation of a plan alternative for program blocks and instructions 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptNodeStatistics.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptNodeStatistics.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptNodeStatistics.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptNodeStatistics.java
index 6cb2d31e7fb..a0ce00d92c9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptNodeStatistics.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptNodeStatistics.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTree.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTree.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTree.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTree.java
index 7354fce0a10..b96e5a88465 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTree.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTree.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.Optimizer.PlanInputType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.Optimizer.PlanInputType;
 
 /**
  * Represents a complete plan of a top-level parfor. This includes the internal
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreeConverter.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreeConverter.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreeConverter.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreeConverter.java
index 7d1442d06a2..0ac8655e10b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreeConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreeConverter.java
@@ -15,64 +15,64 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.MultiThreadedHop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties;
-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.FunctionStatement;
-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.ParForStatement;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatement;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-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.opt.OptNode.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.Optimizer.PlanInputType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ComputationCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.DataGenCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cpfile.MatrixIndexingCPFileInstruction;
-import com.ibm.bi.dml.runtime.instructions.cpfile.ParameterizedBuiltinCPFileInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.MultiThreadedHop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.FunctionStatement;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.ParForStatement;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ExecType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.Optimizer.PlanInputType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.ComputationCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.DataGenCPInstruction;
+import org.apache.sysml.runtime.instructions.cpfile.MatrixIndexingCPFileInstruction;
+import org.apache.sysml.runtime.instructions.cpfile.ParameterizedBuiltinCPFileInstruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 /**
  * Converter for creating an internal plan representation for a given runtime program
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanChecker.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanChecker.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanChecker.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanChecker.java
index 43f22279728..fdfd8b7dc1c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanChecker.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanChecker.java
@@ -15,35 +15,35 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
 
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-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.FunctionStatement;
-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.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatement;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.FunctionStatement;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMapping.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMapping.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMapping.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMapping.java
index 1cfcfbddca1..1f845bb02f4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMapping.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMapping.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
 
 /**
  * Helper class for mapping nodes of the internal plan representation to statement blocks and 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMappingAbstract.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMappingAbstract.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMappingAbstract.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMappingAbstract.java
index c2f9925526b..2ee20b91f77 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMappingAbstract.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMappingAbstract.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 public class OptTreePlanMappingAbstract extends OptTreePlanMapping
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMappingRuntime.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMappingRuntime.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMappingRuntime.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMappingRuntime.java
index 8ed21c36eeb..8d6c0f2fd11 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptTreePlanMappingRuntime.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptTreePlanMappingRuntime.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.instructions.Instruction;
 
 public class OptTreePlanMappingRuntime extends OptTreePlanMapping
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizationWrapper.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
index 059e54ccd18..bcf0fed7bf3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizationWrapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,46 +28,46 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.ipa.InterProceduralAnalysis;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteRule;
-import com.ibm.bi.dml.hops.rewrite.ProgramRewriteStatus;
-import com.ibm.bi.dml.hops.rewrite.ProgramRewriter;
-import com.ibm.bi.dml.hops.rewrite.RewriteConstantFolding;
-import com.ibm.bi.dml.hops.rewrite.RewriteRemoveUnnecessaryBranches;
-import com.ibm.bi.dml.hops.rewrite.StatementBlockRewriteRule;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-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.IfStatement;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.POptMode;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.Optimizer.CostModelType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Stat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.StatisticMonitor;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.ipa.InterProceduralAnalysis;
+import org.apache.sysml.hops.rewrite.HopRewriteRule;
+import org.apache.sysml.hops.rewrite.ProgramRewriteStatus;
+import org.apache.sysml.hops.rewrite.ProgramRewriter;
+import org.apache.sysml.hops.rewrite.RewriteConstantFolding;
+import org.apache.sysml.hops.rewrite.RewriteRemoveUnnecessaryBranches;
+import org.apache.sysml.hops.rewrite.StatementBlockRewriteRule;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.POptMode;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.Optimizer.CostModelType;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Stat;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.StatisticMonitor;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.utils.Statistics;
 
 
 /**
@@ -97,7 +97,7 @@ public class OptimizationWrapper
 	{
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.runtime.controlprogram.parfor.opt")
+			Logger.getLogger("org.apache.sysml.runtime.controlprogram.parfor.opt")
 				  .setLevel((Level) Level.DEBUG);
 		}
 	}
@@ -186,7 +186,7 @@ public static void optimize( POptMode type, ParForStatementBlock sb, ParForProgr
 	public static void setLogLevel( Level optLogLevel )
 	{
 		if( !LDEBUG ){ //set log level if not overwritten by internal flag
-			Logger.getLogger("com.ibm.bi.dml.runtime.controlprogram.parfor.opt")
+			Logger.getLogger("org.apache.sysml.runtime.controlprogram.parfor.opt")
 			      .setLevel( optLogLevel );
 		}
 	}
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/Optimizer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/Optimizer.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/Optimizer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/Optimizer.java
index e1a16c690ac..e19932a56ac 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/Optimizer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/Optimizer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -23,15 +23,15 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.POptMode;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.POptMode;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ExecType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerConstrained.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerConstrained.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerConstrained.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerConstrained.java
index 09431cc3b2c..8081159d44f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerConstrained.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerConstrained.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.util.HashMap;
 import java.util.HashSet;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties;
-import com.ibm.bi.dml.parser.ParForStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-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.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+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.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ExecType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
 
 /**
  * Rule-Based ParFor Optimizer (time: O(n)):
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerHeuristic.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerHeuristic.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerHeuristic.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerHeuristic.java
index 8294b263638..a3680a2f677 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerHeuristic.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerHeuristic.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.POptMode;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.POptMode;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java
index ae581e6e7a2..89cf6535017 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/OptimizerRuleBased.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,69 +28,69 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.AggBinaryOp.MMultMethod;
-import com.ibm.bi.dml.hops.Hop.MultiThreadedHop;
-import com.ibm.bi.dml.hops.Hop.ReOrgOp;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.hops.rewrite.HopRewriteUtils;
-import com.ibm.bi.dml.hops.rewrite.ProgramRewriteStatus;
-import com.ibm.bi.dml.hops.rewrite.ProgramRewriter;
-import com.ibm.bi.dml.hops.rewrite.RewriteInjectSparkLoopCheckpointing;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.LopProperties;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.FunctionStatementBlock;
-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.StatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-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.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ResultMergeLocalFile;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDObject;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.AggBinaryOp.MMultMethod;
+import org.apache.sysml.hops.Hop.MultiThreadedHop;
+import org.apache.sysml.hops.Hop.ReOrgOp;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.hops.rewrite.HopRewriteUtils;
+import org.apache.sysml.hops.rewrite.ProgramRewriteStatus;
+import org.apache.sysml.hops.rewrite.ProgramRewriter;
+import org.apache.sysml.hops.rewrite.RewriteInjectSparkLoopCheckpointing;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.LopProperties;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.ParForStatement;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+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.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.ResultMergeLocalFile;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ExecType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.ParamType;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.spark.data.RDDObject;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 /**
  * Rule-Based ParFor Optimizer (time: O(n)):
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestDef.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestDef.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestDef.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestDef.java
index 4f46c780efb..a050d7d3241 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestDef.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestDef.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.InternalTestVariable;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.PerfTestTool.TestVariable;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.DataFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.InternalTestVariable;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestMeasure;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.PerfTestTool.TestVariable;
 
 /**
  * Internal representation of a test configuration consisting of a logical TestMeasure,
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestExtFunctCP.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestExtFunctCP.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestExtFunctCP.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestExtFunctCP.java
index b08a0510950..fffc281850e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestExtFunctCP.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestExtFunctCP.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-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.Matrix.ValueType;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+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.Matrix.ValueType;
 
 /**
  * External function (type CP) used within the PerfTestTool in order to
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestMemoryObserver.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestMemoryObserver.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestMemoryObserver.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestMemoryObserver.java
index b3dce1e31bc..409cbf918b4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestMemoryObserver.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestMemoryObserver.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestTool.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestTool.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestTool.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestTool.java
index 602162a3138..987af19be1a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestTool.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestTool.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -45,45 +45,45 @@
 import au.com.bytecode.opencsv.CSVReader;
 import au.com.bytecode.opencsv.CSVWriter;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.parser.ExternalFunctionStatement;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.LazyWriteBuffer;
-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.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.instructions.CPInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.DataGenCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.io.IOUtilFunctions;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.ExternalFunctionStatement;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.CacheException;
+import org.apache.sysml.runtime.controlprogram.caching.LazyWriteBuffer;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.CPInstructionParser;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.DataGenCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.io.IOUtilFunctions;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * DML Instructions Performance Test Tool: 
@@ -123,7 +123,7 @@ public class PerfTestTool
 	private static final String  PERF_TOOL_DIR          = "./conf/PerfTestTool/";
 //	private static final String  PERF_RESULTS_FNAME     = PERF_TOOL_DIR + "%id%.dat";
 	private static final String  PERF_PROFILE_FNAME     = PERF_TOOL_DIR + "performance_profile.xml";
-	private static final String  DML_SCRIPT_FNAME       = "./src/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml";
+	private static final String  DML_SCRIPT_FNAME       = "./src/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml";
 	private static final String  DML_TMP_FNAME          = PERF_TOOL_DIR + "temp.dml";
 	
 	//XML profile tags and attributes
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml
index f0d563a77dc..a401a78c5de 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/PerfTestToolRegression.dml
@@ -21,15 +21,15 @@
 
 dynRead = externalFunction(Matrix[Double] d, String fname, Integer m, Integer n) 
 return (Matrix[Double] D) 
-implemented in (classname="com.ibm.bi.dml.runtime.controlprogram.parfor.test.dml.DynamicReadMatrix2DCP",exectype="mem") 
+implemented in (classname="org.apache.sysml.runtime.controlprogram.parfor.test.dml.DynamicReadMatrix2DCP",exectype="mem") 
 
 dynWrite = externalFunction(Matrix[Double] R, String fname) 
 return (Matrix[Double] D) 
-implemented in (classname="com.ibm.bi.dml.runtime.controlprogram.parfor.test.dml.DynamicWriteMatrix2DCP",exectype="mem") 
+implemented in (classname="org.apache.sysml.runtime.controlprogram.parfor.test.dml.DynamicWriteMatrix2DCP",exectype="mem") 
 
 solve = externalFunction(Matrix[Double] A, Matrix[Double] y) 
 return (Matrix[Double] b) 
-implemented in (classname="com.ibm.bi.dml.packagesupport.LinearSolverWrapperCP",exectype="mem") 
+implemented in (classname="org.apache.sysml.packagesupport.LinearSolverWrapperCP",exectype="mem") 
 
 k = %numModels%;
 m = -1; 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/ProgramRecompiler.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/ProgramRecompiler.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/ProgramRecompiler.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/ProgramRecompiler.java
index e9b2f430c04..0f2c7aa67d4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/opt/ProgramRecompiler.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/opt/ProgramRecompiler.java
@@ -15,49 +15,49 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.opt;
+package org.apache.sysml.runtime.controlprogram.parfor.opt;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.IndexingOp;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.LopProperties;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.compile.Dag;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.IfStatement;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ArithmeticBinaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.IndexingOp;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.LopProperties;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.compile.Dag;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptNode.NodeType;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.cp.ArithmeticBinaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/InfrastructureAnalyzer.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/InfrastructureAnalyzer.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/InfrastructureAnalyzer.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/InfrastructureAnalyzer.java
index 7303fbfe5ae..560348469f0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/InfrastructureAnalyzer.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/InfrastructureAnalyzer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.stat;
+package org.apache.sysml.runtime.controlprogram.parfor.stat;
 
 import java.io.IOException;
 import java.util.StringTokenizer;
@@ -23,8 +23,8 @@
 import org.apache.hadoop.mapred.ClusterStatus;
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRConfigurationNames;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.matrix.mapred.MRConfigurationNames;
 
 /**
  * Central place for analyzing and obtaining static infrastructure properties
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/Stat.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/Stat.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/Stat.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/Stat.java
index ff51907d4de..913c7809e0e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/Stat.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/Stat.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.stat;
+package org.apache.sysml.runtime.controlprogram.parfor.stat;
 
 /**
  * Collection of all ParFor statistic types.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/StatisticMonitor.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/StatisticMonitor.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/StatisticMonitor.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/StatisticMonitor.java
index bfd88194cb2..378d48be1fe 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/StatisticMonitor.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/StatisticMonitor.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.stat;
+package org.apache.sysml.runtime.controlprogram.parfor.stat;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map.Entry;
 
-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.PTaskPartitioner;
-import com.ibm.bi.dml.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.PTaskPartitioner;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitioner;
 
 /**
  * This singleton statistic monitor is used to consolidate all parfor runtime statistics.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/Timing.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/Timing.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/Timing.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/Timing.java
index 6e951709a9e..6e0dabd6865 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/stat/Timing.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/stat/Timing.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.stat;
+package org.apache.sysml.runtime.controlprogram.parfor.stat;
 
 /**
  * Helper class for encapsulated time measurements.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/Cell.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/Cell.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/Cell.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/Cell.java
index d283d94275f..e9208e4b7cf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/Cell.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/Cell.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.util;
+package org.apache.sysml.runtime.controlprogram.parfor.util;
 
 /**
  * Helper class for representing text cell and binary cell records in order to
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/IDHandler.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/IDHandler.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/IDHandler.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/IDHandler.java
index 90bee080572..df22486a562 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/IDHandler.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/IDHandler.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.util;
+package org.apache.sysml.runtime.controlprogram.parfor.util;
 
 import java.lang.management.ManagementFactory;
 import java.net.InetAddress;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/IDSequence.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/IDSequence.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/IDSequence.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/IDSequence.java
index 34fecf87209..3e6a35ced95 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/IDSequence.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/IDSequence.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.util;
+package org.apache.sysml.runtime.controlprogram.parfor.util;
 
 /**
  * ID sequence for generating unique long identifiers with start 0 and increment 1.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/PairWritableBlock.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/PairWritableBlock.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/PairWritableBlock.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/PairWritableBlock.java
index 29e6127668c..660ab714119 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/PairWritableBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/PairWritableBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.util;
+package org.apache.sysml.runtime.controlprogram.parfor.util;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,8 +24,8 @@
 
 import org.apache.hadoop.io.Writable;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * Custom writable for a pair of matrix indexes and matrix block
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/PairWritableCell.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/PairWritableCell.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/PairWritableCell.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/PairWritableCell.java
index 8b5fdd3ce67..d0c48b81da7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/PairWritableCell.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/PairWritableCell.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.util;
+package org.apache.sysml.runtime.controlprogram.parfor.util;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,8 +24,8 @@
 
 import org.apache.hadoop.io.Writable;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * Custom writable for a pair of matrix indexes and matrix cell
diff --git a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/StagingFileUtils.java b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/StagingFileUtils.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/StagingFileUtils.java
rename to src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/StagingFileUtils.java
index 1af077e79c5..7b53c04296c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/controlprogram/parfor/util/StagingFileUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/parfor/util/StagingFileUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.controlprogram.parfor.util;
+package org.apache.sysml.runtime.controlprogram.parfor.util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -28,9 +28,9 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
 
 public class StagingFileUtils 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/And.java b/src/main/java/org/apache/sysml/runtime/functionobjects/And.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/And.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/And.java
index cf41848630b..4511acfccc8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/And.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/And.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Builtin.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Builtin.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Builtin.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Builtin.java
index ac099400259..6dc516fe031 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Builtin.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Builtin.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.util.HashMap;
 
 import org.apache.commons.math3.util.FastMath;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/CM.java b/src/main/java/org/apache/sysml/runtime/functionobjects/CM.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/CM.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/CM.java
index e21060e51d7..203b7c6edc3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/CM.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/CM.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/COV.java b/src/main/java/org/apache/sysml/runtime/functionobjects/COV.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/COV.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/COV.java
index f89bbe670d1..1ab5312f921 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/COV.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/COV.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/CTable.java b/src/main/java/org/apache/sysml/runtime/functionobjects/CTable.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/CTable.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/CTable.java
index fb518f0f117..0e93a978199 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/CTable.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/CTable.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.CTableMap;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.CTableMap;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/DiagIndex.java b/src/main/java/org/apache/sysml/runtime/functionobjects/DiagIndex.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/DiagIndex.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/DiagIndex.java
index 957d4225e69..a4bee9a1d0e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/DiagIndex.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/DiagIndex.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class DiagIndex extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Divide.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Divide.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Divide.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Divide.java
index 53800e641ca..d62966b1359 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Divide.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Divide.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class Divide extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Equals.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Equals.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Equals.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Equals.java
index 7adcd54e0ba..1b38f725f20 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Equals.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Equals.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class Equals extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/FileFunction.java b/src/main/java/org/apache/sysml/runtime/functionobjects/FileFunction.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/FileFunction.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/FileFunction.java
index d62145716ca..5a1d66bfd74 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/FileFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/FileFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class FileFunction extends FunctionObject {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/FunctionObject.java b/src/main/java/org/apache/sysml/runtime/functionobjects/FunctionObject.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/FunctionObject.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/FunctionObject.java
index 8613882f7b3..918798cba20 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/FunctionObject.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/FunctionObject.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class FunctionObject 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/GreaterThan.java b/src/main/java/org/apache/sysml/runtime/functionobjects/GreaterThan.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/GreaterThan.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/GreaterThan.java
index 5653feb80ae..6ba59a0edb6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/GreaterThan.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/GreaterThan.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class GreaterThan extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/GreaterThanEquals.java b/src/main/java/org/apache/sysml/runtime/functionobjects/GreaterThanEquals.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/GreaterThanEquals.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/GreaterThanEquals.java
index 5133b5469b1..1df4331155f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/GreaterThanEquals.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/GreaterThanEquals.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class GreaterThanEquals extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/IndexFunction.java b/src/main/java/org/apache/sysml/runtime/functionobjects/IndexFunction.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/IndexFunction.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/IndexFunction.java
index 0e8e4a27bc4..7939a60f88f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/IndexFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/IndexFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/IntegerDivide.java b/src/main/java/org/apache/sysml/runtime/functionobjects/IntegerDivide.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/IntegerDivide.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/IntegerDivide.java
index 4e317abc14b..c4d6ba47f54 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/IntegerDivide.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/IntegerDivide.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class IntegerDivide extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanFunction.java b/src/main/java/org/apache/sysml/runtime/functionobjects/KahanFunction.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanFunction.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/KahanFunction.java
index 6ac0a7c5765..d1a6dd4ad78 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/KahanFunction.java
@@ -15,9 +15,9 @@
  *
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanPlus.java b/src/main/java/org/apache/sysml/runtime/functionobjects/KahanPlus.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanPlus.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/KahanPlus.java
index df5997b69db..fafdce39481 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanPlus.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/KahanPlus.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
 
 
 public class KahanPlus extends KahanFunction implements Serializable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanPlusSq.java b/src/main/java/org/apache/sysml/runtime/functionobjects/KahanPlusSq.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanPlusSq.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/KahanPlusSq.java
index b02b8c2d27c..0879df6e9b6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/KahanPlusSq.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/KahanPlusSq.java
@@ -15,11 +15,11 @@
  *
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/LessThan.java b/src/main/java/org/apache/sysml/runtime/functionobjects/LessThan.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/LessThan.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/LessThan.java
index 42e86a35717..792d255d4da 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/LessThan.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/LessThan.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class LessThan extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/LessThanEquals.java b/src/main/java/org/apache/sysml/runtime/functionobjects/LessThanEquals.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/LessThanEquals.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/LessThanEquals.java
index ed02fefd4cc..3d97d7d4818 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/LessThanEquals.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/LessThanEquals.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class LessThanEquals extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/MaxIndex.java b/src/main/java/org/apache/sysml/runtime/functionobjects/MaxIndex.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/MaxIndex.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/MaxIndex.java
index f1477e78ba5..4612bc76f97 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/MaxIndex.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/MaxIndex.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class MaxIndex extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Mean.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Mean.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Mean.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Mean.java
index b800e75686c..39daab31e04 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Mean.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Mean.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
 
 
 public class Mean extends ValueFunction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/MinIndex.java b/src/main/java/org/apache/sysml/runtime/functionobjects/MinIndex.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/MinIndex.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/MinIndex.java
index a415e76be41..13cb440acac 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/MinIndex.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/MinIndex.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class MinIndex extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Minus.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Minus.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Minus.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Minus.java
index b9a92368ce2..64946a11538 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Minus.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Minus.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Minus1Multiply.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Minus1Multiply.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Minus1Multiply.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Minus1Multiply.java
index 6d36a7e6747..4041ddaec12 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Minus1Multiply.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Minus1Multiply.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/MinusNz.java b/src/main/java/org/apache/sysml/runtime/functionobjects/MinusNz.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/MinusNz.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/MinusNz.java
index 6cef0d10355..9f8346d86ea 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/MinusNz.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/MinusNz.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Modulus.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Modulus.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Modulus.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Modulus.java
index 6840bef29ae..f7d9281ab54 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Modulus.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Modulus.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 /**
  * Integer modulus, where we adhere to the defined R semantics:
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Multiply.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Multiply.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Multiply.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Multiply.java
index dc80be4e4f8..c9bbf408d2c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Multiply.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Multiply.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Multiply2.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Multiply2.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Multiply2.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Multiply2.java
index 01af4909188..2e5c04cea9c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Multiply2.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Multiply2.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class Multiply2 extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Not.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Not.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Not.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Not.java
index e045847264f..83404c7d6ab 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Not.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Not.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class Not extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/NotEquals.java b/src/main/java/org/apache/sysml/runtime/functionobjects/NotEquals.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/NotEquals.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/NotEquals.java
index e6a74e3c1c8..b0818de7b55 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/NotEquals.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/NotEquals.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 public class NotEquals extends ValueFunction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/OffsetColumnIndex.java b/src/main/java/org/apache/sysml/runtime/functionobjects/OffsetColumnIndex.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/OffsetColumnIndex.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/OffsetColumnIndex.java
index 41bfbd4a7f6..ac81920e31d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/OffsetColumnIndex.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/OffsetColumnIndex.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class OffsetColumnIndex extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Or.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Or.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Or.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Or.java
index 61c3c631222..11b34a82389 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Or.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Or.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ParameterizedBuiltin.java b/src/main/java/org/apache/sysml/runtime/functionobjects/ParameterizedBuiltin.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/ParameterizedBuiltin.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/ParameterizedBuiltin.java
index 0734b61799f..ed83fd449d5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ParameterizedBuiltin.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/ParameterizedBuiltin.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.util.HashMap;
 
@@ -27,8 +27,8 @@
 import org.apache.commons.math3.distribution.TDistribution;
 import org.apache.commons.math3.exception.MathArithmeticException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Plus.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Plus.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Plus.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Plus.java
index c185639745b..bc89c2403e8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Plus.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Plus.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLRuntimeException;
 
 // Singleton class
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Power.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Power.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Power.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Power.java
index 638ff0da630..5bd404b8001 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Power.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Power.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 // Singleton class
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Power2.java b/src/main/java/org/apache/sysml/runtime/functionobjects/Power2.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/Power2.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/Power2.java
index 87d91b84e4e..5b9c2aa7906 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/Power2.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/Power2.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 // Singleton class
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceAll.java b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceAll.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceAll.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/ReduceAll.java
index 574cfd30743..11ddeeb255d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceAll.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceAll.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class ReduceAll extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceCol.java b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceCol.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceCol.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/ReduceCol.java
index 348a44c86d0..70c242dadcf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceCol.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceCol.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class ReduceCol extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceDiag.java b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceDiag.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceDiag.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/ReduceDiag.java
index f7c95923028..479b8338a84 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceDiag.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceDiag.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class ReduceDiag extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceRow.java b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceRow.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceRow.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/ReduceRow.java
index 8c08e0a64e2..04970a02407 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ReduceRow.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/ReduceRow.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class ReduceRow extends IndexFunction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/RemoveFile.java b/src/main/java/org/apache/sysml/runtime/functionobjects/RemoveFile.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/RemoveFile.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/RemoveFile.java
index 2a6bc738ebb..a39aaf8cd00 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/RemoveFile.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/RemoveFile.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.IOException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 public class RemoveFile extends FileFunction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/RenameFile.java b/src/main/java/org/apache/sysml/runtime/functionobjects/RenameFile.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/RenameFile.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/RenameFile.java
index a865306c811..8cc05a4c822 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/RenameFile.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/RenameFile.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.IOException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 public class RenameFile extends FileFunction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/SortIndex.java b/src/main/java/org/apache/sysml/runtime/functionobjects/SortIndex.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/SortIndex.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/SortIndex.java
index e04551366f0..c7306934d5d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/SortIndex.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/SortIndex.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 /**
  * This index function is NOT used for actual sorting but just as a reference
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/SwapIndex.java b/src/main/java/org/apache/sysml/runtime/functionobjects/SwapIndex.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/SwapIndex.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/SwapIndex.java
index 5b5906bdc34..4b761320db9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/SwapIndex.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/SwapIndex.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
 
 
 public class SwapIndex extends IndexFunction implements Serializable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ValueFunction.java b/src/main/java/org/apache/sysml/runtime/functionobjects/ValueFunction.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/functionobjects/ValueFunction.java
rename to src/main/java/org/apache/sysml/runtime/functionobjects/ValueFunction.java
index af42955b5d3..2940abaf833 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/functionobjects/ValueFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/ValueFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.functionobjects;
+package org.apache.sysml.runtime.functionobjects;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/CPInstructionParser.java b/src/main/java/org/apache/sysml/runtime/instructions/CPInstructionParser.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/CPInstructionParser.java
rename to src/main/java/org/apache/sysml/runtime/instructions/CPInstructionParser.java
index c9744a9070d..67ca43cdf90 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/CPInstructionParser.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/CPInstructionParser.java
@@ -15,50 +15,50 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions;
+package org.apache.sysml.runtime.instructions;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.cp.AggregateBinaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.AggregateTernaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.AggregateUnaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.AppendCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ArithmeticBinaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanBinaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanUnaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BuiltinBinaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.BuiltinUnaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CentralMomentCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CovarianceCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.DataGenCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.DataPartitionCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.FileCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.MMChainCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.MMTSJCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.MatrixIndexingCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.MatrixReshapeCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.MultiReturnBuiltinCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.PMMJCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.QuantilePickCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.QuantileSortCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.QuaternaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.RelationalBinaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ReorgCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.StringInitCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.TernaryCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.UaggOuterChainCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.VariableCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.cpfile.MatrixIndexingCPFileInstruction;
-import com.ibm.bi.dml.runtime.instructions.cpfile.ParameterizedBuiltinCPFileInstruction;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.cp.AggregateBinaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.AggregateTernaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.AggregateUnaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.AppendCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.ArithmeticBinaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.BooleanBinaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.BooleanUnaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.BuiltinBinaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.BuiltinUnaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.cp.CentralMomentCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.CovarianceCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.DataGenCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.DataPartitionCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.FileCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.MMChainCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.MMTSJCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.MatrixIndexingCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.MatrixReshapeCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.MultiReturnBuiltinCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.PMMJCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.QuantilePickCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.QuantileSortCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.QuaternaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.RelationalBinaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.ReorgCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.StringInitCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.TernaryCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.UaggOuterChainCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.VariableCPInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.cpfile.MatrixIndexingCPFileInstruction;
+import org.apache.sysml.runtime.instructions.cpfile.ParameterizedBuiltinCPFileInstruction;
 
 public class CPInstructionParser extends InstructionParser 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/Instruction.java b/src/main/java/org/apache/sysml/runtime/instructions/Instruction.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/Instruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/Instruction.java
index 68ad8e717d8..1f563f656a8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/Instruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/Instruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions;
+package org.apache.sysml.runtime.instructions;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.api.monitoring.Location;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.DataIdentifier;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.api.monitoring.Location;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
 
 
 public abstract class Instruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/InstructionParser.java b/src/main/java/org/apache/sysml/runtime/instructions/InstructionParser.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/InstructionParser.java
rename to src/main/java/org/apache/sysml/runtime/instructions/InstructionParser.java
index 01e2688c1e5..8e38d208140 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/InstructionParser.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/InstructionParser.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions;
+package org.apache.sysml.runtime.instructions;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction.SPINSTRUCTION_TYPE;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction.SPINSTRUCTION_TYPE;
 
 
 public class InstructionParser 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/InstructionUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/InstructionUtils.java
rename to src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java
index d32ca61b9d0..4c4a4d9f3d8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/InstructionUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/InstructionUtils.java
@@ -15,65 +15,65 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions;
+package org.apache.sysml.runtime.instructions;
 
 import java.util.StringTokenizer;
 
-import com.ibm.bi.dml.lops.AppendM;
-import com.ibm.bi.dml.lops.BinaryM;
-import com.ibm.bi.dml.lops.MapMult;
-import com.ibm.bi.dml.lops.MapMultChain;
-import com.ibm.bi.dml.lops.PMMJ;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.lops.UAggOuterChain;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy;
-import com.ibm.bi.dml.lops.WeightedCrossEntropyR;
-import com.ibm.bi.dml.lops.WeightedDivMM;
-import com.ibm.bi.dml.lops.WeightedDivMMR;
-import com.ibm.bi.dml.lops.WeightedSigmoid;
-import com.ibm.bi.dml.lops.WeightedSigmoidR;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss;
-import com.ibm.bi.dml.lops.WeightedSquaredLossR;
-import com.ibm.bi.dml.lops.WeightedUnaryMM;
-import com.ibm.bi.dml.lops.WeightedUnaryMMR;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.And;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Divide;
-import com.ibm.bi.dml.runtime.functionobjects.Equals;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThan;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.IntegerDivide;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlusSq;
-import com.ibm.bi.dml.runtime.functionobjects.LessThan;
-import com.ibm.bi.dml.runtime.functionobjects.LessThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Mean;
-import com.ibm.bi.dml.runtime.functionobjects.Minus;
-import com.ibm.bi.dml.runtime.functionobjects.Minus1Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.MinusNz;
-import com.ibm.bi.dml.runtime.functionobjects.Modulus;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply2;
-import com.ibm.bi.dml.runtime.functionobjects.NotEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Or;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.functionobjects.Power;
-import com.ibm.bi.dml.runtime.functionobjects.Power2;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceDiag;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceRow;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction.SPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.LeftScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.RightScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.lops.AppendM;
+import org.apache.sysml.lops.BinaryM;
+import org.apache.sysml.lops.MapMult;
+import org.apache.sysml.lops.MapMultChain;
+import org.apache.sysml.lops.PMMJ;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.lops.UAggOuterChain;
+import org.apache.sysml.lops.WeightedCrossEntropy;
+import org.apache.sysml.lops.WeightedCrossEntropyR;
+import org.apache.sysml.lops.WeightedDivMM;
+import org.apache.sysml.lops.WeightedDivMMR;
+import org.apache.sysml.lops.WeightedSigmoid;
+import org.apache.sysml.lops.WeightedSigmoidR;
+import org.apache.sysml.lops.WeightedSquaredLoss;
+import org.apache.sysml.lops.WeightedSquaredLossR;
+import org.apache.sysml.lops.WeightedUnaryMM;
+import org.apache.sysml.lops.WeightedUnaryMMR;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.And;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Divide;
+import org.apache.sysml.runtime.functionobjects.Equals;
+import org.apache.sysml.runtime.functionobjects.GreaterThan;
+import org.apache.sysml.runtime.functionobjects.GreaterThanEquals;
+import org.apache.sysml.runtime.functionobjects.IntegerDivide;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.KahanPlusSq;
+import org.apache.sysml.runtime.functionobjects.LessThan;
+import org.apache.sysml.runtime.functionobjects.LessThanEquals;
+import org.apache.sysml.runtime.functionobjects.Mean;
+import org.apache.sysml.runtime.functionobjects.Minus;
+import org.apache.sysml.runtime.functionobjects.Minus1Multiply;
+import org.apache.sysml.runtime.functionobjects.MinusNz;
+import org.apache.sysml.runtime.functionobjects.Modulus;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Multiply2;
+import org.apache.sysml.runtime.functionobjects.NotEquals;
+import org.apache.sysml.runtime.functionobjects.Or;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.Power;
+import org.apache.sysml.runtime.functionobjects.Power2;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.functionobjects.ReduceDiag;
+import org.apache.sysml.runtime.functionobjects.ReduceRow;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction.CPINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction.SPINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.LeftScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.RightScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
 
 
 public class InstructionUtils 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/MRInstructionParser.java b/src/main/java/org/apache/sysml/runtime/instructions/MRInstructionParser.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/MRInstructionParser.java
rename to src/main/java/org/apache/sysml/runtime/instructions/MRInstructionParser.java
index 932cb08fd1e..1efb8af7cf0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/MRInstructionParser.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/MRInstructionParser.java
@@ -15,67 +15,67 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions;
+package org.apache.sysml.runtime.instructions;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.lops.BinaryM;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.MapMult;
-import com.ibm.bi.dml.lops.MapMultChain;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy;
-import com.ibm.bi.dml.lops.WeightedCrossEntropyR;
-import com.ibm.bi.dml.lops.WeightedDivMM;
-import com.ibm.bi.dml.lops.WeightedDivMMR;
-import com.ibm.bi.dml.lops.WeightedSigmoid;
-import com.ibm.bi.dml.lops.WeightedSigmoidR;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss;
-import com.ibm.bi.dml.lops.WeightedSquaredLossR;
-import com.ibm.bi.dml.lops.WeightedUnaryMM;
-import com.ibm.bi.dml.lops.WeightedUnaryMMR;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateUnaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AppendInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinUaggChainInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryMInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CM_N_COVInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVWriteInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineTernaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineUnaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CumulativeAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CumulativeOffsetInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CumulativeSplitInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.DataPartitionMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MMTSJMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MapMultChainInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MatrixReshapeMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.PMMJMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ParameterizedBuiltinMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.PickByCountInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.QuaternaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RandInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RangeBasedReIndexInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RemoveEmptyMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReorgInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReplicateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ScalarInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.SeqInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.TernaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UaggOuterChainInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UnaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ZeroOutInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.matrix.SortMR;
+import org.apache.sysml.lops.BinaryM;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.MapMult;
+import org.apache.sysml.lops.MapMultChain;
+import org.apache.sysml.lops.WeightedCrossEntropy;
+import org.apache.sysml.lops.WeightedCrossEntropyR;
+import org.apache.sysml.lops.WeightedDivMM;
+import org.apache.sysml.lops.WeightedDivMMR;
+import org.apache.sysml.lops.WeightedSigmoid;
+import org.apache.sysml.lops.WeightedSigmoidR;
+import org.apache.sysml.lops.WeightedSquaredLoss;
+import org.apache.sysml.lops.WeightedSquaredLossR;
+import org.apache.sysml.lops.WeightedUnaryMM;
+import org.apache.sysml.lops.WeightedUnaryMMR;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateUnaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AppendInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinUaggChainInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryMInstruction;
+import org.apache.sysml.runtime.instructions.mr.CM_N_COVInstruction;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.CSVWriteInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineTernaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineUnaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CumulativeAggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.CumulativeOffsetInstruction;
+import org.apache.sysml.runtime.instructions.mr.CumulativeSplitInstruction;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.DataPartitionMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.MMTSJMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MapMultChainInstruction;
+import org.apache.sysml.runtime.instructions.mr.MatrixReshapeMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.PMMJMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.ParameterizedBuiltinMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.PickByCountInstruction;
+import org.apache.sysml.runtime.instructions.mr.QuaternaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.RandInstruction;
+import org.apache.sysml.runtime.instructions.mr.RangeBasedReIndexInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.RemoveEmptyMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReorgInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReplicateInstruction;
+import org.apache.sysml.runtime.instructions.mr.ScalarInstruction;
+import org.apache.sysml.runtime.instructions.mr.SeqInstruction;
+import org.apache.sysml.runtime.instructions.mr.TernaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.UaggOuterChainInstruction;
+import org.apache.sysml.runtime.instructions.mr.UnaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.ZeroOutInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.matrix.SortMR;
 
 
 public class MRInstructionParser extends InstructionParser 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/MRJobInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/MRJobInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java
index 8c7883ad28a..9d57af2198e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/MRJobInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/MRJobInstruction.java
@@ -15,37 +15,37 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions;
+package org.apache.sysml.runtime.instructions;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.compile.JobType;
-import com.ibm.bi.dml.lops.runtime.RunMRJobs;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-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.ProgramConverter;
-import com.ibm.bi.dml.runtime.instructions.cp.Data;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
-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.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.compile.JobType;
+import org.apache.sysml.lops.runtime.RunMRJobs;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.instructions.cp.Data;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.utils.Statistics;
 
 /*
 ---------------------------------------------------------------------------------------
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/SPInstructionParser.java b/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/SPInstructionParser.java
rename to src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java
index 62c49b8795a..bd4d9d0c822 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/SPInstructionParser.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java
@@ -15,63 +15,63 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions;
+package org.apache.sysml.runtime.instructions;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.lops.Checkpoint;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy;
-import com.ibm.bi.dml.lops.WeightedCrossEntropyR;
-import com.ibm.bi.dml.lops.WeightedDivMM;
-import com.ibm.bi.dml.lops.WeightedDivMMR;
-import com.ibm.bi.dml.lops.WeightedSigmoid;
-import com.ibm.bi.dml.lops.WeightedSigmoidR;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss;
-import com.ibm.bi.dml.lops.WeightedSquaredLossR;
-import com.ibm.bi.dml.lops.WeightedUnaryMM;
-import com.ibm.bi.dml.lops.WeightedUnaryMMR;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.spark.AggregateTernarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.AggregateUnarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.AppendGAlignedSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.AppendGSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.AppendMSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.AppendRSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.ArithmeticBinarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.BinUaggChainSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.BuiltinBinarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.BuiltinUnarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CSVReblockSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CentralMomentSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CheckpointSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CovarianceSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CpmmSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CumulativeAggregateSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CumulativeOffsetSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.MapmmChainSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.MapmmSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.MatrixIndexingSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.MatrixReshapeSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.PMapmmSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.ParameterizedBuiltinSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.PmmSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.QuantilePickSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.QuaternarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.RandSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.ReblockSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.RelationalBinarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.ReorgSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.RmmSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction.SPINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.instructions.spark.TernarySPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.TsmmSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.QuantileSortSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.UaggOuterChainSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.WriteSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.ZipmmSPInstruction;
+import org.apache.sysml.lops.Checkpoint;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.WeightedCrossEntropy;
+import org.apache.sysml.lops.WeightedCrossEntropyR;
+import org.apache.sysml.lops.WeightedDivMM;
+import org.apache.sysml.lops.WeightedDivMMR;
+import org.apache.sysml.lops.WeightedSigmoid;
+import org.apache.sysml.lops.WeightedSigmoidR;
+import org.apache.sysml.lops.WeightedSquaredLoss;
+import org.apache.sysml.lops.WeightedSquaredLossR;
+import org.apache.sysml.lops.WeightedUnaryMM;
+import org.apache.sysml.lops.WeightedUnaryMMR;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.spark.AggregateTernarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.AggregateUnarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.AppendGAlignedSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.AppendGSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.AppendMSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.AppendRSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.ArithmeticBinarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.BinUaggChainSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.BuiltinBinarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.BuiltinUnarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CSVReblockSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CentralMomentSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CheckpointSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CovarianceSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CpmmSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CumulativeAggregateSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CumulativeOffsetSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.MapmmChainSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.MapmmSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.MatrixIndexingSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.MatrixReshapeSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.PMapmmSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.ParameterizedBuiltinSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.PmmSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.QuantilePickSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.QuaternarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.RandSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.ReblockSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.RelationalBinarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.ReorgSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.RmmSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction.SPINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.instructions.spark.TernarySPInstruction;
+import org.apache.sysml.runtime.instructions.spark.TsmmSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.QuantileSortSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.UaggOuterChainSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.WriteSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.ZipmmSPInstruction;
 
 
 public class SPInstructionParser extends InstructionParser {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java
similarity index 77%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateBinaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java
index 19776fa3b37..de17f744e4e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateBinaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateBinaryCPInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class AggregateBinaryCPInstruction extends BinaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateTernaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateTernaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java
index 47085417f72..cfb2384d0a9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateTernaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateTernaryCPInstruction.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class AggregateTernaryCPInstruction extends ComputationCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateUnaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
index 63d181513f4..0e78c2bd356 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AggregateUnaryCPInstruction.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
 
 public class AggregateUnaryCPInstruction extends UnaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AppendCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/AppendCPInstruction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AppendCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/AppendCPInstruction.java
index a056daa99a1..f492750f122 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/AppendCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/AppendCPInstruction.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.OffsetColumnIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 
 public class AppendCPInstruction extends BinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java
index 672a33a8185..a21c0764539 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ArithmeticBinaryCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public abstract class ArithmeticBinaryCPInstruction extends BinaryCPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BinaryCPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BinaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/BinaryCPInstruction.java
index def535e7152..8b63274d49e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BinaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BinaryCPInstruction.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public abstract class BinaryCPInstruction extends ComputationCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanBinaryCPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanBinaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanBinaryCPInstruction.java
index 30452e208ba..afbe6f66bb2 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanBinaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanBinaryCPInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class BooleanBinaryCPInstruction extends BinaryCPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java
index cd0db268761..809cdb974dd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanObject.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class BooleanObject extends ScalarObject  
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanUnaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanUnaryCPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanUnaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanUnaryCPInstruction.java
index 5ea958780dc..d584fe4bd68 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BooleanUnaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BooleanUnaryCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
 
 
 public class BooleanUnaryCPInstruction extends UnaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BreakPointInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BreakPointInstruction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BreakPointInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/BreakPointInstruction.java
index fc2d581d8fd..e5fb6a5ca9a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BreakPointInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BreakPointInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.debug.DebugState;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.debug.DebugState;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java
similarity index 76%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java
index c02533b6e1a..c044d41f486 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinBinaryCPInstruction.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.RightScalarOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.RightScalarOperator;
 
 
 public abstract class BuiltinBinaryCPInstruction extends BinaryCPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java
similarity index 74%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java
index 8a56450b324..edae21ff188 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/BuiltinUnaryCPInstruction.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 
 public abstract class BuiltinUnaryCPInstruction extends UnaryCPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CM_COV_Object.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CM_COV_Object.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CM_COV_Object.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/CM_COV_Object.java
index 10bdc57da20..816c71dd666 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CM_COV_Object.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CM_COV_Object.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
 
 
 public class CM_COV_Object extends Data 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/CPInstruction.java
index 66d78f4a4ad..25858997de7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CPInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.api.MLContextProxy;
-import com.ibm.bi.dml.lops.runtime.RunMRJobs;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.CPInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.api.MLContextProxy;
+import org.apache.sysml.lops.runtime.RunMRJobs;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.CPInstructionParser;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public abstract class CPInstruction extends Instruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CPOperand.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CPOperand.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CPOperand.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/CPOperand.java
index 3341b5e3798..990013cd18f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CPOperand.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CPOperand.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Expression.*;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.*;
+import org.apache.sysml.runtime.instructions.Instruction;
 
 
 public class CPOperand 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CentralMomentCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CentralMomentCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java
index 34d336127b3..b72a6bfafcf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CentralMomentCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CentralMomentCPInstruction.java
@@ -16,19 +16,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
 
 public class CentralMomentCPInstruction extends AggregateUnaryCPInstruction
 {	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ComputationCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ComputationCPInstruction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ComputationCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ComputationCPInstruction.java
index ddd49acd1c2..67d15a8f85f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ComputationCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ComputationCPInstruction.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public abstract class ComputationCPInstruction extends CPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CovarianceCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CovarianceCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java
index 49129a30eda..433d334c393 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/CovarianceCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/CovarianceCPInstruction.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.COV;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.COVOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.COV;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.COVOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class CovarianceCPInstruction extends BinaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/Data.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/Data.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/Data.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/Data.java
index 07e7d0d93c1..4047f3f8c74 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/Data.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/Data.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MetaData;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MetaData;
 
 
 public abstract class Data implements Serializable 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DataGenCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/DataGenCPInstruction.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DataGenCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/DataGenCPInstruction.java
index d97a4d43288..a928e237ce7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DataGenCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/DataGenCPInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixDatagen;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.RandomMatrixGenerator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.LibMatrixDatagen;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.RandomMatrixGenerator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class DataGenCPInstruction extends UnaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DataPartitionCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java
similarity index 76%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DataPartitionCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java
index 717fd6bd860..cafd774fd50 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DataPartitionCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/DataPartitionCPInstruction.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.io.MatrixWriterFactory;
-import com.ibm.bi.dml.runtime.io.WriterBinaryBlock;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.io.MatrixWriterFactory;
+import org.apache.sysml.runtime.io.WriterBinaryBlock;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DoubleObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/DoubleObject.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DoubleObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/DoubleObject.java
index 70b4a68aadc..3df21d8c0a0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/DoubleObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/DoubleObject.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class DoubleObject extends ScalarObject 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FileCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FileCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java
index 7a631db670b..c0708da185f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FileCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/FileCPInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.io.IOException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.RemoveFile;
-import com.ibm.bi.dml.runtime.functionobjects.RenameFile;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.RemoveFile;
+import org.apache.sysml.runtime.functionobjects.RenameFile;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FileObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/FileObject.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FileObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/FileObject.java
index 158c339f440..7a469e9bc6a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FileObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/FileObject.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class FileObject extends Data 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FunctionCallCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FunctionCallCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java
index b5d1aa2503c..a3812c85ee9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/FunctionCallCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/FunctionCallCPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,21 +23,21 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.lops.Lop;
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-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.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.DataIdentifier;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/IntObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/IntObject.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/IntObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/IntObject.java
index 3bcda0c79c1..f850cf6d146 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/IntObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/IntObject.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 public class IntObject extends ScalarObject
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/KahanObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/KahanObject.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/KahanObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/KahanObject.java
index 9ee12f5d75a..fca725b6fa6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/KahanObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/KahanObject.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 
 public class KahanObject extends Data 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MMChainCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MMChainCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java
index f8b77ef755f..8f9b1b8ae62 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MMChainCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMChainCPInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.lops.MapMultChain.ChainType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.MapMultChain.ChainType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MMTSJCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MMTSJCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java
index e9ab8221334..078b5689a61 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MMTSJCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MMTSJCPInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java
similarity index 76%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java
index face2db5453..a2f323fc2df 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixBuiltinCPInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.LibCommonsMath;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.data.LibCommonsMath;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 
 public class MatrixBuiltinCPInstruction extends BuiltinUnaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixIndexingCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixIndexingCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java
index 9cedcdac8b6..1d6a0bcee38 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixIndexingCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixIndexingCPInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.util.IndexRange;
 
 public class MatrixIndexingCPInstruction extends UnaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java
index e262dffc3c3..41bda85d918 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixArithmeticCPInstruction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class MatrixMatrixArithmeticCPInstruction extends ArithmeticBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java
index 2e452f5e95c..e15770dedd1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixBuiltinCPInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.LibCommonsMath;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.data.LibCommonsMath;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class MatrixMatrixBuiltinCPInstruction extends BuiltinBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java
index f19437f6ded..3c90a14d017 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixMatrixRelationalCPInstruction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class MatrixMatrixRelationalCPInstruction extends RelationalBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixReshapeCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixReshapeCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java
index bb658dfc163..116baff1e6a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixReshapeCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixReshapeCPInstruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixReorg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.LibMatrixReorg;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java
index 648df9c3d38..a48c0d6f01c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MatrixScalarBuiltinCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
 
 
 public class MatrixScalarBuiltinCPInstruction extends BuiltinBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
index 96c1f504175..b1360621bf9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.util.ArrayList;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.LibCommonsMath;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.LibCommonsMath;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class MultiReturnBuiltinCPInstruction extends ComputationCPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/PMMJCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/PMMJCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java
index 0e44bd3b125..bfb0cbc2c82 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/PMMJCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/PMMJCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
index 1b14d0519ce..81e60b4333f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ParameterizedBuiltinCPInstruction.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.io.IOException;
 import java.util.HashMap;
 
 import org.apache.wink.json4j.JSONException;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.ParameterizedBuiltin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.transform.DataTransform;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.ParameterizedBuiltin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.transform.DataTransform;
 
 
 public class ParameterizedBuiltinCPInstruction extends ComputationCPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuantilePickCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuantilePickCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java
index dfd1fc9ef58..8472062971f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuantilePickCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantilePickCPInstruction.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.io.IOException;
 
-import com.ibm.bi.dml.lops.PickByCount.OperationTypes;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MetaData;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.PickByCount.OperationTypes;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MetaData;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class QuantilePickCPInstruction extends BinaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuantileSortCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuantileSortCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java
index e9ec52d740b..d4dd5cb66a3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuantileSortCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuantileSortCPInstruction.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
 
 public class QuantileSortCPInstruction extends UnaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuaternaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuaternaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java
index 42889fc5fa6..cc82693247c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/QuaternaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/QuaternaryCPInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.lops.WeightedDivMM.WDivMMType;
-import com.ibm.bi.dml.lops.WeightedSigmoid.WSigmoidType;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss.WeightsType;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy.WCeMMType;
-import com.ibm.bi.dml.lops.WeightedUnaryMM.WUMMType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.QuaternaryOperator;
+import org.apache.sysml.lops.WeightedDivMM.WDivMMType;
+import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType;
+import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType;
+import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType;
+import org.apache.sysml.lops.WeightedUnaryMM.WUMMType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.QuaternaryOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/RelationalBinaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/RelationalBinaryCPInstruction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/RelationalBinaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/RelationalBinaryCPInstruction.java
index bb83c6f313f..720abf35284 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/RelationalBinaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/RelationalBinaryCPInstruction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public abstract class RelationalBinaryCPInstruction extends BinaryCPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ReorgCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ReorgCPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ReorgCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ReorgCPInstruction.java
index 328bd88fd5d..5e8d40d6e46 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ReorgCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ReorgCPInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.DiagIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SortIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.DiagIndex;
+import org.apache.sysml.runtime.functionobjects.SortIndex;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 
 public class ReorgCPInstruction extends UnaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarBuiltinCPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarBuiltinCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarBuiltinCPInstruction.java
index da5b04adf98..37f4e8d7b13 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarBuiltinCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarBuiltinCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
 
 
 public class ScalarBuiltinCPInstruction extends BuiltinUnaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java
index fbe5bcf37bc..528d757f683 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixArithmeticCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
 
 // TODO rename to MatrixScalar...
 public class ScalarMatrixArithmeticCPInstruction extends ArithmeticBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java
index 2f19f1071de..4f897449d3e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarMatrixRelationalCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
 
 //TODO rename to MatrixScalar...
 public class ScalarMatrixRelationalCPInstruction extends RelationalBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarObject.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarObject.java
index 8b7b575e08b..11dd551e070 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarObject.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
 
 public abstract class ScalarObject extends Data
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarArithmeticCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarArithmeticCPInstruction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarArithmeticCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarArithmeticCPInstruction.java
index cb718942a00..27badfb5dd2 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarArithmeticCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarArithmeticCPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Divide;
-import com.ibm.bi.dml.runtime.functionobjects.Power;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Divide;
+import org.apache.sysml.runtime.functionobjects.Power;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class ScalarScalarArithmeticCPInstruction extends ArithmeticBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarBuiltinCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarBuiltinCPInstruction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarBuiltinCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarBuiltinCPInstruction.java
index 774b5d128b2..9d957e40d10 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarBuiltinCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarBuiltinCPInstruction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class ScalarScalarBuiltinCPInstruction extends BuiltinBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarRelationalCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarRelationalCPInstruction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarRelationalCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarRelationalCPInstruction.java
index 5e295f66276..8d45723c1dd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/ScalarScalarRelationalCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/ScalarScalarRelationalCPInstruction.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class ScalarScalarRelationalCPInstruction extends RelationalBinaryCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/StringInitCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/StringInitCPInstruction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/StringInitCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/StringInitCPInstruction.java
index ba94edafb02..5aa91822051 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/StringInitCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/StringInitCPInstruction.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.util.StringTokenizer;
 
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class StringInitCPInstruction extends UnaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/StringObject.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/StringObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java
index 49afe84c11d..a93db7aaba8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/StringObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/StringObject.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
 
 public class StringObject extends ScalarObject 
 {	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/TernaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/TernaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java
index 47c293c8e7a..b9274b7025a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/TernaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/TernaryCPInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.lops.Ternary;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.CTableMap;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.lops.Ternary;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.CTableMap;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.util.DataConverter;
 
 
 public class TernaryCPInstruction extends ComputationCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/UaggOuterChainCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/UaggOuterChainCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java
index 411e89aa916..1d478138077 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/UaggOuterChainCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/UaggOuterChainCPInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.lops.UAggOuterChain;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixOuterAgg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.lops.UAggOuterChain;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.LibMatrixOuterAgg;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 public class UaggOuterChainCPInstruction extends UnaryCPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/UnaryCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/UnaryCPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/UnaryCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/UnaryCPInstruction.java
index 142dbf8c59f..8257138e1aa 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/UnaryCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/UnaryCPInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.Not;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.Not;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
 
 
 public abstract class UnaryCPInstruction extends ComputationCPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/VariableCPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cp/VariableCPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java
index 7d19c9d9061..7e02b490add 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cp/VariableCPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cp/VariableCPInstruction.java
@@ -15,36 +15,36 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cp;
+package org.apache.sysml.runtime.instructions.cp;
 
 import java.io.IOException;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.ProgramConverter;
-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.InstructionUtils;
-import com.ibm.bi.dml.runtime.io.WriterMatrixMarket;
-import com.ibm.bi.dml.runtime.io.WriterTextCSV;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.MetaData;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.io.WriterMatrixMarket;
+import org.apache.sysml.runtime.io.WriterTextCSV;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.MetaData;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class VariableCPInstruction extends CPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
index ce8b952df76..67a78825e7b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/MatrixIndexingCPFileInstruction.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cpfile;
+package org.apache.sysml.runtime.instructions.cpfile;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.MatrixIndexingCPInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixFormatMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.MatrixIndexingCPInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * This instruction is used if a single partition is too large to fit in memory.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java
index 5854b1026ed..18ae41c4d4d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/cpfile/ParameterizedBuiltinCPFileInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.cpfile;
+package org.apache.sysml.runtime.instructions.cpfile;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -40,38 +40,38 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.Cell;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDHandler;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.StagingFileUtils;
-import com.ibm.bi.dml.runtime.functionobjects.ParameterizedBuiltin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.io.MatrixWriter;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+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.Cell;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDHandler;
+import org.apache.sysml.runtime.controlprogram.parfor.util.StagingFileUtils;
+import org.apache.sysml.runtime.functionobjects.ParameterizedBuiltin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.io.MatrixWriter;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * File-based (out-of-core) realization of remove empty for robustness because there is no
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateBinaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateBinaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java
index f982feee179..a644e676d02 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateBinaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateBinaryInstruction.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.MMCJ.MMCJType;
-import com.ibm.bi.dml.lops.MapMult;
-import com.ibm.bi.dml.lops.MapMult.CacheType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.MMCJ.MMCJType;
+import org.apache.sysml.lops.MapMult;
+import org.apache.sysml.lops.MapMult.CacheType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class AggregateBinaryInstruction extends BinaryMRInstructionBase implements IDistributedCacheConsumer
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.java
similarity index 76%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.java
index c5c83a5cda2..b16dcca18d5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateInstruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class AggregateInstruction extends UnaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateUnaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateUnaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.java
index 7bb56e439a9..f9ecb9c022c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AggregateUnaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AggregateUnaryInstruction.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceDiag;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.ReduceDiag;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class AggregateUnaryInstruction extends UnaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendGInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendGInstruction.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendGInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/AppendGInstruction.java
index b160ab840fd..d7e84444c07 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendGInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendGInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class AppendGInstruction extends AppendInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java
index 41476ee1350..fde4ae5eb0f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendInstruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class AppendInstruction extends BinaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendMInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendMInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java
index 43f10a83be5..1675330fd3f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendMInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendMInstruction.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.AppendM.CacheType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.AppendM.CacheType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class AppendMInstruction extends AppendInstruction implements IDistributedCacheConsumer
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendRInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/AppendRInstruction.java
index 4ed43a7c180..c09f8e527c9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/AppendRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/AppendRInstruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class AppendRInstruction extends AppendInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinUaggChainInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinUaggChainInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.java
index 7470a901f76..940f3399aa4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinUaggChainInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinUaggChainInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryInstruction.java
index 87b0853dd0d..db18189c40e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryInstruction.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class BinaryInstruction extends BinaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryMInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryMInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java
index 065abee264e..c87469bc2eb 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryMInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMInstruction.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.AppendM.CacheType;
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.AppendM.CacheType;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class BinaryMInstruction extends BinaryMRInstructionBase implements IDistributedCacheConsumer
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryMRInstructionBase.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMRInstructionBase.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryMRInstructionBase.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMRInstructionBase.java
index c6beb159ac8..664380a9515 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/BinaryMRInstructionBase.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/BinaryMRInstructionBase.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public abstract class BinaryMRInstructionBase extends MRInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CM_N_COVInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CM_N_COVInstruction.java
similarity index 74%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CM_N_COVInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CM_N_COVInstruction.java
index 315ee9965c5..f7b8530365c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CM_N_COVInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CM_N_COVInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.COV;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.COVOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.COV;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.COVOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
 
 
 public class CM_N_COVInstruction extends UnaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CSVReblockInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVReblockInstruction.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CSVReblockInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CSVReblockInstruction.java
index 9a9ad0346f8..e65894fd9a9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CSVReblockInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVReblockInstruction.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class CSVReblockInstruction extends ReblockInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CSVWriteInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CSVWriteInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java
index 367989120ef..86ce0fff897 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CSVWriteInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CSVWriteInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class CSVWriteInstruction extends UnaryMRInstructionBase{
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineBinaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineBinaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java
index bd5a2319f45..395b9e2c0c1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineBinaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineBinaryInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class CombineBinaryInstruction extends BinaryMRInstructionBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineTernaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineTernaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java
index 6d36432de5c..c9d06d3bd9a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineTernaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineTernaryInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.lops.Ternary.OperationTypes;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.lops.Ternary.OperationTypes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
 
 
 public class CombineTernaryInstruction extends TernaryInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineUnaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java
similarity index 76%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineUnaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java
index b2280d16f9a..1757712571c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CombineUnaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CombineUnaryInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class CombineUnaryInstruction extends UnaryMRInstructionBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeAggregateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeAggregateInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java
index ae8306e6c7e..ab745408f9b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeAggregateInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeAggregateInstruction.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class CumulativeAggregateInstruction extends AggregateUnaryInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeOffsetInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeOffsetInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java
index 504a92ed424..cc4da2152ed 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeOffsetInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeOffsetInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 
 public class CumulativeOffsetInstruction extends BinaryInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeSplitInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeSplitInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java
index 5f08240d04f..81162f073a0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/CumulativeSplitInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/CumulativeSplitInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/DataGenMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/DataGenMRInstruction.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/DataGenMRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/DataGenMRInstruction.java
index 445b0c82712..6f86cb1a9e4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/DataGenMRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/DataGenMRInstruction.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public abstract class DataGenMRInstruction extends MRInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/DataPartitionMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/DataPartitionMRInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/DataPartitionMRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/DataPartitionMRInstruction.java
index cfc757cc4c5..c638a483101 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/DataPartitionMRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/DataPartitionMRInstruction.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * Dummy instruction for cost estimation of data partition mr.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/GroupedAggregateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java
similarity index 74%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/GroupedAggregateInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java
index 60338dcc415..9d940ae6c98 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/GroupedAggregateInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/GroupedAggregateInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
 
 
 public class GroupedAggregateInstruction extends UnaryMRInstructionBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/IDistributedCacheConsumer.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/IDistributedCacheConsumer.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/IDistributedCacheConsumer.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/IDistributedCacheConsumer.java
index 4d809e9e835..b39df08a110 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/IDistributedCacheConsumer.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/IDistributedCacheConsumer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MMTSJMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MMTSJMRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java
index 3204d2533fc..d48efa54d1b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MMTSJMRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MMTSJMRInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java
index e68422b5e5d..70a6cd5a334 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MRInstruction.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public abstract class MRInstruction extends Instruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MapMultChainInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MapMultChainInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java
index d778581ba18..9fc7a16734e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MapMultChainInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MapMultChainInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.MapMultChain.ChainType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.lops.MapMultChain.ChainType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MatrixReshapeMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MatrixReshapeMRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java
index 159b31fe9e3..2b0218c0392 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/MatrixReshapeMRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/MatrixReshapeMRInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixReorg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixReorg;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/PMMJMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/PMMJMRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java
index 849bd28efa0..a8e9bf4699e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/PMMJMRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/PMMJMRInstruction.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.PMMJ.CacheType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.PMMJ.CacheType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java
index 0bd2a831eda..6cbd849f0dd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ParameterizedBuiltinMRInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixReorg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixReorg;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/PickByCountInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/PickByCountInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java
index f05fab21e3e..30e6eebd93b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/PickByCountInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/PickByCountInstruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.lops.PickByCount.OperationTypes;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.PickByCount.OperationTypes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class PickByCountInstruction extends MRInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/QuaternaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/QuaternaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java
index 087f55451b3..0f846003b25 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/QuaternaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/QuaternaryInstruction.java
@@ -15,36 +15,36 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.WeightedCrossEntropy.WCeMMType;
-import com.ibm.bi.dml.lops.WeightedDivMM.WDivMMType;
-import com.ibm.bi.dml.lops.WeightedDivMMR;
-import com.ibm.bi.dml.lops.WeightedSigmoid.WSigmoidType;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss.WeightsType;
-import com.ibm.bi.dml.lops.WeightedSquaredLossR;
-import com.ibm.bi.dml.lops.WeightedUnaryMM;
-import com.ibm.bi.dml.lops.WeightedUnaryMM.WUMMType;
-import com.ibm.bi.dml.lops.WeightedUnaryMMR;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixReorg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.QuaternaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType;
+import org.apache.sysml.lops.WeightedDivMM.WDivMMType;
+import org.apache.sysml.lops.WeightedDivMMR;
+import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType;
+import org.apache.sysml.lops.WeightedSquaredLoss;
+import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType;
+import org.apache.sysml.lops.WeightedSquaredLossR;
+import org.apache.sysml.lops.WeightedUnaryMM;
+import org.apache.sysml.lops.WeightedUnaryMM.WUMMType;
+import org.apache.sysml.lops.WeightedUnaryMMR;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixReorg;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.QuaternaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RandInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RandInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java
index 42534357ab1..9a31aacfb00 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RandInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/RandInstruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class RandInstruction extends DataGenMRInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RangeBasedReIndexInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RangeBasedReIndexInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java
index 4976138197e..2edab995b29 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RangeBasedReIndexInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/RangeBasedReIndexInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReIndexOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReIndexOperator;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class RangeBasedReIndexInstruction extends UnaryMRInstructionBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReblockInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReblockInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java
index a09c77ff6c0..4055af3e06a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReblockInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReblockInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class ReblockInstruction extends UnaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RemoveEmptyMRInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RemoveEmptyMRInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java
index a5a6c65abf9..d3b7f8ce1c7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/RemoveEmptyMRInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/RemoveEmptyMRInstruction.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixReorg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.LibMatrixReorg;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReorgInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReorgInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java
index 8a21e064970..c5f071a8e5a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReorgInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReorgInstruction.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.DiagIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.DiagIndex;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 
 public class ReorgInstruction extends UnaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReplicateInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReplicateInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java
index c13e691f705..a42e0421a7e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ReplicateInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ReplicateInstruction.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ScalarInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ScalarInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java
index f47dfe9b374..0f91a257027 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ScalarInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ScalarInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
 
 
 public class ScalarInstruction extends UnaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/SeqInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/SeqInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java
index 0a5e6790d60..197bde8bb72 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/SeqInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/SeqInstruction.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class SeqInstruction extends DataGenMRInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/TernaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/TernaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java
index 8e19dc215d7..bd03278a4b1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/TernaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/TernaryInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.lops.Ternary;
-import com.ibm.bi.dml.lops.Ternary.OperationTypes;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.CTableMap;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.lops.Ternary;
+import org.apache.sysml.lops.Ternary.OperationTypes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.CTableMap;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
 
 
 public class TernaryInstruction extends MRInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UaggOuterChainInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UaggOuterChainInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java
index a41441568e4..c888d5b3dca 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UaggOuterChainInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/UaggOuterChainInstruction.java
@@ -15,32 +15,32 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceRow;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixOuterAgg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.functionobjects.ReduceRow;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixOuterAgg;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UnaryInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java
similarity index 77%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UnaryInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java
index 194c8e8966a..9b9dd664f27 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UnaryInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryInstruction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 
 public class UnaryInstruction extends UnaryMRInstructionBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UnaryMRInstructionBase.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryMRInstructionBase.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UnaryMRInstructionBase.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryMRInstructionBase.java
index a869e93d1d2..6ce1da4e468 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/UnaryMRInstructionBase.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/UnaryMRInstructionBase.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public abstract class UnaryMRInstructionBase extends MRInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ZeroOutInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ZeroOutInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java
index fc8d3da3fde..8f8eeafbf8f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/mr/ZeroOutInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/mr/ZeroOutInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.mr;
+package org.apache.sysml.runtime.instructions.mr;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.CachedValueMap;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ZeroOutOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.CachedValueMap;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ZeroOutOperator;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * ZeroOut with complementary=false is to zero out a subregion inside a matrix
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AggregateTernarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AggregateTernarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java
index 7c7806ff5d0..7f13b2be2a8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AggregateTernarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateTernarySPInstruction.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AggregateUnarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AggregateUnarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java
index ae38aeb971a..87eb4ba7010 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AggregateUnarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AggregateUnarySPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
@@ -23,27 +23,27 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceRow;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.AggregateDropCorrectionFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.FilterDiagBlocksFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.functionobjects.ReduceRow;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.functions.AggregateDropCorrectionFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.FilterDiagBlocksFunction;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendGAlignedSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendGAlignedSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java
index 67dc07e9bbb..3d7ed330c8c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendGAlignedSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGAlignedSPInstruction.java
@@ -15,26 +15,26 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.PairFunction;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.OffsetColumnIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 public class AppendGAlignedSPInstruction extends BinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendGSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendGSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java
index d86e2f58993..16be42adeb4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendGSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendGSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,20 +26,20 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.OffsetColumnIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class AppendGSPInstruction extends BinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendMSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendMSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java
index 76f198cd2e9..c71cf55ac02 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendMSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendMSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -25,24 +25,24 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.OffsetColumnIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LazyIterableIterator;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.LazyIterableIterator;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 public class AppendMSPInstruction extends BinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendRSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendRSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java
index bff74d8dcbc..577692c7989 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/AppendRSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/AppendRSPInstruction.java
@@ -15,25 +15,25 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.OffsetColumnIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.OffsetColumnIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 public class AppendRSPInstruction extends BinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java
index bac5bb0bed9..f6b68174aaa 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ArithmeticBinarySPInstruction.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public abstract class ArithmeticBinarySPInstruction extends BinarySPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BinUaggChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BinUaggChainSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java
index 1f0aabcc762..859a06a2709 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BinUaggChainSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinUaggChainSPInstruction.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 
 public class BinUaggChainSPInstruction extends UnarySPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BinarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java
index 0736b6520db..c536994593e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BinarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BinarySPInstruction.java
@@ -15,31 +15,31 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.MatrixMatrixBinaryOpFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.MatrixScalarUnaryFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.MatrixVectorBinaryOpPartitionFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.OuterVectorBinaryOpFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ReplicateVectorFunction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.functions.MatrixMatrixBinaryOpFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.MatrixScalarUnaryFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.MatrixVectorBinaryOpPartitionFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.OuterVectorBinaryOpFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.ReplicateVectorFunction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
 
 public abstract class BinarySPInstruction extends ComputationSPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BuiltinBinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java
similarity index 71%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BuiltinBinarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java
index 3ec50d69e34..a5c99444b61 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BuiltinBinarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinBinarySPInstruction.java
@@ -1,19 +1,19 @@
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.RightScalarOperator;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.RightScalarOperator;
 
 public abstract class BuiltinBinarySPInstruction extends BinarySPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BuiltinUnarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java
similarity index 58%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BuiltinUnarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java
index baf3608449d..51140fffdd0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/BuiltinUnarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/BuiltinUnarySPInstruction.java
@@ -1,15 +1,15 @@
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 
 public abstract class BuiltinUnarySPInstruction extends UnarySPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CSVReblockSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CSVReblockSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java
index 479bdb62e2a..ab585415c42 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CSVReblockSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CSVReblockSPInstruction.java
@@ -15,28 +15,28 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
 import org.apache.spark.api.java.JavaPairRDD;
 
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtils;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtils;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class CSVReblockSPInstruction extends UnarySPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CentralMomentSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CentralMomentSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java
index 34aecfad5a1..e79e582beb3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CentralMomentSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CentralMomentSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
@@ -23,23 +23,23 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CheckpointSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CheckpointSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java
index affb0d5f65d..68857a6bc1b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CheckpointSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CheckpointSPInstruction.java
@@ -15,28 +15,28 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.storage.StorageLevel;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.BooleanObject;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDObject;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyBlockFunction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.BooleanObject;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.RDDObject;
+import org.apache.sysml.runtime.instructions.spark.functions.CopyBlockFunction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class CheckpointSPInstruction extends UnarySPInstruction
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ComputationSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ComputationSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java
index 934afd4f7fd..def2a8dc366 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ComputationSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ComputationSPInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public abstract class ComputationSPInstruction extends SPInstruction {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CovarianceSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CovarianceSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java
index 393474f022f..550338573db 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CovarianceSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CovarianceSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
@@ -23,21 +23,21 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.COV;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.COVOperator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.COV;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.COVOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CpmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CpmmSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java
index 4e65c661055..78c5257d044 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CpmmSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CpmmSPInstruction.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.PairFunction;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * Cpmm: cross-product matrix multiplication operation (distributed matrix multiply
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java
index b9be32f7cca..ca2a4078ac4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeAggregateSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import org.apache.spark.api.java.JavaPairRDD;
@@ -23,18 +23,18 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java
index 722a8b096ea..1bb2db616f7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/CumulativeOffsetSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 
@@ -25,22 +25,22 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 
 public class CumulativeOffsetSPInstruction extends BinarySPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MapmmChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MapmmChainSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java
index 637a6c0f642..191c8f8efe4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MapmmChainSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmChainSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import org.apache.spark.api.java.JavaPairRDD;
@@ -24,19 +24,19 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.MapMultChain;
-import com.ibm.bi.dml.lops.MapMultChain.ChainType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.MapMultChain;
+import org.apache.sysml.lops.MapMultChain.ChainType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MapmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MapmmSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java
index f9e0acc1962..57e5009eda7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MapmmSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MapmmSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import java.util.ArrayList;
@@ -27,28 +27,28 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.lops.MapMult;
-import com.ibm.bi.dml.lops.MapMult.CacheType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LazyIterableIterator;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.FilterNonEmptyBlocksFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.lops.MapMult;
+import org.apache.sysml.lops.MapMult.CacheType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.LazyIterableIterator;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.functions.FilterNonEmptyBlocksFunction;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * TODO: we need to reason about multiple broadcast variables for chains of mapmults (sum of operations until cleanup) 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java
index 56903445262..e5aca4b0a14 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorArithmeticSPInstruction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixBVectorArithmeticSPInstruction extends ArithmeticBinarySPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java
index d9ac52afbdc..b172994fb45 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorBuiltinSPInstruction.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixBVectorBuiltinSPInstruction extends BuiltinBinarySPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java
index b80aade4a49..30e8cc4f274 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBVectorRelationalSPInstruction.java
@@ -16,14 +16,14 @@
  */
 
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixBVectorRelationalSPInstruction extends RelationalBinarySPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java
similarity index 77%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java
index c6c50a1ac24..26ab9a24ada 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixBuiltinSPInstruction.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixIndexingSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixIndexingSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java
index 08b5c5e961b..afbe362b708 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixIndexingSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixIndexingSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,28 +26,28 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.hops.AggBinaryOp.SparkAggType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LazyIterableIterator;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.IsBlockInRange;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.hops.AggBinaryOp.SparkAggType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.LazyIterableIterator;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.functions.IsBlockInRange;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class MatrixIndexingSPInstruction  extends UnarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java
index 67d89fbba8e..b8a3ac4e802 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixArithmeticSPInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixMatrixArithmeticSPInstruction extends ArithmeticBinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java
similarity index 75%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java
index 6310801c41a..ea063415a98 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixBuiltinSPInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixMatrixBuiltinSPInstruction extends BuiltinBinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java
index 248bb6d68b6..abeba24be2c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixMatrixRelationalSPInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class MatrixMatrixRelationalSPInstruction extends RelationalBinarySPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixReshapeSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixReshapeSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java
index 2aabad05c5f..8f68832a0c5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixReshapeSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixReshapeSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 
@@ -24,22 +24,22 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixReorg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixReorg;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java
index 4f3046c51ff..ddeff1a4310 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarArithmeticSPInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixScalarArithmeticSPInstruction extends ArithmeticBinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
index ff77540bed5..2e47801dc17 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixScalarBuiltinSPInstruction extends BuiltinBinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java
similarity index 69%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java
index c417789da5e..241101bb47a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarRelationalSPInstruction.java
@@ -1,10 +1,10 @@
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class MatrixScalarRelationalSPInstruction extends RelationalBinarySPInstruction  
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/PMapmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/PMapmmSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java
index b571d625ac9..94013b870c4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/PMapmmSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/PMapmmSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import java.util.ArrayList;
@@ -28,25 +28,25 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.PMapMult;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedMatrixBlock;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.IsBlockInRange;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.PMapMult;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedMatrixBlock;
+import org.apache.sysml.runtime.instructions.spark.functions.IsBlockInRange;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * This pmapmm matrix multiplication instruction is still experimental
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
index 439af56590b..f277d3f9251 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ParameterizedBuiltinSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,43 +27,43 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ParameterizedBuiltinFunctionExpression;
-import com.ibm.bi.dml.parser.Statement;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.ParameterizedBuiltin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ExtractGroup;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ExtractGroupNWeights;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.PerformGroupByAggInCombiner;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.PerformGroupByAggInReducer;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ReplicateVectorFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.UnflattenIterablesAfterCogroup;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixReorg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.transform.DataTransform;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression;
+import org.apache.sysml.parser.Statement;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.ParameterizedBuiltin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.functions.ExtractGroup;
+import org.apache.sysml.runtime.instructions.spark.functions.ExtractGroupNWeights;
+import org.apache.sysml.runtime.instructions.spark.functions.PerformGroupByAggInCombiner;
+import org.apache.sysml.runtime.instructions.spark.functions.PerformGroupByAggInReducer;
+import org.apache.sysml.runtime.instructions.spark.functions.ReplicateVectorFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.UnflattenIterablesAfterCogroup;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixReorg;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.transform.DataTransform;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ParameterizedBuiltinSPInstruction  extends ComputationSPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/PmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/PmmSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java
index 1a6b2fb043b..5e291eb7cb5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/PmmSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/PmmSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import java.util.ArrayList;
@@ -25,26 +25,26 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.MapMult.CacheType;
-import com.ibm.bi.dml.lops.PMMJ;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.MapMult.CacheType;
+import org.apache.sysml.lops.PMMJ;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuantilePickSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuantilePickSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java
index 8291c455c7a..21c4abec01a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuantilePickSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantilePickSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.List;
 
@@ -25,22 +25,22 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.PickByCount.OperationTypes;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.PickByCount.OperationTypes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class QuantilePickSPInstruction extends BinarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuantileSortSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuantileSortSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java
index 0b877c3cff1..51099354518 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuantileSortSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuantileSortSPInstruction.java
@@ -15,26 +15,26 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDSortUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDSortUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
 
 public class QuantileSortSPInstruction extends UnarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuaternarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuaternarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java
index ac8dce8092b..1af79679044 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/QuaternarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/QuaternarySPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import java.io.Serializable;
@@ -30,33 +30,33 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.WeightedCrossEntropy;
-import com.ibm.bi.dml.lops.WeightedDivMM;
-import com.ibm.bi.dml.lops.WeightedDivMM.WDivMMType;
-import com.ibm.bi.dml.lops.WeightedSigmoid;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss;
-import com.ibm.bi.dml.lops.WeightedSquaredLossR;
-import com.ibm.bi.dml.lops.WeightedSigmoid.WSigmoidType;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss.WeightsType;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy.WCeMMType;
-import com.ibm.bi.dml.lops.WeightedUnaryMM;
-import com.ibm.bi.dml.lops.WeightedUnaryMM.WUMMType;
-import com.ibm.bi.dml.lops.WeightedUnaryMMR;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LazyIterableIterator;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.QuaternaryOperator;
+import org.apache.sysml.lops.WeightedCrossEntropy;
+import org.apache.sysml.lops.WeightedDivMM;
+import org.apache.sysml.lops.WeightedDivMM.WDivMMType;
+import org.apache.sysml.lops.WeightedSigmoid;
+import org.apache.sysml.lops.WeightedSquaredLoss;
+import org.apache.sysml.lops.WeightedSquaredLossR;
+import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType;
+import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType;
+import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType;
+import org.apache.sysml.lops.WeightedUnaryMM;
+import org.apache.sysml.lops.WeightedUnaryMM.WUMMType;
+import org.apache.sysml.lops.WeightedUnaryMMR;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.instructions.spark.data.LazyIterableIterator;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.QuaternaryOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RandSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RandSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java
index 372a26ce4dc..08c13b09c53 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RandSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/RandSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -32,30 +32,30 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.DataGen;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixDatagen;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.RandomMatrixGenerator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.DataGen;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixDatagen;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.RandomMatrixGenerator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.utils.Statistics;
 
 public class RandSPInstruction extends UnarySPInstruction
 {
@@ -311,8 +311,8 @@ public void processInstruction( ExecutionContext ec )
 		if ( this.method == DataGenMethod.RAND ) 
 		{
 			// The implementation is in same spirit as MapReduce
-			// We generate seeds similar to com.ibm.bi.dml.runtime.matrix.DataGenMR
-			// and then generate blocks similar to com.ibm.bi.dml.runtime.matrix.mapred.DataGenMapper
+			// We generate seeds similar to org.apache.sysml.runtime.matrix.DataGenMR
+			// and then generate blocks similar to org.apache.sysml.runtime.matrix.mapred.DataGenMapper
 			
 			//generate pseudo-random seed (because not specified) 
 			long lSeed = seed; //seed per invocation
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ReblockSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ReblockSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java
index 079e236e9b0..904454c90bd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ReblockSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReblockSPInstruction.java
@@ -15,32 +15,32 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
 import org.apache.spark.api.java.JavaPairRDD;
 
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDProperties;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ExtractBlockForBinaryReblock;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtils;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.RDDProperties;
+import org.apache.sysml.runtime.instructions.spark.functions.ExtractBlockForBinaryReblock;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtils;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class ReblockSPInstruction extends UnarySPInstruction 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RelationalBinarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/RelationalBinarySPInstruction.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RelationalBinarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/RelationalBinarySPInstruction.java
index 2997400fbe3..257acabb577 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RelationalBinarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/RelationalBinarySPInstruction.java
@@ -1,14 +1,14 @@
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public abstract class RelationalBinarySPInstruction extends BinarySPInstruction {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ReorgSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ReorgSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java
index f69f8c0cdfb..2cda50faa5a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ReorgSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ReorgSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 
@@ -25,28 +25,28 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.DiagIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SortIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.FilterDiagBlocksFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.IsBlockInRange;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDSortUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ReorgMapFunction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.DiagIndex;
+import org.apache.sysml.runtime.functionobjects.SortIndex;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.functions.FilterDiagBlocksFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.IsBlockInRange;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDSortUtils;
+import org.apache.sysml.runtime.instructions.spark.functions.ReorgMapFunction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ReorgSPInstruction extends UnarySPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/RmmSPInstruction.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RmmSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/RmmSPInstruction.java
index b9171588e6f..199f5ceb77c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/RmmSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/RmmSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import java.util.LinkedList;
@@ -26,22 +26,22 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.TripleIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.TripleIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/SPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/SPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java
index d61bad79175..06da8a62d98 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/SPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/SPInstruction.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.api.MLContext;
-import com.ibm.bi.dml.api.MLContextProxy;
-import com.ibm.bi.dml.lops.runtime.RunMRJobs;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.SPInstructionParser;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.MLContext;
+import org.apache.sysml.api.MLContextProxy;
+import org.apache.sysml.lops.runtime.RunMRJobs;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.SPInstructionParser;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/TernarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/TernarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java
index 60fa40cf6e5..6f074ddae3d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/TernarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/TernarySPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.util.ArrayList;
 
@@ -26,30 +26,30 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.Ternary;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.CTable;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CTableMap;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
-import com.ibm.bi.dml.runtime.util.LongLongDoubleHashMap.LLDoubleEntry;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.Ternary;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.CTable;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CTableMap;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.util.LongLongDoubleHashMap.LLDoubleEntry;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class TernarySPInstruction extends ComputationSPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/TsmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/TsmmSPInstruction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/TsmmSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/TsmmSPInstruction.java
index d56cd47fb65..a3b3ffa516e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/TsmmSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/TsmmSPInstruction.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
 
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/UaggOuterChainSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/UaggOuterChainSPInstruction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/UaggOuterChainSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/UaggOuterChainSPInstruction.java
index 90b434831f9..e3944b8ca6a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/UaggOuterChainSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/UaggOuterChainSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 
 import java.util.Arrays;
@@ -27,33 +27,33 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.lops.UAggOuterChain;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.IndexFunction;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceRow;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LazyIterableIterator;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.AggregateDropCorrectionFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixOuterAgg;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.lops.UAggOuterChain;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.IndexFunction;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.functionobjects.ReduceRow;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.data.LazyIterableIterator;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.instructions.spark.functions.AggregateDropCorrectionFunction;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixOuterAgg;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.util.DataConverter;
 
 /**
  * Two types of broadcast variables used -- 1. Array of type double. 2.PartitionedMatrixBlock
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/UnarySPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/UnarySPInstruction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/UnarySPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/UnarySPInstruction.java
index f543c47bf97..5c1102ad09e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/UnarySPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/UnarySPInstruction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.Not;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.SimpleOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.Not;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.SimpleOperator;
 
 public abstract class UnarySPInstruction extends ComputationSPInstruction
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/WriteSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/WriteSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java
index 1225cb11d47..83ef316349c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/WriteSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/WriteSPInstruction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,26 +26,26 @@
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.JavaRDD;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ComputeBinaryBlockNnzFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ConvertMatrixBlockToIJVLines;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.functions.ComputeBinaryBlockNnzFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.ConvertMatrixBlockToIJVLines;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class WriteSPInstruction extends SPInstruction 
 {	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ZipmmSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/ZipmmSPInstruction.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ZipmmSPInstruction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/ZipmmSPInstruction.java
index 3f513018266..d95a395c07e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/ZipmmSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/ZipmmSPInstruction.java
@@ -15,29 +15,29 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark;
+package org.apache.sysml.runtime.instructions.spark;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.cp.CPOperand;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDAggregateUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.cp.CPOperand;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDAggregateUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 
 public class ZipmmSPInstruction extends BinarySPInstruction 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/BlockPartitioner.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/BlockPartitioner.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/BlockPartitioner.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/BlockPartitioner.java
index a5e41774888..60760ada30e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/BlockPartitioner.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/BlockPartitioner.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import org.apache.spark.Partitioner;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * Default partitioner used for all binary block rdd operations in order
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/BroadcastObject.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/BroadcastObject.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/BroadcastObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/BroadcastObject.java
index a24001ae467..2d306a7fb71 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/BroadcastObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/BroadcastObject.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import org.apache.spark.broadcast.Broadcast;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/CorrMatrixBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/CorrMatrixBlock.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/CorrMatrixBlock.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/CorrMatrixBlock.java
index 1c389d60992..5ef0f5bcc23 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/CorrMatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/CorrMatrixBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -26,9 +26,9 @@
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataInputStream;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataOutputStream;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.FastBufferedDataInputStream;
+import org.apache.sysml.runtime.util.FastBufferedDataOutputStream;
 
 
 public class CorrMatrixBlock implements Externalizable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/CountLinesInfo.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/CountLinesInfo.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/CountLinesInfo.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/CountLinesInfo.java
index ab088fbc591..da257ec06e3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/CountLinesInfo.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/CountLinesInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/LazyIterableIterator.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/LazyIterableIterator.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/LazyIterableIterator.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/LazyIterableIterator.java
index 91affec6982..2d1292241cd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/LazyIterableIterator.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/LazyIterableIterator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/LineageObject.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/LineageObject.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/LineageObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/LineageObject.java
index fe3306d7c80..3730517b693 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/LineageObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/LineageObject.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
 
 public abstract class LineageObject 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java
index 0842e9bc37c..205ab802809 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBroadcastMatrix.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.io.Serializable;
 
 import org.apache.spark.broadcast.Broadcast;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 /**
  * This class is a wrapper around an array of broadcasts of partitioned matrix blocks,
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/PartitionedMatrixBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/PartitionedMatrixBlock.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java
index 07f224883ff..7bd2f6c9e27 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/PartitionedMatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedMatrixBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -29,16 +29,16 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.SparkUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataInputStream;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataOutputStream;
-import com.ibm.bi.dml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.spark.utils.SparkUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.util.FastBufferedDataInputStream;
+import org.apache.sysml.runtime.util.FastBufferedDataOutputStream;
+import org.apache.sysml.runtime.util.IndexRange;
 
 /**
  * The main purpose of this class is to provide a handle for partitioned matrix blocks, to be used
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RDDObject.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/RDDObject.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RDDObject.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/RDDObject.java
index 84e426f097c..12a4f84a964 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RDDObject.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/RDDObject.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import org.apache.spark.api.java.JavaPairRDD;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RDDProperties.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/RDDProperties.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RDDProperties.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/RDDProperties.java
index 6cf4a6cd6ac..259516bf6d6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RDDProperties.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/RDDProperties.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 /**
  * Class which allows the MLContext to pass properties for the RDD
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RowMatrixBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/RowMatrixBlock.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RowMatrixBlock.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/RowMatrixBlock.java
index 73ddcc78cd1..cee71debd00 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/RowMatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/RowMatrixBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -26,9 +26,9 @@
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataInputStream;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataOutputStream;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.FastBufferedDataInputStream;
+import org.apache.sysml.runtime.util.FastBufferedDataOutputStream;
 
 
 public class RowMatrixBlock implements Externalizable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/SerLongWritable.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/SerLongWritable.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/SerLongWritable.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/SerLongWritable.java
index 4b47a7e40d3..eb1a60820f6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/SerLongWritable.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/SerLongWritable.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/SerText.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/SerText.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/SerText.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/data/SerText.java
index 2cb245d3a27..8197bb75272 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/data/SerText.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/SerText.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.data;
+package org.apache.sysml.runtime.instructions.spark.data;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/AggregateDropCorrectionFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/AggregateDropCorrectionFunction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/AggregateDropCorrectionFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/AggregateDropCorrectionFunction.java
index 09ffdc72f50..255440db986 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/AggregateDropCorrectionFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/AggregateDropCorrectionFunction.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
 
 public class AggregateDropCorrectionFunction implements Function 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ComputeBinaryBlockNnzFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ComputeBinaryBlockNnzFunction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ComputeBinaryBlockNnzFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ComputeBinaryBlockNnzFunction.java
index d12533371c1..6345f9fc23b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ComputeBinaryBlockNnzFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ComputeBinaryBlockNnzFunction.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.Accumulator;
 import org.apache.spark.api.java.function.Function;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertColumnRDDToBinaryBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertColumnRDDToBinaryBlock.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertColumnRDDToBinaryBlock.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertColumnRDDToBinaryBlock.java
index a51d120bedc..392ab590c17 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertColumnRDDToBinaryBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertColumnRDDToBinaryBlock.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,10 +24,10 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ConvertColumnRDDToBinaryBlock {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertMLLibBlocksToBinaryBlocks.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertMLLibBlocksToBinaryBlocks.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertMLLibBlocksToBinaryBlocks.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertMLLibBlocksToBinaryBlocks.java
index 7ba2ee36c2f..5eeb0bc53a5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertMLLibBlocksToBinaryBlocks.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertMLLibBlocksToBinaryBlocks.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 import org.apache.spark.mllib.linalg.DenseMatrix;
@@ -23,9 +23,9 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ConvertMLLibBlocksToBinaryBlocks implements PairFunction,Matrix>, MatrixIndexes, MatrixBlock> {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertMatrixBlockToIJVLines.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertMatrixBlockToIJVLines.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertMatrixBlockToIJVLines.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertMatrixBlockToIJVLines.java
index e321ee604c8..e6224a8c64d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertMatrixBlockToIJVLines.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertMatrixBlockToIJVLines.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.Iterator;
 
@@ -22,9 +22,9 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.BinaryBlockToTextCellConverter;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.BinaryBlockToTextCellConverter;
 
 public class ConvertMatrixBlockToIJVLines implements FlatMapFunction, String> {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertStringToLongTextPair.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertStringToLongTextPair.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertStringToLongTextPair.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertStringToLongTextPair.java
index 342573ecd21..4c7144173f5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertStringToLongTextPair.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertStringToLongTextPair.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertTextLineToBinaryCellFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertTextLineToBinaryCellFunction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertTextLineToBinaryCellFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertTextLineToBinaryCellFunction.java
index 1ab013e4df8..3d00f879853 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertTextLineToBinaryCellFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertTextLineToBinaryCellFunction.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.hadoop.io.Text;
 import org.apache.spark.api.java.function.PairFunction;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.Converter;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.data.TextToBinaryCellConverter;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.Converter;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.TextToBinaryCellConverter;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class ConvertTextLineToBinaryCellFunction implements PairFunction {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertTextToString.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertTextToString.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertTextToString.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertTextToString.java
index 6984e32cbe9..3572b3116a0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ConvertTextToString.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ConvertTextToString.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.hadoop.io.Text;
 import org.apache.spark.api.java.function.Function;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBinaryCellFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBinaryCellFunction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBinaryCellFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBinaryCellFunction.java
index 764cdf7d70d..797e3069955 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBinaryCellFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBinaryCellFunction.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 import scala.Tuple2;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBlockFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBlockFunction.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBlockFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBlockFunction.java
index 5e820f2f6f7..95280267fd5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBlockFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBlockFunction.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 /**
  * General purpose copy function for binary block rdds. This function can be used in
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBlockPairFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBlockPairFunction.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBlockPairFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBlockPairFunction.java
index 9682817aaf9..5eeac767707 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyBlockPairFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyBlockPairFunction.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * General purpose copy function for binary block rdds. This function can be used in
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyTextInputFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyTextInputFunction.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyTextInputFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyTextInputFunction.java
index b510a6f223a..ce37aaa1963 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/CopyTextInputFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/CopyTextInputFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractBlockForBinaryReblock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractBlockForBinaryReblock.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractBlockForBinaryReblock.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractBlockForBinaryReblock.java
index ec41e48b4de..fb8490d1303 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractBlockForBinaryReblock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractBlockForBinaryReblock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.ArrayList;
 
@@ -23,11 +23,11 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ExtractBlockForBinaryReblock implements PairFlatMapFunction, MatrixIndexes, MatrixBlock> 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractGroup.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractGroup.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractGroup.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractGroup.java
index 7a76df62342..f15c9b39806 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractGroup.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractGroup.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.ArrayList;
 
@@ -23,12 +23,12 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ExtractGroup  implements PairFlatMapFunction>, Long, WeightedCell> {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractGroupNWeights.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractGroupNWeights.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractGroupNWeights.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractGroupNWeights.java
index e93e51a2684..53eb7721c02 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ExtractGroupNWeights.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ExtractGroupNWeights.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.ArrayList;
 
@@ -23,12 +23,12 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ExtractGroupNWeights implements PairFlatMapFunction>,Iterable>>, Long, WeightedCell> {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FilterDiagBlocksFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FilterDiagBlocksFunction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FilterDiagBlocksFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FilterDiagBlocksFunction.java
index 54574b67db4..76981b4f7a9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FilterDiagBlocksFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FilterDiagBlocksFunction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FilterNonEmptyBlocksFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FilterNonEmptyBlocksFunction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FilterNonEmptyBlocksFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FilterNonEmptyBlocksFunction.java
index c92ce968e18..9a6fab920dd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FilterNonEmptyBlocksFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FilterNonEmptyBlocksFunction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FindMatrixBlockFromMatrixIndexes.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FindMatrixBlockFromMatrixIndexes.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FindMatrixBlockFromMatrixIndexes.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FindMatrixBlockFromMatrixIndexes.java
index d586e98aaef..c1d8d921e8f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/FindMatrixBlockFromMatrixIndexes.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/FindMatrixBlockFromMatrixIndexes.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * Function class find the tuple that matches the given MatrixIndexes.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMIMBFromRow.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMIMBFromRow.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMIMBFromRow.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMIMBFromRow.java
index 954704437c5..5eb8a74583e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMIMBFromRow.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMIMBFromRow.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 import org.apache.spark.sql.Row;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 public class GetMIMBFromRow implements PairFunction {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMLBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMLBlock.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMLBlock.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMLBlock.java
index 5ee570be6a1..4adf270a726 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMLBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMLBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.io.Serializable;
 
@@ -24,9 +24,9 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.api.MLBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.api.MLBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 public class GetMLBlock implements Function, Row>, Serializable {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMLLibBlocks.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMLLibBlocks.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMLLibBlocks.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMLLibBlocks.java
index 42788065bb5..19e497e05c7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/GetMLLibBlocks.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/GetMLLibBlocks.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.ArrayList;
 
@@ -26,11 +26,11 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class GetMLLibBlocks implements PairFunction, Tuple2, Matrix> {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/IsBlockInRange.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/IsBlockInRange.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/IsBlockInRange.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/IsBlockInRange.java
index 208eab4739b..ff3ec309856 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/IsBlockInRange.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/IsBlockInRange.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class IsBlockInRange implements Function, Boolean> 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/LastCellInMatrixBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/LastCellInMatrixBlock.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/LastCellInMatrixBlock.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/LastCellInMatrixBlock.java
index 496f433acef..5d5b99e5486 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/LastCellInMatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/LastCellInMatrixBlock.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * Function class that finds the index of last cell in the given matrix block.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixMatrixBinaryOpFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixMatrixBinaryOpFunction.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixMatrixBinaryOpFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixMatrixBinaryOpFunction.java
index fed5095013b..08a201bf503 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixMatrixBinaryOpFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixMatrixBinaryOpFunction.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 public class MatrixMatrixBinaryOpFunction implements Function, MatrixBlock> 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixScalarUnaryFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixScalarUnaryFunction.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixScalarUnaryFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixScalarUnaryFunction.java
index 509bda3ac34..3b1e9ecbf46 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixScalarUnaryFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixScalarUnaryFunction.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixVectorBinaryOpFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixVectorBinaryOpFunction.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixVectorBinaryOpFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixVectorBinaryOpFunction.java
index 8a551fe878c..6eeed6307c7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixVectorBinaryOpFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixVectorBinaryOpFunction.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 import org.apache.spark.broadcast.Broadcast;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 public class MatrixVectorBinaryOpFunction implements PairFunction, MatrixIndexes,MatrixBlock>
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixVectorBinaryOpPartitionFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixVectorBinaryOpPartitionFunction.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixVectorBinaryOpPartitionFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixVectorBinaryOpPartitionFunction.java
index e810a84317d..2e0c6ba87b0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/MatrixVectorBinaryOpPartitionFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/MatrixVectorBinaryOpPartitionFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.Iterator;
 
@@ -23,12 +23,12 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.BinaryM.VectorType;
-import com.ibm.bi.dml.runtime.instructions.spark.data.LazyIterableIterator;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.lops.BinaryM.VectorType;
+import org.apache.sysml.runtime.instructions.spark.data.LazyIterableIterator;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 public class MatrixVectorBinaryOpPartitionFunction implements PairFlatMapFunction>, MatrixIndexes,MatrixBlock>
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/OuterVectorBinaryOpFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/OuterVectorBinaryOpFunction.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/OuterVectorBinaryOpFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/OuterVectorBinaryOpFunction.java
index 70b863c6ec7..8f1c2258171 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/OuterVectorBinaryOpFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/OuterVectorBinaryOpFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.Iterator;
 
@@ -23,10 +23,10 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedBroadcastMatrix;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
 
 public class OuterVectorBinaryOpFunction implements PairFlatMapFunction, MatrixIndexes,MatrixBlock>
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/PerformGroupByAggInCombiner.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/PerformGroupByAggInCombiner.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/PerformGroupByAggInCombiner.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/PerformGroupByAggInCombiner.java
index e9a8cbec627..f5b92f1096b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/PerformGroupByAggInCombiner.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/PerformGroupByAggInCombiner.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.Function2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class PerformGroupByAggInCombiner implements Function2 {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/PerformGroupByAggInReducer.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/PerformGroupByAggInReducer.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/PerformGroupByAggInReducer.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/PerformGroupByAggInReducer.java
index cd7656b4960..ff438b11e89 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/PerformGroupByAggInReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/PerformGroupByAggInReducer.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 public class PerformGroupByAggInReducer implements PairFunction>, Long, WeightedCell> {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ReorgMapFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ReorgMapFunction.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ReorgMapFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ReorgMapFunction.java
index 03d6599ccb5..165ab345117 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ReorgMapFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ReorgMapFunction.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.DiagIndex;
-import com.ibm.bi.dml.runtime.functionobjects.IndexFunction;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.DiagIndex;
+import org.apache.sysml.runtime.functionobjects.IndexFunction;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
 
 public class ReorgMapFunction implements PairFunction, MatrixIndexes, MatrixBlock> 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ReplicateVectorFunction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ReplicateVectorFunction.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ReplicateVectorFunction.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ReplicateVectorFunction.java
index 90903ca38a9..0d56eea1aa6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/ReplicateVectorFunction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/ReplicateVectorFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.ArrayList;
 
@@ -23,8 +23,8 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 
 public class ReplicateVectorFunction implements PairFlatMapFunction, MatrixIndexes,MatrixBlock> 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/SparkListener.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/SparkListener.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/SparkListener.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/SparkListener.java
index f7f8e270187..9187a8fd8ef 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/SparkListener.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/SparkListener.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,9 +37,9 @@
 import scala.collection.Seq;
 import scala.xml.Node;
 
-import com.ibm.bi.dml.api.MLContext;
-import com.ibm.bi.dml.api.MLContextProxy;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.api.MLContext;
+import org.apache.sysml.api.MLContextProxy;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
 
 // Instead of extending org.apache.spark.JavaSparkListener
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/UnflattenIterablesAfterCogroup.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/UnflattenIterablesAfterCogroup.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/UnflattenIterablesAfterCogroup.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/functions/UnflattenIterablesAfterCogroup.java
index 80d18ba5ee9..55647861f57 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/functions/UnflattenIterablesAfterCogroup.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/functions/UnflattenIterablesAfterCogroup.java
@@ -1,11 +1,11 @@
-package com.ibm.bi.dml.runtime.instructions.spark.functions;
+package org.apache.sysml.runtime.instructions.spark.functions;
 
 import org.apache.spark.api.java.function.PairFunction;
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 public class UnflattenIterablesAfterCogroup implements PairFunction,Iterable>>, MatrixIndexes, Tuple2> {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDAggregateUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDAggregateUtils.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDAggregateUtils.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDAggregateUtils.java
index 9caed7c99a5..f73f36ca7f9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDAggregateUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDAggregateUtils.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.utils;
+package org.apache.sysml.runtime.instructions.spark.utils;
 
 import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.function.Function;
 import org.apache.spark.api.java.function.Function2;
 
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.instructions.spark.data.CorrMatrixBlock;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RowMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.instructions.spark.data.CorrMatrixBlock;
+import org.apache.sysml.runtime.instructions.spark.data.RowMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
 
 /**
  * Collection of utility methods for aggregating binary block rdds. As a general
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDConverterUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtils.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDConverterUtils.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtils.java
index ae67a277c33..74fb234751d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDConverterUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.utils;
+package org.apache.sysml.runtime.instructions.spark.utils;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -37,21 +37,21 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.spark.data.SerLongWritable;
-import com.ibm.bi.dml.runtime.instructions.spark.data.SerText;
-import com.ibm.bi.dml.runtime.io.IOUtilFunctions;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.ReblockBuffer;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.spark.data.SerLongWritable;
+import org.apache.sysml.runtime.instructions.spark.data.SerText;
+import org.apache.sysml.runtime.io.IOUtilFunctions;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.ReblockBuffer;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class RDDConverterUtils 
 {
@@ -209,8 +209,8 @@ public static JavaPairRDD csvToBinaryBlock(JavaSpark
 	/**
 	 * Example usage:
 	 * 

-	 * import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtils
-	 * import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics
+	 * import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtils
+	 * import org.apache.sysml.runtime.matrix.MatrixCharacteristics
 	 * import org.apache.spark.api.java.JavaSparkContext
 	 * val A = sc.textFile("ranA.csv")
 	 * val Amc = new MatrixCharacteristics
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
index 10dcce881de..a85c02229b6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDConverterUtilsExt.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.utils;
+package org.apache.sysml.runtime.instructions.spark.utils;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -45,19 +45,19 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.api.MLOutput.ConvertDoubleArrayToRows;
-import com.ibm.bi.dml.api.MLOutput.ProjectRows;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ConvertMatrixBlockToIJVLines;
-import com.ibm.bi.dml.runtime.io.IOUtilFunctions;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.ReblockBuffer;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.api.MLOutput.ConvertDoubleArrayToRows;
+import org.apache.sysml.api.MLOutput.ProjectRows;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.spark.functions.ConvertMatrixBlockToIJVLines;
+import org.apache.sysml.runtime.io.IOUtilFunctions;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.ReblockBuffer;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * NOTE: These are experimental converter utils. Once thoroughly tested, they
@@ -77,8 +77,8 @@ public enum RDDConverterTypes {
 	/**
 	 * Example usage:
 	 * 

-	 * import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtilsExt
-	 * import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics
+	 * import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtilsExt
+	 * import org.apache.sysml.runtime.matrix.MatrixCharacteristics
 	 * import org.apache.spark.api.java.JavaSparkContext
 	 * import org.apache.spark.mllib.linalg.distributed.MatrixEntry
 	 * import org.apache.spark.mllib.linalg.distributed.CoordinateMatrix
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDSortUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDSortUtils.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java
index 78cb0ebe53a..d5c82f00c3e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/RDDSortUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/RDDSortUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.instructions.spark.utils;
+package org.apache.sysml.runtime.instructions.spark.utils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -32,19 +32,19 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.functionobjects.SortIndex;
-import com.ibm.bi.dml.runtime.instructions.spark.data.PartitionedMatrixBlock;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RowMatrixBlock;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.ReplicateVectorFunction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.functionobjects.SortIndex;
+import org.apache.sysml.runtime.instructions.spark.data.PartitionedMatrixBlock;
+import org.apache.sysml.runtime.instructions.spark.data.RowMatrixBlock;
+import org.apache.sysml.runtime.instructions.spark.functions.ReplicateVectorFunction;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/SparkUtils.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/SparkUtils.java
rename to src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java
index 1fcf9c2b328..c504e47304d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/instructions/spark/utils/SparkUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/utils/SparkUtils.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.instructions.spark.utils;
+package org.apache.sysml.runtime.instructions.spark.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -30,17 +30,17 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.lops.Checkpoint;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyBinaryCellFunction;
-import com.ibm.bi.dml.runtime.instructions.spark.functions.CopyBlockFunction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.Checkpoint;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.spark.functions.CopyBinaryCellFunction;
+import org.apache.sysml.runtime.instructions.spark.functions.CopyBlockFunction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class SparkUtils 
 {	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/BinaryBlockSerialization.java b/src/main/java/org/apache/sysml/runtime/io/BinaryBlockSerialization.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/io/BinaryBlockSerialization.java
rename to src/main/java/org/apache/sysml/runtime/io/BinaryBlockSerialization.java
index ef6380766f1..d82fb32d2b5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/BinaryBlockSerialization.java
+++ b/src/main/java/org/apache/sysml/runtime/io/BinaryBlockSerialization.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,13 +25,13 @@
 import org.apache.hadoop.io.serializer.Serialization;
 import org.apache.hadoop.io.serializer.Serializer;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataInputStream;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataOutputStream;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.FastBufferedDataInputStream;
+import org.apache.sysml.runtime.util.FastBufferedDataOutputStream;
 
 /**
  * This custom serialization class can be used via 
- * job.set("io.serializations", "com.ibm.bi.dml.runtime.io.BinaryBlockSerialization"); 
+ * job.set("io.serializations", "org.apache.sysml.runtime.io.BinaryBlockSerialization"); 
  * 
  * 
  */
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/IOUtilFunctions.java b/src/main/java/org/apache/sysml/runtime/io/IOUtilFunctions.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/io/IOUtilFunctions.java
rename to src/main/java/org/apache/sysml/runtime/io/IOUtilFunctions.java
index 000ddb90d34..d9abcb375c3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/IOUtilFunctions.java
+++ b/src/main/java/org/apache/sysml/runtime/io/IOUtilFunctions.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -29,7 +29,7 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.RecordReader;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class IOUtilFunctions 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixReader.java b/src/main/java/org/apache/sysml/runtime/io/MatrixReader.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/io/MatrixReader.java
rename to src/main/java/org/apache/sysml/runtime/io/MatrixReader.java
index 529e3c37041..38b8c381711 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixReader.java
+++ b/src/main/java/org/apache/sysml/runtime/io/MatrixReader.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -25,10 +25,10 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * Base class for all format-specific matrix readers. Every reader is required to implement the basic 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixReaderFactory.java b/src/main/java/org/apache/sysml/runtime/io/MatrixReaderFactory.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/io/MatrixReaderFactory.java
rename to src/main/java/org/apache/sysml/runtime/io/MatrixReaderFactory.java
index cbeda730f7b..fcbe71cae40 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixReaderFactory.java
+++ b/src/main/java/org/apache/sysml/runtime/io/MatrixReaderFactory.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixWriter.java b/src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/io/MatrixWriter.java
rename to src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java
index 87cf001d003..5179d70e0f1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixWriter.java
+++ b/src/main/java/org/apache/sysml/runtime/io/MatrixWriter.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 /**
  * Base class for all format-specific matrix writers. Every writer is required to implement the basic 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixWriterFactory.java b/src/main/java/org/apache/sysml/runtime/io/MatrixWriterFactory.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/io/MatrixWriterFactory.java
rename to src/main/java/org/apache/sysml/runtime/io/MatrixWriterFactory.java
index 0f835c43fa5..8df773ddda1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/MatrixWriterFactory.java
+++ b/src/main/java/org/apache/sysml/runtime/io/MatrixWriterFactory.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReadProperties.java b/src/main/java/org/apache/sysml/runtime/io/ReadProperties.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReadProperties.java
rename to src/main/java/org/apache/sysml/runtime/io/ReadProperties.java
index 6faf9bb8901..9bf7b9f95a8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReadProperties.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReadProperties.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
 
 public class ReadProperties 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryBlock.java b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlock.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryBlock.java
rename to src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlock.java
index 154c0d1d247..0ad0d18c611 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,12 +26,12 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 public class ReaderBinaryBlock extends MatrixReader
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryBlockParallel.java b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryBlockParallel.java
rename to src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java
index 551203b3bdb..59e1912f423 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryBlockParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryBlockParallel.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,12 +30,12 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 
 public class ReaderBinaryBlockParallel extends ReaderBinaryBlock 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryCell.java b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryCell.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryCell.java
rename to src/main/java/org/apache/sysml/runtime/io/ReaderBinaryCell.java
index 46f8875cbe6..9637d524535 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderBinaryCell.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderBinaryCell.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 
@@ -24,11 +24,11 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCSV.java b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCSV.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCSV.java
rename to src/main/java/org/apache/sysml/runtime/io/ReaderTextCSV.java
index 67ee2ce50a7..b659826b409 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCSV.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCSV.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -30,12 +30,12 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class ReaderTextCSV extends MatrixReader
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCSVParallel.java b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCSVParallel.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCSVParallel.java
rename to src/main/java/org/apache/sysml/runtime/io/ReaderTextCSVParallel.java
index 9b749c17a33..5c7de41c88a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCSVParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCSVParallel.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -38,11 +38,11 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
 
 /**
  * Parallel version of ReaderTextCSV.java. To summarize, we do two passes in
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCell.java b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCell.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCell.java
rename to src/main/java/org/apache/sysml/runtime/io/ReaderTextCell.java
index 4064148d382..cadd70bdba5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCell.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCell.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -33,11 +33,11 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
 
 public class ReaderTextCell extends MatrixReader
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCellParallel.java b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCellParallel.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCellParallel.java
rename to src/main/java/org/apache/sysml/runtime/io/ReaderTextCellParallel.java
index 4eb703aa43d..2af547239f2 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/ReaderTextCellParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/ReaderTextCellParallel.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -34,13 +34,13 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * Parallel version of ReaderTextCell.java. To summarize, we create read tasks per split
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryBlock.java b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryBlock.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java
index 1712b51dfbf..6fdb287f0f2 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,15 +25,15 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class WriterBinaryBlock extends MatrixWriter
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryBlockParallel.java b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryBlockParallel.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java
index 0218ffdda63..440bbf4f8df 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryBlockParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryBlockParallel.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,15 +30,15 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class WriterBinaryBlockParallel extends WriterBinaryBlock
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryCell.java b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryCell.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java
index 9ca2254d5bd..4129b6dfded 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterBinaryCell.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterBinaryCell.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.IOException;
 
@@ -24,15 +24,15 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class WriterBinaryCell extends MatrixWriter
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterMatrixMarket.java b/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterMatrixMarket.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java
index 7b7c7ca5661..dfc4b8d8acf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterMatrixMarket.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarket.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -31,13 +31,13 @@
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterMatrixMarketParallel.java b/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarketParallel.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterMatrixMarketParallel.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarketParallel.java
index 89384b3ed23..cbd1017337d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterMatrixMarketParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterMatrixMarketParallel.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -31,14 +31,14 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCSV.java b/src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCSV.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java
index dec3c8d28cf..3f83c423c9b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCSV.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterTextCSV.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -33,14 +33,14 @@
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCSVParallel.java b/src/main/java/org/apache/sysml/runtime/io/WriterTextCSVParallel.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCSVParallel.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterTextCSVParallel.java
index d76894c68da..c20b482baa4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCSVParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterTextCSVParallel.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -31,14 +31,14 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCell.java b/src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCell.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java
index 6cb81d3efa2..94ae87ea87e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCell.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterTextCell.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -26,13 +26,13 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class WriterTextCell extends MatrixWriter
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCellParallel.java b/src/main/java/org/apache/sysml/runtime/io/WriterTextCellParallel.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCellParallel.java
rename to src/main/java/org/apache/sysml/runtime/io/WriterTextCellParallel.java
index cacbe490dfe..d77dd4e35a8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/io/WriterTextCellParallel.java
+++ b/src/main/java/org/apache/sysml/runtime/io/WriterTextCellParallel.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.io;
+package org.apache.sysml.runtime.io;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -31,14 +31,14 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class WriterTextCellParallel extends WriterTextCell
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/CMCOVMR.java b/src/main/java/org/apache/sysml/runtime/matrix/CMCOVMR.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/CMCOVMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/CMCOVMR.java
index 1a3538d5b7b..c480054dc06 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/CMCOVMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/CMCOVMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.util.HashSet;
 
@@ -26,15 +26,15 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.RunningJob;
 
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.CM_N_COVCell;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.CMCOVMRMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.CMCOVMRReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.data.CM_N_COVCell;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.mapred.CMCOVMRMapper;
+import org.apache.sysml.runtime.matrix.mapred.CMCOVMRReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
 
 
 public class CMCOVMR 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/CSVReblockMR.java b/src/main/java/org/apache/sysml/runtime/matrix/CSVReblockMR.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/CSVReblockMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/CSVReblockMR.java
index b8e8d23e6f2..b30c45fb834 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/CSVReblockMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/CSVReblockMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -39,22 +39,22 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVAssignRowIDMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVAssignRowIDReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVReblockMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVReblockReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.runtime.transform.TfUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.mapred.CSVAssignRowIDMapper;
+import org.apache.sysml.runtime.matrix.mapred.CSVAssignRowIDReducer;
+import org.apache.sysml.runtime.matrix.mapred.CSVReblockMapper;
+import org.apache.sysml.runtime.matrix.mapred.CSVReblockReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.runtime.transform.TfUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 @SuppressWarnings("deprecation")
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/CleanupMR.java b/src/main/java/org/apache/sysml/runtime/matrix/CleanupMR.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/CleanupMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/CleanupMR.java
index 36c8df13927..1dbc3a72a01 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/CleanupMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/CleanupMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -39,12 +39,12 @@
 import org.apache.hadoop.mapred.lib.NLineInputFormat;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.LocalFileUtils;
 
 
 public class CleanupMR 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/CombineMR.java b/src/main/java/org/apache/sysml/runtime/matrix/CombineMR.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/CombineMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/CombineMR.java
index ca42a0f70a3..1c50e421c82 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/CombineMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/CombineMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,25 +33,25 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.RunningJob;
 
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineTernaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedPair;
-import com.ibm.bi.dml.runtime.matrix.mapred.GMRMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.ReduceBase;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineTernaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixCell;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.matrix.data.WeightedPair;
+import org.apache.sysml.runtime.matrix.mapred.GMRMapper;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.ReduceBase;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class CombineMR 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/DataGenMR.java b/src/main/java/org/apache/sysml/runtime/matrix/DataGenMR.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/DataGenMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/DataGenMR.java
index e910db6ca11..3042f6c19c1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/DataGenMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/DataGenMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.io.PrintWriter;
 import java.util.HashSet;
@@ -33,33 +33,33 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.instructions.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RandInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.SeqInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixDatagen;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.mapred.GMRCombiner;
-import com.ibm.bi.dml.runtime.matrix.mapred.GMRReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.DataGenMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.RandInstruction;
+import org.apache.sysml.runtime.instructions.mr.SeqInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction.MRINSTRUCTION_TYPE;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.LibMatrixDatagen;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.mapred.GMRCombiner;
+import org.apache.sysml.runtime.matrix.mapred.GMRReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.DataGenMapper;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/DataPartitionMR.java b/src/main/java/org/apache/sysml/runtime/matrix/DataPartitionMR.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/DataPartitionMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/DataPartitionMR.java
index c97a72bfcc1..968a07ab666 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/DataPartitionMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/DataPartitionMR.java
@@ -16,17 +16,17 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.DataPartitioner;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.DataPartitionerRemoteMR;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.mapred.DistributedCacheInput;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.parfor.DataPartitioner;
+import org.apache.sysml.runtime.controlprogram.parfor.DataPartitionerRemoteMR;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.mapred.DistributedCacheInput;
 
 public class DataPartitionMR 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/GMR.java b/src/main/java/org/apache/sysml/runtime/matrix/GMR.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/GMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/GMR.java
index 7a4eacbc191..75f0c9dd79a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/GMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/GMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -30,38 +30,38 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-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.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.IDistributedCacheConsumer;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.PickByCountInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixPackedCell;
-import com.ibm.bi.dml.runtime.matrix.mapred.GMRCombiner;
-import com.ibm.bi.dml.runtime.matrix.mapred.GMRMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.GMRReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRBaseForCommonInstructions;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.runtime.matrix.sort.PickFromCompactInputFormat;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.mr.IDistributedCacheConsumer;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.PickByCountInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixPackedCell;
+import org.apache.sysml.runtime.matrix.mapred.GMRCombiner;
+import org.apache.sysml.runtime.matrix.mapred.GMRMapper;
+import org.apache.sysml.runtime.matrix.mapred.GMRReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRBaseForCommonInstructions;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.runtime.matrix.sort.PickFromCompactInputFormat;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
  
 public class GMR
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/GroupedAggMR.java b/src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/GroupedAggMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java
index bf5ec84f160..fdbd7833041 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/GroupedAggMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/GroupedAggMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -25,17 +25,17 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedInt;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.matrix.mapred.GroupedAggMRCombiner;
-import com.ibm.bi.dml.runtime.matrix.mapred.GroupedAggMRMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.GroupedAggMRReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedInt;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.matrix.mapred.GroupedAggMRCombiner;
+import org.apache.sysml.runtime.matrix.mapred.GroupedAggMRMapper;
+import org.apache.sysml.runtime.matrix.mapred.GroupedAggMRReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 public class GroupedAggMR 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/JobReturn.java b/src/main/java/org/apache/sysml/runtime/matrix/JobReturn.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/JobReturn.java
rename to src/main/java/org/apache/sysml/runtime/matrix/JobReturn.java
index a19bea5ec01..416274d5d34 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/JobReturn.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/JobReturn.java
@@ -16,11 +16,11 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
 
 
 public class JobReturn 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/MMCJMR.java b/src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/MMCJMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java
index 4446aca44b3..a68b0c1f227 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/MMCJMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MMCJMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.util.HashSet;
 
@@ -27,24 +27,24 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MMCJMRMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.MMCJMRReducerWithAggregator;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MMCJMRMapper;
+import org.apache.sysml.runtime.matrix.mapred.MMCJMRReducerWithAggregator;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 
 /*
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/MMRJMR.java b/src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/MMRJMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java
index 8e8800767b7..2277bd6a19c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/MMRJMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MMRJMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.util.HashSet;
 
@@ -26,20 +26,20 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.TripleIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MMRJMRMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.MMRJMRReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.yarn.DMLAppMasterUtils;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixCell;
+import org.apache.sysml.runtime.matrix.data.TripleIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MMRJMRMapper;
+import org.apache.sysml.runtime.matrix.mapred.MMRJMRReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.yarn.DMLAppMasterUtils;
 
 /*
  * inBlockRepresentation: indicate whether to use block representation or cell representation
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixCharacteristics.java b/src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java
similarity index 81%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixCharacteristics.java
rename to src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java
index 94f65a15b3d..efb89b168dc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixCharacteristics.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MatrixCharacteristics.java
@@ -16,52 +16,52 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.io.Serializable;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateUnaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AppendInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryMInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryMRInstructionBase;
-import com.ibm.bi.dml.runtime.instructions.mr.CM_N_COVInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineTernaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineUnaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CumulativeAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MMTSJMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MapMultChainInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MatrixReshapeMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.PMMJMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ParameterizedBuiltinMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.QuaternaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RandInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RangeBasedReIndexInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RemoveEmptyMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReorgInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReplicateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ScalarInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.SeqInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.TernaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UaggOuterChainInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UnaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UnaryMRInstructionBase;
-import com.ibm.bi.dml.runtime.instructions.mr.ZeroOutInstruction;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateUnaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AppendInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryMInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryMRInstructionBase;
+import org.apache.sysml.runtime.instructions.mr.CM_N_COVInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineTernaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CombineUnaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CumulativeAggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.MMTSJMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MapMultChainInstruction;
+import org.apache.sysml.runtime.instructions.mr.MatrixReshapeMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.PMMJMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.ParameterizedBuiltinMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.QuaternaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.RandInstruction;
+import org.apache.sysml.runtime.instructions.mr.RangeBasedReIndexInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.RemoveEmptyMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReorgInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReplicateInstruction;
+import org.apache.sysml.runtime.instructions.mr.ScalarInstruction;
+import org.apache.sysml.runtime.instructions.mr.SeqInstruction;
+import org.apache.sysml.runtime.instructions.mr.TernaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.UaggOuterChainInstruction;
+import org.apache.sysml.runtime.instructions.mr.UnaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.UnaryMRInstructionBase;
+import org.apache.sysml.runtime.instructions.mr.ZeroOutInstruction;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.util.IndexRange;
 
 
 public class MatrixCharacteristics implements Serializable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixDimensionsMetaData.java b/src/main/java/org/apache/sysml/runtime/matrix/MatrixDimensionsMetaData.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixDimensionsMetaData.java
rename to src/main/java/org/apache/sysml/runtime/matrix/MatrixDimensionsMetaData.java
index aefff6d7a8a..10aea7e2e72 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixDimensionsMetaData.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MatrixDimensionsMetaData.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 public class MatrixDimensionsMetaData extends MetaData 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixFormatMetaData.java b/src/main/java/org/apache/sysml/runtime/matrix/MatrixFormatMetaData.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixFormatMetaData.java
rename to src/main/java/org/apache/sysml/runtime/matrix/MatrixFormatMetaData.java
index 3ecdc1a2fd5..1c8f299f2cf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/MatrixFormatMetaData.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MatrixFormatMetaData.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
 
 public class MatrixFormatMetaData extends MatrixDimensionsMetaData 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/MetaData.java b/src/main/java/org/apache/sysml/runtime/matrix/MetaData.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/MetaData.java
rename to src/main/java/org/apache/sysml/runtime/matrix/MetaData.java
index fd49fe39478..4b12924eb5b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/MetaData.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/MetaData.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 /**
  * Class to store metadata associated with a file (e.g., a matrix) on disk.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/ReblockMR.java b/src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/ReblockMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java
index f125425e096..4d6567024b5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/ReblockMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/ReblockMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.util.HashSet;
 
@@ -27,20 +27,20 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedAdaptivePartialBlock;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.ReblockMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.ReblockReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedAdaptivePartialBlock;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.ReblockMapper;
+import org.apache.sysml.runtime.matrix.mapred.ReblockReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 
 /*
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/SortMR.java b/src/main/java/org/apache/sysml/runtime/matrix/SortMR.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/SortMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/SortMR.java
index d992aedde33..b2afe1c02ba 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/SortMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/SortMR.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.io.IOException;
 import java.net.URI;
@@ -42,33 +42,33 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.SortKeys;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UnaryInstruction;
-import com.ibm.bi.dml.runtime.io.IOUtilFunctions;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.sort.CompactInputFormat;
-import com.ibm.bi.dml.runtime.matrix.sort.CompactOutputFormat;
-import com.ibm.bi.dml.runtime.matrix.sort.IndexSortComparable;
-import com.ibm.bi.dml.runtime.matrix.sort.IndexSortComparableDesc;
-import com.ibm.bi.dml.runtime.matrix.sort.IndexSortMapper;
-import com.ibm.bi.dml.runtime.matrix.sort.IndexSortReducer;
-import com.ibm.bi.dml.runtime.matrix.sort.IndexSortStitchupReducer;
-import com.ibm.bi.dml.runtime.matrix.sort.SamplingSortMRInputFormat;
-import com.ibm.bi.dml.runtime.matrix.sort.IndexSortStitchupMapper;
-import com.ibm.bi.dml.runtime.matrix.sort.ValueSortMapper;
-import com.ibm.bi.dml.runtime.matrix.sort.ValueSortReducer;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.SortKeys;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.UnaryInstruction;
+import org.apache.sysml.runtime.io.IOUtilFunctions;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.sort.CompactInputFormat;
+import org.apache.sysml.runtime.matrix.sort.CompactOutputFormat;
+import org.apache.sysml.runtime.matrix.sort.IndexSortComparable;
+import org.apache.sysml.runtime.matrix.sort.IndexSortComparableDesc;
+import org.apache.sysml.runtime.matrix.sort.IndexSortMapper;
+import org.apache.sysml.runtime.matrix.sort.IndexSortReducer;
+import org.apache.sysml.runtime.matrix.sort.IndexSortStitchupReducer;
+import org.apache.sysml.runtime.matrix.sort.SamplingSortMRInputFormat;
+import org.apache.sysml.runtime.matrix.sort.IndexSortStitchupMapper;
+import org.apache.sysml.runtime.matrix.sort.ValueSortMapper;
+import org.apache.sysml.runtime.matrix.sort.ValueSortReducer;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/WriteCSVMR.java b/src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/WriteCSVMR.java
rename to src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java
index 2b57cb549f2..16d8d77aa93 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/WriteCSVMR.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/WriteCSVMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix;
+package org.apache.sysml.runtime.matrix;
 
 import java.util.HashMap;
 
@@ -26,21 +26,21 @@
 import org.apache.hadoop.mapred.RunningJob;
 import org.apache.hadoop.mapred.Counters.Group;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVWriteInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVWriteMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVWriteReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.mr.CSVWriteInstruction;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.mapred.CSVWriteMapper;
+import org.apache.sysml.runtime.matrix.mapred.CSVWriteReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 public class WriteCSVMR 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/AdaptivePartialBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/AdaptivePartialBlock.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java
index cd74c50f7d7..6ca0e723850 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/AdaptivePartialBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/AdaptivePartialBlock.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/AddDummyWeightConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/AddDummyWeightConverter.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/AddDummyWeightConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/AddDummyWeightConverter.java
index 9494c590b4a..9cc134afffc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/AddDummyWeightConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/AddDummyWeightConverter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToBinaryCellConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToBinaryCellConverter.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToBinaryCellConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToBinaryCellConverter.java
index f658b8b5c9a..7971ac184a3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToBinaryCellConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToBinaryCellConverter.java
@@ -16,9 +16,9 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToRowBlockConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToRowBlockConverter.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToRowBlockConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToRowBlockConverter.java
index 1ba5280296c..36327cbc6d0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToRowBlockConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToRowBlockConverter.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class BinaryBlockToRowBlockConverter implements Converter
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToTextCellConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToTextCellConverter.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToTextCellConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToTextCellConverter.java
index e27186830b5..40aa86efa3b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryBlockToTextCellConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryBlockToTextCellConverter.java
@@ -16,13 +16,13 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.io.Text;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryCellToRowBlockConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryCellToRowBlockConverter.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryCellToRowBlockConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/BinaryCellToRowBlockConverter.java
index 9d3392169dc..ec6cff9bf40 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryCellToRowBlockConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryCellToRowBlockConverter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 
 public class BinaryCellToRowBlockConverter implements Converter
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryCellToTextConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryCellToTextConverter.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryCellToTextConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/BinaryCellToTextConverter.java
index 55c61dfcc35..110d3888c0c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/BinaryCellToTextConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/BinaryCellToTextConverter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.io.Text;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/CM_N_COVCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/CM_N_COVCell.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java
index 03aca1dd83f..decbbb254c7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/CM_N_COVCell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/CM_N_COVCell.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -27,20 +27,20 @@
 
 import org.apache.hadoop.io.WritableComparable;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.QuaternaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.QuaternaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.util.IndexRange;
 
 @SuppressWarnings("rawtypes")
 public class CM_N_COVCell extends MatrixValue implements WritableComparable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/CSVFileFormatProperties.java b/src/main/java/org/apache/sysml/runtime/matrix/data/CSVFileFormatProperties.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/CSVFileFormatProperties.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/CSVFileFormatProperties.java
index c75f08dd0e9..7371032776c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/CSVFileFormatProperties.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/CSVFileFormatProperties.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.parser.DataExpression;
+import org.apache.sysml.parser.DataExpression;
 
 public class CSVFileFormatProperties extends FileFormatProperties implements Serializable
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/CTableMap.java b/src/main/java/org/apache/sysml/runtime/matrix/data/CTableMap.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/CTableMap.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/CTableMap.java
index ab7b24768d0..567973a1f37 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/CTableMap.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/CTableMap.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.util.LongLongDoubleHashMap;
-import com.ibm.bi.dml.runtime.util.LongLongDoubleHashMap.LLDoubleEntry;
+import org.apache.sysml.runtime.util.LongLongDoubleHashMap;
+import org.apache.sysml.runtime.util.LongLongDoubleHashMap.LLDoubleEntry;
 
 /**
  * Ctable map is an abstraction for the hashmap used for ctable's hash group-by
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/Converter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/Converter.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/Converter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/Converter.java
index cfd30716aaa..3bbccfd346c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/Converter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/Converter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.Writable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/FileFormatProperties.java b/src/main/java/org/apache/sysml/runtime/matrix/data/FileFormatProperties.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/FileFormatProperties.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/FileFormatProperties.java
index d7fe446ee1c..0f4198f379e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/FileFormatProperties.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/FileFormatProperties.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class FileFormatProperties 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/IJV.java b/src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/IJV.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java
index 3f6b4f3e570..e214b3c263a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/IJV.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/IJV.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 /**
  * Helper class for external key/value exchange.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/IdenticalConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/IdenticalConverter.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/IdenticalConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/IdenticalConverter.java
index 22ec8ca4a33..b1a212ed0f9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/IdenticalConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/IdenticalConverter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.Writable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/InputInfo.java b/src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/InputInfo.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java
index 26a3cd16e30..8460beef403 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/InputInfo.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/InputInfo.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 
 import java.io.Serializable;
@@ -30,9 +30,9 @@
 import org.apache.hadoop.mapred.SequenceFileInputFormat;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MetaData;
-import com.ibm.bi.dml.runtime.matrix.sort.PickFromCompactInputFormat;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MetaData;
+import org.apache.sysml.runtime.matrix.sort.PickFromCompactInputFormat;
 
 @SuppressWarnings("rawtypes")
 public class InputInfo implements Serializable 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibCommonsMath.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibCommonsMath.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibCommonsMath.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/LibCommonsMath.java
index 5a8a0daee7a..ba6b306cd92 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibCommonsMath.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibCommonsMath.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.commons.math3.linear.Array2DRowRealMatrix;
 import org.apache.commons.math3.linear.DecompositionSolver;
@@ -24,9 +24,9 @@
 import org.apache.commons.math3.linear.QRDecomposition;
 import org.apache.commons.math3.linear.RealMatrix;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.util.DataConverter;
 
 /**
  * Library for matrix operations that need invocation of 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixAgg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixAgg.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
index 7881930810b..4afba68b4a0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixAgg.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixAgg.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,27 +23,27 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin.BuiltinFunctionCode;
-import com.ibm.bi.dml.runtime.functionobjects.IndexFunction;
-import com.ibm.bi.dml.runtime.functionobjects.KahanFunction;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlusSq;
-import com.ibm.bi.dml.runtime.functionobjects.Mean;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceDiag;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceRow;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Builtin.BuiltinFunctionCode;
+import org.apache.sysml.runtime.functionobjects.IndexFunction;
+import org.apache.sysml.runtime.functionobjects.KahanFunction;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.KahanPlusSq;
+import org.apache.sysml.runtime.functionobjects.Mean;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.functionobjects.ReduceDiag;
+import org.apache.sysml.runtime.functionobjects.ReduceRow;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * MB:
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixBincell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixBincell.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java
index 49a96874528..3406711dc65 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixBincell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixBincell.java
@@ -15,28 +15,28 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.Arrays;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.Divide;
-import com.ibm.bi.dml.runtime.functionobjects.Equals;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThan;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.LessThan;
-import com.ibm.bi.dml.runtime.functionobjects.LessThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Minus;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply2;
-import com.ibm.bi.dml.runtime.functionobjects.NotEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Or;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.functionobjects.Power2;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.SortUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.Divide;
+import org.apache.sysml.runtime.functionobjects.Equals;
+import org.apache.sysml.runtime.functionobjects.GreaterThan;
+import org.apache.sysml.runtime.functionobjects.GreaterThanEquals;
+import org.apache.sysml.runtime.functionobjects.LessThan;
+import org.apache.sysml.runtime.functionobjects.LessThanEquals;
+import org.apache.sysml.runtime.functionobjects.Minus;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Multiply2;
+import org.apache.sysml.runtime.functionobjects.NotEquals;
+import org.apache.sysml.runtime.functionobjects.Or;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.Power2;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.SortUtils;
 
 /**
  * MB:
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixDatagen.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDatagen.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixDatagen.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDatagen.java
index 1a1ef9659e8..337ad23bc17 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixDatagen.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDatagen.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,12 +29,12 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.math3.random.Well1024a;
 
-import com.ibm.bi.dml.hops.DataGenOp;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.util.NormalPRNGenerator;
-import com.ibm.bi.dml.runtime.util.PRNGenerator;
-import com.ibm.bi.dml.runtime.util.PoissonPRNGenerator;
-import com.ibm.bi.dml.runtime.util.UniformPRNGenerator;
+import org.apache.sysml.hops.DataGenOp;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.util.NormalPRNGenerator;
+import org.apache.sysml.runtime.util.PRNGenerator;
+import org.apache.sysml.runtime.util.PoissonPRNGenerator;
+import org.apache.sysml.runtime.util.UniformPRNGenerator;
 
 /**
  *  
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixMult.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixMult.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java
index 819619610ec..97e50c07c59 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixMult.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixMult.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,18 +26,18 @@
 
 import org.apache.commons.math3.util.FastMath;
 
-import com.ibm.bi.dml.lops.MapMultChain.ChainType;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy.WCeMMType;
-import com.ibm.bi.dml.lops.WeightedDivMM.WDivMMType;
-import com.ibm.bi.dml.lops.WeightedSigmoid.WSigmoidType;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss.WeightsType;
-import com.ibm.bi.dml.lops.WeightedUnaryMM.WUMMType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.lops.MapMultChain.ChainType;
+import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType;
+import org.apache.sysml.lops.WeightedDivMM.WDivMMType;
+import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType;
+import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType;
+import org.apache.sysml.lops.WeightedUnaryMM.WUMMType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * MB:
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixOuterAgg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixOuterAgg.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java
index c5dd83ae5aa..588bdefeb90 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixOuterAgg.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixOuterAgg.java
@@ -15,28 +15,28 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.Arrays;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Equals;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThan;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.LessThan;
-import com.ibm.bi.dml.runtime.functionobjects.LessThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.NotEquals;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceRow;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.SortUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Equals;
+import org.apache.sysml.runtime.functionobjects.GreaterThan;
+import org.apache.sysml.runtime.functionobjects.GreaterThanEquals;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.LessThan;
+import org.apache.sysml.runtime.functionobjects.LessThanEquals;
+import org.apache.sysml.runtime.functionobjects.NotEquals;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.functionobjects.ReduceRow;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.SortUtils;
 
 /**
  * ACS:
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java
index 31fe405b592..9060d978db8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/LibMatrixReorg.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixReorg.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,16 +26,16 @@
 import java.util.HashSet;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.DiagIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SortIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.SortUtils;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.DiagIndex;
+import org.apache.sysml.runtime.functionobjects.SortIndex;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.SortUtils;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * MB:
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlock.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java
index 18fce8128f1..9686932e247 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlock.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -34,55 +34,55 @@
 import org.apache.commons.math3.random.Well1024a;
 import org.apache.hadoop.io.DataInputBuffer;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.lops.MapMultChain.ChainType;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.CTable;
-import com.ibm.bi.dml.runtime.functionobjects.DiagIndex;
-import com.ibm.bi.dml.runtime.functionobjects.Divide;
-import com.ibm.bi.dml.runtime.functionobjects.KahanFunction;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlusSq;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceAll;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceCol;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceRow;
-import com.ibm.bi.dml.runtime.functionobjects.SortIndex;
-import com.ibm.bi.dml.runtime.functionobjects.SwapIndex;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.DoubleObject;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.instructions.cp.ScalarObject;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixBincell.BinaryAccessType;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.COVOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.QuaternaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataInputStream;
-import com.ibm.bi.dml.runtime.util.FastBufferedDataOutputStream;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.lops.MapMultChain.ChainType;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.CTable;
+import org.apache.sysml.runtime.functionobjects.DiagIndex;
+import org.apache.sysml.runtime.functionobjects.Divide;
+import org.apache.sysml.runtime.functionobjects.KahanFunction;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.KahanPlusSq;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.ReduceAll;
+import org.apache.sysml.runtime.functionobjects.ReduceCol;
+import org.apache.sysml.runtime.functionobjects.ReduceRow;
+import org.apache.sysml.runtime.functionobjects.SortIndex;
+import org.apache.sysml.runtime.functionobjects.SwapIndex;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.DoubleObject;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.instructions.cp.ScalarObject;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.LibMatrixBincell.BinaryAccessType;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.COVOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.QuaternaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.FastBufferedDataInputStream;
+import org.apache.sysml.runtime.util.FastBufferedDataOutputStream;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class MatrixBlock extends MatrixValue implements Externalizable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlockDataInput.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlockDataInput.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlockDataInput.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlockDataInput.java
index 838eb8c27b1..08b23d3b992 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlockDataInput.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlockDataInput.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlockDataOutput.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlockDataOutput.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlockDataOutput.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlockDataOutput.java
index f79bc57a76e..4f3ee403b84 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixBlockDataOutput.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixBlockDataOutput.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixCell.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixCell.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MatrixCell.java
index 0fb2be889b2..5b9d7f2eecd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixCell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixCell.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -28,21 +28,21 @@
 
 import org.apache.hadoop.io.WritableComparable;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.CTable;
-import com.ibm.bi.dml.runtime.functionobjects.ReduceDiag;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.QuaternaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.CTable;
+import org.apache.sysml.runtime.functionobjects.ReduceDiag;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.QuaternaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.util.IndexRange;
 
 @SuppressWarnings("rawtypes")
 public class MatrixCell extends MatrixValue implements WritableComparable, Serializable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixIndexes.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixIndexes.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixIndexes.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MatrixIndexes.java
index 8f5e6c2d179..9cb6d1d113f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixIndexes.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixIndexes.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -29,7 +29,7 @@
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.WritableComparator;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 /**
  * This represent the indexes to the blocks of the matrix.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixPackedCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixPackedCell.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java
index dd1bad12fdd..ad29fbec910 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixPackedCell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixPackedCell.java
@@ -16,17 +16,17 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
 
 
 public class MatrixPackedCell extends MatrixCell
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixValue.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixValue.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixValue.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MatrixValue.java
index 7afbcec67cd..ac1aaadacc3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MatrixValue.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MatrixValue.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,20 +25,20 @@
 
 import org.apache.hadoop.io.WritableComparable;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.QuaternaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.QuaternaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 @SuppressWarnings("rawtypes")
 public abstract class MatrixValue implements WritableComparable 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MultipleOutputCommitter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/MultipleOutputCommitter.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/MultipleOutputCommitter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/MultipleOutputCommitter.java
index b9a3e6a9da9..c2937996480 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/MultipleOutputCommitter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/MultipleOutputCommitter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.IOException;
 
@@ -30,7 +30,7 @@
 import org.apache.hadoop.mapred.TaskAttemptContext;
 import org.apache.hadoop.mapred.TaskAttemptID;
 
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 
 public class MultipleOutputCommitter extends FileOutputCommitter 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/NumItemsByEachReducerMetaData.java b/src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
index 1b1d9e27c2e..ec2c246b0d4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/NumItemsByEachReducerMetaData.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
 
 public class NumItemsByEachReducerMetaData extends MatrixDimensionsMetaData 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/OperationsOnMatrixValues.java b/src/main/java/org/apache/sysml/runtime/matrix/data/OperationsOnMatrixValues.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/OperationsOnMatrixValues.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/OperationsOnMatrixValues.java
index fd10ba2bbd6..01e4762491b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/OperationsOnMatrixValues.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/OperationsOnMatrixValues.java
@@ -16,25 +16,25 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.BinaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
-import com.ibm.bi.dml.runtime.util.IndexRange;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.BinaryOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.util.IndexRange;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class OperationsOnMatrixValues 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/OutputInfo.java b/src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/OutputInfo.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java
index 01365f1b379..c08d03d7fbe 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/OutputInfo.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.Serializable;
 
@@ -29,9 +29,9 @@
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.hadoop.mapred.TextOutputFormat;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVWriteReducer.RowBlockForTextOutput;
-import com.ibm.bi.dml.runtime.matrix.sort.CompactOutputFormat;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.mapred.CSVWriteReducer.RowBlockForTextOutput;
+import org.apache.sysml.runtime.matrix.sort.CompactOutputFormat;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/Pair.java b/src/main/java/org/apache/sysml/runtime/matrix/data/Pair.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/Pair.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/Pair.java
index f8de328784d..07bf6c03391 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/Pair.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/Pair.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class Pair 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/PartialBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/PartialBlock.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/PartialBlock.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/PartialBlock.java
index 7ac8ed6ebdd..f32d8fc0657 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/PartialBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/PartialBlock.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/PoissonRandomMatrixGenerator.java b/src/main/java/org/apache/sysml/runtime/matrix/data/PoissonRandomMatrixGenerator.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/PoissonRandomMatrixGenerator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/PoissonRandomMatrixGenerator.java
index f42c804fa2c..6742e050fad 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/PoissonRandomMatrixGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/PoissonRandomMatrixGenerator.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.util.PoissonPRNGenerator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.util.PoissonPRNGenerator;
 
 public class PoissonRandomMatrixGenerator extends RandomMatrixGenerator {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/RandomMatrixGenerator.java b/src/main/java/org/apache/sysml/runtime/matrix/data/RandomMatrixGenerator.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/RandomMatrixGenerator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/RandomMatrixGenerator.java
index e31515e6189..11213d60120 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/RandomMatrixGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/RandomMatrixGenerator.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.util.NormalPRNGenerator;
-import com.ibm.bi.dml.runtime.util.PRNGenerator;
-import com.ibm.bi.dml.runtime.util.PoissonPRNGenerator;
-import com.ibm.bi.dml.runtime.util.UniformPRNGenerator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.util.NormalPRNGenerator;
+import org.apache.sysml.runtime.util.PRNGenerator;
+import org.apache.sysml.runtime.util.PoissonPRNGenerator;
+import org.apache.sysml.runtime.util.UniformPRNGenerator;
 
 public class RandomMatrixGenerator {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/RuntimeDataFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/data/RuntimeDataFormat.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/RuntimeDataFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/RuntimeDataFormat.java
index 928ba9980c3..dc0014f55f1 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/RuntimeDataFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/RuntimeDataFormat.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public enum RuntimeDataFormat 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/SparseRow.java b/src/main/java/org/apache/sysml/runtime/matrix/data/SparseRow.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/SparseRow.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/SparseRow.java
index 404b64b14bd..71a1bd11fcc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/SparseRow.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/SparseRow.java
@@ -16,12 +16,12 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-import com.ibm.bi.dml.runtime.util.SortUtils;
+import org.apache.sysml.runtime.util.SortUtils;
 
 public class SparseRow implements Serializable 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/SparseRowsIterator.java b/src/main/java/org/apache/sysml/runtime/matrix/data/SparseRowsIterator.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/SparseRowsIterator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/SparseRowsIterator.java
index 070af86e9ca..f3ddb0c22b0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/SparseRowsIterator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/SparseRowsIterator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/Tagged.java b/src/main/java/org/apache/sysml/runtime/matrix/data/Tagged.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/Tagged.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/Tagged.java
index ab22ed70a09..a4ac2273a6c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/Tagged.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/Tagged.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedAdaptivePartialBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedAdaptivePartialBlock.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedAdaptivePartialBlock.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedAdaptivePartialBlock.java
index 2485d3788e3..194d7f2bc36 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedAdaptivePartialBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedAdaptivePartialBlock.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class TaggedAdaptivePartialBlock extends Tagged
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedFirstSecondIndexes.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedFirstSecondIndexes.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedFirstSecondIndexes.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedFirstSecondIndexes.java
index 0e07fa566de..14102e3d366 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedFirstSecondIndexes.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedFirstSecondIndexes.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -31,9 +31,9 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Partitioner;
 
-import com.ibm.bi.dml.runtime.instructions.mr.CSVWriteInstruction;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.instructions.mr.CSVWriteInstruction;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 //sorted by first index, tag, and second index
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedInt.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedInt.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedInt.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedInt.java
index e1217134985..9ad08067cae 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedInt.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedInt.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.IntWritable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixBlock.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixBlock.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixBlock.java
index e57f3444868..76817b522e4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixBlock.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class TaggedMatrixBlock extends TaggedMatrixValue
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixCell.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixCell.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixCell.java
index dcd411390c6..7eb70dba8ba 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixCell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixCell.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class TaggedMatrixCell extends TaggedMatrixValue
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixPackedCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixPackedCell.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixPackedCell.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixPackedCell.java
index 3ec86d75949..7b46bf9d200 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixPackedCell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixPackedCell.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class TaggedMatrixPackedCell extends TaggedMatrixValue
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixValue.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixValue.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixValue.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixValue.java
index 019647d876a..87a1edaea70 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedMatrixValue.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedMatrixValue.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class TaggedMatrixValue extends Tagged
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedPartialBlock.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedPartialBlock.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedPartialBlock.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedPartialBlock.java
index 5e1947d92a7..e300d4aa5bf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedPartialBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedPartialBlock.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 public class TaggedPartialBlock extends Tagged
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedTripleIndexes.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedTripleIndexes.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedTripleIndexes.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TaggedTripleIndexes.java
index 616438f3438..6453cee5159 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TaggedTripleIndexes.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TaggedTripleIndexes.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -27,7 +27,7 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Partitioner;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TextCellToRowBlockConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TextCellToRowBlockConverter.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TextCellToRowBlockConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TextCellToRowBlockConverter.java
index 133c94a6f1a..acd75d1a980 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TextCellToRowBlockConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TextCellToRowBlockConverter.java
@@ -16,12 +16,12 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
 
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
 
 public class TextCellToRowBlockConverter implements Converter
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TextToBinaryCellConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TextToBinaryCellConverter.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TextToBinaryCellConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TextToBinaryCellConverter.java
index 367896f9fcc..fbb1ee4a63e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TextToBinaryCellConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TextToBinaryCellConverter.java
@@ -16,12 +16,12 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
 
-import com.ibm.bi.dml.runtime.util.FastStringTokenizer;
+import org.apache.sysml.runtime.util.FastStringTokenizer;
 
 
 public class TextToBinaryCellConverter 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TripleIndexes.java b/src/main/java/org/apache/sysml/runtime/matrix/data/TripleIndexes.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/TripleIndexes.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/TripleIndexes.java
index b068eae9d0a..4427e61e099 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/TripleIndexes.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/TripleIndexes.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -29,7 +29,7 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Partitioner;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 
 public class TripleIndexes implements WritableComparable, Serializable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/UnPaddedOutputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/data/UnPaddedOutputFormat.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/UnPaddedOutputFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/UnPaddedOutputFormat.java
index 5f55cf24797..c6cdb040f4f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/UnPaddedOutputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/UnPaddedOutputFormat.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedCell.java b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedCell.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedCell.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/WeightedCell.java
index 2d958c2b3de..3b826d51568 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedCell.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedCell.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,12 +24,12 @@
 import java.util.Collection;
 import java.util.Map;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateUnaryOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ReorgOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.ScalarOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.UnaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.operators.AggregateUnaryOperator;
+import org.apache.sysml.runtime.matrix.operators.ReorgOperator;
+import org.apache.sysml.runtime.matrix.operators.ScalarOperator;
+import org.apache.sysml.runtime.matrix.operators.UnaryOperator;
 
 
 public class WeightedCell extends MatrixCell
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedCellToSortInputConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedCellToSortInputConverter.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedCellToSortInputConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/WeightedCellToSortInputConverter.java
index 47a389e19f9..c6d6dd798c4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedCellToSortInputConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedCellToSortInputConverter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.DoubleWritable;
 import org.apache.hadoop.io.IntWritable;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedPair.java b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedPair.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedPair.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/WeightedPair.java
index 088041fa996..9443308d1d5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedPair.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedPair.java
@@ -16,13 +16,13 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
 
 
 public class WeightedPair extends WeightedCell 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedPairToSortInputConverter.java b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedPairToSortInputConverter.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedPairToSortInputConverter.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/WeightedPairToSortInputConverter.java
index 4508ad7a04b..73762805b6f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/WeightedPairToSortInputConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/WeightedPairToSortInputConverter.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.data;
+package org.apache.sysml.runtime.matrix.data;
 
 import org.apache.hadoop.io.DoubleWritable;
 import org.apache.hadoop.io.IntWritable;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/DelegatingInputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/DelegatingInputFormat.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/DelegatingInputFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/DelegatingInputFormat.java
index bb3a344bd73..df93910475b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/DelegatingInputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/DelegatingInputFormat.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.ibm.bi.dml.runtime.matrix.data.hadoopfix;
+package org.apache.sysml.runtime.matrix.data.hadoopfix;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/MultipleInputs.java b/src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/MultipleInputs.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/MultipleInputs.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/MultipleInputs.java
index 50724ac3cde..5ef7f3d2408 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/MultipleInputs.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/MultipleInputs.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ibm.bi.dml.runtime.matrix.data.hadoopfix;
+package org.apache.sysml.runtime.matrix.data.hadoopfix;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/TaggedInputSplit.java b/src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/TaggedInputSplit.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/TaggedInputSplit.java
rename to src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/TaggedInputSplit.java
index 2e08c423c2a..4f7ad58f05a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/data/hadoopfix/TaggedInputSplit.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/data/hadoopfix/TaggedInputSplit.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.ibm.bi.dml.runtime.matrix.data.hadoopfix;
+package org.apache.sysml.runtime.matrix.data.hadoopfix;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CMCOVMRMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CMCOVMRMapper.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CMCOVMRMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CMCOVMRMapper.java
index 6f9ed2582af..3adca0ceb95 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CMCOVMRMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CMCOVMRMapper.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -27,15 +27,15 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.COV;
-import com.ibm.bi.dml.runtime.instructions.mr.CM_N_COVInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.CM_N_COVCell;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedPair;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.COVOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.COV;
+import org.apache.sysml.runtime.instructions.mr.CM_N_COVInstruction;
+import org.apache.sysml.runtime.matrix.data.CM_N_COVCell;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.data.WeightedPair;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.COVOperator;
 
 
 public class CMCOVMRMapper extends MapperBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CMCOVMRReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CMCOVMRReducer.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CMCOVMRReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CMCOVMRReducer.java
index adcab8fa2ed..794ee3d05ac 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CMCOVMRReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CMCOVMRReducer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,19 +29,19 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.COV;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.mr.CM_N_COVInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.CM_N_COVCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.COVOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.COV;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.mr.CM_N_COVInstruction;
+import org.apache.sysml.runtime.matrix.data.CM_N_COVCell;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.COVOperator;
 
 
 public class CMCOVMRReducer extends ReduceBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVAssignRowIDMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVAssignRowIDMapper.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVAssignRowIDMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVAssignRowIDMapper.java
index 14e19dab34c..3e9c29e4a65 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVAssignRowIDMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVAssignRowIDMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.regex.Pattern;
@@ -32,12 +32,12 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.wink.json4j.JSONException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
-import com.ibm.bi.dml.runtime.transform.TfUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.transform.TfUtils;
 
 public class CSVAssignRowIDMapper extends MapReduceBase implements Mapper
 {	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVAssignRowIDReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVAssignRowIDReducer.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVAssignRowIDReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVAssignRowIDReducer.java
index 8f29199c312..952ab4c575a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVAssignRowIDReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVAssignRowIDReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,8 +28,8 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
 
 public class CSVAssignRowIDReducer extends MapReduceBase implements Reducer
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVReblockMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVReblockMapper.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVReblockMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVReblockMapper.java
index c0e1090b80d..261cd46d8b9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVReblockMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVReblockMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,14 +33,14 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.io.IOUtilFunctions;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.BlockRow;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.io.IOUtilFunctions;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.BlockRow;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class CSVReblockMapper extends MapperBase implements Mapper
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVReblockReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVReblockReducer.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVReblockReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVReblockReducer.java
index ec025418b71..6b63e31f1ab 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVReblockReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVReblockReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,15 +26,15 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.BlockRow;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.BlockRow;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
 
 public class CSVReblockReducer extends ReduceBase implements Reducer
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVWriteMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVWriteMapper.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVWriteMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVWriteMapper.java
index eea2cd98392..d42069ef18b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVWriteMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVWriteMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,11 +27,11 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.instructions.mr.CSVWriteInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.instructions.mr.CSVWriteInstruction;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
 
 public class CSVWriteMapper extends MapperBase implements Mapper
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVWriteReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVWriteReducer.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVWriteReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVWriteReducer.java
index f1e0f0bc5ee..0a8ca904edf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CSVWriteReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CSVWriteReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -32,15 +32,15 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.instructions.mr.CSVWriteInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVWriteReducer.RowBlockForTextOutput;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVWriteReducer.RowBlockForTextOutput.Situation;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.instructions.mr.CSVWriteInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.mapred.CSVWriteReducer.RowBlockForTextOutput;
+import org.apache.sysml.runtime.matrix.mapred.CSVWriteReducer.RowBlockForTextOutput.Situation;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class CSVWriteReducer extends ReduceBase implements Reducer
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedMap.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedMap.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedMap.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedMap.java
index 2bcb81deb4f..eeef6306e72 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedMap.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedMap.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedMapElement.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedMapElement.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedMapElement.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedMapElement.java
index 644b5fd9630..f3a873cdcbc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedMapElement.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedMapElement.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 public abstract class CachedMapElement
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedValueMap.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedValueMap.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedValueMap.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedValueMap.java
index c9b975c40b3..c1d4e1d609b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CachedValueMap.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CachedValueMap.java
@@ -16,14 +16,14 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
 
 
 public class CachedValueMap //extends CachedMap
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CollectMultipleConvertedOutputs.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CollectMultipleConvertedOutputs.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CollectMultipleConvertedOutputs.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/CollectMultipleConvertedOutputs.java
index e731d691461..d8b2c1af364 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/CollectMultipleConvertedOutputs.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/CollectMultipleConvertedOutputs.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 
@@ -24,9 +24,9 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.lib.MultipleOutputs;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.Converter;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.Converter;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 
 @SuppressWarnings("rawtypes")
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/DataGenMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/DataGenMapper.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/DataGenMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/DataGenMapper.java
index 21b7c86ba2e..22256b62eb7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/DataGenMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/DataGenMapper.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 
@@ -26,14 +26,14 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.hops.Hop.DataGenMethod;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RandInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.LibMatrixDatagen;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.RandomMatrixGenerator;
+import org.apache.sysml.hops.Hop.DataGenMethod;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.RandInstruction;
+import org.apache.sysml.runtime.matrix.data.LibMatrixDatagen;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.RandomMatrixGenerator;
 
 
 public class DataGenMapper extends GMRMapper 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/DistributedCacheInput.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/DistributedCacheInput.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/DistributedCacheInput.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/DistributedCacheInput.java
index a8a4da72db7..e26fc304a49 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/DistributedCacheInput.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/DistributedCacheInput.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.File;
 import java.util.ArrayList;
 
 import org.apache.hadoop.fs.Path;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.io.MatrixReaderFactory;
-import com.ibm.bi.dml.runtime.io.ReaderBinaryBlock;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.io.MatrixReaderFactory;
+import org.apache.sysml.runtime.io.ReaderBinaryBlock;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.util.DataConverter;
 
 public class DistributedCacheInput 
 {	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRCombiner.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCombiner.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRCombiner.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCombiner.java
index e958f56758c..16fa7f1765f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRCombiner.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCombiner.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -26,10 +26,10 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixPackedCell;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixPackedCell;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
 
 
 public class GMRCombiner extends ReduceBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRCtableBuffer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRCtableBuffer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java
index ec31b614396..a303bf750de 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRCtableBuffer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRCtableBuffer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -24,13 +24,13 @@
 
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.io.MatrixWriter;
-import com.ibm.bi.dml.runtime.matrix.data.CTableMap;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.util.LongLongDoubleHashMap.LLDoubleEntry;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.io.MatrixWriter;
+import org.apache.sysml.runtime.matrix.data.CTableMap;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.util.LongLongDoubleHashMap.LLDoubleEntry;
 
 
 public class GMRCtableBuffer 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRMapper.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRMapper.java
index 78e6b29ceaa..f529c7c89b9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRMapper.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,12 +28,12 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixPackedCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixPackedCell;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixPackedCell;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixPackedCell;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRReducer.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRReducer.java
index c0bbf60cc1d..93f1057d928 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GMRReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GMRReducer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,15 +27,15 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.instructions.mr.AppendRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.TernaryInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixPackedCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.instructions.mr.AppendRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.TernaryInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixPackedCell;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
 
 
 public class GMRReducer extends ReduceBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRCombiner.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRCombiner.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRCombiner.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRCombiner.java
index e99d38185eb..db9ad6554a9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRCombiner.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRCombiner.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,16 +26,16 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedInt;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.matrix.data.TaggedInt;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class GroupedAggMRCombiner extends ReduceBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRMapper.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRMapper.java
index feea37359d9..0d4df467a44 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRMapper.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,12 +28,12 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedInt;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.TaggedInt;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
 
 
 public class GroupedAggMRMapper extends MapperBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRReducer.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRReducer.java
index 061c0a5a5e9..dbaccf59d66 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/GroupedAggMRReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/GroupedAggMRReducer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,17 +28,17 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedInt;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCell;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.Operator;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.TaggedInt;
+import org.apache.sysml.runtime.matrix.data.WeightedCell;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.Operator;
 
 
 public class GroupedAggMRReducer extends ReduceBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/IndexedMatrixValue.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/IndexedMatrixValue.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/IndexedMatrixValue.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/IndexedMatrixValue.java
index e09002d54de..ea1d08f17df 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/IndexedMatrixValue.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/IndexedMatrixValue.java
@@ -16,12 +16,12 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
 
 public class IndexedMatrixValue implements Serializable
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCache.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCache.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCache.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCache.java
index bf53bbe93d8..feb043fa001 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCache.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCache.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -25,11 +25,11 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * Base class for MMCJ partial aggregator and MMCJ input cache to factor out
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCombiner.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCombiner.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCombiner.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCombiner.java
index 8848bd205de..aba91ef1cea 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCombiner.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCombiner.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -26,8 +26,8 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
 
 
 public class MMCJMRCombiner extends MMCJMRCombinerReducerBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCombinerReducerBase.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCombinerReducerBase.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCombinerReducerBase.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCombinerReducerBase.java
index 2aa38ae46e3..1b990ce3713 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRCombinerReducerBase.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRCombinerReducerBase.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,14 +24,14 @@
 
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
 
 
 public class MMCJMRCombinerReducerBase extends ReduceBase
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRInputCache.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRInputCache.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRInputCache.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRInputCache.java
index 473dc96ce2f..875e27f1df6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRInputCache.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRInputCache.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 public class MMCJMRInputCache extends MMCJMRCache
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRMapper.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRMapper.java
index 4119467ff73..ba31415307c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRMapper.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,12 +27,12 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
 
 
 public class MMCJMRMapper extends MapperBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRReducer.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRReducer.java
index 05165e29eca..bdf49645c59 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRReducer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,15 +30,15 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 public class MMCJMRReducer extends MMCJMRCombinerReducerBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRReducerWithAggregator.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRReducerWithAggregator.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRReducerWithAggregator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRReducerWithAggregator.java
index fe10ded76aa..15a3a8b9c64 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMCJMRReducerWithAggregator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMCJMRReducerWithAggregator.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -27,16 +27,16 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.MMCJ.MMCJType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.MMCJ.MMCJType;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 public class MMCJMRReducerWithAggregator extends MMCJMRCombinerReducerBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMRJMRMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMRJMRMapper.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMRJMRMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMRJMRMapper.java
index da5104d0760..14c0d7f32c2 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMRJMRMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMRJMRMapper.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,12 +29,12 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TripleIndexes;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.matrix.data.TripleIndexes;
 
 
 public class MMRJMRMapper extends MapperBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMRJMRReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMRJMRReducer.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMRJMRReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MMRJMRReducer.java
index dc290ece41a..8b5c39c0f24 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MMRJMRReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MMRJMRReducer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -26,15 +26,15 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.TripleIndexes;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.matrix.data.TripleIndexes;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
 
 
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRBaseForCommonInstructions.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRBaseForCommonInstructions.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java
index a6aedac1c96..9d2f20d4679 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRBaseForCommonInstructions.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRBaseForCommonInstructions.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,29 +28,29 @@
 import org.apache.hadoop.mapred.MapReduceBase;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateUnaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AppendGInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AppendMInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryMInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryMRInstructionBase;
-import com.ibm.bi.dml.runtime.instructions.mr.CumulativeAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CumulativeSplitInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MatrixReshapeMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RangeBasedReIndexInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RemoveEmptyMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReorgInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UnaryMRInstructionBase;
-import com.ibm.bi.dml.runtime.instructions.mr.ZeroOutInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateUnaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AppendGInstruction;
+import org.apache.sysml.runtime.instructions.mr.AppendMInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryMInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryMRInstructionBase;
+import org.apache.sysml.runtime.instructions.mr.CumulativeAggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.CumulativeSplitInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MatrixReshapeMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.RangeBasedReIndexInstruction;
+import org.apache.sysml.runtime.instructions.mr.RemoveEmptyMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReorgInstruction;
+import org.apache.sysml.runtime.instructions.mr.UnaryMRInstructionBase;
+import org.apache.sysml.runtime.instructions.mr.ZeroOutInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
 
 
 @SuppressWarnings("deprecation")
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRConfigurationNames.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRConfigurationNames.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRConfigurationNames.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MRConfigurationNames.java
index 578abae1a4d..b49e67b77c6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRConfigurationNames.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRConfigurationNames.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRJobConfiguration.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRJobConfiguration.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
index 1e212924ed8..8100972c908 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MRJobConfiguration.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MRJobConfiguration.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,59 +41,59 @@
 import org.apache.hadoop.mapred.lib.MultipleOutputs;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
 
-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.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-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.MRInstructionParser;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AppendGInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.AppendMInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.BinaryMInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CM_N_COVInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVWriteInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.GroupedAggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MapMultChainInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.PMMJMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.RemoveEmptyMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.UnaryMRInstructionBase;
-import com.ibm.bi.dml.runtime.io.BinaryBlockSerialization;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.AddDummyWeightConverter;
-import com.ibm.bi.dml.runtime.matrix.data.BinaryBlockToBinaryCellConverter;
-import com.ibm.bi.dml.runtime.matrix.data.BinaryBlockToRowBlockConverter;
-import com.ibm.bi.dml.runtime.matrix.data.BinaryBlockToTextCellConverter;
-import com.ibm.bi.dml.runtime.matrix.data.BinaryCellToRowBlockConverter;
-import com.ibm.bi.dml.runtime.matrix.data.BinaryCellToTextConverter;
-import com.ibm.bi.dml.runtime.matrix.data.Converter;
-import com.ibm.bi.dml.runtime.matrix.data.IdenticalConverter;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.MultipleOutputCommitter;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TextCellToRowBlockConverter;
-import com.ibm.bi.dml.runtime.matrix.data.TextToBinaryCellConverter;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedCellToSortInputConverter;
-import com.ibm.bi.dml.runtime.matrix.data.WeightedPair;
-import com.ibm.bi.dml.runtime.matrix.data.hadoopfix.MultipleInputs;
-import com.ibm.bi.dml.runtime.matrix.sort.SamplingSortMRInputFormat;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitionFormat;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRInstructionParser;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.AggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.AppendGInstruction;
+import org.apache.sysml.runtime.instructions.mr.AppendMInstruction;
+import org.apache.sysml.runtime.instructions.mr.BinaryMInstruction;
+import org.apache.sysml.runtime.instructions.mr.CM_N_COVInstruction;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.CSVWriteInstruction;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.GroupedAggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MapMultChainInstruction;
+import org.apache.sysml.runtime.instructions.mr.PMMJMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.RemoveEmptyMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.UnaryMRInstructionBase;
+import org.apache.sysml.runtime.io.BinaryBlockSerialization;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.AddDummyWeightConverter;
+import org.apache.sysml.runtime.matrix.data.BinaryBlockToBinaryCellConverter;
+import org.apache.sysml.runtime.matrix.data.BinaryBlockToRowBlockConverter;
+import org.apache.sysml.runtime.matrix.data.BinaryBlockToTextCellConverter;
+import org.apache.sysml.runtime.matrix.data.BinaryCellToRowBlockConverter;
+import org.apache.sysml.runtime.matrix.data.BinaryCellToTextConverter;
+import org.apache.sysml.runtime.matrix.data.Converter;
+import org.apache.sysml.runtime.matrix.data.IdenticalConverter;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.MultipleOutputCommitter;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TextCellToRowBlockConverter;
+import org.apache.sysml.runtime.matrix.data.TextToBinaryCellConverter;
+import org.apache.sysml.runtime.matrix.data.WeightedCellToSortInputConverter;
+import org.apache.sysml.runtime.matrix.data.WeightedPair;
+import org.apache.sysml.runtime.matrix.data.hadoopfix.MultipleInputs;
+import org.apache.sysml.runtime.matrix.sort.SamplingSortMRInputFormat;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 @SuppressWarnings({ "rawtypes", "deprecation" })
 public class MRJobConfiguration 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MapperBase.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MapperBase.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MapperBase.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/MapperBase.java
index 505dba7a1a4..beeac5820b0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/MapperBase.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/MapperBase.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,20 +29,20 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateBinaryInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.DataGenMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.PMMJMRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.Converter;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.instructions.mr.AggregateBinaryInstruction;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.instructions.mr.DataGenMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.PMMJMRInstruction;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.matrix.data.Converter;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
 
 @SuppressWarnings("rawtypes")
 public abstract class MapperBase extends MRBaseForCommonInstructions
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/PartialAggregator.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/PartialAggregator.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/PartialAggregator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/PartialAggregator.java
index 4cd9520a27e..22ec070905b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/PartialAggregator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/PartialAggregator.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 
@@ -25,13 +25,13 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateBinaryOperator;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateBinaryOperator;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 public class PartialAggregator extends MMCJMRCache
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockBuffer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockBuffer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java
index 1adddb5cd78..ba4a9fd7f13 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockBuffer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockBuffer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,14 +26,14 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.mapred.OutputCollector;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.AdaptivePartialBlock;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.PartialBlock;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedAdaptivePartialBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.AdaptivePartialBlock;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.PartialBlock;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.runtime.matrix.data.TaggedAdaptivePartialBlock;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockMapper.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockMapper.java
index d7514f5cb56..c659fece507 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockMapper.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,16 +29,16 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.AdaptivePartialBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.PartialBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedAdaptivePartialBlock;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.AdaptivePartialBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.PartialBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedAdaptivePartialBlock;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockReducer.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockReducer.java
index 375283e019c..0601550d312 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReblockReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReblockReducer.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -27,14 +27,14 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.mr.ReblockInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.AdaptivePartialBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.PartialBlock;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedAdaptivePartialBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.mr.ReblockInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.AdaptivePartialBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.PartialBlock;
+import org.apache.sysml.runtime.matrix.data.TaggedAdaptivePartialBlock;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReduceBase.java b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReduceBase.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReduceBase.java
rename to src/main/java/org/apache/sysml/runtime/matrix/mapred/ReduceBase.java
index 13c4a63eb33..0f034c9f4d3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/mapred/ReduceBase.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/mapred/ReduceBase.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.mapred;
+package org.apache.sysml.runtime.matrix.mapred;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,18 +28,18 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.instructions.mr.AggregateInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.MRInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.TernaryInstruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.OperationsOnMatrixValues;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedMatrixValue;
-import com.ibm.bi.dml.runtime.matrix.operators.AggregateOperator;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.instructions.mr.AggregateInstruction;
+import org.apache.sysml.runtime.instructions.mr.MRInstruction;
+import org.apache.sysml.runtime.instructions.mr.TernaryInstruction;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.OperationsOnMatrixValues;
+import org.apache.sysml.runtime.matrix.data.TaggedMatrixValue;
+import org.apache.sysml.runtime.matrix.operators.AggregateOperator;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 
 public class ReduceBase extends MRBaseForCommonInstructions
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateBinaryOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateBinaryOperator.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateBinaryOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateBinaryOperator.java
index ada01ce4a3a..a27965a78b4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateBinaryOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateBinaryOperator.java
@@ -16,13 +16,13 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 
 public class AggregateBinaryOperator extends Operator implements Serializable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateOperator.java
similarity index 77%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateOperator.java
index a87070da3fc..7d6227aace7 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateOperator.java
@@ -16,17 +16,17 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.lops.PartialAggregate.CorrectionLocationType;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlusSq;
-import com.ibm.bi.dml.runtime.functionobjects.Minus;
-import com.ibm.bi.dml.runtime.functionobjects.Or;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.lops.PartialAggregate.CorrectionLocationType;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.KahanPlusSq;
+import org.apache.sysml.runtime.functionobjects.Minus;
+import org.apache.sysml.runtime.functionobjects.Or;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 
 public class AggregateOperator  extends Operator implements Serializable
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateUnaryOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateUnaryOperator.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateUnaryOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateUnaryOperator.java
index a249a424d96..36b02df9424 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/AggregateUnaryOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/AggregateUnaryOperator.java
@@ -16,14 +16,14 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.runtime.functionobjects.IndexFunction;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlusSq;
-import com.ibm.bi.dml.runtime.functionobjects.Minus;
-import com.ibm.bi.dml.runtime.functionobjects.Or;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.IndexFunction;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.KahanPlusSq;
+import org.apache.sysml.runtime.functionobjects.Minus;
+import org.apache.sysml.runtime.functionobjects.Or;
+import org.apache.sysml.runtime.functionobjects.Plus;
 
 
 public class AggregateUnaryOperator  extends Operator 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/BinaryOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/BinaryOperator.java
similarity index 70%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/BinaryOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/BinaryOperator.java
index af1b7a3bb4a..5d2d304e5bd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/BinaryOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/BinaryOperator.java
@@ -16,30 +16,30 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.hops.Hop.OpOp2;
-import com.ibm.bi.dml.runtime.functionobjects.And;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Divide;
-import com.ibm.bi.dml.runtime.functionobjects.Equals;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThan;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.IntegerDivide;
-import com.ibm.bi.dml.runtime.functionobjects.LessThan;
-import com.ibm.bi.dml.runtime.functionobjects.LessThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Minus;
-import com.ibm.bi.dml.runtime.functionobjects.MinusNz;
-import com.ibm.bi.dml.runtime.functionobjects.Modulus;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.NotEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Or;
-import com.ibm.bi.dml.runtime.functionobjects.Plus;
-import com.ibm.bi.dml.runtime.functionobjects.Power;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin.BuiltinFunctionCode;
+import org.apache.sysml.hops.Hop.OpOp2;
+import org.apache.sysml.runtime.functionobjects.And;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Divide;
+import org.apache.sysml.runtime.functionobjects.Equals;
+import org.apache.sysml.runtime.functionobjects.GreaterThan;
+import org.apache.sysml.runtime.functionobjects.GreaterThanEquals;
+import org.apache.sysml.runtime.functionobjects.IntegerDivide;
+import org.apache.sysml.runtime.functionobjects.LessThan;
+import org.apache.sysml.runtime.functionobjects.LessThanEquals;
+import org.apache.sysml.runtime.functionobjects.Minus;
+import org.apache.sysml.runtime.functionobjects.MinusNz;
+import org.apache.sysml.runtime.functionobjects.Modulus;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.NotEquals;
+import org.apache.sysml.runtime.functionobjects.Or;
+import org.apache.sysml.runtime.functionobjects.Plus;
+import org.apache.sysml.runtime.functionobjects.Power;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.functionobjects.Builtin.BuiltinFunctionCode;
 
 public class BinaryOperator  extends Operator implements Serializable
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/CMOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/CMOperator.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/CMOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/CMOperator.java
index 7a834a79e30..eabcf1b7c91 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/CMOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/CMOperator.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 public class CMOperator extends Operator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/COVOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/COVOperator.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/COVOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/COVOperator.java
index ab5596865cf..6eb6988a2cb 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/COVOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/COVOperator.java
@@ -16,9 +16,9 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.runtime.functionobjects.COV;
+import org.apache.sysml.runtime.functionobjects.COV;
 
 public class COVOperator extends Operator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/LeftScalarOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java
similarity index 76%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/LeftScalarOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java
index 05aee6fceef..890d1a7bfd8 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/LeftScalarOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/LeftScalarOperator.java
@@ -16,15 +16,15 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThan;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.LessThan;
-import com.ibm.bi.dml.runtime.functionobjects.LessThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Power;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.GreaterThan;
+import org.apache.sysml.runtime.functionobjects.GreaterThanEquals;
+import org.apache.sysml.runtime.functionobjects.LessThan;
+import org.apache.sysml.runtime.functionobjects.LessThanEquals;
+import org.apache.sysml.runtime.functionobjects.Power;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 
 public class LeftScalarOperator extends ScalarOperator 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/Operator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/Operator.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/Operator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/Operator.java
index f64f75ded27..f113c16f06f 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/Operator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/Operator.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/QuaternaryOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/QuaternaryOperator.java
similarity index 74%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/QuaternaryOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/QuaternaryOperator.java
index c0b14121bc8..a3ec42b83cc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/QuaternaryOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/QuaternaryOperator.java
@@ -16,17 +16,17 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.lops.WeightedDivMM.WDivMMType;
-import com.ibm.bi.dml.lops.WeightedSigmoid.WSigmoidType;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss.WeightsType;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy.WCeMMType;
-import com.ibm.bi.dml.lops.WeightedUnaryMM.WUMMType;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply2;
-import com.ibm.bi.dml.runtime.functionobjects.Power2;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.lops.WeightedDivMM.WDivMMType;
+import org.apache.sysml.lops.WeightedSigmoid.WSigmoidType;
+import org.apache.sysml.lops.WeightedSquaredLoss.WeightsType;
+import org.apache.sysml.lops.WeightedCrossEntropy.WCeMMType;
+import org.apache.sysml.lops.WeightedUnaryMM.WUMMType;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Multiply2;
+import org.apache.sysml.runtime.functionobjects.Power2;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 public class QuaternaryOperator extends Operator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ReIndexOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/ReIndexOperator.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ReIndexOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/ReIndexOperator.java
index d1c8f3d5a9b..0c196b64022 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ReIndexOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/ReIndexOperator.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
 public class ReIndexOperator extends Operator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ReorgOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/ReorgOperator.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ReorgOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/ReorgOperator.java
index cdb726359de..7315e85a5b0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ReorgOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/ReorgOperator.java
@@ -16,11 +16,11 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
 import java.io.Serializable;
 
-import com.ibm.bi.dml.runtime.functionobjects.IndexFunction;
+import org.apache.sysml.runtime.functionobjects.IndexFunction;
 
 public class ReorgOperator  extends Operator implements Serializable
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/RightScalarOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/RightScalarOperator.java
similarity index 75%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/RightScalarOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/RightScalarOperator.java
index 282b526e9cf..706f27354f6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/RightScalarOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/RightScalarOperator.java
@@ -16,14 +16,14 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
-
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThan;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.LessThan;
-import com.ibm.bi.dml.runtime.functionobjects.LessThanEquals;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+package org.apache.sysml.runtime.matrix.operators;
+
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.GreaterThan;
+import org.apache.sysml.runtime.functionobjects.GreaterThanEquals;
+import org.apache.sysml.runtime.functionobjects.LessThan;
+import org.apache.sysml.runtime.functionobjects.LessThanEquals;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 
 public class RightScalarOperator extends ScalarOperator 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ScalarOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java
similarity index 71%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ScalarOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java
index 8608a50b5fc..5b86f534294 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ScalarOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/ScalarOperator.java
@@ -16,23 +16,23 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.And;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.Builtin.BuiltinFunctionCode;
-import com.ibm.bi.dml.runtime.functionobjects.Equals;
-import com.ibm.bi.dml.runtime.functionobjects.GreaterThan;
-import com.ibm.bi.dml.runtime.functionobjects.LessThan;
-import com.ibm.bi.dml.runtime.functionobjects.Minus;
-import com.ibm.bi.dml.runtime.functionobjects.MinusNz;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply;
-import com.ibm.bi.dml.runtime.functionobjects.Multiply2;
-import com.ibm.bi.dml.runtime.functionobjects.NotEquals;
-import com.ibm.bi.dml.runtime.functionobjects.Power;
-import com.ibm.bi.dml.runtime.functionobjects.Power2;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.And;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.Builtin.BuiltinFunctionCode;
+import org.apache.sysml.runtime.functionobjects.Equals;
+import org.apache.sysml.runtime.functionobjects.GreaterThan;
+import org.apache.sysml.runtime.functionobjects.LessThan;
+import org.apache.sysml.runtime.functionobjects.Minus;
+import org.apache.sysml.runtime.functionobjects.MinusNz;
+import org.apache.sysml.runtime.functionobjects.Multiply;
+import org.apache.sysml.runtime.functionobjects.Multiply2;
+import org.apache.sysml.runtime.functionobjects.NotEquals;
+import org.apache.sysml.runtime.functionobjects.Power;
+import org.apache.sysml.runtime.functionobjects.Power2;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 
 public class ScalarOperator  extends Operator 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/SimpleOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/SimpleOperator.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/SimpleOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/SimpleOperator.java
index d242e43e068..667e1257dcb 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/SimpleOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/SimpleOperator.java
@@ -16,9 +16,9 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.runtime.functionobjects.FunctionObject;
+import org.apache.sysml.runtime.functionobjects.FunctionObject;
 
 /*
  * Simple operator is just a wrapper for a single function object of any type.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/UnaryOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/UnaryOperator.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/UnaryOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/UnaryOperator.java
index d9afcf98cc9..508e6d6fa16 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/UnaryOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/UnaryOperator.java
@@ -16,10 +16,10 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
-import com.ibm.bi.dml.runtime.functionobjects.Builtin;
-import com.ibm.bi.dml.runtime.functionobjects.ValueFunction;
+import org.apache.sysml.runtime.functionobjects.Builtin;
+import org.apache.sysml.runtime.functionobjects.ValueFunction;
 
 public class UnaryOperator extends Operator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ZeroOutOperator.java b/src/main/java/org/apache/sysml/runtime/matrix/operators/ZeroOutOperator.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ZeroOutOperator.java
rename to src/main/java/org/apache/sysml/runtime/matrix/operators/ZeroOutOperator.java
index d05f13ee2df..86118cd1434 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/operators/ZeroOutOperator.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/operators/ZeroOutOperator.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.operators;
+package org.apache.sysml.runtime.matrix.operators;
 
 public class ZeroOutOperator extends Operator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactDoubleIntInputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/CompactDoubleIntInputFormat.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactDoubleIntInputFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/CompactDoubleIntInputFormat.java
index 4d906546274..8fd98b5eaf2 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactDoubleIntInputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/CompactDoubleIntInputFormat.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -37,9 +37,9 @@
 import org.apache.hadoop.mapred.RecordReader;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 
 public class CompactDoubleIntInputFormat extends FileInputFormat
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactInputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/CompactInputFormat.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactInputFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/CompactInputFormat.java
index a7ab648a485..87937b40214 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactInputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/CompactInputFormat.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactOutputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/CompactOutputFormat.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactOutputFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/CompactOutputFormat.java
index f5920805fb4..cd2ddcd7c4b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/CompactOutputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/CompactOutputFormat.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortComparable.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortComparable.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortComparable.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortComparable.java
index 32ecc3d840c..454ee928093 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortComparable.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortComparable.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortComparableDesc.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortComparableDesc.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortComparableDesc.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortComparableDesc.java
index 3ff98df2098..098546abfbc 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortComparableDesc.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortComparableDesc.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import org.apache.hadoop.io.DoubleWritable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortMapper.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortMapper.java
index d7cb25761f0..408d48f63d6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 
@@ -26,10 +26,10 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.SortMR;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.SortMR;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 public class IndexSortMapper extends MapReduceBase 
    implements Mapper
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortReducer.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortReducer.java
index a4b2a982715..e07fd2e706c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -27,11 +27,11 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.SortMR;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.matrix.SortMR;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 public class IndexSortReducer extends MapReduceBase 
     implements Reducer
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortStitchupMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortStitchupMapper.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortStitchupMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortStitchupMapper.java
index 344dc12fb4c..40a65f9620b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortStitchupMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortStitchupMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 import java.util.StringTokenizer;
@@ -26,10 +26,10 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.SortMR;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.SortMR;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 public class IndexSortStitchupMapper extends MapReduceBase 
  	  implements Mapper
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortStitchupReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortStitchupReducer.java
similarity index 83%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortStitchupReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortStitchupReducer.java
index e91bf4c211a..89f76542d70 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/IndexSortStitchupReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/IndexSortStitchupReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -26,10 +26,10 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 public class IndexSortStitchupReducer extends MapReduceBase 
 		implements Reducer
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/PickFromCompactInputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/PickFromCompactInputFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java
index f8c54293861..a8ef0eb3cd9 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/PickFromCompactInputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/PickFromCompactInputFormat.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -39,10 +39,10 @@
 import org.apache.hadoop.mapred.RecordReader;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 //key class to read has to be DoubleWritable
 public class PickFromCompactInputFormat extends FileInputFormat
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ReadWithZeros.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/ReadWithZeros.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ReadWithZeros.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/ReadWithZeros.java
index 6553acc2502..5d0bcce8446 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ReadWithZeros.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/ReadWithZeros.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/SamplingSortMRInputFormat.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/SamplingSortMRInputFormat.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/SamplingSortMRInputFormat.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/SamplingSortMRInputFormat.java
index 88f91a0cf7e..6da873bb82e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/SamplingSortMRInputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/SamplingSortMRInputFormat.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -37,10 +37,10 @@
 import org.apache.hadoop.util.IndexedSortable;
 import org.apache.hadoop.util.QuickSort;
 
-import com.ibm.bi.dml.runtime.matrix.data.Converter;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.data.Converter;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 
 @SuppressWarnings("rawtypes")
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ValueSortMapper.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ValueSortMapper.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java
index 261d9cebcc8..dae9f3d2b78 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ValueSortMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortMapper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 
@@ -28,13 +28,13 @@
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.mr.CombineUnaryInstruction;
-import com.ibm.bi.dml.runtime.matrix.SortMR;
-import com.ibm.bi.dml.runtime.matrix.data.Converter;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.mr.CombineUnaryInstruction;
+import org.apache.sysml.runtime.matrix.SortMR;
+import org.apache.sysml.runtime.matrix.data.Converter;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.Pair;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 @SuppressWarnings("rawtypes")
 public class ValueSortMapper extends MapReduceBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ValueSortReducer.java b/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortReducer.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ValueSortReducer.java
rename to src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortReducer.java
index 3bf90350218..e2f95774382 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/matrix/sort/ValueSortReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/matrix/sort/ValueSortReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.matrix.sort;
+package org.apache.sysml.runtime.matrix.sort;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -29,8 +29,8 @@
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
 
-import com.ibm.bi.dml.runtime.matrix.SortMR;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.matrix.SortMR;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 @SuppressWarnings("rawtypes")
 public class ValueSortReducer extends MapReduceBase 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfBBMR.java b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfBBMR.java
rename to src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java
index 24e670101e2..cf8434f3203 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfBBMR.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMR.java
@@ -16,7 +16,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.util.HashSet;
 
 import org.apache.hadoop.filecache.DistributedCache;
@@ -26,23 +26,23 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.RunningJob;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.instructions.InstructionParser;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.BlockRow;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.WriteCSVMR;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVReblockReducer;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.instructions.InstructionParser;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.BlockRow;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.WriteCSVMR;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.mapred.CSVReblockReducer;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.ConvertTarget;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration.MatrixChar_N_ReducerGroups;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * MapReduce job that performs the actual data transformations, such as recoding
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfBBMapper.java b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMapper.java
similarity index 85%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfBBMapper.java
rename to src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMapper.java
index f4095a0ea2f..c49dc72b094 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfBBMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfBBMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,14 +33,14 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.wink.json4j.JSONException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
-import com.ibm.bi.dml.runtime.matrix.data.TaggedFirstSecondIndexes;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVReblockMapper;
-import com.ibm.bi.dml.runtime.matrix.mapred.CSVReblockMapper.IndexedBlockRow;
-import com.ibm.bi.dml.runtime.matrix.mapred.MapperBase;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.matrix.data.TaggedFirstSecondIndexes;
+import org.apache.sysml.runtime.matrix.mapred.CSVReblockMapper;
+import org.apache.sysml.runtime.matrix.mapred.CSVReblockMapper.IndexedBlockRow;
+import org.apache.sysml.runtime.matrix.mapred.MapperBase;
 
 @SuppressWarnings("deprecation")
 public class ApplyTfBBMapper extends MapperBase implements Mapper{
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVMR.java b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVMR.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVMR.java
rename to src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVMR.java
index b073f091fb0..1441f9ced7d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVMR.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
@@ -34,11 +34,11 @@
 import org.apache.hadoop.mapred.TextInputFormat;
 import org.apache.hadoop.mapred.TextOutputFormat;
 
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 
 @SuppressWarnings("deprecation")
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVMapper.java b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVMapper.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVMapper.java
rename to src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVMapper.java
index e26efaf0c9e..d2bfc323913 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -31,7 +31,7 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.wink.json4j.JSONException;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLRuntimeException;
 
 public class ApplyTfCSVMapper implements Mapper {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVSPARK.java b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVSPARK.java
rename to src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java
index 312d18186b1..03237332b31 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/ApplyTfCSVSPARK.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/ApplyTfCSVSPARK.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -34,9 +34,9 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
 
 
 public class ApplyTfCSVSPARK {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/BinAgent.java b/src/main/java/org/apache/sysml/runtime/transform/BinAgent.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/BinAgent.java
rename to src/main/java/org/apache/sysml/runtime/transform/BinAgent.java
index 10917c0eb55..876dd05b799 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/BinAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/BinAgent.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -38,8 +38,8 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.transform.MVImputeAgent.MVMethod;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.transform.MVImputeAgent.MVMethod;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class BinAgent extends TransformationAgent {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/DataTransform.java b/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/DataTransform.java
rename to src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
index 9479b2f712c..999f2790ab0 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/DataTransform.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/DataTransform.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -44,40 +44,40 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.lops.CSVReBlock;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ParameterizedBuiltinFunctionExpression;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-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.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionParser;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.mr.CSVReblockInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.ParameterizedBuiltinSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.data.RDDObject;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtils;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.AssignRowIDMRReturn;
-import com.ibm.bi.dml.runtime.matrix.JobReturn;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.transform.TransformationAgent.TX_METHOD;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.utils.JSONHelper;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.lops.CSVReBlock;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ParameterizedBuiltinFunctionExpression;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionParser;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.ParameterizedBuiltinCPInstruction;
+import org.apache.sysml.runtime.instructions.mr.CSVReblockInstruction;
+import org.apache.sysml.runtime.instructions.spark.ParameterizedBuiltinSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.data.RDDObject;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtils;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.AssignRowIDMRReturn;
+import org.apache.sysml.runtime.matrix.JobReturn;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.transform.TransformationAgent.TX_METHOD;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.utils.JSONHelper;
 
 public class DataTransform {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/DistinctValue.java b/src/main/java/org/apache/sysml/runtime/transform/DistinctValue.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/DistinctValue.java
rename to src/main/java/org/apache/sysml/runtime/transform/DistinctValue.java
index 86b8e3c5a7f..bcdd8b0aca5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/DistinctValue.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/DistinctValue.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -29,8 +29,8 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
 
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class DistinctValue implements Writable, Serializable {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/DummycodeAgent.java b/src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/DummycodeAgent.java
rename to src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java
index e776729ef57..d419f31b9b2 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/DummycodeAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/DummycodeAgent.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -37,7 +37,7 @@
 
 import com.google.common.base.Functions;
 import com.google.common.collect.Ordering;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class DummycodeAgent extends TransformationAgent {	
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/GTFMTDMapper.java b/src/main/java/org/apache/sysml/runtime/transform/GTFMTDMapper.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/GTFMTDMapper.java
rename to src/main/java/org/apache/sysml/runtime/transform/GTFMTDMapper.java
index 1ebb78c2a35..bf040f3b958 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/GTFMTDMapper.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/GTFMTDMapper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.IOException;
 
 import org.apache.hadoop.io.IntWritable;
@@ -27,7 +27,7 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.wink.json4j.JSONException;
 
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
 
 
 public class GTFMTDMapper implements Mapper{
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/GTFMTDReducer.java b/src/main/java/org/apache/sysml/runtime/transform/GTFMTDReducer.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/GTFMTDReducer.java
rename to src/main/java/org/apache/sysml/runtime/transform/GTFMTDReducer.java
index 83a7b32185f..b412a725fbf 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/GTFMTDReducer.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/GTFMTDReducer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,8 +34,8 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.wink.json4j.JSONException;
 
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 
 public class GTFMTDReducer implements Reducer {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/GenTfMtdMR.java b/src/main/java/org/apache/sysml/runtime/transform/GenTfMtdMR.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/GenTfMtdMR.java
rename to src/main/java/org/apache/sysml/runtime/transform/GenTfMtdMR.java
index c634d406e94..b6bd081c184 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/GenTfMtdMR.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/GenTfMtdMR.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.IOException;
 
 import org.apache.hadoop.fs.FileSystem;
@@ -32,8 +32,8 @@
 import org.apache.hadoop.mapred.TextInputFormat;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
 
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
 
 /**
  * MR Job to Generate Transform Metadata based on a given transformation specification file (JSON format).
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/GenTfMtdSPARK.java b/src/main/java/org/apache/sysml/runtime/transform/GenTfMtdSPARK.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/GenTfMtdSPARK.java
rename to src/main/java/org/apache/sysml/runtime/transform/GenTfMtdSPARK.java
index f424cd70042..7c34be6ffd3 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/GenTfMtdSPARK.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/GenTfMtdSPARK.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,9 +37,9 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
 
 public class GenTfMtdSPARK {
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/MVImputeAgent.java b/src/main/java/org/apache/sysml/runtime/transform/MVImputeAgent.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/MVImputeAgent.java
rename to src/main/java/org/apache/sysml/runtime/transform/MVImputeAgent.java
index aeec9d620e1..dc63833346a 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/MVImputeAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/MVImputeAgent.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -40,15 +40,15 @@
 
 import scala.Tuple2;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.functionobjects.CM;
-import com.ibm.bi.dml.runtime.functionobjects.KahanPlus;
-import com.ibm.bi.dml.runtime.functionobjects.Mean;
-import com.ibm.bi.dml.runtime.instructions.cp.CM_COV_Object;
-import com.ibm.bi.dml.runtime.instructions.cp.KahanObject;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator;
-import com.ibm.bi.dml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.functionobjects.CM;
+import org.apache.sysml.runtime.functionobjects.KahanPlus;
+import org.apache.sysml.runtime.functionobjects.Mean;
+import org.apache.sysml.runtime.instructions.cp.CM_COV_Object;
+import org.apache.sysml.runtime.instructions.cp.KahanObject;
+import org.apache.sysml.runtime.matrix.operators.CMOperator;
+import org.apache.sysml.runtime.matrix.operators.CMOperator.AggregateOperationTypes;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class MVImputeAgent extends TransformationAgent {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/OmitAgent.java b/src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/OmitAgent.java
rename to src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java
index cfda9a3d315..67abb04443e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/OmitAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/OmitAgent.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -30,7 +30,7 @@
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
 
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class OmitAgent extends TransformationAgent {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/RecodeAgent.java b/src/main/java/org/apache/sysml/runtime/transform/RecodeAgent.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/RecodeAgent.java
rename to src/main/java/org/apache/sysml/runtime/transform/RecodeAgent.java
index c4221fcd8e1..226250d75e6 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/RecodeAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/RecodeAgent.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -40,8 +40,8 @@
 import scala.Tuple2;
 
 import com.google.common.collect.Ordering;
-import com.ibm.bi.dml.runtime.transform.MVImputeAgent.MVMethod;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
+import org.apache.sysml.runtime.transform.MVImputeAgent.MVMethod;
+import org.apache.sysml.runtime.util.UtilFunctions;
 
 public class RecodeAgent extends TransformationAgent {
 	
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/TfUtils.java b/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/TfUtils.java
rename to src/main/java/org/apache/sysml/runtime/transform/TfUtils.java
index e6e3c72f03a..b49b34c935c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/TfUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.BufferedReader;
 import java.io.EOFException;
@@ -37,17 +37,17 @@
 import org.apache.wink.json4j.JSONException;
 import org.apache.wink.json4j.JSONObject;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR;
-import com.ibm.bi.dml.runtime.matrix.CSVReblockMR.OffsetCount;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRJobConfiguration;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.utils.JSONHelper;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.matrix.CSVReblockMR;
+import org.apache.sysml.runtime.matrix.CSVReblockMR.OffsetCount;
+import org.apache.sysml.runtime.matrix.mapred.MRJobConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.utils.JSONHelper;
 
 
 @SuppressWarnings("deprecation")
diff --git a/src/main/java/com/ibm/bi/dml/runtime/transform/TransformationAgent.java b/src/main/java/org/apache/sysml/runtime/transform/TransformationAgent.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/transform/TransformationAgent.java
rename to src/main/java/org/apache/sysml/runtime/transform/TransformationAgent.java
index 37cbba7ea1b..372a0a75057 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/transform/TransformationAgent.java
+++ b/src/main/java/org/apache/sysml/runtime/transform/TransformationAgent.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.transform;
+package org.apache.sysml.runtime.transform;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/BinaryBlockInputFormat.java b/src/main/java/org/apache/sysml/runtime/util/BinaryBlockInputFormat.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/runtime/util/BinaryBlockInputFormat.java
rename to src/main/java/org/apache/sysml/runtime/util/BinaryBlockInputFormat.java
index 04eae4f903e..55afc0bd73d 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/BinaryBlockInputFormat.java
+++ b/src/main/java/org/apache/sysml/runtime/util/BinaryBlockInputFormat.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.IOException;
 
@@ -26,8 +26,8 @@
 import org.apache.hadoop.mapred.SequenceFileInputFormat;
 import org.apache.hadoop.mapred.FileSplit;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * Custom binary block input format to return the custom record reader.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/BinaryBlockRecordReader.java b/src/main/java/org/apache/sysml/runtime/util/BinaryBlockRecordReader.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/runtime/util/BinaryBlockRecordReader.java
rename to src/main/java/org/apache/sysml/runtime/util/BinaryBlockRecordReader.java
index bf2e0abb2cc..7b007d0c896 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/BinaryBlockRecordReader.java
+++ b/src/main/java/org/apache/sysml/runtime/util/BinaryBlockRecordReader.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.IOException;
 
@@ -23,8 +23,8 @@
 import org.apache.hadoop.mapred.FileSplit;
 import org.apache.hadoop.mapred.SequenceFileRecordReader;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
 
 /**
  * Custom record reader for binary block. Currently its only purpose is to allow for
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/DataConverter.java b/src/main/java/org/apache/sysml/runtime/util/DataConverter.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/util/DataConverter.java
rename to src/main/java/org/apache/sysml/runtime/util/DataConverter.java
index c9d4d9169f0..039b7bf6743 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/DataConverter.java
+++ b/src/main/java/org/apache/sysml/runtime/util/DataConverter.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25,24 +25,24 @@
 
 import org.apache.commons.math3.linear.Array2DRowRealMatrix;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.io.MatrixReaderFactory;
-import com.ibm.bi.dml.runtime.io.MatrixWriter;
-import com.ibm.bi.dml.runtime.io.MatrixWriterFactory;
-import com.ibm.bi.dml.runtime.io.ReadProperties;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CTableMap;
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.udf.Matrix;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.io.MatrixReaderFactory;
+import org.apache.sysml.runtime.io.MatrixWriter;
+import org.apache.sysml.runtime.io.MatrixWriterFactory;
+import org.apache.sysml.runtime.io.ReadProperties;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CTableMap;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.udf.Matrix;
 
 
 /**
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/FastBufferedDataInputStream.java b/src/main/java/org/apache/sysml/runtime/util/FastBufferedDataInputStream.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/util/FastBufferedDataInputStream.java
rename to src/main/java/org/apache/sysml/runtime/util/FastBufferedDataInputStream.java
index 5f23ace06ba..2b79301acfd 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/FastBufferedDataInputStream.java
+++ b/src/main/java/org/apache/sysml/runtime/util/FastBufferedDataInputStream.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.DataInput;
 import java.io.EOFException;
@@ -23,8 +23,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlockDataInput;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.matrix.data.MatrixBlockDataInput;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/FastBufferedDataOutputStream.java b/src/main/java/org/apache/sysml/runtime/util/FastBufferedDataOutputStream.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/util/FastBufferedDataOutputStream.java
rename to src/main/java/org/apache/sysml/runtime/util/FastBufferedDataOutputStream.java
index be574ce51ad..7c9a50e5f74 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/FastBufferedDataOutputStream.java
+++ b/src/main/java/org/apache/sysml/runtime/util/FastBufferedDataOutputStream.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.DataOutput;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlockDataOutput;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRow;
+import org.apache.sysml.runtime.matrix.data.MatrixBlockDataOutput;
+import org.apache.sysml.runtime.matrix.data.SparseRow;
 
 /**
  * This buffered output stream is essentially a merged version of
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/FastStringTokenizer.java b/src/main/java/org/apache/sysml/runtime/util/FastStringTokenizer.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/runtime/util/FastStringTokenizer.java
rename to src/main/java/org/apache/sysml/runtime/util/FastStringTokenizer.java
index b59112a6c2d..8e97a28e951 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/FastStringTokenizer.java
+++ b/src/main/java/org/apache/sysml/runtime/util/FastStringTokenizer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/IndexRange.java b/src/main/java/org/apache/sysml/runtime/util/IndexRange.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/util/IndexRange.java
rename to src/main/java/org/apache/sysml/runtime/util/IndexRange.java
index b38702a7b78..afa70e8f9e5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/IndexRange.java
+++ b/src/main/java/org/apache/sysml/runtime/util/IndexRange.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/LocalFileUtils.java b/src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/runtime/util/LocalFileUtils.java
rename to src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java
index 8041f06b2bc..7827e503fbe 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/LocalFileUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/util/LocalFileUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,17 +23,17 @@
 import java.io.IOException;
 import java.util.HashMap;
 
-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.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue;
-import com.ibm.bi.dml.runtime.matrix.data.Pair;
+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.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue;
+import org.apache.sysml.runtime.matrix.data.Pair;
 
 public class LocalFileUtils 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/LongLongDoubleHashMap.java b/src/main/java/org/apache/sysml/runtime/util/LongLongDoubleHashMap.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/runtime/util/LongLongDoubleHashMap.java
rename to src/main/java/org/apache/sysml/runtime/util/LongLongDoubleHashMap.java
index a40bf14ba06..d7f5831e073 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/LongLongDoubleHashMap.java
+++ b/src/main/java/org/apache/sysml/runtime/util/LongLongDoubleHashMap.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/MapReduceTool.java b/src/main/java/org/apache/sysml/runtime/util/MapReduceTool.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/util/MapReduceTool.java
rename to src/main/java/org/apache/sysml/runtime/util/MapReduceTool.java
index 63c58a71730..3b37c39b00b 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/MapReduceTool.java
+++ b/src/main/java/org/apache/sysml/runtime/util/MapReduceTool.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -37,20 +37,20 @@
 import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.mapred.JobConf;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.io.MatrixReaderFactory;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.FileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.sort.ReadWithZeros;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.io.MatrixReaderFactory;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.sort.ReadWithZeros;
 
 
 public class MapReduceTool 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/NormalPRNGenerator.java b/src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/util/NormalPRNGenerator.java
rename to src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java
index a8050a5d6f8..82e85c1e947 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/NormalPRNGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/util/NormalPRNGenerator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/PRNGenerator.java b/src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java
similarity index 95%
rename from src/main/java/com/ibm/bi/dml/runtime/util/PRNGenerator.java
rename to src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java
index 6dc2631abf7..0ed47da4c30 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/PRNGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/util/PRNGenerator.java
@@ -16,7 +16,7 @@
  */
 
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 public abstract class PRNGenerator 
 {
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/PoissonPRNGenerator.java b/src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/runtime/util/PoissonPRNGenerator.java
rename to src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java
index 1d064424c90..bc50eb7ab82 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/PoissonPRNGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/util/PoissonPRNGenerator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import org.apache.commons.math3.distribution.PoissonDistribution;
 import org.apache.commons.math3.random.SynchronizedRandomGenerator;
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/RandN.java b/src/main/java/org/apache/sysml/runtime/util/RandN.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/util/RandN.java
rename to src/main/java/org/apache/sysml/runtime/util/RandN.java
index 60c5bf325e5..70a139ceafb 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/RandN.java
+++ b/src/main/java/org/apache/sysml/runtime/util/RandN.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/RandNPair.java b/src/main/java/org/apache/sysml/runtime/util/RandNPair.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/util/RandNPair.java
rename to src/main/java/org/apache/sysml/runtime/util/RandNPair.java
index 11d574ffba0..3c4c36e493c 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/RandNPair.java
+++ b/src/main/java/org/apache/sysml/runtime/util/RandNPair.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/SortUtils.java b/src/main/java/org/apache/sysml/runtime/util/SortUtils.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/runtime/util/SortUtils.java
rename to src/main/java/org/apache/sysml/runtime/util/SortUtils.java
index 07ad879cc8a..237086afdb5 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/SortUtils.java
+++ b/src/main/java/org/apache/sysml/runtime/util/SortUtils.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.util.Arrays;
 import java.util.Random;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
 
 /**
  * Utilities for sorting, primarily used for SparseRows.
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/UniformPRNGenerator.java b/src/main/java/org/apache/sysml/runtime/util/UniformPRNGenerator.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/runtime/util/UniformPRNGenerator.java
rename to src/main/java/org/apache/sysml/runtime/util/UniformPRNGenerator.java
index 73eef76e968..7aedaf012d4 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/UniformPRNGenerator.java
+++ b/src/main/java/org/apache/sysml/runtime/util/UniformPRNGenerator.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/ibm/bi/dml/runtime/util/UtilFunctions.java b/src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/runtime/util/UtilFunctions.java
rename to src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java
index d124ec42a08..c5a27427d8e 100644
--- a/src/main/java/com/ibm/bi/dml/runtime/util/UtilFunctions.java
+++ b/src/main/java/org/apache/sysml/runtime/util/UtilFunctions.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.runtime.util;
+package org.apache.sysml.runtime.util;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.NumItemsByEachReducerMetaData;
-import com.ibm.bi.dml.runtime.matrix.mapred.IndexedMatrixValue;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
+import org.apache.sysml.runtime.matrix.mapred.IndexedMatrixValue;
 
 public class UtilFunctions 
 {
diff --git a/src/main/java/com/ibm/bi/dml/udf/BinaryObject.java b/src/main/java/org/apache/sysml/udf/BinaryObject.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/udf/BinaryObject.java
rename to src/main/java/org/apache/sysml/udf/BinaryObject.java
index c853af04463..21c289bc6fd 100644
--- a/src/main/java/com/ibm/bi/dml/udf/BinaryObject.java
+++ b/src/main/java/org/apache/sysml/udf/BinaryObject.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.udf;
+package org.apache.sysml.udf;
 
 /**
  * Class to represent an object.
diff --git a/src/main/java/com/ibm/bi/dml/udf/ExternalFunctionInvocationInstruction.java b/src/main/java/org/apache/sysml/udf/ExternalFunctionInvocationInstruction.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/udf/ExternalFunctionInvocationInstruction.java
rename to src/main/java/org/apache/sysml/udf/ExternalFunctionInvocationInstruction.java
index 82d2bfefb85..565f470101a 100644
--- a/src/main/java/com/ibm/bi/dml/udf/ExternalFunctionInvocationInstruction.java
+++ b/src/main/java/org/apache/sysml/udf/ExternalFunctionInvocationInstruction.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.udf;
+package org.apache.sysml.udf;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
 
 /**
  * Class to maintain external function invocation instructions.
diff --git a/src/main/java/com/ibm/bi/dml/udf/FunctionParameter.java b/src/main/java/org/apache/sysml/udf/FunctionParameter.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/udf/FunctionParameter.java
rename to src/main/java/org/apache/sysml/udf/FunctionParameter.java
index 03377aeaf8f..4836efcea00 100644
--- a/src/main/java/com/ibm/bi/dml/udf/FunctionParameter.java
+++ b/src/main/java/org/apache/sysml/udf/FunctionParameter.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.udf;
+package org.apache.sysml.udf;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/ibm/bi/dml/udf/Matrix.java b/src/main/java/org/apache/sysml/udf/Matrix.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/udf/Matrix.java
rename to src/main/java/org/apache/sysml/udf/Matrix.java
index baa5451f282..d2489333371 100644
--- a/src/main/java/com/ibm/bi/dml/udf/Matrix.java
+++ b/src/main/java/org/apache/sysml/udf/Matrix.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.udf;
+package org.apache.sysml.udf;
 
 import java.io.IOException;
 
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.io.MatrixReader;
-import com.ibm.bi.dml.runtime.io.MatrixReaderFactory;
-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.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlockCP;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.io.MatrixReader;
+import org.apache.sysml.runtime.io.MatrixReaderFactory;
+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.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
 
 /**
  * Class to represent the matrix input type
diff --git a/src/main/java/com/ibm/bi/dml/udf/PackageFunction.java b/src/main/java/org/apache/sysml/udf/PackageFunction.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/udf/PackageFunction.java
rename to src/main/java/org/apache/sysml/udf/PackageFunction.java
index 326bc3f039d..b6f36073891 100644
--- a/src/main/java/com/ibm/bi/dml/udf/PackageFunction.java
+++ b/src/main/java/org/apache/sysml/udf/PackageFunction.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.udf;
+package org.apache.sysml.udf;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -23,7 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.util.IDSequence;
+import org.apache.sysml.runtime.controlprogram.parfor.util.IDSequence;
 
 /**
  * Abstract class that should be extended to implement a package function.
diff --git a/src/main/java/com/ibm/bi/dml/udf/PackageRuntimeException.java b/src/main/java/org/apache/sysml/udf/PackageRuntimeException.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/udf/PackageRuntimeException.java
rename to src/main/java/org/apache/sysml/udf/PackageRuntimeException.java
index a7f7d0a247d..a5832c0b83f 100644
--- a/src/main/java/com/ibm/bi/dml/udf/PackageRuntimeException.java
+++ b/src/main/java/org/apache/sysml/udf/PackageRuntimeException.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.udf;
+package org.apache.sysml.udf;
 
 /**
  * Class to capture a runtime exception during package execution.
diff --git a/src/main/java/com/ibm/bi/dml/udf/Scalar.java b/src/main/java/org/apache/sysml/udf/Scalar.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/udf/Scalar.java
rename to src/main/java/org/apache/sysml/udf/Scalar.java
index 755b9b5b13a..1bf27c62415 100644
--- a/src/main/java/com/ibm/bi/dml/udf/Scalar.java
+++ b/src/main/java/org/apache/sysml/udf/Scalar.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.udf;
+package org.apache.sysml.udf;
 
 /**
  * Class to represent a scalar input/output.
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/BinningWrapper.java b/src/main/java/org/apache/sysml/udf/lib/BinningWrapper.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/udf/lib/BinningWrapper.java
rename to src/main/java/org/apache/sysml/udf/lib/BinningWrapper.java
index 66b2856502f..63434741226 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/BinningWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/BinningWrapper.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
-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.Matrix.ValueType;
-import com.ibm.bi.dml.udf.Scalar.ScalarValueType;
+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.Matrix.ValueType;
+import org.apache.sysml.udf.Scalar.ScalarValueType;
 
 /**
  * Wrapper class for binning a sorted input vector
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/DeNaNWrapper.java b/src/main/java/org/apache/sysml/udf/lib/DeNaNWrapper.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/udf/lib/DeNaNWrapper.java
rename to src/main/java/org/apache/sysml/udf/lib/DeNaNWrapper.java
index f7fc3b802e5..593bdd7addd 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/DeNaNWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DeNaNWrapper.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
 
-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.Matrix.ValueType;
+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.Matrix.ValueType;
 
 /**
  * Wrapper class to deNaN matrices by replacing all NaNs with zeros,
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/DeNegInfinityWrapper.java b/src/main/java/org/apache/sysml/udf/lib/DeNegInfinityWrapper.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/udf/lib/DeNegInfinityWrapper.java
rename to src/main/java/org/apache/sysml/udf/lib/DeNegInfinityWrapper.java
index acb683052d7..73f5d8a6c78 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/DeNegInfinityWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DeNegInfinityWrapper.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
 
-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.Matrix.ValueType;
+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.Matrix.ValueType;
 
 /**
  * Wrapper class to deNegInfinity matrices by replacing all Negative Infinities
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicProjectMatrixCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicProjectMatrixCP.java
similarity index 84%
rename from src/main/java/com/ibm/bi/dml/udf/lib/DynamicProjectMatrixCP.java
rename to src/main/java/org/apache/sysml/udf/lib/DynamicProjectMatrixCP.java
index c721ae1bbe4..aa64ee4635c 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicProjectMatrixCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicProjectMatrixCP.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-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.Matrix.ValueType;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+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.Matrix.ValueType;
 
 public class DynamicProjectMatrixCP extends PackageFunction
 {
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicReadMatrixCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
similarity index 79%
rename from src/main/java/com/ibm/bi/dml/udf/lib/DynamicReadMatrixCP.java
rename to src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
index 2df1cbf3867..2d599219c92 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicReadMatrixCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixCP.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-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.Matrix.ValueType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+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.Matrix.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicReadMatrixRcCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
similarity index 80%
rename from src/main/java/com/ibm/bi/dml/udf/lib/DynamicReadMatrixRcCP.java
rename to src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
index cdae5a7e059..d957002aae8 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicReadMatrixRcCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicReadMatrixRcCP.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-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.Matrix.ValueType;
-import com.ibm.bi.dml.udf.Scalar.ScalarValueType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+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.Matrix.ValueType;
+import org.apache.sysml.udf.Scalar.ScalarValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicWriteMatrixCP.java b/src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java
similarity index 73%
rename from src/main/java/com/ibm/bi/dml/udf/lib/DynamicWriteMatrixCP.java
rename to src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java
index c2b87e817db..699e935637c 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/DynamicWriteMatrixCP.java
+++ b/src/main/java/org/apache/sysml/udf/lib/DynamicWriteMatrixCP.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-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.Scalar.ScalarValueType;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+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.Scalar.ScalarValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/GatherWrapper.java b/src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/udf/lib/GatherWrapper.java
rename to src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java
index 85307d487cd..6a7124d8dc8 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/GatherWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/GatherWrapper.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
-import com.ibm.bi.dml.runtime.controlprogram.caching.MatrixObject;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-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.Matrix.ValueType;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+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.Matrix.ValueType;
 /**
  * Wrapper class for conversions of bit vectors to condensed position vectors.
  * The semantics are equivalent to the following dml snippet:
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/OrderWrapper.java b/src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java
similarity index 90%
rename from src/main/java/com/ibm/bi/dml/udf/lib/OrderWrapper.java
rename to src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java
index 7b9b448e6eb..532761c55b4 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/OrderWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/OrderWrapper.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
 import java.util.Arrays;
 import java.util.Comparator;
 
-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.Matrix.ValueType;
+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.Matrix.ValueType;
 /**
  * Wrapper class for Order rows based on values in a column
  *
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/PermutationMatrixWrapper.java b/src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/udf/lib/PermutationMatrixWrapper.java
rename to src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java
index 9561d7edd30..11b4f9927fd 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/PermutationMatrixWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/PermutationMatrixWrapper.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
 import java.util.Arrays;
 import java.util.Comparator;
 
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-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.Matrix.ValueType;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+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.Matrix.ValueType;
 
 /**
  * Wrapper class for Sorting and Creating of a Permutation Matrix
@@ -43,7 +43,7 @@
  * 
  * permutation_matrix= externalFunction(Matrix[Double] A, Boolean desc) return
  * (Matrix[Double] P) implemented in
- * (classname="com.ibm.bi.dml.udf.lib.PermutationMatrixWrapper"
+ * (classname="org.apache.sysml.udf.lib.PermutationMatrixWrapper"
  * ,exectype="mem"); A = read( "Data/A.mtx"); P = permutation_matrix( A[,2],
  * false); B = P %*% A
  * 
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/RemoveEmptyRows.java b/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/udf/lib/RemoveEmptyRows.java
rename to src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
index 3d00b7adcae..32fc218bfc9 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/RemoveEmptyRows.java
+++ b/src/main/java/org/apache/sysml/udf/lib/RemoveEmptyRows.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -33,12 +33,12 @@
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.TextInputFormat;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-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.Matrix.ValueType;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.udf.FunctionParameter;
+import org.apache.sysml.udf.Matrix;
+import org.apache.sysml.udf.PackageFunction;
+import org.apache.sysml.udf.Matrix.ValueType;
 
 /**
  * 
diff --git a/src/main/java/com/ibm/bi/dml/udf/lib/TimeWrapper.java b/src/main/java/org/apache/sysml/udf/lib/TimeWrapper.java
similarity index 78%
rename from src/main/java/com/ibm/bi/dml/udf/lib/TimeWrapper.java
rename to src/main/java/org/apache/sysml/udf/lib/TimeWrapper.java
index 0eb181a2872..beca10a05d4 100644
--- a/src/main/java/com/ibm/bi/dml/udf/lib/TimeWrapper.java
+++ b/src/main/java/org/apache/sysml/udf/lib/TimeWrapper.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.udf.lib;
+package org.apache.sysml.udf.lib;
 
-//import com.ibm.bi.dml.packagesupport.Scalar;
-//import com.ibm.bi.dml.packagesupport.FIO;
+//import org.apache.sysml.packagesupport.Scalar;
+//import org.apache.sysml.packagesupport.FIO;
 
-import com.ibm.bi.dml.udf.FunctionParameter;
-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.Scalar.ScalarValueType;
+import org.apache.sysml.udf.FunctionParameter;
+import org.apache.sysml.udf.PackageFunction;
+import org.apache.sysml.udf.PackageRuntimeException;
+import org.apache.sysml.udf.Scalar;
+import org.apache.sysml.udf.Scalar.ScalarValueType;
 
 /**
  * Wrapper class for time invocation
  * 
  * time = externalFunction(Integer i) return (Double B) implemented in
- * (classname="com.ibm.bi.dml.udf.lib.TimeWrapper",exectype="mem");
+ * (classname="org.apache.sysml.udf.lib.TimeWrapper",exectype="mem");
  * 
  * t = time (1);
  * 
diff --git a/src/main/java/com/ibm/bi/dml/utils/AppException.java b/src/main/java/org/apache/sysml/utils/AppException.java
similarity index 92%
rename from src/main/java/com/ibm/bi/dml/utils/AppException.java
rename to src/main/java/org/apache/sysml/utils/AppException.java
index 2ef278f3dc9..2f2714ba79a 100644
--- a/src/main/java/com/ibm/bi/dml/utils/AppException.java
+++ b/src/main/java/org/apache/sysml/utils/AppException.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.utils;
+package org.apache.sysml.utils;
 
-import com.ibm.bi.dml.api.DMLException;
+import org.apache.sysml.api.DMLException;
 
 /**
  * This exception should be thrown to flag errors by systemML apps
diff --git a/src/main/java/com/ibm/bi/dml/utils/Explain.java b/src/main/java/org/apache/sysml/utils/Explain.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/utils/Explain.java
rename to src/main/java/org/apache/sysml/utils/Explain.java
index 6b2e7ac9a64..7c2e70f7beb 100644
--- a/src/main/java/com/ibm/bi/dml/utils/Explain.java
+++ b/src/main/java/org/apache/sysml/utils/Explain.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.utils;
+package org.apache.sysml.utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,48 +23,48 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.hops.FunctionOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.VisitStatus;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.LiteralOp;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFLoopNode;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode;
-import com.ibm.bi.dml.hops.globalopt.gdfgraph.GDFNode.NodeType;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.ForStatement;
-import com.ibm.bi.dml.parser.ExternalFunctionStatement;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.FunctionStatement;
-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.ParForStatementBlock;
-import com.ibm.bi.dml.parser.WhileStatement;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ExternalFunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.CPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.CSVReblockSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.ReblockSPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.hops.FunctionOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.VisitStatus;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.LiteralOp;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFLoopNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode;
+import org.apache.sysml.hops.globalopt.gdfgraph.GDFNode.NodeType;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.ForStatement;
+import org.apache.sysml.parser.ExternalFunctionStatement;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.FunctionStatement;
+import org.apache.sysml.parser.FunctionStatementBlock;
+import org.apache.sysml.parser.IfStatement;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.ParForStatementBlock;
+import org.apache.sysml.parser.WhileStatement;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ExternalFunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.CPInstruction;
+import org.apache.sysml.runtime.instructions.spark.CSVReblockSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.ReblockSPInstruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
 
 public class Explain 
 {	
diff --git a/src/main/java/com/ibm/bi/dml/utils/InstallDependencyForIntegrationTests.java b/src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/utils/InstallDependencyForIntegrationTests.java
rename to src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java
index 71814fb7863..e8a39c95769 100644
--- a/src/main/java/com/ibm/bi/dml/utils/InstallDependencyForIntegrationTests.java
+++ b/src/main/java/org/apache/sysml/utils/InstallDependencyForIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  * 
  */
-package com.ibm.bi.dml.utils;
+package org.apache.sysml.utils;
 
 import static org.junit.Assert.fail;
 
@@ -23,7 +23,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-//import com.ibm.bi.dml.test.utils.TestUtils;
+//import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * This class will be used to setup dependency on Eclipse environment as well as on Jenkins server
diff --git a/src/main/java/com/ibm/bi/dml/utils/JSONHelper.java b/src/main/java/org/apache/sysml/utils/JSONHelper.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/utils/JSONHelper.java
rename to src/main/java/org/apache/sysml/utils/JSONHelper.java
index 09e4f57d562..f986c0ba561 100644
--- a/src/main/java/com/ibm/bi/dml/utils/JSONHelper.java
+++ b/src/main/java/org/apache/sysml/utils/JSONHelper.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.utils;
+package org.apache.sysml.utils;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/com/ibm/bi/dml/utils/ParameterBuilder.java b/src/main/java/org/apache/sysml/utils/ParameterBuilder.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/utils/ParameterBuilder.java
rename to src/main/java/org/apache/sysml/utils/ParameterBuilder.java
index 66b87625e04..0da2dc76f69 100644
--- a/src/main/java/com/ibm/bi/dml/utils/ParameterBuilder.java
+++ b/src/main/java/org/apache/sysml/utils/ParameterBuilder.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.utils;
+package org.apache.sysml.utils;
 
 import static org.junit.Assert.fail;
 
diff --git a/src/main/java/com/ibm/bi/dml/utils/Statistics.java b/src/main/java/org/apache/sysml/utils/Statistics.java
similarity index 96%
rename from src/main/java/com/ibm/bi/dml/utils/Statistics.java
rename to src/main/java/org/apache/sysml/utils/Statistics.java
index b907ad4ea8d..b75c1ce0114 100644
--- a/src/main/java/com/ibm/bi/dml/utils/Statistics.java
+++ b/src/main/java/org/apache/sysml/utils/Statistics.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.utils;
+package org.apache.sysml.utils;
 
 import java.lang.management.CompilationMXBean;
 import java.lang.management.GarbageCollectorMXBean;
@@ -28,15 +28,15 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.controlprogram.caching.CacheStatistics;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.InstructionUtils;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.instructions.cp.FunctionCallCPInstruction;
-import com.ibm.bi.dml.runtime.instructions.spark.SPInstruction;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.controlprogram.caching.CacheStatistics;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.InstructionUtils;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.cp.FunctionCallCPInstruction;
+import org.apache.sysml.runtime.instructions.spark.SPInstruction;
 
 /**
  * This class captures all statistics.
diff --git a/src/main/java/com/ibm/bi/dml/utils/Timer.java b/src/main/java/org/apache/sysml/utils/Timer.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/utils/Timer.java
rename to src/main/java/org/apache/sysml/utils/Timer.java
index 8fbb40d7265..b775f9dac64 100644
--- a/src/main/java/com/ibm/bi/dml/utils/Timer.java
+++ b/src/main/java/org/apache/sysml/utils/Timer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.utils;
+package org.apache.sysml.utils;
 
 public class Timer 
 {
diff --git a/src/main/java/com/ibm/bi/dml/yarn/DMLAppMaster.java b/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
similarity index 94%
rename from src/main/java/com/ibm/bi/dml/yarn/DMLAppMaster.java
rename to src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
index 80670e146b9..058c2c91971 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/DMLAppMaster.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMaster.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn;
+package org.apache.sysml.yarn;
 
 import java.io.IOException;
 
@@ -37,10 +37,10 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-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.runtime.DMLScriptException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.DMLScriptException;
 
 public class DMLAppMaster 
 {
@@ -54,7 +54,7 @@ public class DMLAppMaster
 	{
 		// for internal debugging only
 		if( DMLYarnClientProxy.LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.yarn").setLevel((Level) Level.DEBUG);
+			Logger.getLogger("org.apache.sysml.yarn").setLevel((Level) Level.DEBUG);
 		}
 	}
 	
diff --git a/src/main/java/com/ibm/bi/dml/yarn/DMLAppMasterStatusReporter.java b/src/main/java/org/apache/sysml/yarn/DMLAppMasterStatusReporter.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/yarn/DMLAppMasterStatusReporter.java
rename to src/main/java/org/apache/sysml/yarn/DMLAppMasterStatusReporter.java
index 35865e3465c..9eb111b4d96 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/DMLAppMasterStatusReporter.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMasterStatusReporter.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn;
+package org.apache.sysml.yarn;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/com/ibm/bi/dml/yarn/DMLAppMasterUtils.java b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/yarn/DMLAppMasterUtils.java
rename to src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
index 2390d373e47..3e3208b32bb 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/DMLAppMasterUtils.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLAppMasterUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn;
+package org.apache.sysml.yarn;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,21 +24,21 @@
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.OptimizerUtils.OptimizationLevel;
-import com.ibm.bi.dml.lops.Lop;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.yarn.ropt.ResourceConfig;
-import com.ibm.bi.dml.yarn.ropt.ResourceOptimizer;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterConfig;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.OptimizerUtils.OptimizationLevel;
+import org.apache.sysml.lops.Lop;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.yarn.ropt.ResourceConfig;
+import org.apache.sysml.yarn.ropt.ResourceOptimizer;
+import org.apache.sysml.yarn.ropt.YarnClusterConfig;
 
 public class DMLAppMasterUtils 
 {
diff --git a/src/main/java/com/ibm/bi/dml/yarn/DMLYarnClient.java b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
similarity index 98%
rename from src/main/java/com/ibm/bi/dml/yarn/DMLYarnClient.java
rename to src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
index 52d6196e265..17cc27eeea5 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/DMLYarnClient.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLYarnClient.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn;
+package org.apache.sysml.yarn;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -52,12 +52,12 @@
 import org.apache.hadoop.yarn.util.ConverterUtils;
 import org.apache.hadoop.yarn.util.Records;
 
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLScriptException;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLScriptException;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.util.MapReduceTool;
 
 /**
  * NOTES:
diff --git a/src/main/java/com/ibm/bi/dml/yarn/DMLYarnClientProxy.java b/src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java
similarity index 82%
rename from src/main/java/com/ibm/bi/dml/yarn/DMLYarnClientProxy.java
rename to src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java
index 7affc0ad81b..e1b9d2f17c6 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/DMLYarnClientProxy.java
+++ b/src/main/java/org/apache/sysml/yarn/DMLYarnClientProxy.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn;
+package org.apache.sysml.yarn;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -25,17 +25,17 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.OptimizerUtils.OptimizationLevel;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.yarn.ropt.ResourceConfig;
-import com.ibm.bi.dml.yarn.ropt.ResourceOptimizer;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterAnalyzer;
-import com.ibm.bi.dml.yarn.ropt.YarnClusterConfig;
-import com.ibm.bi.dml.yarn.ropt.YarnOptimizerUtils;
-import com.ibm.bi.dml.yarn.ropt.YarnOptimizerUtils.GridEnumType;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils.OptimizationLevel;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.yarn.ropt.ResourceConfig;
+import org.apache.sysml.yarn.ropt.ResourceOptimizer;
+import org.apache.sysml.yarn.ropt.YarnClusterAnalyzer;
+import org.apache.sysml.yarn.ropt.YarnClusterConfig;
+import org.apache.sysml.yarn.ropt.YarnOptimizerUtils;
+import org.apache.sysml.yarn.ropt.YarnOptimizerUtils.GridEnumType;
 
 /**
  * The sole purpose of this class is to serve as a proxy to
@@ -56,7 +56,7 @@ public class DMLYarnClientProxy
 	{
 		// for internal debugging only
 		if( LDEBUG ) {
-			Logger.getLogger("com.ibm.bi.dml.yarn")
+			Logger.getLogger("org.apache.sysml.yarn")
 			      .setLevel((Level) Level.DEBUG);
 		}
 	}
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumeration.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java
similarity index 86%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumeration.java
rename to src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java
index 6d9e218f77d..e5cf2d78dac 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumeration.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumeration.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 public abstract class GridEnumeration 
 {
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationEqui.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationEqui.java
rename to src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
index e3f8fc2463a..ed4d0fd8823 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationEqui.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationEqui.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 public class GridEnumerationEqui extends GridEnumeration
 {
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationExp.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
similarity index 89%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationExp.java
rename to src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
index 506b6554ead..9087ab2ac54 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationExp.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationExp.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.util.ArrayList;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 public class GridEnumerationExp extends GridEnumeration
 {
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationHybrid.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationHybrid.java
rename to src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java
index 63bea6321cb..3485c2eb08c 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationHybrid.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationHybrid.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
 
 /**
  * Composite overlay of hybrid and exp grid.
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationMemory.java b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
similarity index 87%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationMemory.java
rename to src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
index db18f4211e3..37affed98c7 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/GridEnumerationMemory.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/GridEnumerationMemory.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 
-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.parser.StatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
 
 public class GridEnumerationMemory extends GridEnumeration
 {
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/MRJobResourceInstruction.java b/src/main/java/org/apache/sysml/yarn/ropt/MRJobResourceInstruction.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/MRJobResourceInstruction.java
rename to src/main/java/org/apache/sysml/yarn/ropt/MRJobResourceInstruction.java
index 7e9ea944725..b52db89cb8a 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/MRJobResourceInstruction.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/MRJobResourceInstruction.java
@@ -15,9 +15,9 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
 
 /**
  * The purpose of this class is to encode the yarn mapred memory configuration into 
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceConfig.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
similarity index 88%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceConfig.java
rename to src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
index 7f6f11e9d8f..1fc4058a669 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceConfig.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceConfig.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.util.ArrayList;
 import java.util.Collections;
 
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
 
 public class ResourceConfig 
 {
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceOptimizer.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
similarity index 91%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceOptimizer.java
rename to src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
index c6f6486016e..5d41aad207c 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceOptimizer.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,42 +23,42 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.ibm.bi.dml.hops.DataOp;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.hops.Hop.DataOpTypes;
-import com.ibm.bi.dml.hops.HopsException;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.cost.CostEstimationWrapper;
-import com.ibm.bi.dml.hops.recompile.Recompiler;
-import com.ibm.bi.dml.lops.LopsException;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.parser.ForStatementBlock;
-import com.ibm.bi.dml.parser.IfStatementBlock;
-import com.ibm.bi.dml.parser.StatementBlock;
-import com.ibm.bi.dml.parser.WhileStatementBlock;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.DMLUnsupportedOperationException;
-import com.ibm.bi.dml.runtime.controlprogram.ForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.FunctionProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.IfProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.LocalVariableMap;
-import com.ibm.bi.dml.runtime.controlprogram.Program;
-import com.ibm.bi.dml.runtime.controlprogram.ProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.WhileProgramBlock;
-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.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.opt.OptTreeConverter;
-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.instructions.Instruction;
-import com.ibm.bi.dml.runtime.instructions.MRJobInstruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.MatrixDimensionsMetaData;
-import com.ibm.bi.dml.yarn.DMLYarnClient;
-import com.ibm.bi.dml.yarn.ropt.YarnOptimizerUtils.GridEnumType;
+import org.apache.sysml.hops.DataOp;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.hops.Hop.DataOpTypes;
+import org.apache.sysml.hops.HopsException;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.cost.CostEstimationWrapper;
+import org.apache.sysml.hops.recompile.Recompiler;
+import org.apache.sysml.lops.LopsException;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.parser.ForStatementBlock;
+import org.apache.sysml.parser.IfStatementBlock;
+import org.apache.sysml.parser.StatementBlock;
+import org.apache.sysml.parser.WhileStatementBlock;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.DMLUnsupportedOperationException;
+import org.apache.sysml.runtime.controlprogram.ForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.FunctionProgramBlock;
+import org.apache.sysml.runtime.controlprogram.IfProgramBlock;
+import org.apache.sysml.runtime.controlprogram.LocalVariableMap;
+import org.apache.sysml.runtime.controlprogram.Program;
+import org.apache.sysml.runtime.controlprogram.ProgramBlock;
+import org.apache.sysml.runtime.controlprogram.WhileProgramBlock;
+import org.apache.sysml.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.controlprogram.parfor.opt.OptTreeConverter;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.instructions.MRJobInstruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.MatrixDimensionsMetaData;
+import org.apache.sysml.yarn.DMLYarnClient;
+import org.apache.sysml.yarn.ropt.YarnOptimizerUtils.GridEnumType;
 
 /**
  * TODO parallel version with exposed numThreads parameter
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceOptimizerCPMigration.java b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizerCPMigration.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceOptimizerCPMigration.java
rename to src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizerCPMigration.java
index e1ff5a376c8..5bf90aa3ae0 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/ResourceOptimizerCPMigration.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/ResourceOptimizerCPMigration.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 
 public class ResourceOptimizerCPMigration 
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/YarnClusterAnalyzer.java b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
similarity index 99%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/YarnClusterAnalyzer.java
rename to src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
index 4611f579407..f3f55c85b72 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/YarnClusterAnalyzer.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterAnalyzer.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,8 +33,8 @@
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.mapred.MRConfigurationNames;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.mapred.MRConfigurationNames;
 
 /**
  * Central place for analyzing and obtaining static infrastructure properties
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/YarnClusterConfig.java b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterConfig.java
similarity index 97%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/YarnClusterConfig.java
rename to src/main/java/org/apache/sysml/yarn/ropt/YarnClusterConfig.java
index e6132e77076..15aa8516254 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/YarnClusterConfig.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/YarnClusterConfig.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
 public class YarnClusterConfig 
 {	
diff --git a/src/main/java/com/ibm/bi/dml/yarn/ropt/YarnOptimizerUtils.java b/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
similarity index 93%
rename from src/main/java/com/ibm/bi/dml/yarn/ropt/YarnOptimizerUtils.java
rename to src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
index a3247bde398..5c853e1f6a1 100644
--- a/src/main/java/com/ibm/bi/dml/yarn/ropt/YarnOptimizerUtils.java
+++ b/src/main/java/org/apache/sysml/yarn/ropt/YarnOptimizerUtils.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.yarn.ropt;
+package org.apache.sysml.yarn.ropt;
 
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.OptimizerUtils;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
 
 public class YarnOptimizerUtils 
 {
diff --git a/src/main/standalone/runStandaloneSystemML.bat b/src/main/standalone/runStandaloneSystemML.bat
index a425d3aca4d..157e0f4559c 100644
--- a/src/main/standalone/runStandaloneSystemML.bat
+++ b/src/main/standalone/runStandaloneSystemML.bat
@@ -15,7 +15,7 @@ set LOG4JPROP=log4j.properties
 
 for /f "tokens=1,* delims= " %%a in ("%*") do set ALLBUTFIRST=%%b
 
-java -Xmx4g -Xms4g -Xmn400m -cp %CLASSPATH% -Dlog4j.configuration=file:%LOG4JPROP% com.ibm.bi.dml.api.DMLScript -f %1 -exec singlenode -config=SystemML-config.xml %ALLBUTFIRST%
+java -Xmx4g -Xms4g -Xmn400m -cp %CLASSPATH% -Dlog4j.configuration=file:%LOG4JPROP% org.apache.sysml.api.DMLScript -f %1 -exec singlenode -config=SystemML-config.xml %ALLBUTFIRST%
 GOTO End
 
 :Err
diff --git a/src/main/standalone/runStandaloneSystemML.sh b/src/main/standalone/runStandaloneSystemML.sh
index 98585e7993c..f20a12d8ce7 100644
--- a/src/main/standalone/runStandaloneSystemML.sh
+++ b/src/main/standalone/runStandaloneSystemML.sh
@@ -43,7 +43,7 @@ done
 LOG4JPROP=log4j.properties
 
 # invoke the jar with options and arguments
-java -Xmx4g -Xms4g -Xmn400m -cp ${CLASSPATH} -Dlog4j.configuration=file:${LOG4JPROP} com.ibm.bi.dml.api.DMLScript \
+java -Xmx4g -Xms4g -Xmn400m -cp ${CLASSPATH} -Dlog4j.configuration=file:${LOG4JPROP} org.apache.sysml.api.DMLScript \
      -f ${SCRIPT_FILE} -exec singlenode -config=$CURRENT_PATH"/SystemML-config.xml" \
      $@
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/AutomatedScalabilityTestBase.java b/src/test/java/org/apache/sysml/test/integration/AutomatedScalabilityTestBase.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/AutomatedScalabilityTestBase.java
rename to src/test/java/org/apache/sysml/test/integration/AutomatedScalabilityTestBase.java
index dc243f29179..5e2e548e333 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/AutomatedScalabilityTestBase.java
+++ b/src/test/java/org/apache/sysml/test/integration/AutomatedScalabilityTestBase.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration;
+package org.apache.sysml.test.integration;
 
 import java.util.ArrayList;
 
 import org.junit.After;
 import org.junit.Before;
 
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public abstract class AutomatedScalabilityTestBase extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java
rename to src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
index 198a3255011..a4bace63c14 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysml/test/integration/AutomatedTestBase.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration;
+package org.apache.sysml.test.integration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -30,7 +30,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 
-import com.ibm.bi.dml.lops.Lop;
+import org.apache.sysml.lops.Lop;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.wink.json4j.JSONObject;
@@ -38,25 +38,25 @@
 import org.junit.Assert;
 import org.junit.Before;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.api.MLContext;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.DataExpression;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContext;
-import com.ibm.bi.dml.runtime.controlprogram.context.ExecutionContextFactory;
-import com.ibm.bi.dml.runtime.controlprogram.context.SparkExecutionContext;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.ParameterBuilder;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.api.MLContext;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.DataExpression;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysml.runtime.controlprogram.context.ExecutionContextFactory;
+import org.apache.sysml.runtime.controlprogram.context.SparkExecutionContext;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.ParameterBuilder;
+import org.apache.sysml.utils.Statistics;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/BinaryMatrixCharacteristics.java b/src/test/java/org/apache/sysml/test/integration/BinaryMatrixCharacteristics.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/BinaryMatrixCharacteristics.java
rename to src/test/java/org/apache/sysml/test/integration/BinaryMatrixCharacteristics.java
index de12968ddf6..681533e188e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/BinaryMatrixCharacteristics.java
+++ b/src/test/java/org/apache/sysml/test/integration/BinaryMatrixCharacteristics.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration;
+package org.apache.sysml.test.integration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/TestConfiguration.java b/src/test/java/org/apache/sysml/test/integration/TestConfiguration.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/TestConfiguration.java
rename to src/test/java/org/apache/sysml/test/integration/TestConfiguration.java
index b2e588911fe..406537ad814 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/TestConfiguration.java
+++ b/src/test/java/org/apache/sysml/test/integration/TestConfiguration.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration;
+package org.apache.sysml.test.integration;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/TestMatrixCharacteristics.java b/src/test/java/org/apache/sysml/test/integration/TestMatrixCharacteristics.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/TestMatrixCharacteristics.java
rename to src/test/java/org/apache/sysml/test/integration/TestMatrixCharacteristics.java
index f7372c15524..3dcfaf4d9a8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/TestMatrixCharacteristics.java
+++ b/src/test/java/org/apache/sysml/test/integration/TestMatrixCharacteristics.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration;
+package org.apache.sysml.test.integration;
 
 public class TestMatrixCharacteristics 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/ApplyTransformTest.java b/src/test/java/org/apache/sysml/test/integration/applications/ApplyTransformTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/ApplyTransformTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/ApplyTransformTest.java
index c78a51738f7..1dca12edb2b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/ApplyTransformTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/ApplyTransformTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,8 +27,8 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
 
 public abstract class ApplyTransformTest extends AutomatedTestBase{
 	
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/ArimaTest.java b/src/test/java/org/apache/sysml/test/integration/applications/ArimaTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/ArimaTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/ArimaTest.java
index 52222696845..b8120adaae0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/ArimaTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/ArimaTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,10 +25,10 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class ArimaTest extends AutomatedTestBase {
 	
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/CsplineCGTest.java b/src/test/java/org/apache/sysml/test/integration/applications/CsplineCGTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/CsplineCGTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/CsplineCGTest.java
index 437c6dac3f6..7c4522950b0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/CsplineCGTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/CsplineCGTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,9 +23,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class CsplineCGTest extends AutomatedTestBase {
     protected final static String TEST_DIR = "applications/cspline/";
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/CsplineDSTest.java b/src/test/java/org/apache/sysml/test/integration/applications/CsplineDSTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/CsplineDSTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/CsplineDSTest.java
index 8fc3cdf101f..5158fa59c88 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/CsplineDSTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/CsplineDSTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class CsplineDSTest  extends AutomatedTestBase {
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/GLMTest.java b/src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/GLMTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java
index 884982dc84d..4e332f112fd 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/GLMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/GLMTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,10 +26,10 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public abstract class GLMTest extends AutomatedTestBase
@@ -277,7 +277,7 @@ protected void testGLM(ScriptType scriptType)
             
         }
         
-        int defaultBlockSize = com.ibm.bi.dml.parser.DMLTranslator.DMLBlockSize;
+        int defaultBlockSize = org.apache.sysml.parser.DMLTranslator.DMLBlockSize;
 
         MatrixCharacteristics mc_X = new MatrixCharacteristics (rows, cols, defaultBlockSize, defaultBlockSize, nnz_in_X);
         writeInputMatrixWithMTD ("X", X, true, mc_X);
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/GNMFTest.java b/src/test/java/org/apache/sysml/test/integration/applications/GNMFTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/GNMFTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/GNMFTest.java
index 9cf0bcf7e79..7e3d9e01ec5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/GNMFTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/GNMFTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class GNMFTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/HITSTest.java b/src/test/java/org/apache/sysml/test/integration/applications/HITSTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/HITSTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/HITSTest.java
index 7141b76fd42..33e1b718282 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/HITSTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/HITSTest.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public abstract class HITSTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/ID3Test.java b/src/test/java/org/apache/sysml/test/integration/applications/ID3Test.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/ID3Test.java
rename to src/test/java/org/apache/sysml/test/integration/applications/ID3Test.java
index 08dca3bc965..fb3e01687b2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/ID3Test.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/ID3Test.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,11 +26,11 @@
 import org.junit.Assert;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public abstract class ID3Test extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/L2SVMTest.java b/src/test/java/org/apache/sysml/test/integration/applications/L2SVMTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/L2SVMTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/L2SVMTest.java
index ef4a7122945..bfe4b97a1c4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/L2SVMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/L2SVMTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class L2SVMTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/LinearLogRegTest.java b/src/test/java/org/apache/sysml/test/integration/applications/LinearLogRegTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/LinearLogRegTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/LinearLogRegTest.java
index 537943e6844..9abcc28cbec 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/LinearLogRegTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/LinearLogRegTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class LinearLogRegTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/LinearRegressionTest.java b/src/test/java/org/apache/sysml/test/integration/applications/LinearRegressionTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/LinearRegressionTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/LinearRegressionTest.java
index 8424e6f8d91..2e71956f037 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/LinearRegressionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/LinearRegressionTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class LinearRegressionTest extends AutomatedTestBase {
 	
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/MDABivariateStatsTest.java b/src/test/java/org/apache/sysml/test/integration/applications/MDABivariateStatsTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/MDABivariateStatsTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/MDABivariateStatsTest.java
index a7292bc4d4f..97c54cb5140 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/MDABivariateStatsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/MDABivariateStatsTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,10 +25,10 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class MDABivariateStatsTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/MultiClassSVMTest.java b/src/test/java/org/apache/sysml/test/integration/applications/MultiClassSVMTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/MultiClassSVMTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/MultiClassSVMTest.java
index 50ddc61469c..5c838b27a5a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/MultiClassSVMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/MultiClassSVMTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class MultiClassSVMTest  extends AutomatedTestBase
 {	
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/NaiveBayesTest.java b/src/test/java/org/apache/sysml/test/integration/applications/NaiveBayesTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/NaiveBayesTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/NaiveBayesTest.java
index 0d8d9326f90..ee6d215217e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/NaiveBayesTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/NaiveBayesTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,9 +25,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class NaiveBayesTest  extends AutomatedTestBase{
 	
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/PageRankTest.java b/src/test/java/org/apache/sysml/test/integration/applications/PageRankTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/PageRankTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/PageRankTest.java
index 6876c21188c..268c149e9a7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/PageRankTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/PageRankTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,9 +24,9 @@
 
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public abstract class PageRankTest extends AutomatedTestBase {
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/WelchTTest.java b/src/test/java/org/apache/sysml/test/integration/applications/WelchTTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/WelchTTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/WelchTTest.java
index 42e5d25d590..a8531d6f039 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/WelchTTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/WelchTTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications;
+package org.apache.sysml.test.integration.applications;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,10 +27,10 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 @RunWith(value = Parameterized.class)
 public abstract class WelchTTest extends AutomatedTestBase {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateCategoricalCategoricallTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateCategoricalCategoricallTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateCategoricalCategoricallTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateCategoricalCategoricallTest.java
index bf692ae3ea5..4aae9c7dc04 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateCategoricalCategoricallTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateCategoricalCategoricallTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class BivariateCategoricalCategoricallTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateOrdinalOrdinalTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateOrdinalOrdinalTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateOrdinalOrdinalTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateOrdinalOrdinalTest.java
index e361a4fd626..39d47bb7232 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateOrdinalOrdinalTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateOrdinalOrdinalTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class BivariateOrdinalOrdinalTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateScaleCategoricalTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateScaleCategoricalTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateScaleCategoricalTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateScaleCategoricalTest.java
index df4c18886fc..687eb2fa8be 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateScaleCategoricalTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateScaleCategoricalTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class BivariateScaleCategoricalTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateScaleScaleTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateScaleScaleTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateScaleScaleTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateScaleScaleTest.java
index 8094668b297..0b240853716 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/BivariateScaleScaleTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/BivariateScaleScaleTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class BivariateScaleScaleTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/OrderStatisticsTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/OrderStatisticsTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/OrderStatisticsTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/OrderStatisticsTest.java
index 36508ce067a..f86ce80a053 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/OrderStatisticsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/OrderStatisticsTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import java.util.Arrays;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class OrderStatisticsTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateCategoricalTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateCategoricalTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateCategoricalTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateCategoricalTest.java
index 98b2dadb8dc..d199702c694 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateCategoricalTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateCategoricalTest.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 /** Tests of univariate statistics functions over categorical data. */
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateStatsBase.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
index bc91178840f..b1830faa048 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateStatsBase.java
@@ -1,12 +1,12 @@
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import java.util.HashMap;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * Shared methods and fields from the different univariate stats test harness
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleDenseTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleDenseTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleDenseTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleDenseTest.java
index e6a706ee27e..039e60017be 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleDenseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleDenseTest.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
 
 /**
  * Tests of univariate statistics built-in functions.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleSparseTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleSparseTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleSparseTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleSparseTest.java
index 2a98ef48aa5..b0ac313c557 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleSparseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateUnweightedScaleSparseTest.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateWeightedScaleDenseTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateWeightedScaleDenseTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateWeightedScaleDenseTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateWeightedScaleDenseTest.java
index 2a467637f4e..8ae2b568335 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateWeightedScaleDenseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateWeightedScaleDenseTest.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
 
 /**
  * Tests of univariate statistics built-in functions.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateWeightedScaleSparseTest.java b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateWeightedScaleSparseTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateWeightedScaleSparseTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateWeightedScaleSparseTest.java
index 62af05a81a1..d21dbdfb192 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/UnivariateWeightedScaleSparseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/descriptivestats/UnivariateWeightedScaleSparseTest.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
 
 /**
  * Tests of univariate statistics built-in functions.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ApplyTransformDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/ApplyTransformDMLTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ApplyTransformDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/ApplyTransformDMLTest.java
index 537e6aadb3d..c1e211434ae 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ApplyTransformDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/ApplyTransformDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.ApplyTransformTest;
+import org.apache.sysml.test.integration.applications.ApplyTransformTest;
 
 @RunWith(value = Parameterized.class)
 public class ApplyTransformDMLTest extends ApplyTransformTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ArimaDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/ArimaDMLTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ArimaDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/ArimaDMLTest.java
index 6a08edaf48f..17dc19e80b0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ArimaDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/ArimaDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.ArimaTest;
+import org.apache.sysml.test.integration.applications.ArimaTest;
 
 @RunWith(value = Parameterized.class)
 public class ArimaDMLTest extends ArimaTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/CsplineCGDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/CsplineCGDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/CsplineCGDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/CsplineCGDMLTest.java
index 3a6c6455f58..06983f35df6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/CsplineCGDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/CsplineCGDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.CsplineCGTest;
+import org.apache.sysml.test.integration.applications.CsplineCGTest;
 
 @RunWith(value = Parameterized.class)
 public class CsplineCGDMLTest extends CsplineCGTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/CsplineDSDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/CsplineDSDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/CsplineDSDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/CsplineDSDMLTest.java
index f97456573fb..5fb3e274797 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/CsplineDSDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/CsplineDSDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.CsplineDSTest;
+import org.apache.sysml.test.integration.applications.CsplineDSTest;
 
 @RunWith(value = Parameterized.class)
 public class CsplineDSDMLTest extends CsplineDSTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/GLMDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/GLMDMLTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/GLMDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/GLMDMLTest.java
index 9a87181f743..4e7b3be4002 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/GLMDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/GLMDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.GLMTest;
+import org.apache.sysml.test.integration.applications.GLMTest;
 
 @RunWith(value = Parameterized.class)
 public class GLMDMLTest extends GLMTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/GNMFDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/GNMFDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/GNMFDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/GNMFDMLTest.java
index ceab76c1e37..0ec1d624ded 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/GNMFDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/GNMFDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.GNMFTest;
+import org.apache.sysml.test.integration.applications.GNMFTest;
 
 @RunWith(value = Parameterized.class)
 public class GNMFDMLTest extends GNMFTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/HITSDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/HITSDMLTest.java
similarity index 85%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/HITSDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/HITSDMLTest.java
index 0b3f81935d9..ad82867932f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/HITSDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/HITSDMLTest.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.applications.HITSTest;
+import org.apache.sysml.test.integration.applications.HITSTest;
 
 public class HITSDMLTest extends HITSTest {
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ID3DMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/ID3DMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ID3DMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/ID3DMLTest.java
index b46275c103f..7f7471fd779 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/ID3DMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/ID3DMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.ID3Test;
+import org.apache.sysml.test.integration.applications.ID3Test;
 
 @RunWith(value = Parameterized.class)
 public class ID3DMLTest extends ID3Test {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/L2SVMDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/L2SVMDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/L2SVMDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/L2SVMDMLTest.java
index 0b0eb19ff83..df26e72258c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/L2SVMDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/L2SVMDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.L2SVMTest;
+import org.apache.sysml.test.integration.applications.L2SVMTest;
 
 @RunWith(value = Parameterized.class)
 public class L2SVMDMLTest extends L2SVMTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/LinearLogRegDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/LinearLogRegDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/LinearLogRegDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/LinearLogRegDMLTest.java
index 3d8d81123dd..522a34b2d24 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/LinearLogRegDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/LinearLogRegDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.LinearLogRegTest;
+import org.apache.sysml.test.integration.applications.LinearLogRegTest;
 
 @RunWith(value = Parameterized.class)
 public class LinearLogRegDMLTest extends LinearLogRegTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/LinearRegressionDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/LinearRegressionDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/LinearRegressionDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/LinearRegressionDMLTest.java
index e7f56a69286..1901920fc7a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/LinearRegressionDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/LinearRegressionDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.LinearRegressionTest;
+import org.apache.sysml.test.integration.applications.LinearRegressionTest;
 
 @RunWith(value = Parameterized.class)
 public class LinearRegressionDMLTest extends LinearRegressionTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/MDABivariateStatsDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/MDABivariateStatsDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/MDABivariateStatsDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/MDABivariateStatsDMLTest.java
index fff54685207..1e27ef98911 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/MDABivariateStatsDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/MDABivariateStatsDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.MDABivariateStatsTest;
+import org.apache.sysml.test.integration.applications.MDABivariateStatsTest;
 
 @RunWith(value = Parameterized.class)
 public class MDABivariateStatsDMLTest extends MDABivariateStatsTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/MultiClassSVMDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/MultiClassSVMDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/MultiClassSVMDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/MultiClassSVMDMLTest.java
index 16d8d75e493..68a53f9b588 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/MultiClassSVMDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/MultiClassSVMDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.MultiClassSVMTest;
+import org.apache.sysml.test.integration.applications.MultiClassSVMTest;
 
 @RunWith(value = Parameterized.class)
 public class MultiClassSVMDMLTest extends MultiClassSVMTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/NaiveBayesDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/NaiveBayesDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/NaiveBayesDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/NaiveBayesDMLTest.java
index 027ad97b3d3..9d844a71c7a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/NaiveBayesDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/NaiveBayesDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.NaiveBayesTest;
+import org.apache.sysml.test.integration.applications.NaiveBayesTest;
 
 @RunWith(value = Parameterized.class)
 public class NaiveBayesDMLTest extends NaiveBayesTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/PageRankDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/PageRankDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/PageRankDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/PageRankDMLTest.java
index 82a98a31572..8fdf99ed50c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/PageRankDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/PageRankDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.PageRankTest;
+import org.apache.sysml.test.integration.applications.PageRankTest;
 
 @RunWith(value = Parameterized.class)
 public class PageRankDMLTest extends PageRankTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/WelchTDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/dml/WelchTDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/dml/WelchTDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/dml/WelchTDMLTest.java
index b703df34c0e..d0df8e11477 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/dml/WelchTDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/dml/WelchTDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.dml;
+package org.apache.sysml.test.integration.applications.dml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.WelchTTest;
+import org.apache.sysml.test.integration.applications.WelchTTest;
 
 @RunWith(value = Parameterized.class)
 public class WelchTDMLTest extends WelchTTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForBivariateStatsTest.java b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForBivariateStatsTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForBivariateStatsTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForBivariateStatsTest.java
index 7fed05c55cb..4e6e2758241 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForBivariateStatsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForBivariateStatsTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.parfor;
+package org.apache.sysml.test.integration.applications.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForBivariateStatsTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCVMulticlassSVMTest.java b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCVMulticlassSVMTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCVMulticlassSVMTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCVMulticlassSVMTest.java
index b2b0adf5de6..abdc0ac2893 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCVMulticlassSVMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCVMulticlassSVMTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.parfor;
+package org.apache.sysml.test.integration.applications.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForCVMulticlassSVMTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCorrelationTest.java b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCorrelationTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCorrelationTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCorrelationTest.java
index 034f78bfe93..6d8c26aef58 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCorrelationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCorrelationTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.parfor;
+package org.apache.sysml.test.integration.applications.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForCorrelationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCorrelationTestLarge.java b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCorrelationTestLarge.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCorrelationTestLarge.java
rename to src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCorrelationTestLarge.java
index b3f72944708..cca5df035cf 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForCorrelationTestLarge.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForCorrelationTestLarge.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.parfor;
+package org.apache.sysml.test.integration.applications.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * Intension is to test file-based result merge with regard to its integration
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForNaiveBayesTest.java b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForNaiveBayesTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForNaiveBayesTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForNaiveBayesTest.java
index 097dbe2f07e..4517fe9b3dd 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForNaiveBayesTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForNaiveBayesTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.parfor;
+package org.apache.sysml.test.integration.applications.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForUnivariateStatsTest.java b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForUnivariateStatsTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForUnivariateStatsTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForUnivariateStatsTest.java
index ee7573ba1e1..d8a783c9d22 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/parfor/ParForUnivariateStatsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/parfor/ParForUnivariateStatsTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.parfor;
+package org.apache.sysml.test.integration.applications.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForUnivariateStatsTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ApplyTransformPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/ApplyTransformPyDMLTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ApplyTransformPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/ApplyTransformPyDMLTest.java
index ed88c693f5a..8d7995ee1e4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ApplyTransformPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/ApplyTransformPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.ApplyTransformTest;
+import org.apache.sysml.test.integration.applications.ApplyTransformTest;
 
 @RunWith(value = Parameterized.class)
 public class ApplyTransformPyDMLTest extends ApplyTransformTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ArimaPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/ArimaPyDMLTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ArimaPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/ArimaPyDMLTest.java
index 1c6ea48053c..b927c8a8d17 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ArimaPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/ArimaPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.ArimaTest;
+import org.apache.sysml.test.integration.applications.ArimaTest;
 
 @RunWith(value = Parameterized.class)
 public class ArimaPyDMLTest extends ArimaTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/CsplineCGPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/CsplineCGPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/CsplineCGPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/CsplineCGPyDMLTest.java
index bfa22c14033..ccd568c07ed 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/CsplineCGPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/CsplineCGPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.CsplineCGTest;
+import org.apache.sysml.test.integration.applications.CsplineCGTest;
 
 @RunWith(value = Parameterized.class)
 public class CsplineCGPyDMLTest extends CsplineCGTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/CsplineDSPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/CsplineDSPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/CsplineDSPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/CsplineDSPyDMLTest.java
index b7403c123f5..dcb6e544664 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/CsplineDSPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/CsplineDSPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.CsplineDSTest;
+import org.apache.sysml.test.integration.applications.CsplineDSTest;
 
 @RunWith(value = Parameterized.class)
 public class CsplineDSPyDMLTest extends CsplineDSTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/GLMPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/GLMPyDMLTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/GLMPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/GLMPyDMLTest.java
index 275df76f556..d37cf52338f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/GLMPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/GLMPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.GLMTest;
+import org.apache.sysml.test.integration.applications.GLMTest;
 
 @RunWith(value = Parameterized.class)
 public class GLMPyDMLTest extends GLMTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/GNMFPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/GNMFPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/GNMFPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/GNMFPyDMLTest.java
index c8c16659f3e..10b380a9799 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/GNMFPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/GNMFPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.GNMFTest;
+import org.apache.sysml.test.integration.applications.GNMFTest;
 
 @RunWith(value = Parameterized.class)
 public class GNMFPyDMLTest extends GNMFTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/HITSPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/HITSPyDMLTest.java
similarity index 85%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/HITSPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/HITSPyDMLTest.java
index 1675e9a33f4..b80dbb5238e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/HITSPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/HITSPyDMLTest.java
@@ -15,11 +15,11 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.applications.HITSTest;
+import org.apache.sysml.test.integration.applications.HITSTest;
 
 public class HITSPyDMLTest extends HITSTest {
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ID3PyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/ID3PyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ID3PyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/ID3PyDMLTest.java
index 6eed0cb8d5b..8db974466b2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/ID3PyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/ID3PyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.ID3Test;
+import org.apache.sysml.test.integration.applications.ID3Test;
 
 @RunWith(value = Parameterized.class)
 public class ID3PyDMLTest extends ID3Test {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/L2SVMPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/L2SVMPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/L2SVMPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/L2SVMPyDMLTest.java
index 91c0954a3c5..74e309ed6c8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/L2SVMPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/L2SVMPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.L2SVMTest;
+import org.apache.sysml.test.integration.applications.L2SVMTest;
 
 @RunWith(value = Parameterized.class)
 public class L2SVMPyDMLTest extends L2SVMTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/LinearLogRegPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/LinearLogRegPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/LinearLogRegPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/LinearLogRegPyDMLTest.java
index 456ef52aad9..a0e401572bd 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/LinearLogRegPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/LinearLogRegPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.LinearLogRegTest;
+import org.apache.sysml.test.integration.applications.LinearLogRegTest;
 
 @RunWith(value = Parameterized.class)
 public class LinearLogRegPyDMLTest extends LinearLogRegTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/LinearRegressionPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/LinearRegressionPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/LinearRegressionPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/LinearRegressionPyDMLTest.java
index 67ebe5c3a14..d8304975df9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/LinearRegressionPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/LinearRegressionPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.LinearRegressionTest;
+import org.apache.sysml.test.integration.applications.LinearRegressionTest;
 
 @RunWith(value = Parameterized.class)
 public class LinearRegressionPyDMLTest extends LinearRegressionTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/MDABivariateStatsPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/MDABivariateStatsPyDMLTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/MDABivariateStatsPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/MDABivariateStatsPyDMLTest.java
index 881de3f7431..e9ce5dd9ffd 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/MDABivariateStatsPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/MDABivariateStatsPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.MDABivariateStatsTest;
+import org.apache.sysml.test.integration.applications.MDABivariateStatsTest;
 
 @RunWith(value = Parameterized.class)
 public class MDABivariateStatsPyDMLTest extends MDABivariateStatsTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/MultiClassSVMPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/MultiClassSVMPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/MultiClassSVMPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/MultiClassSVMPyDMLTest.java
index acca074d4cc..b32d6505afc 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/MultiClassSVMPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/MultiClassSVMPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.MultiClassSVMTest;
+import org.apache.sysml.test.integration.applications.MultiClassSVMTest;
 
 @RunWith(value = Parameterized.class)
 public class MultiClassSVMPyDMLTest extends MultiClassSVMTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/NaiveBayesPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/NaiveBayesPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/NaiveBayesPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/NaiveBayesPyDMLTest.java
index 83ca0be92f6..c4301e0f9a4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/NaiveBayesPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/NaiveBayesPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.NaiveBayesTest;
+import org.apache.sysml.test.integration.applications.NaiveBayesTest;
 
 @RunWith(value = Parameterized.class)
 public class NaiveBayesPyDMLTest extends NaiveBayesTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/PageRankPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/PageRankPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/PageRankPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/PageRankPyDMLTest.java
index a4540f9b06f..34f30a6bddb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/PageRankPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/PageRankPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.PageRankTest;
+import org.apache.sysml.test.integration.applications.PageRankTest;
 
 @RunWith(value = Parameterized.class)
 public class PageRankPyDMLTest extends PageRankTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/WelchTPyDMLTest.java b/src/test/java/org/apache/sysml/test/integration/applications/pydml/WelchTPyDMLTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/WelchTPyDMLTest.java
rename to src/test/java/org/apache/sysml/test/integration/applications/pydml/WelchTPyDMLTest.java
index 77f78794b6d..2b7f615ab77 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/applications/pydml/WelchTPyDMLTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/applications/pydml/WelchTPyDMLTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.pydml;
+package org.apache.sysml.test.integration.applications.pydml;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.ibm.bi.dml.test.integration.applications.WelchTTest;
+import org.apache.sysml.test.integration.applications.WelchTTest;
 
 @RunWith(value = Parameterized.class)
 public class WelchTPyDMLTest extends WelchTTest {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/AggregateInfTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/AggregateInfTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/AggregateInfTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/AggregateInfTest.java
index 36e9f5dfb81..28ee588676f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/AggregateInfTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/AggregateInfTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ColSumTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/ColSumTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ColSumTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/ColSumTest.java
index 2d68ec740a2..022d2cd5779 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ColSumTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/ColSumTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ColSumsSqTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/ColSumsSqTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ColSumsSqTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/ColSumsSqTest.java
index b9ea24d3214..8d2d6538f48 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ColSumsSqTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/ColSumsSqTest.java
@@ -15,18 +15,18 @@
  *
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
-
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+package org.apache.sysml.test.integration.functions.aggregate;
+
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullAggregateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullAggregateTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullAggregateTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullAggregateTest.java
index cd4ddcb4aac..7ae3ba86428 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullAggregateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullAggregateTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullColAggregateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullColAggregateTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullColAggregateTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullColAggregateTest.java
index af5c168c6f2..6a4c6d3bbe1 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullColAggregateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullColAggregateTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * NOTES:
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullGroupedAggregateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullGroupedAggregateTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullGroupedAggregateTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullGroupedAggregateTest.java
index d0b881d6d86..87664b6754e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullGroupedAggregateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullGroupedAggregateTest.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import java.io.IOException;
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullRowAggregateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullRowAggregateTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullRowAggregateTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullRowAggregateTest.java
index 2b753b28759..1fe8af9b1a3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/FullRowAggregateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/FullRowAggregateTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * NOTES:
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/LengthTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/LengthTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/LengthTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/LengthTest.java
index a2885c57b58..57c34cf505e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/LengthTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/LengthTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/MaxTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/MaxTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/MaxTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/MaxTest.java
index 24e86c80b17..0491782eed4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/MaxTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/MaxTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/MinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/MinTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/MinTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/MinTest.java
index afce265efbb..91d308f802b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/MinTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/MinTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/NColTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/NColTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/NColTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/NColTest.java
index 26b11bb7cf9..0f76f1c3f59 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/NColTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/NColTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/NRowTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/NRowTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/NRowTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/NRowTest.java
index a5002428928..50866719dd0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/NRowTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/NRowTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ProdTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/ProdTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ProdTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/ProdTest.java
index e8169adeb23..8f3b5968ee1 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/ProdTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/ProdTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/RowSumTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/RowSumTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/RowSumTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/RowSumTest.java
index 7c215d1a54d..59a8c6def81 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/RowSumTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/RowSumTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/RowSumsSqTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/RowSumsSqTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/RowSumsSqTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/RowSumsSqTest.java
index 9e8b4d3224b..559e8538268 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/RowSumsSqTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/RowSumsSqTest.java
@@ -15,18 +15,18 @@
  *
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
-
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+package org.apache.sysml.test.integration.functions.aggregate;
+
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/SumSqTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/SumSqTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/SumSqTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/SumSqTest.java
index a1867abf5ed..393c0107183 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/SumSqTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/SumSqTest.java
@@ -15,18 +15,18 @@
  *
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
-
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+package org.apache.sysml.test.integration.functions.aggregate;
+
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/SumTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/SumTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/SumTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/SumTest.java
index 712505fe511..8427960ef08 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/SumTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/SumTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/TraceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/TraceTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/TraceTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/aggregate/TraceTest.java
index 8f87d531d22..ad1441d39d6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/aggregate/TraceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/aggregate/TraceTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendChainTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendChainTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/append/AppendChainTest.java
index c128b8a2a9f..875d5f226b6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendChainTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendChainTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.append;
+package org.apache.sysml.test.integration.functions.append;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class AppendChainTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendMatrixTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java
index b65fdd1b9f0..6c2f245dbba 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendMatrixTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.append;
+package org.apache.sysml.test.integration.functions.append;
 
 import java.util.HashMap;
 import java.util.Random;
@@ -23,16 +23,16 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.BinaryOp;
-import com.ibm.bi.dml.hops.BinaryOp.AppendMethod;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.BinaryOp;
+import org.apache.sysml.hops.BinaryOp.AppendMethod;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class AppendMatrixTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendVectorTest.java b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendVectorTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java
index 0610d10289f..b4478d4bdbf 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/AppendVectorTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/append/AppendVectorTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.append;
+package org.apache.sysml.test.integration.functions.append;
 
 import java.util.HashMap;
 import java.util.Random;
@@ -23,14 +23,14 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class AppendVectorTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/RBindCBindMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/append/RBindCBindMatrixTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/append/RBindCBindMatrixTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/append/RBindCBindMatrixTest.java
index 1464bcf108c..1d49994137a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/RBindCBindMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/append/RBindCBindMatrixTest.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.append;
+package org.apache.sysml.test.integration.functions.append;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class RBindCBindMatrixTest extends AutomatedTestBase
 {	
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/StringAppendTest.java b/src/test/java/org/apache/sysml/test/integration/functions/append/StringAppendTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/append/StringAppendTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/append/StringAppendTest.java
index d4f3f6fe0fc..2b5e9a9bde9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/append/StringAppendTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/append/StringAppendTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.append;
+package org.apache.sysml.test.integration.functions.append;
 
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class StringAppendTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/BinUaggChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/BinUaggChainTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/BinUaggChainTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/BinUaggChainTest.java
index 83b676e2143..995b4f47f43 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/BinUaggChainTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/BinUaggChainTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * TODO: extend test by various binary operator - unary aggregate operator combinations.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/CentralMomentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/CentralMomentTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/CentralMomentTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/CentralMomentTest.java
index f2f2fe4172f..38a69b08c53 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/CentralMomentTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/CentralMomentTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/CovarianceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/CovarianceTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/CovarianceTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/CovarianceTest.java
index b567066adbf..e906989c3d4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/CovarianceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/CovarianceTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/DiagMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/DiagMatrixMultiplicationTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/DiagMatrixMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/DiagMatrixMultiplicationTest.java
index 05795cfa8f0..136085b1e38 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/DiagMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/DiagMatrixMultiplicationTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class DiagMatrixMultiplicationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseAdditionMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseAdditionMultiplicationTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseAdditionMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseAdditionMultiplicationTest.java
index 6990da85709..184f188b9d4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseAdditionMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseAdditionMultiplicationTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.Date;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class ElementwiseAdditionMultiplicationTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseAdditionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseAdditionTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseAdditionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseAdditionTest.java
index d044f1e66df..112dfdfcb33 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseAdditionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseAdditionTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseDivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseDivisionTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseDivisionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseDivisionTest.java
index 2175aafbedc..4f4d8525ee9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseDivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseDivisionTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseModulusTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseModulusTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseModulusTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseModulusTest.java
index 062d78994f7..ad8a5aa2ebb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseModulusTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseModulusTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.runtime.functionobjects.Modulus;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.runtime.functionobjects.Modulus;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class ElementwiseModulusTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseMultiplicationTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseMultiplicationTest.java
index 612af465187..88af59a1a09 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseMultiplicationTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class ElementwiseMultiplicationTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseSubtractionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseSubtractionTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseSubtractionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseSubtractionTest.java
index 7fd2748e3f2..21b54aef905 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ElementwiseSubtractionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ElementwiseSubtractionTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class ElementwiseSubtractionTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MapMultChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultChainTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MapMultChainTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultChainTest.java
index 2d82425f226..a393733dbb5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MapMultChainTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultChainTest.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.MapMultChain;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.MapMultChain;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class MapMultChainTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MapMultLimitTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MapMultLimitTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java
index 5040ca28c19..aba157ebf81 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MapMultLimitTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MapMultLimitTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * Tests the number of mapmult operations that can be piggybacked into the same GMR job.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
index 2dc75f65879..dc797c40cb8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixMultiplicationTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class MatrixMultiplicationTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MatrixVectorTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MatrixVectorTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java
index 47e1dd16d97..4ad254ae5a7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/MatrixVectorTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/MatrixVectorTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class MatrixVectorTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/OuterProductTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/OuterProductTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java
index 1142ca7feaa..667f4eecf3f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/OuterProductTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/OuterProductTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class OuterProductTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/QuantileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/QuantileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java
index 59098d7021c..7fa00e95e7b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/QuantileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/QuantileTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarAdditionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
index a7301b8201f..a76b332658a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarAdditionTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarDivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
index 98c286b3e53..43997f42473 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarDivisionTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarModulusTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarModulusTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java
index e8d4d7611be..76462ecff43 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarModulusTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarModulusTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
 
-import com.ibm.bi.dml.runtime.functionobjects.Modulus;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.runtime.functionobjects.Modulus;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class ScalarModulusTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
index 7db6f6168b1..6d68c05ea5b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarMultiplicationTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class ScalarMultiplicationTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
index 5ba6218e1d4..94938b818e9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ScalarSubtractionTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class ScalarSubtractionTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
index 6864f768be3..6c2d89d368b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/TransposeMatrixMultiplicationTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * This test investigates the specific Hop-Lop rewrite t(X)%*%v -> t(t(v)%*%X).
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/UaggOuterChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
index 5bf219fbc55..efc69a2853b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UaggOuterChainTest.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.UAggOuterChain;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.UAggOuterChain;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * TODO: extend test by various binary operator - unary aggregate operator combinations.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
index 2ec6cf2ebb4..5feba2a11c7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/UltraSparseMRMatrixMultiplicationTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.AggBinaryOp.MMultMethod;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.AggBinaryOp.MMultMethod;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * Test for MMCJ MR because otherwise seldom (if at all) executed in our testsuite, ultrasparse 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
index 4bd654089b1..5cc464653e3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix/ZipMMSparkMatrixMultiplicationTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.AggBinaryOp.MMultMethod;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.AggBinaryOp.MMultMethod;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
index 3a8b1724e84..5de1c82787a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixMatrixCellwiseOperationTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_cellwise;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullMatrixMatrixCellwiseOperationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
index a693a0fbb9b..8adc9a7dac5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperationTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_cellwise;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullMatrixVectorColCellwiseOperationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
index bca24e2c37c..6c7eeeb78d3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperationTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_cellwise;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullMatrixVectorRowCellwiseOperationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
index c27ba69f88b..80ea5d875f9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullMinus1MultTest.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_cellwise;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
index a693d5de1ae..fc51c4760d7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseCompareOperationTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_cellwise;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
 
 import java.util.Arrays;
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * TODO cleanup outer(X,Y,z) definition to take two column vectors instead of column and row vector.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
index 3fdf5be790f..9d5b6a68917 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/FullVectorVectorCellwiseOperationTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_cellwise;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * TODO cleanup outer(X,Y,z) definition to take two column vectors instead of column and row vector.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
index 5198b9e42c0..590a69ebe85 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullDistributedMatrixMultiplicationTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.util.HashMap;
 
@@ -23,15 +23,15 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.AggBinaryOp;
-import com.ibm.bi.dml.hops.AggBinaryOp.MMultMethod;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.AggBinaryOp;
+import org.apache.sysml.hops.AggBinaryOp.MMultMethod;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullDistributedMatrixMultiplicationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
index 42f7ceeb701..93f0228c422 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullIntegerDivisionTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -24,17 +24,17 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullIntegerDivisionTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
index 67182afb082..49da3d2fcee 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.util.HashMap;
 
@@ -23,12 +23,12 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullMatrixMultiplicationTest extends AutomatedTestBase 
 {	
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
index b3c14961607..92d2ed94719 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationTransposeSelfTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.util.HashMap;
 
@@ -23,13 +23,13 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.MMTSJ.MMTSJType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.MMTSJ.MMTSJType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullMatrixMultiplicationTransposeSelfTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
index 30f4534808d..81d49190588 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMatrixMultiplicationUltraSparseTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.util.HashMap;
 
@@ -23,12 +23,12 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullMatrixMultiplicationUltraSparseTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
index 408fba7708e..36acec632d4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullMinMaxComparisonTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -24,17 +24,17 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullMinMaxComparisonTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredMatrixTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredMatrixTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredMatrixTest.java
index c9166cdd36c..0aa822ff212 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredMatrixTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.util.HashMap;
 
@@ -23,13 +23,13 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * The main purpose of this test is to verify various input combinations for
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredScalarLeftTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredScalarLeftTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredScalarLeftTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredScalarLeftTest.java
index 28b91d47545..3827e306629 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredScalarLeftTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredScalarLeftTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.util.HashMap;
 
@@ -23,12 +23,12 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * The main purpose of this test is to verify the internal optimization regarding
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredScalarRightTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredScalarRightTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredScalarRightTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredScalarRightTest.java
index 6ccdcde4734..bef64a80d06 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPPredScalarRightTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPPredScalarRightTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.util.HashMap;
 
@@ -23,12 +23,12 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * The main purpose of this test is to verify the internal optimization regarding
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
index c5174e84a43..7f0e2731a75 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/FullPowerTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -24,17 +24,17 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.DataType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.DataType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullPowerTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/AdditionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/AdditionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java
index e7c7172a23c..85e809a9ccc 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/AdditionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AdditionTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/AndTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/AndTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java
index 6dd3cfe48e9..ee2522d28df 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/AndTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/AndTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/DivisionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java
similarity index 98%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/DivisionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java
index d7bdcb6828a..c6f13bc77b6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/DivisionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/DivisionTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class DivisionTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/EqualTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/EqualTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java
index 357c2064032..7f11a995540 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/EqualTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/EqualTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/FullStringComparisonTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
index 8c504e097a9..2783f6a1e6c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/FullStringComparisonTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import java.io.IOException;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  * The main purpose of this test is to verify all combinations of
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
index 78b54a60ce9..42b4cbbed34 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanOrEqualTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/GreaterThanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/GreaterThanTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java
index d197560434f..54efaf00e3d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/GreaterThanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/GreaterThanTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
index e2ac67822b7..8fa51d45128 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanOrEqualTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LessThanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LessThanTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java
index f63471fb22c..16783c95a99 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LessThanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LessThanTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LogarithmTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LogarithmTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java
index fe25242676c..b803fb14ca6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/LogarithmTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/LogarithmTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/ModulusTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/ModulusTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java
index 11bac0e8e49..3561bc85582 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/ModulusTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/ModulusTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ModulusTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/MultiplicationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/MultiplicationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java
index ac109b6af09..0ac004817e3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/MultiplicationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/MultiplicationTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/OrTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/OrTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java
index a5f6f46cd64..d302d1eb8be 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/OrTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/OrTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/PowerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/PowerTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java
index c1c63b5a4f6..4862507536e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/PowerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/PowerTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/SubtractionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java
similarity index 99%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/SubtractionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java
index 10d3dcf99fa..02c2da9a6b2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/SubtractionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/binary/scalar/SubtractionTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class SubtractionTest extends AutomatedTestBase
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/blocks/VariableTest.java b/src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/blocks/VariableTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java
index 2deb9c97610..cbb49cf86bc 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/blocks/VariableTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/blocks/VariableTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.blocks;
+package org.apache.sysml.test.integration.functions.blocks;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/blocks/WhileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/blocks/WhileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java
index 1462c4b5b64..d4b4054810c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/blocks/WhileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/blocks/WhileTest.java
@@ -15,10 +15,10 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.blocks;
+package org.apache.sysml.test.integration.functions.blocks;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/caching/CachingPWriteExportTest.java b/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/caching/CachingPWriteExportTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
index bf3d67b8b16..d75d55988a2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/caching/CachingPWriteExportTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/caching/CachingPWriteExportTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.caching;
+package org.apache.sysml.test.integration.functions.caching;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class CachingPWriteExportTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/FullReblockTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/FullReblockTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java
index 838854e3b88..e043b1d93bc 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/FullReblockTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/FullReblockTest.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import java.io.IOException;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullReblockTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/FullStringInitializeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/FullStringInitializeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java
index 60efd08f862..4be4fdf0a17 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/FullStringInitializeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/FullStringInitializeTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandRuntimePlatformTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandRuntimePlatformTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandRuntimePlatformTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandRuntimePlatformTest.java
index d1829b94f5e..3ddccd036c3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandRuntimePlatformTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandRuntimePlatformTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -27,12 +27,12 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * Complete suit of tests for Rand:
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest1.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest1.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest1.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandTest1.java
index 73164026bbd..d8a3b943a25 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest1.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest1.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest2.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest2.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandTest2.java
index 01b2a42bbab..9fcd90d9343 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest2.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest2.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest3.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest3.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest3.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandTest3.java
index 47fd88302cb..1dc0dfbe81b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest3.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest3.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest4.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest4.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest4.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandTest4.java
index 42e8b052867..90d907cd1ab 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest4.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest4.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest5.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest5.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest5.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandTest5.java
index 26b18dcead5..a8b17c64e29 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandTest5.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandTest5.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * The major purpose of this test is to verify min/max value domains
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandVarMinMaxTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandVarMinMaxTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandVarMinMaxTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandVarMinMaxTest.java
index 671771f774c..570dccf941e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandVarMinMaxTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandVarMinMaxTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandVarSeedTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/RandVarSeedTest.java
similarity index 83%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandVarSeedTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/RandVarSeedTest.java
index b9f6fe2a275..c6147baeee7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/RandVarSeedTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/RandVarSeedTest.java
@@ -15,24 +15,24 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import java.util.HashMap;
 import java.util.Random;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 		
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/ReadMMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/ReadMMTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java
index 0afef183931..6bf290cd522 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/ReadMMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/ReadMMTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import static org.junit.Assert.fail;
 
@@ -23,15 +23,15 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/ReblockTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/ReblockTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/ReblockTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/ReblockTest.java
index 11a13850699..72b5992ce69 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/ReblockTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/ReblockTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/SampleTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/SampleTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java
index bfa7a5c20b8..1a2cd57669b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/SampleTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/SampleTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -25,11 +25,11 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  * Tests if Rand produces the same output, for a given set of parameters, across different (CP vs. MR) runtime platforms.   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/SequenceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/SequenceTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java
index 30f4378f9df..710f740f673 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/SequenceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/SequenceTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,12 +26,12 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * Tests if Rand produces the same output, for a given set of parameters, across different (CP vs. MR) runtime platforms.   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/VariableTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/VariableTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/VariableTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/VariableTest.java
index 6efa75b83aa..316cb22a122 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/VariableTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/VariableTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/WriteMMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/WriteMMTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/WriteMMTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/WriteMMTest.java
index 0ddeb803416..84daf99217b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/WriteMMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/WriteMMTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/WriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/data/WriteTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/data/WriteTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/data/WriteTest.java
index f03d455b280..0cffd7d3b60 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/data/WriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/data/WriteTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.BinaryMatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.BinaryMatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/dmlscript/DMLScriptTest1.java b/src/test/java/org/apache/sysml/test/integration/functions/dmlscript/DMLScriptTest1.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/dmlscript/DMLScriptTest1.java
rename to src/test/java/org/apache/sysml/test/integration/functions/dmlscript/DMLScriptTest1.java
index 1c6384b0757..65de6275b9d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/dmlscript/DMLScriptTest1.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/dmlscript/DMLScriptTest1.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.dmlscript;
+package org.apache.sysml.test.integration.functions.dmlscript;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/dmlscript/DMLScriptTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/dmlscript/DMLScriptTest2.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/dmlscript/DMLScriptTest2.java
rename to src/test/java/org/apache/sysml/test/integration/functions/dmlscript/DMLScriptTest2.java
index e870667c494..6aa19fb498a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/dmlscript/DMLScriptTest2.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/dmlscript/DMLScriptTest2.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.dmlscript;
+package org.apache.sysml.test.integration.functions.dmlscript;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/DynProjectTest.java b/src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/external/DynProjectTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java
index 0e965ad5ca2..0973b650f2d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/DynProjectTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/external/DynProjectTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.external;
+package org.apache.sysml.test.integration.functions.external;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class DynProjectTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/DynReadWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/external/DynReadWriteTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/external/DynReadWriteTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/external/DynReadWriteTest.java
index 4870f1fafff..b82831a5f02 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/DynReadWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/external/DynReadWriteTest.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.external;
+package org.apache.sysml.test.integration.functions.external;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class DynReadWriteTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/FunctionExpressionsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/external/FunctionExpressionsTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/external/FunctionExpressionsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/external/FunctionExpressionsTest.java
index cdccbf5101c..b726c324423 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/FunctionExpressionsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/external/FunctionExpressionsTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.external;
+package org.apache.sysml.test.integration.functions.external;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.utils.Statistics;
 
 public class FunctionExpressionsTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/OrderTest.java b/src/test/java/org/apache/sysml/test/integration/functions/external/OrderTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/external/OrderTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/external/OrderTest.java
index b4cb65ac253..776e97c6402 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/external/OrderTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/external/OrderTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.external;
+package org.apache.sysml.test.integration.functions.external;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class OrderTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregCG.java b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregCG.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregCG.java
rename to src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregCG.java
index d98ababc9a2..4d1e409c870 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregCG.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregCG.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.gdfo;
+package org.apache.sysml.test.integration.functions.gdfo;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregDS.java b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregDS.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregDS.java
rename to src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregDS.java
index 8445d189122..219591cc1b0 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregDS.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregDS.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.gdfo;
+package org.apache.sysml.test.integration.functions.gdfo;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregDSsimpl.java b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregDSsimpl.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregDSsimpl.java
rename to src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregDSsimpl.java
index 9d2a55b0d2d..91e7ca67ffb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOLinregDSsimpl.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOLinregDSsimpl.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.gdfo;
+package org.apache.sysml.test.integration.functions.gdfo;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOMMChainLoop.java b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOMMChainLoop.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOMMChainLoop.java
rename to src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOMMChainLoop.java
index d2bdd0b5a67..31a5f5975a5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/GDFOMMChainLoop.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/GDFOMMChainLoop.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.gdfo;
+package org.apache.sysml.test.integration.functions.gdfo;
 
 import java.util.HashMap;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/HashInterestingPropertiesTest.java b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/HashInterestingPropertiesTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/HashInterestingPropertiesTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/gdfo/HashInterestingPropertiesTest.java
index c85bad95f09..a7829af2621 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/gdfo/HashInterestingPropertiesTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/gdfo/HashInterestingPropertiesTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.gdfo;
+package org.apache.sysml.test.integration.functions.gdfo;
 
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.globalopt.InterestingProperties;
-import com.ibm.bi.dml.hops.globalopt.InterestingProperties.Format;
-import com.ibm.bi.dml.hops.globalopt.InterestingProperties.Location;
-import com.ibm.bi.dml.hops.globalopt.InterestingProperties.Partitioning;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.globalopt.InterestingProperties;
+import org.apache.sysml.hops.globalopt.InterestingProperties.Format;
+import org.apache.sysml.hops.globalopt.InterestingProperties.Location;
+import org.apache.sysml.hops.globalopt.InterestingProperties.Partitioning;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class HashInterestingPropertiesTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
index dda988b67d3..564bd56773b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/Jdk7IssueRightIndexingTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingScalarTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingScalarTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java
index 551d04727e3..fc281194ff6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingScalarTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingScalarTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class LeftIndexingScalarTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
index fb42c9c5a73..81b69380d6c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseDenseTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp.LeftIndexingMethod;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp.LeftIndexingMethod;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class LeftIndexingSparseDenseTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
index bee41b524c2..5a5497a2e66 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingSparseSparseTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp.LeftIndexingMethod;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp.LeftIndexingMethod;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class LeftIndexingSparseSparseTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java
index b03bba723bb..4c925656fa5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/LeftIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/LeftIndexingTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.LeftIndexingOp;
-import com.ibm.bi.dml.hops.LeftIndexingOp.LeftIndexingMethod;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.LeftIndexingOp;
+import org.apache.sysml.hops.LeftIndexingOp.LeftIndexingMethod;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class LeftIndexingTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/RightIndexingMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/RightIndexingMatrixTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java
index ceccf42b7c6..9a62ab4315f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/RightIndexingMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingMatrixTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import java.util.HashMap;
 import java.util.Random;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/RightIndexingVectorTest.java b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/RightIndexingVectorTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java
index 9114af1b815..deaeb7b1a4c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/indexing/RightIndexingVectorTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/indexing/RightIndexingVectorTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import java.util.HashMap;
 import java.util.Random;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/FullDynWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/FullDynWriteTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java
index be6c54b234f..e50c74b0cf9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/FullDynWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/FullDynWriteTest.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import java.io.IOException;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.runtime.util.UtilFunctions;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.runtime.util.UtilFunctions;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullDynWriteTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest1.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest1.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java
index ea84053695d..8a94029a7e8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest1.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest1.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest2.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java
index 12c59d8a15e..1dcd5bc042e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest2.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest2.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest3.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest3.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java
index c9867054832..f441e64f154 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest3.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest3.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest4.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest4.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java
index 49594e63dc9..3446da17757 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest4.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest4.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest5.java b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest5.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java
index 3ccc0537064..109216b15ef 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/IOTest5.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/IOTest5.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/ScalarIOTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/ScalarIOTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java
index 79bc0a95547..e86bbfaf94c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/ScalarIOTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/ScalarIOTest.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ScalarIOTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/SeqParReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/SeqParReadTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
index a6850382ede..db0929fff9e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/SeqParReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/SeqParReadTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import java.io.IOException;
 
@@ -23,17 +23,17 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class SeqParReadTest extends AutomatedTestBase {
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/binary/SerializeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java
similarity index 83%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/binary/SerializeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java
index b37afdafc02..83381f509c7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/binary/SerializeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/binary/SerializeTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.binary;
+package org.apache.sysml.test.integration.functions.io.binary;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class SerializeTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/CSVParametersTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/CSVParametersTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java
index 92eb20390c4..f6f5f03935a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/CSVParametersTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/CSVParametersTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.csv;
+package org.apache.sysml.test.integration.functions.io.csv;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -25,11 +25,11 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 @RunWith(value = Parameterized.class)
 public class CSVParametersTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/FormatChangeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/FormatChangeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java
index f12675d89a5..12d95646782 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/FormatChangeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/FormatChangeTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.csv;
+package org.apache.sysml.test.integration.functions.io.csv;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,11 +26,11 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 @RunWith(value = Parameterized.class)
 public class FormatChangeTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/ReadCSVTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/ReadCSVTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
index d0ff86a6a98..4124af5734d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/ReadCSVTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/ReadCSVTest.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.csv;
+package org.apache.sysml.test.integration.functions.io.csv;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * JUnit Test cases to evaluate the functionality of reading CSV files.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/WriteCSVTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/WriteCSVTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java
index 5e17dcdb802..3edc9c776a5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/csv/WriteCSVTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/csv/WriteCSVTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.csv;
+package org.apache.sysml.test.integration.functions.io.csv;
 
 import java.io.IOException;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * JUnit Test cases to evaluate the functionality of reading CSV files.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/FormatChangeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
index 66ea65d0318..d38f620f09a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/FormatChangeTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.matrixmarket;
+package org.apache.sysml.test.integration.functions.io.matrixmarket;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FormatChangeTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/ReadMMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/ReadMMTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
index 18880412f67..18d3518b0c9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/ReadMMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ReadMMTest.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.matrixmarket;
+package org.apache.sysml.test.integration.functions.io.matrixmarket;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ReadMMTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/jmlc/SystemTMulticlassSVMScoreTest.java b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/SystemTMulticlassSVMScoreTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/jmlc/SystemTMulticlassSVMScoreTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/jmlc/SystemTMulticlassSVMScoreTest.java
index 8af9d83a60d..86430f80fd3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/jmlc/SystemTMulticlassSVMScoreTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/jmlc/SystemTMulticlassSVMScoreTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.jmlc;
+package org.apache.sysml.test.integration.functions.jmlc;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,18 +23,18 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.api.jmlc.Connection;
-import com.ibm.bi.dml.api.jmlc.PreparedScript;
-import com.ibm.bi.dml.api.jmlc.ResultVariables;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.Timing;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.jmlc.Connection;
+import org.apache.sysml.api.jmlc.PreparedScript;
+import org.apache.sysml.api.jmlc.ResultVariables;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.Timing;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ConditionalValidateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ConditionalValidateTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java
index 80ceaecd4de..d77c8b5642a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ConditionalValidateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ConditionalValidateTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/DataTypeCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/DataTypeCastingTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java
index 6dfd1e01f78..b31b6658899 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/DataTypeCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeCastingTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/DataTypeChangeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/DataTypeChangeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
index 03297760d9c..5acb0729092 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/DataTypeChangeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/DataTypeChangeTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -24,16 +24,16 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-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.parser.AParserWrapper;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.parser.AParserWrapper;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  * GENERAL NOTE
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/FunctionInliningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/FunctionInliningTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.java
index 50aef573ced..7ff23601cab 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/FunctionInliningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/FunctionInliningTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.utils.Statistics;
 
 public class FunctionInliningTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPALiteralReplacementTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPALiteralReplacementTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java
index 3ab7918ff2f..638ed8e7f78 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPALiteralReplacementTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPALiteralReplacementTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * Regression test for function recompile-once issue with literal replacement.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPAScalarRecursionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPAScalarRecursionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java
index 9f8f1558d6b..bf75e5dfa28 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPAScalarRecursionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAScalarRecursionTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPAUnknownRecursionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAUnknownRecursionTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPAUnknownRecursionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/IPAUnknownRecursionTest.java
index 254452790e6..4118659e527 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/IPAUnknownRecursionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/IPAUnknownRecursionTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class IPAUnknownRecursionTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/InvalidFunctionSignatureTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionSignatureTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/InvalidFunctionSignatureTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionSignatureTest.java
index 11710c93355..4c4b827b30e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/InvalidFunctionSignatureTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/InvalidFunctionSignatureTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/LongOverflowTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/LongOverflowTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java
index 9b2591616e8..e41ca12f344 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/LongOverflowTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/LongOverflowTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/NrowNcolStringTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/NrowNcolStringTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java
index 1b6f926cc8b..e3efbd4a5f6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/NrowNcolStringTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolStringTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java
similarity index 83%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java
index 5b783ed1b4b..c09df9fca8d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/NrowNcolUnknownCSVReadTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  *  This test checks for valid meta information after csv read with unknown size
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/OuterTableExpandTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/OuterTableExpandTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/OuterTableExpandTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/OuterTableExpandTest.java
index 84f5d111df1..56bc6164047 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/OuterTableExpandTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/OuterTableExpandTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/PrintExpressionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintExpressionTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/PrintExpressionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/PrintExpressionTest.java
index 544fabb81f0..df532a80d68 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/PrintExpressionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintExpressionTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/PrintMatrixTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/PrintMatrixTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java
index ccf8403f61b..68eaa13b5cb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/PrintMatrixTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/PrintMatrixTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ReadAfterWriteTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ReadAfterWriteTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java
index 76b85ac6e90..dd25ec26e86 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ReadAfterWriteTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ReadAfterWriteTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.Random;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java
index 4f085f6c44a..3444dc50a66 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSimplifyRowColSumMVMultTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * Regression test for function recompile-once issue with literal replacement.
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java
index 7b10e35a519..2427f626907 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/RewriteSlicedMatrixMultTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ScalarAssignmentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarAssignmentTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ScalarAssignmentTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarAssignmentTest.java
index 8a918f5dbc9..343905f0666 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ScalarAssignmentTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarAssignmentTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class ScalarAssignmentTest extends AutomatedTestBase
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ScalarFunctionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ScalarFunctionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java
index c75ec0ad7fe..5de0b3774de 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ScalarFunctionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ScalarFunctionTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/SetWorkingDirTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/SetWorkingDirTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/SetWorkingDirTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/SetWorkingDirTest.java
index d17b8fb76e1..dead06ba82f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/SetWorkingDirTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/SetWorkingDirTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,10 +23,10 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.runtime.util.LocalFileUtils;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.runtime.util.LocalFileUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ValueTypeAutoCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
index 96924c27226..881c1ba1274 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeAutoCastingTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ValueTypeCastingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ValueTypeCastingTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java
index d197fccf1a6..115cd25a4fb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/misc/ValueTypeCastingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/misc/ValueTypeCastingTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/mlcontext/GNMFTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/mlcontext/GNMFTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
index 4c6dd509777..bd50efaa0ca 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/mlcontext/GNMFTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/GNMFTest.java
@@ -1,4 +1,4 @@
-package com.ibm.bi.dml.test.integration.functions.mlcontext;
+package org.apache.sysml.test.integration.functions.mlcontext;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -16,21 +16,21 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.api.MLContext;
-import com.ibm.bi.dml.api.MLOutput;
-import com.ibm.bi.dml.parser.ParseException;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.runtime.instructions.spark.utils.RDDConverterUtilsExt;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.api.MLContext;
+import org.apache.sysml.api.MLOutput;
+import org.apache.sysml.parser.ParseException;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.runtime.instructions.spark.utils.RDDConverterUtilsExt;
 
 import org.apache.spark.mllib.linalg.distributed.MatrixEntry;
 import org.apache.spark.mllib.linalg.distributed.CoordinateMatrix;
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ForLoopPredicateTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ForLoopPredicateTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java
index fafdce978ed..1fdf632820b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ForLoopPredicateTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ForLoopPredicateTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class ForLoopPredicateTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
index d79325014f4..fd25d61c95e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForAdversarialLiteralsTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.controlprogram.parfor.ProgramConverter;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.controlprogram.parfor.ProgramConverter;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForAdversarialLiteralsTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
index fc2dc86b453..f98bd95c853 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForColwiseDataPartitioningTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitioner;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitioner;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForColwiseDataPartitioningTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
index e5ee1d776b0..0847739ac37 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDataPartitionLeftIndexingTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForDataPartitionLeftIndexingTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
index c6f04aac9d5..e4791633fd7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForDependencyAnalysisTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -24,15 +24,15 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-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.parser.AParserWrapper;
-import com.ibm.bi.dml.parser.DMLProgram;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.LanguageException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.parser.AParserWrapper;
+import org.apache.sysml.parser.DMLProgram;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.LanguageException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 /**
  * Different test cases for ParFOR loop dependency analysis:
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForFunctionSerializationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
index 00222f88339..38a84077434 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForFunctionSerializationTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForFunctionSerializationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
index 7227986d235..f1169d27e96 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForMultipleDataPartitioningTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForMultipleDataPartitioningTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
index fa89235b722..267cb589883 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForNaNResultMergeTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 import java.util.Map.Entry;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForNaNResultMergeTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
index be49f9dc24e..48a2b4ab74c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForParallelRemoteResultMergeTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
@@ -23,11 +23,11 @@
 import org.junit.Test;
 import org.junit.Ignore;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class ParForParallelRemoteResultMergeTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
index 4427d7fa5df..9b7fddba36b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRepeatedOptimizationTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
@@ -23,16 +23,16 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock;
-import com.ibm.bi.dml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock;
+import org.apache.sysml.runtime.controlprogram.parfor.stat.InfrastructureAnalyzer;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class ParForRepeatedOptimizationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
index 06da6e1fe98..41204e0bafe 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForReplaceThreadIDRecompileTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
@@ -23,11 +23,11 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForReplaceThreadIDRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
index 4b705aade60..b4beaaeb263 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRowwiseDataPartitioningTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.Hop;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PDataPartitioner;
-import com.ibm.bi.dml.runtime.controlprogram.ParForProgramBlock.PExecMode;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.Hop;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PDataPartitioner;
+import org.apache.sysml.runtime.controlprogram.ParForProgramBlock.PExecMode;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForRowwiseDataPartitioningTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
index 99c9ff23d06..a07e979582d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForRulebasedOptimizerTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class ParForRulebasedOptimizerTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
index 009f8d0e8df..dd8698ed9bc 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/parfor/ParForSerialRemoteResultMergeTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class ParForSerialRemoteResultMergeTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/piggybacking/PiggybackingTest1.java b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/piggybacking/PiggybackingTest1.java
rename to src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java
index a2e97e95e16..1c6a2471dd4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/piggybacking/PiggybackingTest1.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest1.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.piggybacking;
+package org.apache.sysml.test.integration.functions.piggybacking;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class PiggybackingTest1 extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/piggybacking/PiggybackingTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest2.java
similarity index 85%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/piggybacking/PiggybackingTest2.java
rename to src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest2.java
index c8399bcc3fb..da185c15ae6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/piggybacking/PiggybackingTest2.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/piggybacking/PiggybackingTest2.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.piggybacking;
+package org.apache.sysml.test.integration.functions.piggybacking;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class PiggybackingTest2 extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
index 87647bc8f97..e2c6dd71031 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/RewritesWeightedSigmoidTest.java
@@ -15,25 +15,25 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.quaternary;
+package org.apache.sysml.test.integration.functions.quaternary;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedSigmoid;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedSigmoid;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
index 757c29f163a..c0b095b7a14 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedCrossEntropyTest.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.quaternary;
+package org.apache.sysml.test.integration.functions.quaternary;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.QuaternaryOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedCrossEntropy;
-import com.ibm.bi.dml.lops.WeightedCrossEntropyR;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.QuaternaryOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedCrossEntropy;
+import org.apache.sysml.lops.WeightedCrossEntropyR;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
index c20f7f60241..64ee9fc2fb4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedDivMatrixMultTest.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.quaternary;
+package org.apache.sysml.test.integration.functions.quaternary;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.QuaternaryOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedDivMM;
-import com.ibm.bi.dml.lops.WeightedDivMMR;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.QuaternaryOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedDivMM;
+import org.apache.sysml.lops.WeightedDivMMR;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java
index 814f1b0f6aa..b1cf5bec6fb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSigmoidTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSigmoidTest.java
@@ -15,25 +15,25 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.quaternary;
+package org.apache.sysml.test.integration.functions.quaternary;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.QuaternaryOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedSigmoid;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.QuaternaryOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedSigmoid;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
index b0eabe86419..27eb3f492a4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedSquaredLossTest.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.quaternary;
+package org.apache.sysml.test.integration.functions.quaternary;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.QuaternaryOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedSquaredLoss;
-import com.ibm.bi.dml.lops.WeightedSquaredLossR;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.QuaternaryOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedSquaredLoss;
+import org.apache.sysml.lops.WeightedSquaredLossR;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
index 078cbd6bd8b..085069a1eba 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/quaternary/WeightedUnaryMatrixMultTest.java
@@ -15,27 +15,27 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.quaternary;
+package org.apache.sysml.test.integration.functions.quaternary;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.QuaternaryOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.lops.WeightedUnaryMM;
-import com.ibm.bi.dml.lops.WeightedUnaryMMR;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.QuaternaryOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.lops.WeightedUnaryMM;
+import org.apache.sysml.lops.WeightedUnaryMMR;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java
index d8b61fdea21..08e21af0b4b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/BranchRemovalTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/BranchRemovalTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class BranchRemovalTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
index 4f5eedbb510..b9b371e8973 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/CSVReadUnknownSizeTest.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class CSVReadUnknownSizeTest extends AutomatedTestBase {
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
index ab159ed2f2e..e64d232d867 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/FunctionRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/FunctionRecompileTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
@@ -23,12 +23,12 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class FunctionRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
index 8e507ba798c..bfb3aea30a2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAAssignConstantPropagationTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class IPAAssignConstantPropagationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAComplexAppendTest.java
similarity index 85%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAComplexAppendTest.java
index ee993b3b1a3..d26c977d272 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAComplexAppendTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAComplexAppendTest.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.io.IOException;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class IPAComplexAppendTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAConstantPropagationTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAConstantPropagationTest.java
index 2728215f12e..a7edebf65d7 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAConstantPropagationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAConstantPropagationTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class IPAConstantPropagationTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
index b1b14babca0..1fea1df8724 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/IPAPropagationSizeMultipleFunctionsTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class IPAPropagationSizeMultipleFunctionsTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
index cfa0f1fe8be..a170fd88141 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/LiteralReplaceCastScalarReadTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.lops.UnaryCP;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.lops.UnaryCP;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/MultipleReadsIPATest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/MultipleReadsIPATest.java
index 9408f8b0331..40cbcfc8df9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/MultipleReadsIPATest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/MultipleReadsIPATest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class MultipleReadsIPATest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java
index 4a7b05b193b..026fc7cded3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/PredicateRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/PredicateRecompileTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.utils.Statistics;
 
 public class PredicateRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java
index 60936faed80..791a258aade 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandJobRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandJobRecompileTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class RandJobRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java
index ee50c2faf7f..cfb32eb1a32 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandRecompileTest.java
@@ -15,15 +15,15 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.utils.Statistics;
 
 public class RandRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
index 19a5071aaa4..f1fbfb68b88 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RandSizeExpressionEvalTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.utils.Statistics;
 
 public class RandSizeExpressionEvalTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java
index c542094a3d9..af960b347c9 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/ReblockRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/ReblockRecompileTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -24,16 +24,16 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.runtime.matrix.data.InputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class ReblockRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
index 8c0db05633a..184a136c6af 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RemoveEmptyPotpourriTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * The main purpose of this test is to ensure that encountered and fixed
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
index 60a7ff74758..3c0afa015ef 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RemoveEmptyRecompileTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * INTERESTING NOTE: see MINUS_RIGHT; if '(X+1)-X' instead of '(X+2)-X'
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RewriteComplexMapMultChainTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RewriteComplexMapMultChainTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RewriteComplexMapMultChainTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/RewriteComplexMapMultChainTest.java
index bfa0239b23f..69e1edcf43f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/RewriteComplexMapMultChainTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/RewriteComplexMapMultChainTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.io.IOException;
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class RewriteComplexMapMultChainTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
index c0e8625b4d6..4ecfa1e1729 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityFunctionRecompileTest.java
@@ -15,25 +15,25 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.utils.Statistics;
 
 public class SparsityFunctionRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/SparsityRecompileTest.java b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/SparsityRecompileTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java
index 8bc3dccead3..3d17912a457 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/recompile/SparsityRecompileTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/recompile/SparsityRecompileTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import java.util.HashMap;
 
@@ -23,19 +23,19 @@
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.parser.DMLTranslator;
-import com.ibm.bi.dml.parser.Expression.ValueType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.OutputInfo;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.util.DataConverter;
-import com.ibm.bi.dml.runtime.util.MapReduceTool;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.parser.DMLTranslator;
+import org.apache.sysml.parser.Expression.ValueType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.OutputInfo;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.util.DataConverter;
+import org.apache.sysml.runtime.util.MapReduceTool;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class SparsityRecompileTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/DiagV2MTest.java b/src/test/java/org/apache/sysml/test/integration/functions/reorg/DiagV2MTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/DiagV2MTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/reorg/DiagV2MTest.java
index abf3f361220..107c60fe587 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/DiagV2MTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/reorg/DiagV2MTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.reorg;
+package org.apache.sysml.test.integration.functions.reorg;
 
 import java.util.HashMap;
 import java.util.Random;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class DiagV2MTest extends AutomatedTestBase
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/FullOrderTest.java b/src/test/java/org/apache/sysml/test/integration/functions/reorg/FullOrderTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/FullOrderTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/reorg/FullOrderTest.java
index 4f81a2e95b7..4589e713a85 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/FullOrderTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/reorg/FullOrderTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.reorg;
+package org.apache.sysml.test.integration.functions.reorg;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.hops.ReorgOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.hops.ReorgOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * TODO add tests for dynamically computed ordering parameters; in hybrid execution mode
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/FullTransposeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/reorg/FullTransposeTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/FullTransposeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/reorg/FullTransposeTest.java
index 2fa4c639c02..a039f8e5355 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/FullTransposeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/reorg/FullTransposeTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.reorg;
+package org.apache.sysml.test.integration.functions.reorg;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/MatrixReshapeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/reorg/MatrixReshapeTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/MatrixReshapeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/reorg/MatrixReshapeTest.java
index f331ef5c647..974c69fffee 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/reorg/MatrixReshapeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/reorg/MatrixReshapeTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.reorg;
+package org.apache.sysml.test.integration.functions.reorg;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * NOTE: there are differences to R's matrix operation; in SystemML byrow refers to both input and output
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/terms/ScalarMatrixUnaryBinaryTermTest.java b/src/test/java/org/apache/sysml/test/integration/functions/terms/ScalarMatrixUnaryBinaryTermTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/terms/ScalarMatrixUnaryBinaryTermTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/terms/ScalarMatrixUnaryBinaryTermTest.java
index 8bd86dc1fe3..d84d8df35b6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/terms/ScalarMatrixUnaryBinaryTermTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/terms/ScalarMatrixUnaryBinaryTermTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.terms;
+package org.apache.sysml.test.integration.functions.terms;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 public class ScalarMatrixUnaryBinaryTermTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/terms/ScalarToMatrixInLoopTest.java b/src/test/java/org/apache/sysml/test/integration/functions/terms/ScalarToMatrixInLoopTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/terms/ScalarToMatrixInLoopTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/terms/ScalarToMatrixInLoopTest.java
index 22d6e568ceb..6e921f73aa8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/terms/ScalarToMatrixInLoopTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/terms/ScalarToMatrixInLoopTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.terms;
+package org.apache.sysml.test.integration.functions.terms;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 public class ScalarToMatrixInLoopTest extends AutomatedTestBase 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CTableMatrixIgnoreZerosTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableMatrixIgnoreZerosTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CTableMatrixIgnoreZerosTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableMatrixIgnoreZerosTest.java
index 4a896bb5fd2..f04ac7b136e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CTableMatrixIgnoreZerosTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableMatrixIgnoreZerosTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.ternary;
+package org.apache.sysml.test.integration.functions.ternary;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.TernaryOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.TernaryOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * This test investigates the specific Hop-Lop rewrite for the following pattern:
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CTableSequenceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CTableSequenceTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java
index b5cdcfe4f22..051023c17f4 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CTableSequenceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CTableSequenceTest.java
@@ -15,20 +15,20 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.ternary;
+package org.apache.sysml.test.integration.functions.ternary;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.TernaryOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.TernaryOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * This test investigates the specific Hop-Lop rewrite ctable(seq(1,nrow(X)),X).
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CentralMomentWeightsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CentralMomentWeightsTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CentralMomentWeightsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/ternary/CentralMomentWeightsTest.java
index f606cd5b7e0..4dc2454361a 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CentralMomentWeightsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CentralMomentWeightsTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.ternary;
+package org.apache.sysml.test.integration.functions.ternary;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CovarianceWeightsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CovarianceWeightsTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CovarianceWeightsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/ternary/CovarianceWeightsTest.java
index b66f0259dbc..e2177afd4d3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/CovarianceWeightsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/CovarianceWeightsTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.ternary;
+package org.apache.sysml.test.integration.functions.ternary;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/QuantileWeightsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/QuantileWeightsTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/QuantileWeightsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/ternary/QuantileWeightsTest.java
index 4c785f17f35..788d842e030 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/QuantileWeightsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/QuantileWeightsTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.ternary;
+package org.apache.sysml.test.integration.functions.ternary;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/TableOutputTest.java b/src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/TableOutputTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java
index e582a46df0c..dbfdd4d05b5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/ternary/TableOutputTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/ternary/TableOutputTest.java
@@ -15,19 +15,19 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.ternary;
+package org.apache.sysml.test.integration.functions.ternary;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class TableOutputTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/transform/RunTest.java b/src/test/java/org/apache/sysml/test/integration/functions/transform/RunTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/transform/RunTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/transform/RunTest.java
index 75a1a5b2c83..8b3cb022667 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/transform/RunTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/transform/RunTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.transform;
+package org.apache.sysml.test.integration.functions.transform;
 
 import java.io.IOException;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/transform/ScalingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/transform/ScalingTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java
index 2fd7726842d..87d413733f1 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/transform/ScalingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/transform/ScalingTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.transform;
+package org.apache.sysml.test.integration.functions.transform;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,19 +29,19 @@
 import org.apache.wink.json4j.JSONObject;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.runtime.io.ReaderBinaryBlock;
-import com.ibm.bi.dml.runtime.io.ReaderTextCSV;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.transform.TransformationAgent.TX_METHOD;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.runtime.io.ReaderBinaryBlock;
+import org.apache.sysml.runtime.io.ReaderTextCSV;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.transform.TransformationAgent.TX_METHOD;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/transform/TransformTest.java b/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/transform/TransformTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java
index 9c33fca4383..1772e6b0850 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/transform/TransformTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/transform/TransformTest.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.transform;
+package org.apache.sysml.test.integration.functions.transform;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.conf.ConfigurationManager;
-import com.ibm.bi.dml.conf.DMLConfig;
-import com.ibm.bi.dml.runtime.io.ReaderBinaryBlock;
-import com.ibm.bi.dml.runtime.io.ReaderTextCSV;
-import com.ibm.bi.dml.runtime.matrix.data.CSVFileFormatProperties;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.conf.ConfigurationManager;
+import org.apache.sysml.conf.DMLConfig;
+import org.apache.sysml.runtime.io.ReaderBinaryBlock;
+import org.apache.sysml.runtime.io.ReaderTextCSV;
+import org.apache.sysml.runtime.matrix.data.CSVFileFormatProperties;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class TransformTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ACosTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ACosTest.java
index 42353b3a5a9..fe1c6069ae8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ACosTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ACosTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ASinTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ASinTest.java
index c4fbbc0f3f9..655e3416fd3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ASinTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ASinTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ATanTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ATanTest.java
index 908026a9c8a..c6b5f9ec34f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ATanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ATanTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/AbsTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/AbsTest.java
index 055afbfbf91..3c4d82326ba 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/AbsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/AbsTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/CastAsScalarTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/CastAsScalarTest.java
index a36930be099..ffe79fcca2b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CastAsScalarTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/CastAsScalarTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/CosTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/CosTest.java
index 06c21cfcab4..7a42a359664 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/CosTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/CosTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/DiagTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/DiagTest.java
index a2368f0cc11..e6b4264778f 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/DiagTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/DiagTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
index 75d2e57d73d..430a041faf6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/EigenFactorizeTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class EigenFactorizeTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCummaxTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCummaxTest.java
index b0d9572f026..90ee7fbd9c5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCummaxTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCummaxTest.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumminTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumminTest.java
index 24569741b3f..a435a34fdb3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumminTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumminTest.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumprodTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumprodTest.java
index 2bc93b4ee49..3dcd9e3cf73 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumprodTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumprodTest.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumsumTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumsumTest.java
index 7d5f63345c4..2cd1ef700e5 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullCumsumTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullCumsumTest.java
@@ -15,22 +15,22 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullSelectPosTest.java
similarity index 88%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullSelectPosTest.java
index 0c10938a285..f582effc81b 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/FullSelectPosTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/FullSelectPosTest.java
@@ -15,23 +15,23 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.OptimizerUtils;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.instructions.Instruction;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.OptimizerUtils;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.instructions.Instruction;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java
index 9dc03e93cf7..216005b60df 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/IQMTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/IQMTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/LUFactorizeTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/LUFactorizeTest.java
index 31680ad9150..720f4359b5e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/LUFactorizeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/LUFactorizeTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class LUFactorizeTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
index 011342017fd..a2b4b9f9a97 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MLUnaryBuiltinTest.java
@@ -15,21 +15,21 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 /**
  * 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MatrixInverseTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MatrixInverseTest.java
index 1ff8df78296..d435ea526c6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MatrixInverseTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MatrixInverseTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class MatrixInverseTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MinusTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MinusTest.java
index 62d6deadce1..aeb75e14b64 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/MinusTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/MinusTest.java
@@ -15,18 +15,18 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class MinusTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/NegationTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/NegationTest.java
index f2f1a9490f6..92b5913585d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/NegationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/NegationTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/PrintTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/PrintTest.java
index f9f56bc8ea6..d018a17e470 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/PrintTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/PrintTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class PrintTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/QRSolverTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/QRSolverTest.java
index dfade923ef3..0b45f68b24c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/QRSolverTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/QRSolverTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class QRSolverTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
index afe9fb3180b..d61076ee61c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RemoveEmptyTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.hops.ParameterizedBuiltinOp;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.MatrixCharacteristics;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.hops.ParameterizedBuiltinOp;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.MatrixCharacteristics;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 public class RemoveEmptyTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java
index b679a20c192..8944cb1b427 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ReplaceTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/ReplaceTest.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import java.util.HashMap;
 import java.util.Random;
@@ -23,14 +23,14 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript;
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.lops.LopProperties.ExecType;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
-import com.ibm.bi.dml.utils.Statistics;
+import org.apache.sysml.api.DMLScript;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.lops.LopProperties.ExecType;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
+import org.apache.sysml.utils.Statistics;
 
 public class ReplaceTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java
similarity index 97%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java
index 1ccd7b59f58..62223bf980e 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/RoundTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/RoundTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/SinTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/SinTest.java
index a984e0ae78c..fc2bd337ab3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SinTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/SinTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/SqrtTest.java
similarity index 91%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/SqrtTest.java
index 173c3827c5a..a9f6e73f412 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/SqrtTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/SqrtTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.DMLRuntimeException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.DMLRuntimeException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/TanTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/TanTest.java
index 18eead2d576..ef7fd5cc9b6 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/TanTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/TransposeTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/TransposeTest.java
index 9628f5a0425..8ca9bc147e1 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/TransposeTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/matrix/TransposeTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ACosTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ACosTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ACosTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ACosTest.java
index 1f4dc7871e8..4d52bfbedf8 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ACosTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ACosTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ASinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ASinTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ASinTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ASinTest.java
index e7818b11f1c..0d64b55ef8c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ASinTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ASinTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ATanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ATanTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ATanTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ATanTest.java
index 81d6307d7e1..ad343f7a7bd 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ATanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ATanTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/AbsTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/AbsTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/AbsTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/AbsTest.java
index 3f0af616bc2..af38f61d167 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/AbsTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/AbsTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/BooleanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/BooleanTest.java
similarity index 87%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/BooleanTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/BooleanTest.java
index b20514a84be..1bca029f289 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/BooleanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/BooleanTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/CosTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/CosTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/CosTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/CosTest.java
index d948772e98c..142746a0d89 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/CosTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/CosTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ExponentTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ExponentTest.java
similarity index 95%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ExponentTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ExponentTest.java
index 9885850b765..02e413ab0d2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ExponentTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/ExponentTest.java
@@ -15,14 +15,14 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLException;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.api.DMLException;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/FullDistributionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java
similarity index 92%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/FullDistributionTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java
index d7b875b25c3..3561bbd38b2 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/FullDistributionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/FullDistributionTest.java
@@ -15,17 +15,17 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import java.util.HashMap;
 import java.util.Random;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class FullDistributionTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/NegationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NegationTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/NegationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NegationTest.java
index 9e9173e4acf..6022de3c5a3 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/NegationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NegationTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/NotTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/NotTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java
index 711137bbe26..982d0ccf88c 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/NotTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/NotTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/PrintTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/PrintTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java
index 4578fdfb4c0..6c5743ae252 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/PrintTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/PrintTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/RoundTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/RoundTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java
index f5695f50065..76067478963 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/RoundTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/RoundTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 public class RoundTest extends AutomatedTestBase 
 {
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/SinTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/SinTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java
index 4d394ba2bf9..c0c67735582 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/SinTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SinTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/SqrtTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java
similarity index 94%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/SqrtTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java
index 5698211be98..87bce4c1efb 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/SqrtTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/SqrtTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java
index 9a3df2398fe..37a5b488057 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTest2.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java
similarity index 90%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTest2.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java
index c55e1f548dd..40d1f28bf66 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTest2.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTest2.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTestCtrlStr.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTestCtrlStr.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java
index f0f0796f12c..13a59a4f05d 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/StopTestCtrlStr.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/StopTestCtrlStr.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.api.DMLScript.RUNTIME_PLATFORM;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.api.DMLScript.RUNTIME_PLATFORM;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 /**
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/TanTest.java b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java
similarity index 93%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/TanTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java
index ced2bb77370..f35b195e716 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/TanTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/unary/scalar/TanTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/functions/vect/AutoVectorizationTest.java b/src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java
similarity index 96%
rename from src/test/java/com/ibm/bi/dml/test/integration/functions/vect/AutoVectorizationTest.java
rename to src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java
index 6d94677867b..1b99d6c7997 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/functions/vect/AutoVectorizationTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/vect/AutoVectorizationTest.java
@@ -15,16 +15,16 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.vect;
+package org.apache.sysml.test.integration.functions.vect;
 
 import java.util.HashMap;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.test.integration.AutomatedTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.test.integration.AutomatedTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 /**
  *   
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/scalability/LinearRegressionTest.java b/src/test/java/org/apache/sysml/test/integration/scalability/LinearRegressionTest.java
similarity index 86%
rename from src/test/java/com/ibm/bi/dml/test/integration/scalability/LinearRegressionTest.java
rename to src/test/java/org/apache/sysml/test/integration/scalability/LinearRegressionTest.java
index 1c3fa9c2ebf..77efbdb1784 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/scalability/LinearRegressionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/scalability/LinearRegressionTest.java
@@ -15,13 +15,13 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.scalability;
+package org.apache.sysml.test.integration.scalability;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedScalabilityTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
-import com.ibm.bi.dml.test.utils.TestUtils;
+import org.apache.sysml.test.integration.AutomatedScalabilityTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
+import org.apache.sysml.test.utils.TestUtils;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/integration/scalability/PageRankTest.java b/src/test/java/org/apache/sysml/test/integration/scalability/PageRankTest.java
similarity index 89%
rename from src/test/java/com/ibm/bi/dml/test/integration/scalability/PageRankTest.java
rename to src/test/java/org/apache/sysml/test/integration/scalability/PageRankTest.java
index eac13b6d277..a8ee91c4b21 100644
--- a/src/test/java/com/ibm/bi/dml/test/integration/scalability/PageRankTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/scalability/PageRankTest.java
@@ -15,12 +15,12 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.scalability;
+package org.apache.sysml.test.integration.scalability;
 
 import org.junit.Test;
 
-import com.ibm.bi.dml.test.integration.AutomatedScalabilityTestBase;
-import com.ibm.bi.dml.test.integration.TestConfiguration;
+import org.apache.sysml.test.integration.AutomatedScalabilityTestBase;
+import org.apache.sysml.test.integration.TestConfiguration;
 
 
 
diff --git a/src/test/java/com/ibm/bi/dml/test/utils/TestUtils.java b/src/test/java/org/apache/sysml/test/utils/TestUtils.java
similarity index 99%
rename from src/test/java/com/ibm/bi/dml/test/utils/TestUtils.java
rename to src/test/java/org/apache/sysml/test/utils/TestUtils.java
index d6f0308344b..c3a9295f657 100644
--- a/src/test/java/com/ibm/bi/dml/test/utils/TestUtils.java
+++ b/src/test/java/org/apache/sysml/test/utils/TestUtils.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.utils;
+package org.apache.sysml.test.utils;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
@@ -52,14 +52,14 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.SequenceFile;
 
-import com.ibm.bi.dml.runtime.io.IOUtilFunctions;
-import com.ibm.bi.dml.runtime.matrix.data.IJV;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixBlock;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixCell;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixIndexes;
-import com.ibm.bi.dml.runtime.matrix.data.MatrixValue.CellIndex;
-import com.ibm.bi.dml.runtime.matrix.data.SparseRowsIterator;
-import com.ibm.bi.dml.test.integration.BinaryMatrixCharacteristics;
+import org.apache.sysml.runtime.io.IOUtilFunctions;
+import org.apache.sysml.runtime.matrix.data.IJV;
+import org.apache.sysml.runtime.matrix.data.MatrixBlock;
+import org.apache.sysml.runtime.matrix.data.MatrixCell;
+import org.apache.sysml.runtime.matrix.data.MatrixIndexes;
+import org.apache.sysml.runtime.matrix.data.MatrixValue.CellIndex;
+import org.apache.sysml.runtime.matrix.data.SparseRowsIterator;
+import org.apache.sysml.test.integration.BinaryMatrixCharacteristics;
 
 
 /**
diff --git a/src/test/scripts/applications/ctableStats/stratstats.dml b/src/test/scripts/applications/ctableStats/stratstats.dml
index ee354226fb3..ea3eda409af 100644
--- a/src/test/scripts/applications/ctableStats/stratstats.dml
+++ b/src/test/scripts/applications/ctableStats/stratstats.dml
@@ -307,7 +307,7 @@ print ("END STRATIFIED STATISTICS SCRIPT");
 
 
 deNaN = externalFunction (Matrix[Double] A) return (Matrix[Double] B)
-        implemented in (classname = "com.ibm.bi.dml.udf.lib.DeNaNWrapper", exectype = "mem");
+        implemented in (classname = "org.apache.sysml.udf.lib.DeNaNWrapper", exectype = "mem");
 
 fStat_tailprob = function (Matrix[double] fStat, Matrix[double] df_1, Matrix[double] df_2) return (Matrix[double] tailprob)
 { # TEMPORARY IMPLEMENTATION
diff --git a/src/test/scripts/functions/aggregate/ColSumScalarTest.dml b/src/test/scripts/functions/aggregate/ColSumScalarTest.dml
index 9a0465237d6..a5076292314 100644
--- a/src/test/scripts/functions/aggregate/ColSumScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/ColSumScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.ColSumTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.ColSumTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/ColSumTest.dml b/src/test/scripts/functions/aggregate/ColSumTest.dml
index b17e8cbcfbb..aa479af2c7a 100644
--- a/src/test/scripts/functions/aggregate/ColSumTest.dml
+++ b/src/test/scripts/functions/aggregate/ColSumTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.ColSumTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.ColSumTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/LengthScalarTest.dml b/src/test/scripts/functions/aggregate/LengthScalarTest.dml
index 4bd233fea7a..d4be7d11045 100644
--- a/src/test/scripts/functions/aggregate/LengthScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/LengthScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.LengthTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.LengthTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/LengthTest.dml b/src/test/scripts/functions/aggregate/LengthTest.dml
index ba771a82e2a..d542f5e87d2 100644
--- a/src/test/scripts/functions/aggregate/LengthTest.dml
+++ b/src/test/scripts/functions/aggregate/LengthTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.LengthTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.LengthTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/MaxScalarTest.dml b/src/test/scripts/functions/aggregate/MaxScalarTest.dml
index fa6a0fecbad..126228df235 100644
--- a/src/test/scripts/functions/aggregate/MaxScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/MaxScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.LengthTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.LengthTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/MaxTest.dml b/src/test/scripts/functions/aggregate/MaxTest.dml
index 8e318b1bbce..bc822f732b7 100644
--- a/src/test/scripts/functions/aggregate/MaxTest.dml
+++ b/src/test/scripts/functions/aggregate/MaxTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.MaxTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.MaxTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/MinScalarTest.dml b/src/test/scripts/functions/aggregate/MinScalarTest.dml
index f2aabdf0509..5a8c0185f89 100644
--- a/src/test/scripts/functions/aggregate/MinScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/MinScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.LengthTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.LengthTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/MinTest.dml b/src/test/scripts/functions/aggregate/MinTest.dml
index fdeeecebaaa..c48cc20bc56 100644
--- a/src/test/scripts/functions/aggregate/MinTest.dml
+++ b/src/test/scripts/functions/aggregate/MinTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.MinTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.MinTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/NColScalarTest.dml b/src/test/scripts/functions/aggregate/NColScalarTest.dml
index f58e89ec075..9d3d7bec636 100644
--- a/src/test/scripts/functions/aggregate/NColScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/NColScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.LengthTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.LengthTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/NColTest.dml b/src/test/scripts/functions/aggregate/NColTest.dml
index 1b742707daa..ba8cb48d991 100644
--- a/src/test/scripts/functions/aggregate/NColTest.dml
+++ b/src/test/scripts/functions/aggregate/NColTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.NColTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.NColTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/NRowScalarTest.dml b/src/test/scripts/functions/aggregate/NRowScalarTest.dml
index 2b8cffc7f6d..d4f11375e87 100644
--- a/src/test/scripts/functions/aggregate/NRowScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/NRowScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.LengthTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.LengthTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/NRowTest.dml b/src/test/scripts/functions/aggregate/NRowTest.dml
index 0d4f3b65fae..c0de24dd3fa 100644
--- a/src/test/scripts/functions/aggregate/NRowTest.dml
+++ b/src/test/scripts/functions/aggregate/NRowTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.NRowTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.NRowTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/ProdScalarTest.dml b/src/test/scripts/functions/aggregate/ProdScalarTest.dml
index 5f61108cf4e..eab3102b027 100644
--- a/src/test/scripts/functions/aggregate/ProdScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/ProdScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.ProdTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.ProdTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/ProdTest.dml b/src/test/scripts/functions/aggregate/ProdTest.dml
index 688dae94256..f8ede495e8d 100644
--- a/src/test/scripts/functions/aggregate/ProdTest.dml
+++ b/src/test/scripts/functions/aggregate/ProdTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.ProdTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.ProdTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/RowSumScalarTest.dml b/src/test/scripts/functions/aggregate/RowSumScalarTest.dml
index 8997d4bee77..9cbf0a4d576 100644
--- a/src/test/scripts/functions/aggregate/RowSumScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/RowSumScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.LengthTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.LengthTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/RowSumTest.dml b/src/test/scripts/functions/aggregate/RowSumTest.dml
index 4206af56879..b9d41c5be17 100644
--- a/src/test/scripts/functions/aggregate/RowSumTest.dml
+++ b/src/test/scripts/functions/aggregate/RowSumTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.RowSumTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.RowSumTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/SumScalarTest.dml b/src/test/scripts/functions/aggregate/SumScalarTest.dml
index 69b4ed5cef5..c398c36047b 100644
--- a/src/test/scripts/functions/aggregate/SumScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/SumScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.SumTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.SumTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/SumTest.dml b/src/test/scripts/functions/aggregate/SumTest.dml
index de166fe7790..dad788122c0 100644
--- a/src/test/scripts/functions/aggregate/SumTest.dml
+++ b/src/test/scripts/functions/aggregate/SumTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.SumTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.SumTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/TraceScalarTest.dml b/src/test/scripts/functions/aggregate/TraceScalarTest.dml
index c7514bd8222..8a03e049fc8 100644
--- a/src/test/scripts/functions/aggregate/TraceScalarTest.dml
+++ b/src/test/scripts/functions/aggregate/TraceScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.SumTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.SumTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/aggregate/TraceTest.dml b/src/test/scripts/functions/aggregate/TraceTest.dml
index d2e5159c4ae..7cef94bbb7e 100644
--- a/src/test/scripts/functions/aggregate/TraceTest.dml
+++ b/src/test/scripts/functions/aggregate/TraceTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.aggregate.SumTest.java
+# junit test class: org.apache.sysml.test.integration.functions.aggregate.SumTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/matrix/AMultASpecial1Test.dml b/src/test/scripts/functions/binary/matrix/AMultASpecial1Test.dml
index f021e0d2df2..77ce277f914 100644
--- a/src/test/scripts/functions/binary/matrix/AMultASpecial1Test.dml
+++ b/src/test/scripts/functions/binary/matrix/AMultASpecial1Test.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.MatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.MatrixMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 A = A %*% A
diff --git a/src/test/scripts/functions/binary/matrix/AMultBSpecial2Test.dml b/src/test/scripts/functions/binary/matrix/AMultBSpecial2Test.dml
index 33c51f6d0b6..9da514eb22f 100644
--- a/src/test/scripts/functions/binary/matrix/AMultBSpecial2Test.dml
+++ b/src/test/scripts/functions/binary/matrix/AMultBSpecial2Test.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.MatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.MatrixMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm1.dml b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm1.dml
index 12d88ee2991..bc23b594b27 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm1.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm1.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseAdditionMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseAdditionMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm2.dml b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm2.dml
index 633e1a1bca1..29944b25961 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm2.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm2.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseAdditionMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseAdditionMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm3.dml b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm3.dml
index 515e2648a70..5c5af309f30 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm3.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionMultiplicationTerm3.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseAdditionMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseAdditionMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionTest.dml
index 84fabfc49f3..d954e3ddb20 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseAdditionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseAdditionTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionVariableDimensionsTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionVariableDimensionsTest.dml
index ef3bab98e98..12b71918074 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseAdditionVariableDimensionsTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseAdditionVariableDimensionsTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseAdditionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseAdditionTest.java
 
 A = read("$$indir$$a", rows=$$rows1$$, cols=$$cols1$$, format="text");
 B = read("$$indir$$b", rows=$$rows2$$, cols=$$cols2$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseDivisionTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseDivisionTest.dml
index df67874cdb7..7af46761640 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseDivisionTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseDivisionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseDivisionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseDivisionTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseDivisionVariableDimensionsTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseDivisionVariableDimensionsTest.dml
index 7091505dbcb..b407d6a845e 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseDivisionVariableDimensionsTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseDivisionVariableDimensionsTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseDivisionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseDivisionTest.java
 
 A = read("$$indir$$a", rows=$$rows1$$, cols=$$cols1$$, format="text");
 B = read("$$indir$$b", rows=$$rows2$$, cols=$$cols2$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseModulusTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseModulusTest.dml
index 5189ff1b199..cd012279b7c 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseModulusTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseModulusTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseModulusTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseModulusTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseModulusVariableDimensionsTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseModulusVariableDimensionsTest.dml
index bc76a784f1e..23f5ef9ac31 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseModulusVariableDimensionsTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseModulusVariableDimensionsTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseModulusTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseModulusTest.java
 
 A = read("$$indir$$a", rows=$$rows1$$, cols=$$cols1$$, format="text");
 B = read("$$indir$$b", rows=$$rows2$$, cols=$$cols2$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationTest.dml
index 04df73b8d8e..a2e1b2e6b8e 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationVariableDimensionsTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationVariableDimensionsTest.dml
index 2ef4cf54c5e..c488f1c2775 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationVariableDimensionsTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseMultiplicationVariableDimensionsTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$rows1$$, cols=$$cols1$$, format="text");
 B = read("$$indir$$b", rows=$$rows2$$, cols=$$cols2$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionTest.dml
index 81363413830..6143642417e 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseSubtractionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseSubtractionTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionVariableDimensionsTest.dml b/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionVariableDimensionsTest.dml
index dddb6d2c1f1..7e6ccb49432 100644
--- a/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionVariableDimensionsTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ElementwiseSubtractionVariableDimensionsTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ElementwiseSubtractionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ElementwiseSubtractionTest.java
 
 A = read("$$indir$$a", rows=$$rows1$$, cols=$$cols1$$, format="text");
 B = read("$$indir$$b", rows=$$rows2$$, cols=$$cols2$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/MatrixMultiplicationTest.dml b/src/test/scripts/functions/binary/matrix/MatrixMultiplicationTest.dml
index d2c467046d6..21006d978b6 100644
--- a/src/test/scripts/functions/binary/matrix/MatrixMultiplicationTest.dml
+++ b/src/test/scripts/functions/binary/matrix/MatrixMultiplicationTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.MatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.MatrixMultiplicationTest.java
 
 A = read("$$indir$$a", rows=$$m$$, cols=$$n1$$, format="text");
 B = read("$$indir$$b", rows=$$n2$$, cols=$$k$$, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/MatrixVectorMultiplication.dml b/src/test/scripts/functions/binary/matrix/MatrixVectorMultiplication.dml
index 44b5429863d..fdec414d986 100644
--- a/src/test/scripts/functions/binary/matrix/MatrixVectorMultiplication.dml
+++ b/src/test/scripts/functions/binary/matrix/MatrixVectorMultiplication.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1);
 x = read($2);
diff --git a/src/test/scripts/functions/binary/matrix/ScalarAdditionTest.dml b/src/test/scripts/functions/binary/matrix/ScalarAdditionTest.dml
index fec79f1a7b3..c63787ea866 100644
--- a/src/test/scripts/functions/binary/matrix/ScalarAdditionTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ScalarAdditionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ScalarAdditionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ScalarAdditionTest.java
 
 $$vardeclaration$$
 
diff --git a/src/test/scripts/functions/binary/matrix/ScalarDivisionTest.dml b/src/test/scripts/functions/binary/matrix/ScalarDivisionTest.dml
index 1ab7bdb7fd0..22e2dab9fa4 100644
--- a/src/test/scripts/functions/binary/matrix/ScalarDivisionTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ScalarDivisionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ScalarDivisionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ScalarDivisionTest.java
 
 $$vardeclaration$$
 
diff --git a/src/test/scripts/functions/binary/matrix/ScalarModulusTest.dml b/src/test/scripts/functions/binary/matrix/ScalarModulusTest.dml
index 09414faa266..bdc3b53a8f8 100644
--- a/src/test/scripts/functions/binary/matrix/ScalarModulusTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ScalarModulusTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ScalarModulusTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ScalarModulusTest.java
 
 $$vardeclaration$$
 
diff --git a/src/test/scripts/functions/binary/matrix/ScalarMultiplicationTest.dml b/src/test/scripts/functions/binary/matrix/ScalarMultiplicationTest.dml
index 9bffebc7b74..e5c830985dc 100644
--- a/src/test/scripts/functions/binary/matrix/ScalarMultiplicationTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ScalarMultiplicationTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ScalarMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ScalarMultiplicationTest.java
 
 $$vardeclaration$$
 
diff --git a/src/test/scripts/functions/binary/matrix/ScalarSubtractionTest.dml b/src/test/scripts/functions/binary/matrix/ScalarSubtractionTest.dml
index e41e5b72019..5af9349dec8 100644
--- a/src/test/scripts/functions/binary/matrix/ScalarSubtractionTest.dml
+++ b/src/test/scripts/functions/binary/matrix/ScalarSubtractionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.ScalarSubtractionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.ScalarSubtractionTest.java
 
 $$vardeclaration$$
 
diff --git a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml
index 836518302a9..6729d3e8b1a 100644
--- a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml
+++ b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = read($4, rows=$2, cols=1, format="text");
diff --git a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml
index d555597ef8d..03983bcf8f5 100644
--- a/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml
+++ b/src/test/scripts/functions/binary/matrix/UltraSparseMatrixMultiplication2.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = read($4, rows=$2, cols=1, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Addition.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Addition.dml
index ce19a4c2f9c..4ec8b9e1f6e 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Addition.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Addition.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = read($4, rows=$5, cols=$6, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Division.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Division.dml
index bd901c7ee45..37bb2aadd37 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Division.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Division.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = read($4, rows=$5, cols=$6, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Multiplication.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Multiplication.dml
index 8067c1daf9d..435f409ce26 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Multiplication.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Multiplication.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = read($4, rows=$5, cols=$6, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Substraction.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Substraction.dml
index b1e85e794fe..0b0ca018699 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Substraction.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixCellwiseOperation_Substraction.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = read($4, rows=$5, cols=$6, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Addition.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Addition.dml
index 4c84fe57613..42bda51d506 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Addition.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Addition.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Division.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Division.dml
index e675d1d9b99..fb5222d1dbb 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Division.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Division.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Multiplication.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Multiplication.dml
index 39a7db71b36..1dd6b94313a 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Multiplication.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Multiplication.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Substraction.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Substraction.dml
index a86f8da2fc8..ad2528a783e 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Substraction.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorColCellwiseOperation_Substraction.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Addition.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Addition.dml
index 4c84fe57613..42bda51d506 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Addition.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Addition.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Division.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Division.dml
index e675d1d9b99..fb5222d1dbb 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Division.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Division.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Multiplication.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Multiplication.dml
index 39a7db71b36..1dd6b94313a 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Multiplication.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Multiplication.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Substraction.dml b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Substraction.dml
index a86f8da2fc8..ad2528a783e 100644
--- a/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Substraction.dml
+++ b/src/test/scripts/functions/binary/matrix_full_cellwise/FullMatrixVectorRowCellwiseOperation_Substraction.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, format="text");
 B = read($2, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_other/FullMatrixMultiplication.dml b/src/test/scripts/functions/binary/matrix_full_other/FullMatrixMultiplication.dml
index 634bc9edde2..5ac5465f0cb 100644
--- a/src/test/scripts/functions/binary/matrix_full_other/FullMatrixMultiplication.dml
+++ b/src/test/scripts/functions/binary/matrix_full_other/FullMatrixMultiplication.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = read($4, rows=$5, cols=$6, format="text");
diff --git a/src/test/scripts/functions/binary/matrix_full_other/FullPower.dml b/src/test/scripts/functions/binary/matrix_full_other/FullPower.dml
index 78e2cfd0643..7acd3689352 100644
--- a/src/test/scripts/functions/binary/matrix_full_other/FullPower.dml
+++ b/src/test/scripts/functions/binary/matrix_full_other/FullPower.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullMatrixMultiplicationTest.java
 
 A = read($1);
 B = read($2);
diff --git a/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_div.dml b/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_div.dml
index dfc87f6e9f4..47a616ed0d9 100644
--- a/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_div.dml
+++ b/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_div.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullIntegerDivisionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullIntegerDivisionTest.java
 
 A = read($1);
 B = read($2);
diff --git a/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_mod.dml b/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_mod.dml
index bd44103479e..db877d1951a 100644
--- a/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_mod.dml
+++ b/src/test/scripts/functions/binary/matrix_full_other/IntegerDivision_mod.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.FullIntegerDivisionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.FullIntegerDivisionTest.java
 
 A = read($1);
 B = read($2);
diff --git a/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication1.dml b/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication1.dml
index 03a4715a391..c8dd63580d1 100644
--- a/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication1.dml
+++ b/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication1.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.TransposeSelfMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.TransposeSelfMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = t(A) %*% A;
diff --git a/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication2.dml b/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication2.dml
index fb90f814fe6..1a3d4d96d81 100644
--- a/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication2.dml
+++ b/src/test/scripts/functions/binary/matrix_full_other/TransposeSelfMatrixMultiplication2.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.matrix.TransposeSelfMatrixMultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.matrix.TransposeSelfMatrixMultiplicationTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 B = A %*% t(A);
diff --git a/src/test/scripts/functions/binary/scalar/AdditionSingleTest.dml b/src/test/scripts/functions/binary/scalar/AdditionSingleTest.dml
index 978983aab08..68d1ecaef8b 100644
--- a/src/test/scripts/functions/binary/scalar/AdditionSingleTest.dml
+++ b/src/test/scripts/functions/binary/scalar/AdditionSingleTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.AdditionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.AdditionTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/AdditionTest.dml b/src/test/scripts/functions/binary/scalar/AdditionTest.dml
index 9d8a1f20620..10e3839ecf2 100644
--- a/src/test/scripts/functions/binary/scalar/AdditionTest.dml
+++ b/src/test/scripts/functions/binary/scalar/AdditionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.AdditionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.AdditionTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/AndTest.dml b/src/test/scripts/functions/binary/scalar/AndTest.dml
index c6fcc70dcc8..a2304ff9375 100644
--- a/src/test/scripts/functions/binary/scalar/AndTest.dml
+++ b/src/test/scripts/functions/binary/scalar/AndTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.AndTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.AndTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/DivisionSingleTest.dml b/src/test/scripts/functions/binary/scalar/DivisionSingleTest.dml
index 5d6daf1ab12..73ee6ad3450 100644
--- a/src/test/scripts/functions/binary/scalar/DivisionSingleTest.dml
+++ b/src/test/scripts/functions/binary/scalar/DivisionSingleTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.DivisionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.DivisionTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/DivisionTest.dml b/src/test/scripts/functions/binary/scalar/DivisionTest.dml
index b4479bcbe10..362384bcce7 100644
--- a/src/test/scripts/functions/binary/scalar/DivisionTest.dml
+++ b/src/test/scripts/functions/binary/scalar/DivisionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.DivisionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.DivisionTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/EqualTest.dml b/src/test/scripts/functions/binary/scalar/EqualTest.dml
index 700183b8eef..ee5aeee29ad 100644
--- a/src/test/scripts/functions/binary/scalar/EqualTest.dml
+++ b/src/test/scripts/functions/binary/scalar/EqualTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.EqualTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.EqualTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/GreaterThanOrEqualTest.dml b/src/test/scripts/functions/binary/scalar/GreaterThanOrEqualTest.dml
index b77b96b1c9b..baab4029e3e 100644
--- a/src/test/scripts/functions/binary/scalar/GreaterThanOrEqualTest.dml
+++ b/src/test/scripts/functions/binary/scalar/GreaterThanOrEqualTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.GreaterThanOrEqualTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.GreaterThanOrEqualTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/GreaterThanTest.dml b/src/test/scripts/functions/binary/scalar/GreaterThanTest.dml
index 66194e637eb..957b642d2f4 100644
--- a/src/test/scripts/functions/binary/scalar/GreaterThanTest.dml
+++ b/src/test/scripts/functions/binary/scalar/GreaterThanTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.GreaterThanTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.GreaterThanTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/LessThanOrEqualTest.dml b/src/test/scripts/functions/binary/scalar/LessThanOrEqualTest.dml
index ea8e97a160f..69a43fd40f4 100644
--- a/src/test/scripts/functions/binary/scalar/LessThanOrEqualTest.dml
+++ b/src/test/scripts/functions/binary/scalar/LessThanOrEqualTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.LessThanOrEqualTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.LessThanOrEqualTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/LessThanTest.dml b/src/test/scripts/functions/binary/scalar/LessThanTest.dml
index f371d793ed2..59d68dc257c 100644
--- a/src/test/scripts/functions/binary/scalar/LessThanTest.dml
+++ b/src/test/scripts/functions/binary/scalar/LessThanTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.LessThanTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.LessThanTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/LogarithmTest.dml b/src/test/scripts/functions/binary/scalar/LogarithmTest.dml
index 19c5644c844..18b7029ff78 100644
--- a/src/test/scripts/functions/binary/scalar/LogarithmTest.dml
+++ b/src/test/scripts/functions/binary/scalar/LogarithmTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.LogarithmTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.LogarithmTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/ModulusSingleTest.dml b/src/test/scripts/functions/binary/scalar/ModulusSingleTest.dml
index a1d3d8acce4..9af6ac26471 100644
--- a/src/test/scripts/functions/binary/scalar/ModulusSingleTest.dml
+++ b/src/test/scripts/functions/binary/scalar/ModulusSingleTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.ModulusTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.ModulusTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/ModulusTest.dml b/src/test/scripts/functions/binary/scalar/ModulusTest.dml
index a4ffc4fb6e1..0bbf81fce62 100644
--- a/src/test/scripts/functions/binary/scalar/ModulusTest.dml
+++ b/src/test/scripts/functions/binary/scalar/ModulusTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.ModulusTest
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.ModulusTest
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/MultiplicationTest.dml b/src/test/scripts/functions/binary/scalar/MultiplicationTest.dml
index 38fd95cd7f0..4c06fc787e3 100644
--- a/src/test/scripts/functions/binary/scalar/MultiplicationTest.dml
+++ b/src/test/scripts/functions/binary/scalar/MultiplicationTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.MultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.MultiplicationTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/OrTest.dml b/src/test/scripts/functions/binary/scalar/OrTest.dml
index d050c220d37..78f96399335 100644
--- a/src/test/scripts/functions/binary/scalar/OrTest.dml
+++ b/src/test/scripts/functions/binary/scalar/OrTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.OrTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.OrTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/PowerTest.dml b/src/test/scripts/functions/binary/scalar/PowerTest.dml
index a72bd54f674..772b89c86ea 100644
--- a/src/test/scripts/functions/binary/scalar/PowerTest.dml
+++ b/src/test/scripts/functions/binary/scalar/PowerTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.MultiplicationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.MultiplicationTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/SubtractionMultipleOperantsTest.dml b/src/test/scripts/functions/binary/scalar/SubtractionMultipleOperantsTest.dml
index 4643fca631a..4d74d108458 100644
--- a/src/test/scripts/functions/binary/scalar/SubtractionMultipleOperantsTest.dml
+++ b/src/test/scripts/functions/binary/scalar/SubtractionMultipleOperantsTest.dml
@@ -17,7 +17,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.SubtractionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.SubtractionTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/binary/scalar/SubtractionTest.dml b/src/test/scripts/functions/binary/scalar/SubtractionTest.dml
index 4dbe08a45ad..47280249220 100644
--- a/src/test/scripts/functions/binary/scalar/SubtractionTest.dml
+++ b/src/test/scripts/functions/binary/scalar/SubtractionTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.binary.scalar.SubtractionTest.java
+# junit test class: org.apache.sysml.test.integration.functions.binary.scalar.SubtractionTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/blocks/VariableAnalysis1Test.dml b/src/test/scripts/functions/blocks/VariableAnalysis1Test.dml
index b77b54cb1ae..a1952314269 100644
--- a/src/test/scripts/functions/blocks/VariableAnalysis1Test.dml
+++ b/src/test/scripts/functions/blocks/VariableAnalysis1Test.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# JUnit test class: com.ibm.bi.dml.test.integration.functions.blocks.VariableTest.java
+# JUnit test class: org.apache.sysml.test.integration.functions.blocks.VariableTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 
diff --git a/src/test/scripts/functions/blocks/VariablePassing1Test.dml b/src/test/scripts/functions/blocks/VariablePassing1Test.dml
index 93f57343b11..6dab770a10d 100644
--- a/src/test/scripts/functions/blocks/VariablePassing1Test.dml
+++ b/src/test/scripts/functions/blocks/VariablePassing1Test.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# JUnit test class: com.ibm.bi.dml.test.integration.functions.blocks.VariableTest.java
+# JUnit test class: org.apache.sysml.test.integration.functions.blocks.VariableTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="text");
diff --git a/src/test/scripts/functions/blocks/VariablePassing2Test.dml b/src/test/scripts/functions/blocks/VariablePassing2Test.dml
index 323c4a4fd03..0c267fa5fab 100644
--- a/src/test/scripts/functions/blocks/VariablePassing2Test.dml
+++ b/src/test/scripts/functions/blocks/VariablePassing2Test.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# JUnit test class: com.ibm.bi.dml.test.integration.functions.blocks.VariableTest.jav
+# JUnit test class: org.apache.sysml.test.integration.functions.blocks.VariableTest.jav
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = $$factor$$ * t(A);
diff --git a/src/test/scripts/functions/blocks/WhileTest.dml b/src/test/scripts/functions/blocks/WhileTest.dml
index 5a83a88779a..34f8a9b1e80 100644
--- a/src/test/scripts/functions/blocks/WhileTest.dml
+++ b/src/test/scripts/functions/blocks/WhileTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# JUnit test class: com.ibm.bi.dml.test.integration.functions.blocks.WhileTest.java
+# JUnit test class: org.apache.sysml.test.integration.functions.blocks.WhileTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 i = 0;
diff --git a/src/test/scripts/functions/data/CopyVariableTest.dml b/src/test/scripts/functions/data/CopyVariableTest.dml
index d59d1dc1b9b..e512c136879 100644
--- a/src/test/scripts/functions/data/CopyVariableTest.dml
+++ b/src/test/scripts/functions/data/CopyVariableTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.VariableTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.VariableTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = A;
diff --git a/src/test/scripts/functions/data/RandScalarTest.dml b/src/test/scripts/functions/data/RandScalarTest.dml
index f7a8aeb4799..7500690dd9c 100644
--- a/src/test/scripts/functions/data/RandScalarTest.dml
+++ b/src/test/scripts/functions/data/RandScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.RandTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.RandTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/data/RandTest1.dml b/src/test/scripts/functions/data/RandTest1.dml
index 4753ca0f6c3..36643003f5b 100644
--- a/src/test/scripts/functions/data/RandTest1.dml
+++ b/src/test/scripts/functions/data/RandTest1.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.RandTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.RandTest.java
 
 A = Rand(rows=$$rows$$, cols=$$cols$$, min=$$min$$, max=$$max$$);
 write(A, "$$outdir$$rand", format="text");
diff --git a/src/test/scripts/functions/data/RandTest2.dml b/src/test/scripts/functions/data/RandTest2.dml
index fbbc8187006..6a456a980f0 100644
--- a/src/test/scripts/functions/data/RandTest2.dml
+++ b/src/test/scripts/functions/data/RandTest2.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.RandTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.RandTest.java
 
 B = Rand(rows=$$rows$$*5, cols=$$cols$$, min=$$min$$, max=$$max$$);
 write(B, "$$outdir$$rand", format="text");
diff --git a/src/test/scripts/functions/data/RandTest3.dml b/src/test/scripts/functions/data/RandTest3.dml
index 5f207b0de8c..85a2ee4cbd6 100644
--- a/src/test/scripts/functions/data/RandTest3.dml
+++ b/src/test/scripts/functions/data/RandTest3.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.RandTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.RandTest.java
 
 C = Rand(rows=$$rows$$+ 0.5, cols=$$cols$$, min=$$min$$, max=$$max$$);
 write(C, "$$outdir$$rand", format="text");
diff --git a/src/test/scripts/functions/data/RandTest4.dml b/src/test/scripts/functions/data/RandTest4.dml
index 253e89735a1..97d7a1ec346 100644
--- a/src/test/scripts/functions/data/RandTest4.dml
+++ b/src/test/scripts/functions/data/RandTest4.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.RandTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.RandTest.java
 
 A = read("$$indir$$"+"a", rows=$$rows$$, cols=$$cols$$, format="$$format$$");
 
diff --git a/src/test/scripts/functions/data/ReadMMIndexTest.dml b/src/test/scripts/functions/data/ReadMMIndexTest.dml
index e4ea3a9717f..75c2e88fef7 100644
--- a/src/test/scripts/functions/data/ReadMMIndexTest.dml
+++ b/src/test/scripts/functions/data/ReadMMIndexTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.readTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.readTest.java
 
 A = read("$$indir$$b", rows=$$rows$$, cols=$$cols$$, format="$$format$$"$$blockrows$$$$blockcols$$);
 write(A, "$$outdir$$b", format="text");
\ No newline at end of file
diff --git a/src/test/scripts/functions/data/ReadMMTest.dml b/src/test/scripts/functions/data/ReadMMTest.dml
index 4a37349193e..65225a3da3f 100644
--- a/src/test/scripts/functions/data/ReadMMTest.dml
+++ b/src/test/scripts/functions/data/ReadMMTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.readTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.readTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="$$format$$");
 write(A, "$$outdir$$a", format="text");
\ No newline at end of file
diff --git a/src/test/scripts/functions/data/ReblockTest.dml b/src/test/scripts/functions/data/ReblockTest.dml
index 39e8365c7bf..4b61dd8f3eb 100644
--- a/src/test/scripts/functions/data/ReblockTest.dml
+++ b/src/test/scripts/functions/data/ReblockTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.ReblockTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.ReblockTest.java
 
 A = read("$$indir$$a", rows=10, cols=10);
 write(A, "$$outdir$$a", format="text");
\ No newline at end of file
diff --git a/src/test/scripts/functions/data/WriteMMComplexTest.dml b/src/test/scripts/functions/data/WriteMMComplexTest.dml
index 07bb4681ce1..cbce7145a9b 100644
--- a/src/test/scripts/functions/data/WriteMMComplexTest.dml
+++ b/src/test/scripts/functions/data/WriteMMComplexTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.WriteMMTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.WriteMMTest.java
 
 A = read ($1, rows=$2, cols=$3, format="text");
 
diff --git a/src/test/scripts/functions/data/WriteMMTest.dml b/src/test/scripts/functions/data/WriteMMTest.dml
index 08a7d3fde34..4c649c0d043 100644
--- a/src/test/scripts/functions/data/WriteMMTest.dml
+++ b/src/test/scripts/functions/data/WriteMMTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.WriteMMTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.WriteMMTest.java
 
 A = read($1, rows=$2, cols=$3, format="text");
 
diff --git a/src/test/scripts/functions/data/WriteTest.dml b/src/test/scripts/functions/data/WriteTest.dml
index e2af8618d04..0736d51d950 100644
--- a/src/test/scripts/functions/data/WriteTest.dml
+++ b/src/test/scripts/functions/data/WriteTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.writeTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.writeTest.java
 
 A = read("$$indir$$a");
 write(A, "$$outdir$$a", format="$$format$$");
\ No newline at end of file
diff --git a/src/test/scripts/functions/data/WriteTwiceTest.dml b/src/test/scripts/functions/data/WriteTwiceTest.dml
index bcf6bbe3ca6..04fb1136f5a 100644
--- a/src/test/scripts/functions/data/WriteTwiceTest.dml
+++ b/src/test/scripts/functions/data/WriteTwiceTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.data.writeTest.java
+# junit test class: org.apache.sysml.test.integration.functions.data.writeTest.java
 
 A = read("$$indir$$a");
 write(A, "$$outdir$$b", format="text");
diff --git a/src/test/scripts/functions/dmlscript/DMLScriptTest.dml b/src/test/scripts/functions/dmlscript/DMLScriptTest.dml
index 01aaf36b2cc..a3ff5530b08 100644
--- a/src/test/scripts/functions/dmlscript/DMLScriptTest.dml
+++ b/src/test/scripts/functions/dmlscript/DMLScriptTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.dmlscript.DMLScriptTest.java
+# junit test class: org.apache.sysml.test.integration.functions.dmlscript.DMLScriptTest.java
 
 A = read($1, rows=$2, cols=$3, format=$4);
 write(A, $5, format=$4);
diff --git a/src/test/scripts/functions/external/DynProject.dml b/src/test/scripts/functions/external/DynProject.dml
index 368d2840b4f..9390df5f06e 100644
--- a/src/test/scripts/functions/external/DynProject.dml
+++ b/src/test/scripts/functions/external/DynProject.dml
@@ -19,7 +19,7 @@
 
 dynProject = externalFunction(Matrix[Double] B, Matrix[Double] c)
              return (Matrix[Double] PD) 
-             implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicProjectMatrixCP",exectype="mem")  
+             implemented in (classname="org.apache.sysml.udf.lib.DynamicProjectMatrixCP",exectype="mem")  
 
 X = read($1, rows=$3, cols=$4, format="text");
 c = read($2, rows=1, cols=$5, format="text");
diff --git a/src/test/scripts/functions/external/DynReadWrite.dml b/src/test/scripts/functions/external/DynReadWrite.dml
index 2164db0d94a..d8916aa0cbc 100644
--- a/src/test/scripts/functions/external/DynReadWrite.dml
+++ b/src/test/scripts/functions/external/DynReadWrite.dml
@@ -19,11 +19,11 @@
 
 dynRead = externalFunction(String fname, Integer rows, Integer cols, String format)
 return (Matrix[Double] M) 
-implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicReadMatrixCP",exectype="mem")   
+implemented in (classname="org.apache.sysml.udf.lib.DynamicReadMatrixCP",exectype="mem")   
 
 dynWrite = externalFunction(Matrix[Double] input, String fname, String format)
 return(Boolean success)
-implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicWriteMatrixCP",exectype="mem")  
+implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem")  
 
 
 X = read($1, rows=$2, cols=$3, format="text");
diff --git a/src/test/scripts/functions/external/FunctionExpressions1.dml b/src/test/scripts/functions/external/FunctionExpressions1.dml
index 7f97bb3962a..7d48c483c78 100644
--- a/src/test/scripts/functions/external/FunctionExpressions1.dml
+++ b/src/test/scripts/functions/external/FunctionExpressions1.dml
@@ -18,7 +18,7 @@
 
 
 orderExternal = externalFunction(Matrix[Double] A, Integer col, Boolean desc) return (Matrix[Double] B) 
-			    implemented in (classname="com.ibm.bi.dml.udf.lib.OrderWrapper",exectype="mem")
+			    implemented in (classname="org.apache.sysml.udf.lib.OrderWrapper",exectype="mem")
 
 foo = function( Matrix[Double] A ) return (Matrix[Double] B)  
 {
diff --git a/src/test/scripts/functions/external/FunctionExpressions2.dml b/src/test/scripts/functions/external/FunctionExpressions2.dml
index 6add763770c..dce8dd87ad3 100644
--- a/src/test/scripts/functions/external/FunctionExpressions2.dml
+++ b/src/test/scripts/functions/external/FunctionExpressions2.dml
@@ -18,7 +18,7 @@
 
 
 orderExternal = externalFunction(Matrix[Double] A, Integer col, Boolean desc) return (Matrix[Double] B) 
-			    implemented in (classname="com.ibm.bi.dml.udf.lib.OrderWrapper",exectype="mem")
+			    implemented in (classname="org.apache.sysml.udf.lib.OrderWrapper",exectype="mem")
 
 foo = function( Matrix[Double] A ) return (Matrix[Double] B)  
 {
diff --git a/src/test/scripts/functions/external/Order1.dml b/src/test/scripts/functions/external/Order1.dml
index 13995fa68cd..b29166befbc 100644
--- a/src/test/scripts/functions/external/Order1.dml
+++ b/src/test/scripts/functions/external/Order1.dml
@@ -18,7 +18,7 @@
 
 
 orderExternal = externalFunction(Matrix[Double] A, Integer col, Boolean desc) return (Matrix[Double] B) 
-			    implemented in (classname="com.ibm.bi.dml.udf.lib.OrderWrapper",exectype="mem")
+			    implemented in (classname="org.apache.sysml.udf.lib.OrderWrapper",exectype="mem")
  
 A = read( $1, rows=$2, cols=$3);  
 B1 = orderExternal(A, $4, FALSE);
diff --git a/src/test/scripts/functions/external/Order2.dml b/src/test/scripts/functions/external/Order2.dml
index 3db877daf8e..3da974eca47 100644
--- a/src/test/scripts/functions/external/Order2.dml
+++ b/src/test/scripts/functions/external/Order2.dml
@@ -18,7 +18,7 @@
 
 
 orderExternal = externalFunction(Matrix[Double] A, Integer col, Boolean desc) return (Matrix[Double] B) 
-			    implemented in (classname="com.ibm.bi.dml.udf.lib.OrderWrapper",exectype="mem")
+			    implemented in (classname="org.apache.sysml.udf.lib.OrderWrapper",exectype="mem")
  
 A = read( $1, rows=$2, cols=$3);  
 B1 = orderExternal(A, $4, TRUE);
diff --git a/src/test/scripts/functions/external/Outlier.dml b/src/test/scripts/functions/external/Outlier.dml
index 437f6a27237..377e7f09ed2 100644
--- a/src/test/scripts/functions/external/Outlier.dml
+++ b/src/test/scripts/functions/external/Outlier.dml
@@ -26,7 +26,7 @@
 
 outliers = externalFunction(Matrix[Double] D, Integer m, Integer k) 
 return (Matrix[Double] C) 
-implemented in (classname="com.ibm.bi.dml.udf.lib.OutlierWrapper",execlocation="master")
+implemented in (classname="org.apache.sysml.udf.lib.OutlierWrapper",execlocation="master")
 
 M = read( $1, rows=$2, cols=$3, format="text");
 
diff --git a/src/test/scripts/functions/external/SGDMFTest.dml b/src/test/scripts/functions/external/SGDMFTest.dml
index 4f1a0e009ea..d0d5c5069a1 100644
--- a/src/test/scripts/functions/external/SGDMFTest.dml
+++ b/src/test/scripts/functions/external/SGDMFTest.dml
@@ -18,7 +18,7 @@
 
 sgd = externalFunction(Matrix[Double] V, Integer n, Integer m, Integer e, Integer factors)
 return (Matrix[Double] W, Matrix[Double] tH)
-implemented in (classname="com.ibm.bi.dml.udf.lib.SGDWrapper", execlocation="master")
+implemented in (classname="org.apache.sysml.udf.lib.SGDWrapper", execlocation="master")
 
 #n X m is the number of blocks the ratings matrix is divided into
 #each block is of size rows(V)/n X cols(V)/m cells 
diff --git a/src/test/scripts/functions/external/SeqMiner.dml b/src/test/scripts/functions/external/SeqMiner.dml
index b05ead65767..f6b2ea16afe 100644
--- a/src/test/scripts/functions/external/SeqMiner.dml
+++ b/src/test/scripts/functions/external/SeqMiner.dml
@@ -25,7 +25,7 @@
 
 seqMini = externalFunction(Matrix[Double] A, Double sup, Double max_level) 
 return (Matrix[Double] B, Matrix[Double] C) 
-implemented in (classname="com.ibm.bi.dml.udf.lib.SequenceMinerWrapper",execlocation="master");
+implemented in (classname="org.apache.sysml.udf.lib.SequenceMinerWrapper",execlocation="master");
  
 minsup = 0.001;
 max_level=5.0;
diff --git a/src/test/scripts/functions/external/kMeans.dml b/src/test/scripts/functions/external/kMeans.dml
index 91c92296f1e..78c1104f8cf 100644
--- a/src/test/scripts/functions/external/kMeans.dml
+++ b/src/test/scripts/functions/external/kMeans.dml
@@ -26,7 +26,7 @@
 
 kMeans = externalFunction(Matrix[Double] D, Integer k) 
 return (Matrix[Double] C) 
-implemented in (classname="com.ibm.bi.dml.udf.lib.kMeansWrapper",execlocation="master")
+implemented in (classname="org.apache.sysml.udf.lib.kMeansWrapper",execlocation="master")
 
 M = read($1, rows=$2, cols=$3, format="text");
 
diff --git a/src/test/scripts/functions/external/kMeans2.dml b/src/test/scripts/functions/external/kMeans2.dml
index 63cb9b71a8d..2c1a9e15d19 100644
--- a/src/test/scripts/functions/external/kMeans2.dml
+++ b/src/test/scripts/functions/external/kMeans2.dml
@@ -26,11 +26,11 @@
 
 kMeans = externalFunction(Matrix[Double] D, Integer k) 
 return (Matrix[Double] C) 
-implemented in (classname="com.ibm.bi.dml.udf.lib.kMeansWrapper",execlocation="master")
+implemented in (classname="org.apache.sysml.udf.lib.kMeansWrapper",execlocation="master")
 
 kMeansWithInit = externalFunction(Matrix[Double] D, Integer k, Matrix[Double] initK)
 return (Matrix[Double] C)
-implemented in (classname="com.ibm.bi.dml.udf.lib.kMeansWrapper",execlocation="master")
+implemented in (classname="org.apache.sysml.udf.lib.kMeansWrapper",execlocation="master")
 
 M = read($1, rows=$2, cols=$3, format="text");
 initialCenters = read($4, rows=5, cols=$3, format="text");
diff --git a/src/test/scripts/functions/io/IOTest1.dml b/src/test/scripts/functions/io/IOTest1.dml
index 88dfbd8acb6..821462f7934 100644
--- a/src/test/scripts/functions/io/IOTest1.dml
+++ b/src/test/scripts/functions/io/IOTest1.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.io.IOTest1.java
+# junit test class: org.apache.sysml.test.integration.functions.io.IOTest1.java
 
 A = read("$$indir$$"+"a", rows=$$rows$$, cols=$$cols$$, format="$$format$$");
 write(A, "$$outdir$$"+"a", format="text");
diff --git a/src/test/scripts/functions/io/IOTest2.dml b/src/test/scripts/functions/io/IOTest2.dml
index 210db416ad1..059402e2fb8 100644
--- a/src/test/scripts/functions/io/IOTest2.dml
+++ b/src/test/scripts/functions/io/IOTest2.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.io.IOTest2.java
+# junit test class: org.apache.sysml.test.integration.functions.io.IOTest2.java
 
 A = read("$$indir$$"+a, rows=$$rows$$, cols=$$cols$$, format="$$format$$");
 
diff --git a/src/test/scripts/functions/io/IOTest3.dml b/src/test/scripts/functions/io/IOTest3.dml
index 98e2fec5fdf..1d82119dc91 100644
--- a/src/test/scripts/functions/io/IOTest3.dml
+++ b/src/test/scripts/functions/io/IOTest3.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.io.IOTest3.java
+# junit test class: org.apache.sysml.test.integration.functions.io.IOTest3.java
 
 A = read("$$indir$$"+"a", rows=$$rows$$, cols=$$cols$$, format="$$format$$");
 write(A, "$$outdir$$"+a, format="text");
diff --git a/src/test/scripts/functions/io/IOTest4.dml b/src/test/scripts/functions/io/IOTest4.dml
index e806b53c54b..e7d534a7b45 100644
--- a/src/test/scripts/functions/io/IOTest4.dml
+++ b/src/test/scripts/functions/io/IOTest4.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.io.IOTest4.java
+# junit test class: org.apache.sysml.test.integration.functions.io.IOTest4.java
 
 B = 12;
 if( 1==1 ){
diff --git a/src/test/scripts/functions/io/IOTest5.dml b/src/test/scripts/functions/io/IOTest5.dml
index 0856caec048..0c767baa586 100644
--- a/src/test/scripts/functions/io/IOTest5.dml
+++ b/src/test/scripts/functions/io/IOTest5.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.io.IOTest5.java
+# junit test class: org.apache.sysml.test.integration.functions.io.IOTest5.java
 
 B = 12;
 if( 1==1 ){
diff --git a/src/test/scripts/functions/parfor/parfor50.dml b/src/test/scripts/functions/parfor/parfor50.dml
index 76ba1520281..c15b9a42390 100644
--- a/src/test/scripts/functions/parfor/parfor50.dml
+++ b/src/test/scripts/functions/parfor/parfor50.dml
@@ -18,7 +18,7 @@
 
 
 binning = externalFunction(Matrix[Double] A, Integer binsize, Integer numbins) return (Matrix[Double] B, Integer numbinsdef) 
-	implemented in (classname="com.ibm.bi.dml.udf.lib.BinningWrapper",exectype="mem")
+	implemented in (classname="org.apache.sysml.udf.lib.BinningWrapper",exectype="mem")
 	
 fmt = ifdef($fmt, "text");
 num_bins = ifdef($bins, 3); # 50
diff --git a/src/test/scripts/functions/parfor/parfor_extfunct.dml b/src/test/scripts/functions/parfor/parfor_extfunct.dml
index 6e9bc74e47a..ff65eeba3dd 100644
--- a/src/test/scripts/functions/parfor/parfor_extfunct.dml
+++ b/src/test/scripts/functions/parfor/parfor_extfunct.dml
@@ -19,11 +19,11 @@
 
 dynRead = externalFunction(String fname, Integer rows, Integer cols, String format)
 return (Matrix[Double] M) 
-implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicReadMatrixCP",exectype="mem")   
+implemented in (classname="org.apache.sysml.udf.lib.DynamicReadMatrixCP",exectype="mem")   
 
 execCondense = externalFunction(Matrix[Double] input)
 return(Matrix[Double] out)
-implemented in (classname="com.ibm.bi.dml.udf.lib.RemoveEmptyRows",exectype="file", execlocation="master")   
+implemented in (classname="org.apache.sysml.udf.lib.RemoveEmptyRows",exectype="file", execlocation="master")   
 
 
 V = read($1, rows=$2, cols=$3, format="text");   
diff --git a/src/test/scripts/functions/parfor/parfor_literals1a.dml b/src/test/scripts/functions/parfor/parfor_literals1a.dml
index 5ca3c714842..2ae7d508323 100644
--- a/src/test/scripts/functions/parfor/parfor_literals1a.dml
+++ b/src/test/scripts/functions/parfor/parfor_literals1a.dml
@@ -19,7 +19,7 @@
 
 dynWrite = externalFunction(Matrix[Double] input, String fname, String format)
   return(Boolean success)
-  implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
+  implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
 
 A = read($1, rows=$2, cols=$3, format="text");   
 
diff --git a/src/test/scripts/functions/parfor/parfor_literals1b.dml b/src/test/scripts/functions/parfor/parfor_literals1b.dml
index dfb79ca608c..c4b8027818b 100644
--- a/src/test/scripts/functions/parfor/parfor_literals1b.dml
+++ b/src/test/scripts/functions/parfor/parfor_literals1b.dml
@@ -19,7 +19,7 @@
 
 dynWrite = externalFunction(Matrix[Double] input, String fname, String format)
   return(Boolean success)
-  implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
+  implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
 
 A = read($1, rows=$2, cols=$3, format="text");   
 
diff --git a/src/test/scripts/functions/parfor/parfor_literals1c.dml b/src/test/scripts/functions/parfor/parfor_literals1c.dml
index fd107c5d286..86adfd9d255 100644
--- a/src/test/scripts/functions/parfor/parfor_literals1c.dml
+++ b/src/test/scripts/functions/parfor/parfor_literals1c.dml
@@ -19,7 +19,7 @@
 
 dynWrite = externalFunction(Matrix[Double] input, String fname, String format)
   return(Boolean success)
-  implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
+  implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
 
 A = read($1, rows=$2, cols=$3, format="text");   
 
diff --git a/src/test/scripts/functions/parfor/parfor_literals2.dml b/src/test/scripts/functions/parfor/parfor_literals2.dml
index d782e83a012..bb6d722fcde 100644
--- a/src/test/scripts/functions/parfor/parfor_literals2.dml
+++ b/src/test/scripts/functions/parfor/parfor_literals2.dml
@@ -19,7 +19,7 @@
 
 dynWrite_t0 = externalFunction(Matrix[Double] input, String fname, String format)
   return(Boolean success)
-  implemented in (classname="com.ibm.bi.dml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
+  implemented in (classname="org.apache.sysml.udf.lib.DynamicWriteMatrixCP",exectype="mem") 
 
 A = read($1, rows=$2, cols=$3, format="text");   
 
diff --git a/src/test/scripts/functions/terms/TestScalarToMatrixInLoop.dml b/src/test/scripts/functions/terms/TestScalarToMatrixInLoop.dml
index 43e48c97250..8a515389026 100644
--- a/src/test/scripts/functions/terms/TestScalarToMatrixInLoop.dml
+++ b/src/test/scripts/functions/terms/TestScalarToMatrixInLoop.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.terms.ScalarToMatrixInLoop.java
+# junit test class: org.apache.sysml.test.integration.functions.terms.ScalarToMatrixInLoop.java
 
 A = Rand(cols=$$cols$$, rows=$$rows$$);
 W = 5;
diff --git a/src/test/scripts/functions/terms/TestTerm1.dml b/src/test/scripts/functions/terms/TestTerm1.dml
index 51164a37347..3d9c221f616 100644
--- a/src/test/scripts/functions/terms/TestTerm1.dml
+++ b/src/test/scripts/functions/terms/TestTerm1.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.terms.ScalarMatrixUnaryBinaryTest.java
+# junit test class: org.apache.sysml.test.integration.functions.terms.ScalarMatrixUnaryBinaryTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 
diff --git a/src/test/scripts/functions/unary/matrix/ACosTest.dml b/src/test/scripts/functions/unary/matrix/ACosTest.dml
index 7ec93dbe1c1..f22b5926f78 100644
--- a/src/test/scripts/functions/unary/matrix/ACosTest.dml
+++ b/src/test/scripts/functions/unary/matrix/ACosTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.CosTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.CosTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 CosVector = acos(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/ASinTest.dml b/src/test/scripts/functions/unary/matrix/ASinTest.dml
index 3d29ec06276..e33e11a89fe 100644
--- a/src/test/scripts/functions/unary/matrix/ASinTest.dml
+++ b/src/test/scripts/functions/unary/matrix/ASinTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.SinTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.SinTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 SinVector = asin(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/ATanTest.dml b/src/test/scripts/functions/unary/matrix/ATanTest.dml
index 2fcf1f52e9b..b2c9e896a87 100644
--- a/src/test/scripts/functions/unary/matrix/ATanTest.dml
+++ b/src/test/scripts/functions/unary/matrix/ATanTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.TanTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.TanTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 TanVector = atan(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/AbsTest.dml b/src/test/scripts/functions/unary/matrix/AbsTest.dml
index 17703e9c367..87b9739859b 100644
--- a/src/test/scripts/functions/unary/matrix/AbsTest.dml
+++ b/src/test/scripts/functions/unary/matrix/AbsTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.AbsTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.AbsTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 AbsVector = abs(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/CastAsScalarTest.dml b/src/test/scripts/functions/unary/matrix/CastAsScalarTest.dml
index 3931e4e1870..714332ab6b0 100644
--- a/src/test/scripts/functions/unary/matrix/CastAsScalarTest.dml
+++ b/src/test/scripts/functions/unary/matrix/CastAsScalarTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.CastAsScalarTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.CastAsScalarTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/matrix/CosTest.dml b/src/test/scripts/functions/unary/matrix/CosTest.dml
index dfd25be50a6..d498e1007a3 100644
--- a/src/test/scripts/functions/unary/matrix/CosTest.dml
+++ b/src/test/scripts/functions/unary/matrix/CosTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.CosTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.CosTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 CosVector = cos(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/DiagSingleTest.dml b/src/test/scripts/functions/unary/matrix/DiagSingleTest.dml
index 4519787420f..e3aaec10bdc 100644
--- a/src/test/scripts/functions/unary/matrix/DiagSingleTest.dml
+++ b/src/test/scripts/functions/unary/matrix/DiagSingleTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.DiagTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.DiagTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = diag(A);
diff --git a/src/test/scripts/functions/unary/matrix/DiagTest.dml b/src/test/scripts/functions/unary/matrix/DiagTest.dml
index 60a9a2b6983..9e58c52aa6a 100644
--- a/src/test/scripts/functions/unary/matrix/DiagTest.dml
+++ b/src/test/scripts/functions/unary/matrix/DiagTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.DiagTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.DiagTest.java
 
 A = read("$$indir$$a", rows=$$rows$$, cols=$$cols$$, format="text");
 B = diag(A);
diff --git a/src/test/scripts/functions/unary/matrix/NegationTest.dml b/src/test/scripts/functions/unary/matrix/NegationTest.dml
index 7fbbac7f8f6..f918f73938d 100644
--- a/src/test/scripts/functions/unary/matrix/NegationTest.dml
+++ b/src/test/scripts/functions/unary/matrix/NegationTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.NegationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.NegationTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 NegativeVector = -Vector
diff --git a/src/test/scripts/functions/unary/matrix/QRsolve.dml b/src/test/scripts/functions/unary/matrix/QRsolve.dml
index 3752be097f0..7ed02654d45 100644
--- a/src/test/scripts/functions/unary/matrix/QRsolve.dml
+++ b/src/test/scripts/functions/unary/matrix/QRsolve.dml
@@ -2,7 +2,7 @@
 # Ax = b: solve for x via QR decomposition
 
 #solve = externalFunction(Matrix[Double] a, Matrix[Double] b)  return(Matrix[Double] c)
-#  implemented in (classname="com.ibm.bi.dml.udf.lib.LinearSolverWrapperCP",exectype="mem")   
+#  implemented in (classname="org.apache.sysml.udf.lib.LinearSolverWrapperCP",exectype="mem")   
 
 A = read($1);
 b = read($2);
diff --git a/src/test/scripts/functions/unary/matrix/SinTest.dml b/src/test/scripts/functions/unary/matrix/SinTest.dml
index 9eb3d346afc..61195dcd8af 100644
--- a/src/test/scripts/functions/unary/matrix/SinTest.dml
+++ b/src/test/scripts/functions/unary/matrix/SinTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.SinTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.SinTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 SinVector = sin(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/SqrtSingleTest.dml b/src/test/scripts/functions/unary/matrix/SqrtSingleTest.dml
index 9095dd8e6ef..ef6ae4019ac 100644
--- a/src/test/scripts/functions/unary/matrix/SqrtSingleTest.dml
+++ b/src/test/scripts/functions/unary/matrix/SqrtSingleTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.SqrtTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.SqrtTest.java
 
 In = read("$$indir$$in", rows=$$rows$$, cols=$$cols$$, format="text");
 Out = sqrt(In);
diff --git a/src/test/scripts/functions/unary/matrix/SqrtTest.dml b/src/test/scripts/functions/unary/matrix/SqrtTest.dml
index 2c477201b1c..93ebb03c46f 100644
--- a/src/test/scripts/functions/unary/matrix/SqrtTest.dml
+++ b/src/test/scripts/functions/unary/matrix/SqrtTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.SqrtTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.SqrtTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 SqrtVector = sqrt(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/TanTest.dml b/src/test/scripts/functions/unary/matrix/TanTest.dml
index d0dbc9520d6..aa7915cfb12 100644
--- a/src/test/scripts/functions/unary/matrix/TanTest.dml
+++ b/src/test/scripts/functions/unary/matrix/TanTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.TanTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.TanTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 TanVector = tan(Vector);
diff --git a/src/test/scripts/functions/unary/matrix/TransposeTest.dml b/src/test/scripts/functions/unary/matrix/TransposeTest.dml
index 0202d68e419..a05281f5886 100644
--- a/src/test/scripts/functions/unary/matrix/TransposeTest.dml
+++ b/src/test/scripts/functions/unary/matrix/TransposeTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.matrix.TransposeTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.matrix.TransposeTest.java
 
 Vector = read("$$indir$$vector", rows=$$rows$$, cols=1, format="text");
 TransposedVector = t(Vector);
diff --git a/src/test/scripts/functions/unary/scalar/ACosTest.dml b/src/test/scripts/functions/unary/scalar/ACosTest.dml
index 26704e6be6e..27b06523aaa 100644
--- a/src/test/scripts/functions/unary/scalar/ACosTest.dml
+++ b/src/test/scripts/functions/unary/scalar/ACosTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.CosTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.CosTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/ASinTest.dml b/src/test/scripts/functions/unary/scalar/ASinTest.dml
index fd800256bbb..a102bb0c8b3 100644
--- a/src/test/scripts/functions/unary/scalar/ASinTest.dml
+++ b/src/test/scripts/functions/unary/scalar/ASinTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.SinTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.SinTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/ATanTest.dml b/src/test/scripts/functions/unary/scalar/ATanTest.dml
index 6739f46f61b..84468f29546 100644
--- a/src/test/scripts/functions/unary/scalar/ATanTest.dml
+++ b/src/test/scripts/functions/unary/scalar/ATanTest.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.TanTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.TanTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/AbsTest.dml b/src/test/scripts/functions/unary/scalar/AbsTest.dml
index fce10361a30..b360f1ce872 100644
--- a/src/test/scripts/functions/unary/scalar/AbsTest.dml
+++ b/src/test/scripts/functions/unary/scalar/AbsTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.AbsTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.AbsTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/BooleanWhileTest.dml b/src/test/scripts/functions/unary/scalar/BooleanWhileTest.dml
index 23baa6e4e6e..f7748eab1e4 100644
--- a/src/test/scripts/functions/unary/scalar/BooleanWhileTest.dml
+++ b/src/test/scripts/functions/unary/scalar/BooleanWhileTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.BooleanTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.BooleanTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/CosTest.dml b/src/test/scripts/functions/unary/scalar/CosTest.dml
index 39e77ffa20e..ce4111a8dc1 100644
--- a/src/test/scripts/functions/unary/scalar/CosTest.dml
+++ b/src/test/scripts/functions/unary/scalar/CosTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.CosTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.CosTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/ExponentBinaryTest.dml b/src/test/scripts/functions/unary/scalar/ExponentBinaryTest.dml
index f66c4d89f0a..fcf73b39349 100644
--- a/src/test/scripts/functions/unary/scalar/ExponentBinaryTest.dml
+++ b/src/test/scripts/functions/unary/scalar/ExponentBinaryTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.ExponentTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.ExponentTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/ExponentTest.dml b/src/test/scripts/functions/unary/scalar/ExponentTest.dml
index 6397351710d..55e08ed696b 100644
--- a/src/test/scripts/functions/unary/scalar/ExponentTest.dml
+++ b/src/test/scripts/functions/unary/scalar/ExponentTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.ExponentTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.ExponentTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/NegationTest.dml b/src/test/scripts/functions/unary/scalar/NegationTest.dml
index 2d56203b426..faa769df792 100644
--- a/src/test/scripts/functions/unary/scalar/NegationTest.dml
+++ b/src/test/scripts/functions/unary/scalar/NegationTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.NegationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.NegationTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/NotTest.dml b/src/test/scripts/functions/unary/scalar/NotTest.dml
index 8aed324d8dd..c8c8fcf15ff 100644
--- a/src/test/scripts/functions/unary/scalar/NotTest.dml
+++ b/src/test/scripts/functions/unary/scalar/NotTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.NegationTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.NegationTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/PrintTest.dml b/src/test/scripts/functions/unary/scalar/PrintTest.dml
index 3f91d28606f..35a7f35339f 100644
--- a/src/test/scripts/functions/unary/scalar/PrintTest.dml
+++ b/src/test/scripts/functions/unary/scalar/PrintTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.PrintTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.PrintTest.java
 
 x=$$value$$;
 
diff --git a/src/test/scripts/functions/unary/scalar/PrintTest2.dml b/src/test/scripts/functions/unary/scalar/PrintTest2.dml
index 3f6bdbf4b86..26144b64615 100644
--- a/src/test/scripts/functions/unary/scalar/PrintTest2.dml
+++ b/src/test/scripts/functions/unary/scalar/PrintTest2.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.PrintTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.PrintTest.java
 
 x=$$value$$;
 
diff --git a/src/test/scripts/functions/unary/scalar/SinTest.dml b/src/test/scripts/functions/unary/scalar/SinTest.dml
index 1e872264c1f..9a902ff0822 100644
--- a/src/test/scripts/functions/unary/scalar/SinTest.dml
+++ b/src/test/scripts/functions/unary/scalar/SinTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.SinTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.SinTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/SqrtSingleTest.dml b/src/test/scripts/functions/unary/scalar/SqrtSingleTest.dml
index 7ea34f03cce..0f2ea98fc85 100644
--- a/src/test/scripts/functions/unary/scalar/SqrtSingleTest.dml
+++ b/src/test/scripts/functions/unary/scalar/SqrtSingleTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.SqrtTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.SqrtTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/SqrtTest.dml b/src/test/scripts/functions/unary/scalar/SqrtTest.dml
index 2b960643e1e..40854d4e713 100644
--- a/src/test/scripts/functions/unary/scalar/SqrtTest.dml
+++ b/src/test/scripts/functions/unary/scalar/SqrtTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.SqrtTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.SqrtTest.java
 
 $$readhelper$$
 
diff --git a/src/test/scripts/functions/unary/scalar/StopTest1.dml b/src/test/scripts/functions/unary/scalar/StopTest1.dml
index 55827a16cfa..7a9a7b21464 100644
--- a/src/test/scripts/functions/unary/scalar/StopTest1.dml
+++ b/src/test/scripts/functions/unary/scalar/StopTest1.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.StopTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.StopTest.java
 
 val = $1;
 
diff --git a/src/test/scripts/functions/unary/scalar/StopTest2.dml b/src/test/scripts/functions/unary/scalar/StopTest2.dml
index be2f3390d53..605c813dbac 100644
--- a/src/test/scripts/functions/unary/scalar/StopTest2.dml
+++ b/src/test/scripts/functions/unary/scalar/StopTest2.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.StopTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.StopTest.java
 
 A = matrix(1, rows=10, cols=1);
 print(sum(A));
diff --git a/src/test/scripts/functions/unary/scalar/StopTestLoops_fn.dml b/src/test/scripts/functions/unary/scalar/StopTestLoops_fn.dml
index bf5366e5565..f94a02e88bd 100644
--- a/src/test/scripts/functions/unary/scalar/StopTestLoops_fn.dml
+++ b/src/test/scripts/functions/unary/scalar/StopTestLoops_fn.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.StopTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.StopTest.java
 
 A = read($1, rows=$2, cols=1);
 
diff --git a/src/test/scripts/functions/unary/scalar/StopTestLoops_for.dml b/src/test/scripts/functions/unary/scalar/StopTestLoops_for.dml
index 381c3c7b4e9..2ad3a89d444 100644
--- a/src/test/scripts/functions/unary/scalar/StopTestLoops_for.dml
+++ b/src/test/scripts/functions/unary/scalar/StopTestLoops_for.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.StopTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.StopTest.java
 
 A = read($1, rows=$2, cols=1);
 
diff --git a/src/test/scripts/functions/unary/scalar/StopTestLoops_parfor.dml b/src/test/scripts/functions/unary/scalar/StopTestLoops_parfor.dml
index bd0bfe90571..1675071a720 100644
--- a/src/test/scripts/functions/unary/scalar/StopTestLoops_parfor.dml
+++ b/src/test/scripts/functions/unary/scalar/StopTestLoops_parfor.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.StopTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.StopTest.java
 
 A = rand(rows=10, cols=1, seed=10);
 
diff --git a/src/test/scripts/functions/unary/scalar/StopTestLoops_while.dml b/src/test/scripts/functions/unary/scalar/StopTestLoops_while.dml
index 48b7657639f..aee45e541f5 100644
--- a/src/test/scripts/functions/unary/scalar/StopTestLoops_while.dml
+++ b/src/test/scripts/functions/unary/scalar/StopTestLoops_while.dml
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------
 
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.StopTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.StopTest.java
 
 A = read($1, rows=$2, cols=1);
 
diff --git a/src/test/scripts/functions/unary/scalar/TanTest.dml b/src/test/scripts/functions/unary/scalar/TanTest.dml
index 2d4e0301c51..0ee988ad990 100644
--- a/src/test/scripts/functions/unary/scalar/TanTest.dml
+++ b/src/test/scripts/functions/unary/scalar/TanTest.dml
@@ -16,7 +16,7 @@
 #
 #-------------------------------------------------------------
 
-# junit test class: com.ibm.bi.dml.test.integration.functions.unary.scalar.TanTest.java
+# junit test class: org.apache.sysml.test.integration.functions.unary.scalar.TanTest.java
 
 $$readhelper$$
 
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/applications/ZPackageSuite.java b/src/test_suites/java/com/ibm/bi/dml/test/integration/applications/ZPackageSuite.java
deleted file mode 100644
index 340ab59ea24..00000000000
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/applications/ZPackageSuite.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * (C) Copyright IBM Corp. 2010, 2015
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-
-package com.ibm.bi.dml.test.integration.applications;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/** Group together the tests in this package/related subpackages into a single suite so that the Maven build
- *  won't run two of them at once. Since the DML and PyDML equivalent tests currently share the same directories,
- *  they should not be run in parallel. */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	
-  // .applications.dml package
-  com.ibm.bi.dml.test.integration.applications.dml.ApplyTransformDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.ArimaDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.CsplineCGDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.CsplineDSDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.GLMDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.GNMFDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.HITSDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.ID3DMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.L2SVMDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.LinearLogRegDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.LinearRegressionDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.MDABivariateStatsDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.MultiClassSVMDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.NaiveBayesDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.PageRankDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.dml.WelchTDMLTest.class,
-
-  // .applications.pydml package
-  com.ibm.bi.dml.test.integration.applications.pydml.ApplyTransformPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.ArimaPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.CsplineCGPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.CsplineDSPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.GLMPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.GNMFPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.HITSPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.ID3PyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.L2SVMPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.LinearLogRegPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.LinearRegressionPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.MDABivariateStatsPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.MultiClassSVMPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.NaiveBayesPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.PageRankPyDMLTest.class,
-  com.ibm.bi.dml.test.integration.applications.pydml.WelchTPyDMLTest.class
-  
-})
-
-
-/** This class is just a holder for the above JUnit annotations. */
-public class ZPackageSuite {
-
-}
diff --git a/src/test_suites/java/org/apache/sysml/test/integration/applications/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/applications/ZPackageSuite.java
new file mode 100644
index 00000000000..dd82e3113fb
--- /dev/null
+++ b/src/test_suites/java/org/apache/sysml/test/integration/applications/ZPackageSuite.java
@@ -0,0 +1,71 @@
+/**
+ * (C) Copyright IBM Corp. 2010, 2015
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+package org.apache.sysml.test.integration.applications;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/** Group together the tests in this package/related subpackages into a single suite so that the Maven build
+ *  won't run two of them at once. Since the DML and PyDML equivalent tests currently share the same directories,
+ *  they should not be run in parallel. */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	
+  // .applications.dml package
+  org.apache.sysml.test.integration.applications.dml.ApplyTransformDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.ArimaDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.CsplineCGDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.CsplineDSDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.GLMDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.GNMFDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.HITSDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.ID3DMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.L2SVMDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.LinearLogRegDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.LinearRegressionDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.MDABivariateStatsDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.MultiClassSVMDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.NaiveBayesDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.PageRankDMLTest.class,
+  org.apache.sysml.test.integration.applications.dml.WelchTDMLTest.class,
+
+  // .applications.pydml package
+  org.apache.sysml.test.integration.applications.pydml.ApplyTransformPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.ArimaPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.CsplineCGPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.CsplineDSPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.GLMPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.GNMFPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.HITSPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.ID3PyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.L2SVMPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.LinearLogRegPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.LinearRegressionPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.MDABivariateStatsPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.MultiClassSVMPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.NaiveBayesPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.PageRankPyDMLTest.class,
+  org.apache.sysml.test.integration.applications.pydml.WelchTPyDMLTest.class
+  
+})
+
+
+/** This class is just a holder for the above JUnit annotations. */
+public class ZPackageSuite {
+
+}
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/applications/descriptivestats/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/applications/descriptivestats/ZPackageSuite.java
index 45fb087c74f..246e14e1649 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/applications/descriptivestats/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/applications/descriptivestats/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.descriptivestats;
+package org.apache.sysml.test.integration.applications.descriptivestats;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/applications/parfor/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/applications/parfor/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java
index c3ccf8892c7..5312fadaf2a 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/applications/parfor/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/applications/parfor/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.applications.parfor;
+package org.apache.sysml.test.integration.applications.parfor;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/aggregate/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java
similarity index 95%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/aggregate/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java
index 3604b064e8b..de7c199d39c 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/aggregate/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/aggregate/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.aggregate;
+package org.apache.sysml.test.integration.functions.aggregate;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/append/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/append/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java
index 4d44c8193c5..230f20a374f 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/append/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/append/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.append;
+package org.apache.sysml.test.integration.functions.append;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java
similarity index 96%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java
index afed722bf2e..3de02b12d8d 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix;
+package org.apache.sysml.test.integration.functions.binary.matrix;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
similarity index 93%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
index f52be69c70c..df8ac1202cc 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_cellwise/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_cellwise;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_cellwise;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java
index 652c5dc9ff5..c04dbc67ddd 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/matrix_full_other/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.matrix_full_other;
+package org.apache.sysml.test.integration.functions.binary.matrix_full_other;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/scalar/ZPackageSuite.java
similarity index 95%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/binary/scalar/ZPackageSuite.java
index a0e21cd1049..7226ebe8de6 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/binary/scalar/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/binary/scalar/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.binary.scalar;
+package org.apache.sysml.test.integration.functions.binary.scalar;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/blocks/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/blocks/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/blocks/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/blocks/ZPackageSuite.java
index 7c7ac2a35cc..8a6a99c0b5a 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/blocks/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/blocks/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.blocks;
+package org.apache.sysml.test.integration.functions.blocks;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/caching/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/caching/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/caching/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/caching/ZPackageSuite.java
index c2678df0ea2..056118afaa6 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/caching/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/caching/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.caching;
+package org.apache.sysml.test.integration.functions.caching;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/data/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java
similarity index 95%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/data/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java
index 5b22c3bca68..fb3515ef436 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/data/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/data/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.data;
+package org.apache.sysml.test.integration.functions.data;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/dmlscript/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/dmlscript/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/dmlscript/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/dmlscript/ZPackageSuite.java
index 7c2de0ee72d..4769b182d2e 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/dmlscript/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/dmlscript/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.dmlscript;
+package org.apache.sysml.test.integration.functions.dmlscript;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/external/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/external/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/external/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/external/ZPackageSuite.java
index 3968cdb76fe..e2ecaf13020 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/external/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/external/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.external;
+package org.apache.sysml.test.integration.functions.external;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/gdfo/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/gdfo/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/gdfo/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/gdfo/ZPackageSuite.java
index 2d8eaafc7e8..fc71922e54f 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/gdfo/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/gdfo/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.gdfo;
+package org.apache.sysml.test.integration.functions.gdfo;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/indexing/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/indexing/ZPackageSuite.java
similarity index 95%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/indexing/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/indexing/ZPackageSuite.java
index 50b929c4ff7..6e95c73fcc6 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/indexing/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/indexing/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.indexing;
+package org.apache.sysml.test.integration.functions.indexing;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/ZPackageSuite.java
similarity index 95%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/io/ZPackageSuite.java
index 52a7dca77ca..21402979832 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io;
+package org.apache.sysml.test.integration.functions.io;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/binary/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/binary/ZPackageSuite.java
similarity index 93%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/binary/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/io/binary/ZPackageSuite.java
index 8d43f71b8fa..d863083e03f 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/binary/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/binary/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.binary;
+package org.apache.sysml.test.integration.functions.io.binary;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/csv/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/csv/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/csv/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/io/csv/ZPackageSuite.java
index dfcc4236ccb..6ac01ea0572 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/csv/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/csv/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.csv;
+package org.apache.sysml.test.integration.functions.io.csv;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ZPackageSuite.java
similarity index 93%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ZPackageSuite.java
index 8841b5691ff..1db52414646 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/io/matrixmarket/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/io/matrixmarket/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.io.matrixmarket;
+package org.apache.sysml.test.integration.functions.io.matrixmarket;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/jmlc/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/jmlc/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java
index f20917b21e8..f6bae6bbda1 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/jmlc/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/jmlc/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.jmlc;
+package org.apache.sysml.test.integration.functions.jmlc;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/misc/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
similarity index 96%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/misc/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
index a2d033c4fe8..39b1a9c5c1f 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/misc/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/misc/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.misc;
+package org.apache.sysml.test.integration.functions.misc;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/mlcontext/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java
similarity index 93%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/mlcontext/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java
index 8ed2f8370c9..d61b2249296 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/mlcontext/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/mlcontext/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.mlcontext;
+package org.apache.sysml.test.integration.functions.mlcontext;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/parfor/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java
similarity index 96%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/parfor/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java
index e8399f56eaf..42768e02e3f 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/parfor/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/parfor/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.parfor;
+package org.apache.sysml.test.integration.functions.parfor;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/piggybacking/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/piggybacking/ZPackageSuite.java
similarity index 93%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/piggybacking/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/piggybacking/ZPackageSuite.java
index 0ab1d3938fc..035c0b909eb 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/piggybacking/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/piggybacking/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.piggybacking;
+package org.apache.sysml.test.integration.functions.piggybacking;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/quaternary/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/quaternary/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java
index 1d5782ee8aa..5d0a534bbce 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/quaternary/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/quaternary/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.quaternary;
+package org.apache.sysml.test.integration.functions.quaternary;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/recompile/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/recompile/ZPackageSuite.java
similarity index 96%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/recompile/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/recompile/ZPackageSuite.java
index 96c635a060a..ff87a63080b 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/recompile/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/recompile/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.recompile;
+package org.apache.sysml.test.integration.functions.recompile;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/reorg/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/reorg/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/reorg/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/reorg/ZPackageSuite.java
index e81fe96d5ec..9bee4462eef 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/reorg/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/reorg/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.reorg;
+package org.apache.sysml.test.integration.functions.reorg;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/terms/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/terms/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/terms/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/terms/ZPackageSuite.java
index 7f499415ce0..f9b97c81265 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/terms/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/terms/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.terms;
+package org.apache.sysml.test.integration.functions.terms;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/ternary/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/ternary/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/ternary/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/ternary/ZPackageSuite.java
index d56f1e1b4ec..037beef39c4 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/ternary/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/ternary/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.ternary;
+package org.apache.sysml.test.integration.functions.ternary;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/transform/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/transform/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/transform/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/transform/ZPackageSuite.java
index bfc6aef6a3e..53c2aca5c40 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/transform/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/transform/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.transform;
+package org.apache.sysml.test.integration.functions.transform;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/matrix/ZPackageSuite.java
similarity index 95%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/unary/matrix/ZPackageSuite.java
index 7664b2971ea..7a73755d738 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/unary/matrix/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/matrix/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.matrix;
+package org.apache.sysml.test.integration.functions.unary.matrix;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java
similarity index 95%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java
index 5a2a8db4939..be2f45e1ceb 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/unary/scalar/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/unary/scalar/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.unary.scalar;
+package org.apache.sysml.test.integration.functions.unary.scalar;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/vect/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/functions/vect/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/functions/vect/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/functions/vect/ZPackageSuite.java
index 9446f89ce9f..2868e0eabbe 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/functions/vect/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/functions/vect/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.functions.vect;
+package org.apache.sysml.test.integration.functions.vect;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/src/test_suites/java/com/ibm/bi/dml/test/integration/scalability/ZPackageSuite.java b/src/test_suites/java/org/apache/sysml/test/integration/scalability/ZPackageSuite.java
similarity index 94%
rename from src/test_suites/java/com/ibm/bi/dml/test/integration/scalability/ZPackageSuite.java
rename to src/test_suites/java/org/apache/sysml/test/integration/scalability/ZPackageSuite.java
index bd57dd12576..ec5e23e9c7d 100644
--- a/src/test_suites/java/com/ibm/bi/dml/test/integration/scalability/ZPackageSuite.java
+++ b/src/test_suites/java/org/apache/sysml/test/integration/scalability/ZPackageSuite.java
@@ -15,7 +15,7 @@
  * 
  */
 
-package com.ibm.bi.dml.test.integration.scalability;
+package org.apache.sysml.test.integration.scalability;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;