You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2016/07/18 20:17:59 UTC

[28/34] incubator-predictionio git commit: change all to org.apache.predictionio except docs

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Engine.scala b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Engine.scala
index 8fe6361..d443bb4 100644
--- a/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package org.template.recommendation
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 case class Query(
   user: String,

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Preparator.scala b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Preparator.scala
index 64f3908..11717fe 100644
--- a/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
 package org.template.recommendation
 
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Serving.scala b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Serving.scala
index 132755e..ad9058d 100644
--- a/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-parallel-recommendation-cat/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package org.template.recommendation
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving
   extends LServing[Query, PredictedResult] {

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-custom-datasource/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-custom-datasource/build.sbt b/examples/experimental/scala-parallel-recommendation-custom-datasource/build.sbt
index f931883..5065433 100644
--- a/examples/experimental/scala-parallel-recommendation-custom-datasource/build.sbt
+++ b/examples/experimental/scala-parallel-recommendation-custom-datasource/build.sbt
@@ -4,9 +4,9 @@ assemblySettings
 
 name := "template-scala-parallel-recommendation"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSAlgorithm.scala b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSAlgorithm.scala
index e324af7..6fca7b4 100644
--- a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSAlgorithm.scala
+++ b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSAlgorithm.scala
@@ -1,8 +1,8 @@
 package org.template.recommendation
 
-import io.prediction.controller.PAlgorithm
-import io.prediction.controller.Params
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.PAlgorithm
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.BiMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSModel.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSModel.scala b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSModel.scala
index f0c7b7b..243c1d1 100644
--- a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSModel.scala
+++ b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/ALSModel.scala
@@ -5,9 +5,9 @@ package org.apache.spark.mllib.recommendation
 
 import org.template.recommendation.ALSAlgorithmParams
 
-import io.prediction.controller.IPersistentModel
-import io.prediction.controller.IPersistentModelLoader
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.IPersistentModel
+import org.apache.predictionio.controller.IPersistentModelLoader
+import org.apache.predictionio.data.storage.BiMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/DataSource.scala b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/DataSource.scala
index c1c340d..0de2b47 100644
--- a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
 package org.template.recommendation
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Engine.scala b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Engine.scala
index edb7767..4702fe3 100644
--- a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package org.template.recommendation
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 case class Query(
   user: String,

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Preparator.scala b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Preparator.scala
index 6468e4b..8f2f7e4 100644
--- a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
 package org.template.recommendation
 
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Serving.scala b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Serving.scala
index 132755e..ad9058d 100644
--- a/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-parallel-recommendation-custom-datasource/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package org.template.recommendation
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving
   extends LServing[Query, PredictedResult] {

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-entitymap/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-entitymap/build.sbt b/examples/experimental/scala-parallel-recommendation-entitymap/build.sbt
index f931883..5065433 100644
--- a/examples/experimental/scala-parallel-recommendation-entitymap/build.sbt
+++ b/examples/experimental/scala-parallel-recommendation-entitymap/build.sbt
@@ -4,9 +4,9 @@ assemblySettings
 
 name := "template-scala-parallel-recommendation"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSAlgorithm.scala b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSAlgorithm.scala
index 7f50769..1773b23 100644
--- a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSAlgorithm.scala
+++ b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSAlgorithm.scala
@@ -1,7 +1,7 @@
 package org.template.recommendation
 
-import io.prediction.controller.PAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.PAlgorithm
+import org.apache.predictionio.controller.Params
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSModel.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSModel.scala b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSModel.scala
index ba7cf28..2dd2bf3 100644
--- a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSModel.scala
+++ b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/ALSModel.scala
@@ -8,9 +8,9 @@ import org.template.recommendation.ALSAlgorithmParams
 import org.template.recommendation.User
 import org.template.recommendation.Item
 
-import io.prediction.controller.IPersistentModel
-import io.prediction.controller.IPersistentModelLoader
-import io.prediction.data.storage.EntityMap
+import org.apache.predictionio.controller.IPersistentModel
+import org.apache.predictionio.controller.IPersistentModelLoader
+import org.apache.predictionio.data.storage.EntityMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/DataSource.scala b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/DataSource.scala
index 5b219eb..8427aff 100644
--- a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/DataSource.scala
@@ -1,12 +1,12 @@
 package org.template.recommendation
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
-import io.prediction.data.storage.EntityMap
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
+import org.apache.predictionio.data.storage.EntityMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Engine.scala b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Engine.scala
index edb7767..4702fe3 100644
--- a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package org.template.recommendation
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 case class Query(
   user: String,

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Preparator.scala b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Preparator.scala
index bf5013b..b1bf023 100644
--- a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Preparator.scala
@@ -1,7 +1,7 @@
 package org.template.recommendation
 
-import io.prediction.controller.PPreparator
-import io.prediction.data.storage.EntityMap
+import org.apache.predictionio.controller.PPreparator
+import org.apache.predictionio.data.storage.EntityMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Serving.scala b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Serving.scala
index cc5542c..38ba8b9 100644
--- a/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-parallel-recommendation-entitymap/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package org.template.recommendation
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving
   extends LServing[Query, PredictedResult] {

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-mongo-datasource/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-mongo-datasource/build.sbt b/examples/experimental/scala-parallel-recommendation-mongo-datasource/build.sbt
index 73777fd..5f173fa 100644
--- a/examples/experimental/scala-parallel-recommendation-mongo-datasource/build.sbt
+++ b/examples/experimental/scala-parallel-recommendation-mongo-datasource/build.sbt
@@ -4,10 +4,10 @@ assemblySettings
 
 name := "template-scala-parallel-recommendation"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSAlgorithm.scala b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSAlgorithm.scala
index e324af7..6fca7b4 100644
--- a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSAlgorithm.scala
+++ b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSAlgorithm.scala
@@ -1,8 +1,8 @@
 package org.template.recommendation
 
-import io.prediction.controller.PAlgorithm
-import io.prediction.controller.Params
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.PAlgorithm
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.BiMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSModel.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSModel.scala b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSModel.scala
index f0c7b7b..243c1d1 100644
--- a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSModel.scala
+++ b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/ALSModel.scala
@@ -5,9 +5,9 @@ package org.apache.spark.mllib.recommendation
 
 import org.template.recommendation.ALSAlgorithmParams
 
-import io.prediction.controller.IPersistentModel
-import io.prediction.controller.IPersistentModelLoader
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.IPersistentModel
+import org.apache.predictionio.controller.IPersistentModelLoader
+import org.apache.predictionio.data.storage.BiMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/DataSource.scala b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/DataSource.scala
index c3cf391..d21c452 100644
--- a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
 package org.template.recommendation
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Engine.scala b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Engine.scala
index edb7767..4702fe3 100644
--- a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package org.template.recommendation
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 case class Query(
   user: String,

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Preparator.scala b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Preparator.scala
index 6468e4b..8f2f7e4 100644
--- a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
 package org.template.recommendation
 
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Serving.scala b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Serving.scala
index 132755e..ad9058d 100644
--- a/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-parallel-recommendation-mongo-datasource/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package org.template.recommendation
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving
   extends LServing[Query, PredictedResult] {

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-regression/Run.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-regression/Run.scala b/examples/experimental/scala-parallel-regression/Run.scala
index 6500d66..8bee71b 100644
--- a/examples/experimental/scala-parallel-regression/Run.scala
+++ b/examples/experimental/scala-parallel-regression/Run.scala
@@ -1,16 +1,16 @@
-package io.prediction.examples.regression.parallel
+package org.apache.predictionio.examples.regression.parallel
 
-import io.prediction.controller.Engine
-import io.prediction.controller.Params
-import io.prediction.controller.PDataSource
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.IdentityPreparator
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.LAverageServing
-import io.prediction.controller.MeanSquareError
-import io.prediction.controller.Utils
-import io.prediction.controller.Workflow
-import io.prediction.controller.WorkflowParams
+import org.apache.predictionio.controller.Engine
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.IdentityPreparator
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.LAverageServing
+import org.apache.predictionio.controller.MeanSquareError
+import org.apache.predictionio.controller.Utils
+import org.apache.predictionio.controller.Workflow
+import org.apache.predictionio.controller.WorkflowParams
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-regression/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-regression/build.sbt b/examples/experimental/scala-parallel-regression/build.sbt
index 7c63e7d..1fa5433 100644
--- a/examples/experimental/scala-parallel-regression/build.sbt
+++ b/examples/experimental/scala-parallel-regression/build.sbt
@@ -10,7 +10,7 @@ organization := "myorg"
 version := "0.0.1-SNAPSHOT"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark"  %% "spark-mllib"    % "1.2.0"
     exclude("org.apache.spark", "spark-core_2.10")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-regression/engine.json
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-regression/engine.json b/examples/experimental/scala-parallel-regression/engine.json
index fec7aac..e078fad 100644
--- a/examples/experimental/scala-parallel-regression/engine.json
+++ b/examples/experimental/scala-parallel-regression/engine.json
@@ -1,7 +1,7 @@
 {
   "id": "scala-parallel-regression",
   "description": "scala-parallel-regression example",
-  "engineFactory": "io.prediction.examples.regression.parallel.RegressionEngineFactory",
+  "engineFactory": "org.apache.predictionio.examples.regression.parallel.RegressionEngineFactory",
   "datasource": {
     "params": {
       "filepath": "../data/lr_data.txt",

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-dimsum/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-dimsum/build.sbt b/examples/experimental/scala-parallel-similarproduct-dimsum/build.sbt
index fe7cf51..95c7280 100644
--- a/examples/experimental/scala-parallel-similarproduct-dimsum/build.sbt
+++ b/examples/experimental/scala-parallel-similarproduct-dimsum/build.sbt
@@ -4,9 +4,9 @@ assemblySettings
 
 name := "template-scala-parallel-similarproduct-dimsum"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DIMSUMAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DIMSUMAlgorithm.scala b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DIMSUMAlgorithm.scala
index 8db754e..d5cdd9a 100644
--- a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DIMSUMAlgorithm.scala
+++ b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DIMSUMAlgorithm.scala
@@ -1,10 +1,10 @@
 package org.template.similarproduct
 
-import io.prediction.controller.PAlgorithm
-import io.prediction.controller.Params
-import io.prediction.controller.IPersistentModel
-import io.prediction.controller.IPersistentModelLoader
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.PAlgorithm
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.controller.IPersistentModel
+import org.apache.predictionio.controller.IPersistentModelLoader
+import org.apache.predictionio.data.storage.BiMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DataSource.scala b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DataSource.scala
index 4211186..b8571ea 100644
--- a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
 package org.template.similarproduct
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Engine.scala b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Engine.scala
index 02a3212..e52cb82 100644
--- a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package org.template.similarproduct
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 case class Query(
   items: List[String],

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Preparator.scala b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Preparator.scala
index c5e42ec..6b84b01 100644
--- a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
 package org.template.similarproduct
 
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Serving.scala b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Serving.scala
index e7dadab..0e1057c 100644
--- a/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-parallel-similarproduct-dimsum/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package org.template.similarproduct
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving
   extends LServing[Query, PredictedResult] {

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-localmodel/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-localmodel/build.sbt b/examples/experimental/scala-parallel-similarproduct-localmodel/build.sbt
index e148283..2d8306e 100644
--- a/examples/experimental/scala-parallel-similarproduct-localmodel/build.sbt
+++ b/examples/experimental/scala-parallel-similarproduct-localmodel/build.sbt
@@ -4,9 +4,9 @@ assemblySettings
 
 name := "template-scala-parallel-similarproduct"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/ALSAlgorithm.scala b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/ALSAlgorithm.scala
index d250b71..b6d54c2 100644
--- a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/ALSAlgorithm.scala
+++ b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/ALSAlgorithm.scala
@@ -1,10 +1,10 @@
 package org.template.similarproduct
 
-import io.prediction.controller.P2LAlgorithm // ADDED
-import io.prediction.controller.Params
-import io.prediction.controller.IPersistentModel
-import io.prediction.controller.IPersistentModelLoader
-import io.prediction.data.storage.BiMap
+import org.apache.predictionio.controller.P2LAlgorithm // ADDED
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.controller.IPersistentModel
+import org.apache.predictionio.controller.IPersistentModelLoader
+import org.apache.predictionio.data.storage.BiMap
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/DataSource.scala b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/DataSource.scala
index b45fe37..4dc4a73 100644
--- a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
 package org.template.similarproduct
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Engine.scala b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Engine.scala
index 8d594fc..7975530 100644
--- a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package org.template.similarproduct
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 case class Query(
   items: List[String],

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Preparator.scala b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Preparator.scala
index c5e42ec..6b84b01 100644
--- a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
 package org.template.similarproduct
 
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Serving.scala b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Serving.scala
index e7dadab..0e1057c 100644
--- a/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-parallel-similarproduct-localmodel/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package org.template.similarproduct
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving
   extends LServing[Query, PredictedResult] {

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-trim-app/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-trim-app/build.sbt b/examples/experimental/scala-parallel-trim-app/build.sbt
index dbc4554..5ffa78f 100644
--- a/examples/experimental/scala-parallel-trim-app/build.sbt
+++ b/examples/experimental/scala-parallel-trim-app/build.sbt
@@ -4,9 +4,9 @@ assemblySettings
 
 name := "template-scala-parallel-vanilla"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-trim-app/engine.json
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-trim-app/engine.json b/examples/experimental/scala-parallel-trim-app/engine.json
index 87b5c12..5695856 100644
--- a/examples/experimental/scala-parallel-trim-app/engine.json
+++ b/examples/experimental/scala-parallel-trim-app/engine.json
@@ -1,7 +1,7 @@
 {
   "id": "default",
   "description": "Default settings",
-  "engineFactory": "io.prediction.examples.experimental.trimapp.VanillaEngine",
+  "engineFactory": "org.apache.predictionio.examples.experimental.trimapp.VanillaEngine",
   "datasource": {
     "params" : {
       "srcAppId": 13,

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-trim-app/src/main/scala/Algorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-trim-app/src/main/scala/Algorithm.scala b/examples/experimental/scala-parallel-trim-app/src/main/scala/Algorithm.scala
index e110621..f8f6bd2 100644
--- a/examples/experimental/scala-parallel-trim-app/src/main/scala/Algorithm.scala
+++ b/examples/experimental/scala-parallel-trim-app/src/main/scala/Algorithm.scala
@@ -1,7 +1,7 @@
-package io.prediction.examples.experimental.trimapp
+package org.apache.predictionio.examples.experimental.trimapp
 
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-trim-app/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-trim-app/src/main/scala/DataSource.scala b/examples/experimental/scala-parallel-trim-app/src/main/scala/DataSource.scala
index d4e8bfd..d2e1c2f 100644
--- a/examples/experimental/scala-parallel-trim-app/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-parallel-trim-app/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
-package io.prediction.examples.experimental.trimapp
-
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+package org.apache.predictionio.examples.experimental.trimapp
+
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-trim-app/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-trim-app/src/main/scala/Engine.scala b/examples/experimental/scala-parallel-trim-app/src/main/scala/Engine.scala
index c47f9a7..4d7f813 100644
--- a/examples/experimental/scala-parallel-trim-app/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-parallel-trim-app/src/main/scala/Engine.scala
@@ -1,8 +1,8 @@
-package io.prediction.examples.experimental.trimapp
+package org.apache.predictionio.examples.experimental.trimapp
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
-import io.prediction.controller._
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
+import org.apache.predictionio.controller._
 
 case class Query(q: String) extends Serializable
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-trim-app/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-trim-app/src/main/scala/Preparator.scala b/examples/experimental/scala-parallel-trim-app/src/main/scala/Preparator.scala
index b634143..cdd3e46 100644
--- a/examples/experimental/scala-parallel-trim-app/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-parallel-trim-app/src/main/scala/Preparator.scala
@@ -1,7 +1,7 @@
-package io.prediction.examples.experimental.trimapp
+package org.apache.predictionio.examples.experimental.trimapp
 
-import io.prediction.controller.PPreparator
-import io.prediction.data.storage.Event
+import org.apache.predictionio.controller.PPreparator
+import org.apache.predictionio.data.storage.Event
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-parallel-trim-app/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-parallel-trim-app/src/main/scala/Serving.scala b/examples/experimental/scala-parallel-trim-app/src/main/scala/Serving.scala
index ec1c5a8..12f2f71 100644
--- a/examples/experimental/scala-parallel-trim-app/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-parallel-trim-app/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
-package io.prediction.examples.experimental.trimapp
+package org.apache.predictionio.examples.experimental.trimapp
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving
   extends LServing[Query, PredictedResult] {
@@ -10,4 +10,4 @@ class Serving
     predictedResults: Seq[PredictedResult]): PredictedResult = {
     predictedResults.head
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-recommendations/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-recommendations/build.sbt b/examples/experimental/scala-recommendations/build.sbt
index 0d68e7a..4b067bf 100644
--- a/examples/experimental/scala-recommendations/build.sbt
+++ b/examples/experimental/scala-recommendations/build.sbt
@@ -4,10 +4,10 @@ assemblySettings
 
 name := "example-scala-recommendations"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "commons-io"        % "commons-io"    % "2.4",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided",

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-recommendations/src/main/scala/Run.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-recommendations/src/main/scala/Run.scala b/examples/experimental/scala-recommendations/src/main/scala/Run.scala
index 7935a8c..2cd82a6 100644
--- a/examples/experimental/scala-recommendations/src/main/scala/Run.scala
+++ b/examples/experimental/scala-recommendations/src/main/scala/Run.scala
@@ -1,17 +1,17 @@
 package org.apache.spark.mllib.recommendation.engine
 
-import io.prediction.controller.Engine
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.IPersistentModel
-import io.prediction.controller.IPersistentModelLoader
-import io.prediction.controller.PDataSource
-import io.prediction.controller.Params
-import io.prediction.controller.PAlgorithm
-import io.prediction.controller.PIdentityPreparator
-import io.prediction.controller.LFirstServing
-import io.prediction.controller.Utils
-import io.prediction.controller.Workflow
-import io.prediction.controller.WorkflowParams
+import org.apache.predictionio.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.IPersistentModel
+import org.apache.predictionio.controller.IPersistentModelLoader
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.controller.PAlgorithm
+import org.apache.predictionio.controller.PIdentityPreparator
+import org.apache.predictionio.controller.LFirstServing
+import org.apache.predictionio.controller.Utils
+import org.apache.predictionio.controller.Workflow
+import org.apache.predictionio.controller.WorkflowParams
 
 import org.apache.commons.io.FileUtils
 import org.apache.spark.SparkContext

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-refactor-test/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-refactor-test/build.sbt b/examples/experimental/scala-refactor-test/build.sbt
index 339d592..8e2b24b 100644
--- a/examples/experimental/scala-refactor-test/build.sbt
+++ b/examples/experimental/scala-refactor-test/build.sbt
@@ -4,10 +4,10 @@ assemblySettings
 
 name := "template-scala-parallel-vanilla"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  //"io.prediction"    %% "core"          % "0.8.6" % "provided",
-  "io.prediction"    %% "core"          % "0.9.1" % "provided",
+  //"org.apache.predictionio"    %% "core"          % "0.8.6" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.9.1" % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-refactor-test/src/main/scala/Algorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-refactor-test/src/main/scala/Algorithm.scala b/examples/experimental/scala-refactor-test/src/main/scala/Algorithm.scala
index 15131f7..8fb3cc3 100644
--- a/examples/experimental/scala-refactor-test/src/main/scala/Algorithm.scala
+++ b/examples/experimental/scala-refactor-test/src/main/scala/Algorithm.scala
@@ -1,7 +1,7 @@
 package pio.refactor
 
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-refactor-test/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-refactor-test/src/main/scala/DataSource.scala b/examples/experimental/scala-refactor-test/src/main/scala/DataSource.scala
index 2707304..86e1432 100644
--- a/examples/experimental/scala-refactor-test/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-refactor-test/src/main/scala/DataSource.scala
@@ -1,12 +1,12 @@
 package pio.refactor
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.controller._
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.controller._
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-refactor-test/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-refactor-test/src/main/scala/Engine.scala b/examples/experimental/scala-refactor-test/src/main/scala/Engine.scala
index 8726c87..8b65ecb 100644
--- a/examples/experimental/scala-refactor-test/src/main/scala/Engine.scala
+++ b/examples/experimental/scala-refactor-test/src/main/scala/Engine.scala
@@ -1,9 +1,9 @@
 package pio.refactor
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
-import io.prediction.controller._
-//import io.prediction.workflow.CoreWorkflow
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
+import org.apache.predictionio.controller._
+//import org.apache.predictionio.workflow.CoreWorkflow
 import grizzled.slf4j.Logger
 
 case class Query(q: Int)

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-refactor-test/src/main/scala/Evaluator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-refactor-test/src/main/scala/Evaluator.scala b/examples/experimental/scala-refactor-test/src/main/scala/Evaluator.scala
index 7501dfe..709defd 100644
--- a/examples/experimental/scala-refactor-test/src/main/scala/Evaluator.scala
+++ b/examples/experimental/scala-refactor-test/src/main/scala/Evaluator.scala
@@ -1,8 +1,8 @@
 package pio.refactor
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
-import io.prediction.controller._
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
+import org.apache.predictionio.controller._
 
 class VanillaEvaluator
   extends Evaluator[EmptyEvaluationInfo, Query, PredictedResult,

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-refactor-test/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-refactor-test/src/main/scala/Preparator.scala b/examples/experimental/scala-refactor-test/src/main/scala/Preparator.scala
index f8da129..c7edb4a 100644
--- a/examples/experimental/scala-refactor-test/src/main/scala/Preparator.scala
+++ b/examples/experimental/scala-refactor-test/src/main/scala/Preparator.scala
@@ -1,8 +1,8 @@
 /*
 package pio.refactor
 
-import io.prediction.controller.PPreparator
-import io.prediction.data.storage.Event
+import org.apache.predictionio.controller.PPreparator
+import org.apache.predictionio.data.storage.Event
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-refactor-test/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-refactor-test/src/main/scala/Serving.scala b/examples/experimental/scala-refactor-test/src/main/scala/Serving.scala
index 91a37ef..d61435d 100644
--- a/examples/experimental/scala-refactor-test/src/main/scala/Serving.scala
+++ b/examples/experimental/scala-refactor-test/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package pio.refactor
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 import grizzled.slf4j.Logger
 
 class Serving

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/README.md
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/README.md b/examples/experimental/scala-stock/README.md
index 66bda1b..49c5cfc 100644
--- a/examples/experimental/scala-stock/README.md
+++ b/examples/experimental/scala-stock/README.md
@@ -55,7 +55,7 @@ Go to PredictionIO/examples/scala-stock
 
 Now type:
 ```
-../../bin/pio run --asm io.prediction.examples.stock.YahooDataSourceRun -- --master <Your spark master address found at http:local8080> --driver-memory <4-12G>
+../../bin/pio run --asm org.apache.predictionio.examples.stock.YahooDataSourceRun -- --master <Your spark master address found at http:local8080> --driver-memory <4-12G>
 ```
 ### Step 7: Open dashboard and view results
 In PredictionIO folder
@@ -167,7 +167,7 @@ where `$PIO_HOME` is the root directory of PredictionIO's code tree.
 
 Run the fetch script.
 ```
-$ ../sbt/sbt "runMain io.prediction.examples.stock.FetchMain"
+$ ../sbt/sbt "runMain org.apache.predictionio.examples.stock.FetchMain"
 ```
 As SP500 constituents change all the time, the hardcoded list may not reflect
 the current state and the script may fail to extract delisted tickers. Whilst
@@ -314,7 +314,7 @@ evaluation, you have to specify two sets of parameters:
 You can run the evaluation with the following command.
 ```
 $ cd $PIO_HOME/examples
-$ ../bin/pio-run io.prediction.examples.stock.Demo1
+$ ../bin/pio-run org.apache.predictionio.examples.stock.Demo1
 ```
 
 You should see that we are trading from April 2005 until Dec 2007, the NAV went
@@ -334,7 +334,7 @@ backtesting class essentially divides the current NAV by the `maxPositions`. The
 demo is run the same way, by specifying the running main class.
 ```
 $ cd $PIO_HOME/examples
-$ ../bin/pio-run io.prediction.examples.stock.Demo2
+$ ../bin/pio-run org.apache.predictionio.examples.stock.Demo2
 ```
 
 The result is not as great, of course.
@@ -351,7 +351,7 @@ All you need is to change the `metrics` variable to `DailyMetrics`.
 [Demo3](Demo3.scala) shows the actual code. Try it out with:
 ```
 $ cd $PIO_HOME/examples
-$ ../bin/pio-run io.prediction.examples.stock.Demo3
+$ ../bin/pio-run org.apache.predictionio.examples.stock.Demo3
 ```
 
 ### Last Words

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/build.sbt
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/build.sbt b/examples/experimental/scala-stock/build.sbt
index d4e894d..cfc580f 100644
--- a/examples/experimental/scala-stock/build.sbt
+++ b/examples/experimental/scala-stock/build.sbt
@@ -4,11 +4,11 @@ assemblySettings
 
 name := "example-scala-stock"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"     %% "core"           % "0.9.1" % "provided",
-  "io.prediction"     %% "engines"        % "0.9.1" % "provided",
+  "org.apache.predictionio"     %% "core"           % "0.9.1" % "provided",
+  "org.apache.predictionio"     %% "engines"        % "0.9.1" % "provided",
   "com.github.scopt"  %% "scopt"          % "3.2.0",
   "commons-io"         % "commons-io"     % "2.4",
   "org.apache.commons" % "commons-math3"  % "3.3",

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/Algorithm.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/Algorithm.scala b/examples/experimental/scala-stock/src/main/scala/Algorithm.scala
index fd24567..772c213 100644
--- a/examples/experimental/scala-stock/src/main/scala/Algorithm.scala
+++ b/examples/experimental/scala-stock/src/main/scala/Algorithm.scala
@@ -1,12 +1,12 @@
-package io.prediction.examples.stock
+package org.apache.predictionio.examples.stock
 
-import io.prediction.controller.LAlgorithm
+import org.apache.predictionio.controller.LAlgorithm
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._
 import org.apache.spark.rdd.RDD
 import org.apache.spark.broadcast.Broadcast
-import io.prediction.controller.EmptyParams
+import org.apache.predictionio.controller.EmptyParams
 import org.saddle._
 
 import scala.reflect._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/BackTestingMetrics.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/BackTestingMetrics.scala b/examples/experimental/scala-stock/src/main/scala/BackTestingMetrics.scala
index d691a4f..f0649a0 100644
--- a/examples/experimental/scala-stock/src/main/scala/BackTestingMetrics.scala
+++ b/examples/experimental/scala-stock/src/main/scala/BackTestingMetrics.scala
@@ -1,8 +1,8 @@
-package io.prediction.examples.stock
+package org.apache.predictionio.examples.stock
 
-import io.prediction.controller.Params
-import io.prediction.controller.Evaluator
-import io.prediction.controller.NiceRendering
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.controller.Evaluator
+import org.apache.predictionio.controller.NiceRendering
 import com.github.nscala_time.time.Imports._
 import scala.collection.mutable.{ Map => MMap, ArrayBuffer }
 
@@ -12,7 +12,7 @@ import org.json4s.native.JsonMethods._
 import org.json4s.native.Serialization
 //import org.json4s.native.Serialization.{read, write}
 
-import io.prediction.engines.util.{ EvaluatorVisualization => MV }
+import org.apache.predictionio.engines.util.{ EvaluatorVisualization => MV }
 
 import breeze.stats.{ mean, meanAndVariance, MeanAndVariance }
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/Data.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/Data.scala b/examples/experimental/scala-stock/src/main/scala/Data.scala
index a57ef28..d8839ee 100644
--- a/examples/experimental/scala-stock/src/main/scala/Data.scala
+++ b/examples/experimental/scala-stock/src/main/scala/Data.scala
@@ -1,4 +1,4 @@
-package io.prediction.examples.stock
+package org.apache.predictionio.examples.stock
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/DataSource.scala b/examples/experimental/scala-stock/src/main/scala/DataSource.scala
index a91f1aa..475cdc4 100644
--- a/examples/experimental/scala-stock/src/main/scala/DataSource.scala
+++ b/examples/experimental/scala-stock/src/main/scala/DataSource.scala
@@ -1,9 +1,9 @@
-package io.prediction.examples.stock
+package org.apache.predictionio.examples.stock
 
-import io.prediction.controller.Params
-import io.prediction.controller.PDataSource
-import io.prediction.controller.LDataSource
-import io.prediction.controller.EmptyParams
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.LDataSource
+import org.apache.predictionio.controller.EmptyParams
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/Indicators.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/Indicators.scala b/examples/experimental/scala-stock/src/main/scala/Indicators.scala
index 6e4fd61..a4e1d88 100644
--- a/examples/experimental/scala-stock/src/main/scala/Indicators.scala
+++ b/examples/experimental/scala-stock/src/main/scala/Indicators.scala
@@ -1,4 +1,4 @@
-package io.prediction.examples.stock
+package org.apache.predictionio.examples.stock
 
 import org.saddle._
 import org.saddle.index.IndexTime

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/RegressionStrategy.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/RegressionStrategy.scala b/examples/experimental/scala-stock/src/main/scala/RegressionStrategy.scala
index ed3fbe8..2d446e9 100644
--- a/examples/experimental/scala-stock/src/main/scala/RegressionStrategy.scala
+++ b/examples/experimental/scala-stock/src/main/scala/RegressionStrategy.scala
@@ -1,6 +1,6 @@
-package io.prediction.examples.stock
+package org.apache.predictionio.examples.stock
 
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.Params
 
 import org.saddle._
 import org.saddle.index.IndexTime

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/Run.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/Run.scala b/examples/experimental/scala-stock/src/main/scala/Run.scala
index 2f99ade..39c419f 100644
--- a/examples/experimental/scala-stock/src/main/scala/Run.scala
+++ b/examples/experimental/scala-stock/src/main/scala/Run.scala
@@ -1,11 +1,11 @@
-package io.prediction.examples.stock
-
-import io.prediction.controller.Workflow
-import io.prediction.controller.WorkflowParams
-import io.prediction.controller.PIdentityPreparator
-import io.prediction.controller.EmptyParams
-import io.prediction.controller.LFirstServing
-import io.prediction.controller.Params
+package org.apache.predictionio.examples.stock
+
+import org.apache.predictionio.controller.Workflow
+import org.apache.predictionio.controller.WorkflowParams
+import org.apache.predictionio.controller.PIdentityPreparator
+import org.apache.predictionio.controller.EmptyParams
+import org.apache.predictionio.controller.LFirstServing
+import org.apache.predictionio.controller.Params
 import com.github.nscala_time.time.Imports._
 import scala.collection.immutable.HashMap
 import java.io.File

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/scala/YahooDataSource.scala
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/scala/YahooDataSource.scala b/examples/experimental/scala-stock/src/main/scala/YahooDataSource.scala
index 3c8d4f0..ad41020 100644
--- a/examples/experimental/scala-stock/src/main/scala/YahooDataSource.scala
+++ b/examples/experimental/scala-stock/src/main/scala/YahooDataSource.scala
@@ -1,11 +1,11 @@
-package io.prediction.examples.stock
+package org.apache.predictionio.examples.stock
 
 // YahooDataSource reads PredictionIO event store directly.
 
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
-import io.prediction.data.view.LBatchView
-import io.prediction.data.storage.DataMap
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
+import org.apache.predictionio.data.view.LBatchView
+import org.apache.predictionio.data.storage.DataMap
 
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
@@ -14,8 +14,8 @@ import com.github.nscala_time.time.Imports._
 import scala.collection.mutable.{ Map => MMap }
 import scala.collection.GenMap
 
-import io.prediction.controller._
-import io.prediction.controller.{ Params => BaseParams }
+import org.apache.predictionio.controller._
+import org.apache.predictionio.controller.{ Params => BaseParams }
 
 
 import org.apache.spark.SparkContext

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/scala-stock/src/main/twirl/io/prediction/examples/stock/backtesting.scala.html
----------------------------------------------------------------------
diff --git a/examples/experimental/scala-stock/src/main/twirl/io/prediction/examples/stock/backtesting.scala.html b/examples/experimental/scala-stock/src/main/twirl/io/prediction/examples/stock/backtesting.scala.html
index 96ce113..80c796a 100644
--- a/examples/experimental/scala-stock/src/main/twirl/io/prediction/examples/stock/backtesting.scala.html
+++ b/examples/experimental/scala-stock/src/main/twirl/io/prediction/examples/stock/backtesting.scala.html
@@ -1,4 +1,4 @@
-@import io.prediction.examples.stock.BacktestingResult
+@import org.apache.predictionio.examples.stock.BacktestingResult
 <html>
   <head>
     <script type='text/javascript' src='http://www.google.com/jsapi'></script>

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/build.sbt b/examples/scala-parallel-classification/add-algorithm/build.sbt
index a7e7858..30d0ccc 100644
--- a/examples/scala-parallel-classification/add-algorithm/build.sbt
+++ b/examples/scala-parallel-classification/add-algorithm/build.sbt
@@ -4,9 +4,9 @@ assemblySettings
 
 name := "template-scala-parallel-classification"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % pioVersion.value % "provided",
+  "org.apache.predictionio"    %% "core"          % pioVersion.value % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/project/pio-build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/project/pio-build.sbt b/examples/scala-parallel-classification/add-algorithm/project/pio-build.sbt
index 8346a96..9aed0ee 100644
--- a/examples/scala-parallel-classification/add-algorithm/project/pio-build.sbt
+++ b/examples/scala-parallel-classification/add-algorithm/project/pio-build.sbt
@@ -1 +1 @@
-addSbtPlugin("io.prediction" % "pio-build" % "0.9.0")
+addSbtPlugin("org.apache.predictionio" % "pio-build" % "0.9.0")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/src/main/scala/DataSource.scala b/examples/scala-parallel-classification/add-algorithm/src/main/scala/DataSource.scala
index c2a422d..0561611 100644
--- a/examples/scala-parallel-classification/add-algorithm/src/main/scala/DataSource.scala
+++ b/examples/scala-parallel-classification/add-algorithm/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
 package org.template.classification
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/src/main/scala/Engine.scala b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Engine.scala
index 67e36d2..4a9df1c 100644
--- a/examples/scala-parallel-classification/add-algorithm/src/main/scala/Engine.scala
+++ b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package org.template.classification
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 class Query(
   val features: Array[Double]

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/src/main/scala/NaiveBayesAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/src/main/scala/NaiveBayesAlgorithm.scala b/examples/scala-parallel-classification/add-algorithm/src/main/scala/NaiveBayesAlgorithm.scala
index 1666ae8..9bd9e36 100644
--- a/examples/scala-parallel-classification/add-algorithm/src/main/scala/NaiveBayesAlgorithm.scala
+++ b/examples/scala-parallel-classification/add-algorithm/src/main/scala/NaiveBayesAlgorithm.scala
@@ -1,7 +1,7 @@
 package org.template.classification
 
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
 
 import org.apache.spark.SparkContext
 import org.apache.spark.mllib.classification.NaiveBayes

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/src/main/scala/Preparator.scala b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Preparator.scala
index 4e581ea..587eb83 100644
--- a/examples/scala-parallel-classification/add-algorithm/src/main/scala/Preparator.scala
+++ b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
 package org.template.classification
 
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/src/main/scala/RandomForestAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/src/main/scala/RandomForestAlgorithm.scala b/examples/scala-parallel-classification/add-algorithm/src/main/scala/RandomForestAlgorithm.scala
index 5752265..e5e1e33 100644
--- a/examples/scala-parallel-classification/add-algorithm/src/main/scala/RandomForestAlgorithm.scala
+++ b/examples/scala-parallel-classification/add-algorithm/src/main/scala/RandomForestAlgorithm.scala
@@ -1,7 +1,7 @@
 package org.template.classification
 
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
 
 import org.apache.spark.SparkContext
 import org.apache.spark.mllib.tree.RandomForest // CHANGED

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/add-algorithm/src/main/scala/Serving.scala b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Serving.scala
index ef06088..9722883 100644
--- a/examples/scala-parallel-classification/add-algorithm/src/main/scala/Serving.scala
+++ b/examples/scala-parallel-classification/add-algorithm/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package org.template.classification
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving extends LServing[Query, PredictedResult] {
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/custom-attributes/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/custom-attributes/build.sbt b/examples/scala-parallel-classification/custom-attributes/build.sbt
index 5e80315..fc16e53 100644
--- a/examples/scala-parallel-classification/custom-attributes/build.sbt
+++ b/examples/scala-parallel-classification/custom-attributes/build.sbt
@@ -4,11 +4,11 @@ assemblySettings
 
 name := "template-scala-parallel-classification"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % "0.8.6" % "provided",
+  "org.apache.predictionio"    %% "core"          % "0.8.6" % "provided",
   "commons-io"        % "commons-io"    % "2.4",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided",
-  "org.json4s"       %% "json4s-native" % "3.2.10")
\ No newline at end of file
+  "org.json4s"       %% "json4s-native" % "3.2.10")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/custom-attributes/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/custom-attributes/src/main/scala/DataSource.scala b/examples/scala-parallel-classification/custom-attributes/src/main/scala/DataSource.scala
index 52a8635..970e3e0 100644
--- a/examples/scala-parallel-classification/custom-attributes/src/main/scala/DataSource.scala
+++ b/examples/scala-parallel-classification/custom-attributes/src/main/scala/DataSource.scala
@@ -1,11 +1,11 @@
 package com.test1
 
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EmptyActualResult
-import io.prediction.controller.Params
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EmptyActualResult
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/custom-attributes/src/main/scala/Engine.scala b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Engine.scala
index 8236808..a648cfb 100644
--- a/examples/scala-parallel-classification/custom-attributes/src/main/scala/Engine.scala
+++ b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
 package com.test1
 
-import io.prediction.controller.IEngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.IEngineFactory
+import org.apache.predictionio.controller.Engine
 
 class Query(
  val  gender: String,

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/custom-attributes/src/main/scala/Preparator.scala b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Preparator.scala
index c49ed8d..c3cc571 100644
--- a/examples/scala-parallel-classification/custom-attributes/src/main/scala/Preparator.scala
+++ b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
 package com.test1
 
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/custom-attributes/src/main/scala/RandomForestAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/custom-attributes/src/main/scala/RandomForestAlgorithm.scala b/examples/scala-parallel-classification/custom-attributes/src/main/scala/RandomForestAlgorithm.scala
index f2b5c35..ff7a4a9 100644
--- a/examples/scala-parallel-classification/custom-attributes/src/main/scala/RandomForestAlgorithm.scala
+++ b/examples/scala-parallel-classification/custom-attributes/src/main/scala/RandomForestAlgorithm.scala
@@ -1,7 +1,7 @@
 package com.test1
 
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
 
 import org.apache.spark.mllib.tree.RandomForest // CHANGED
 import org.apache.spark.mllib.tree.model.RandomForestModel // CHANGED

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-classification/custom-attributes/src/main/scala/Serving.scala b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Serving.scala
index 0df95d4..ff9692d 100644
--- a/examples/scala-parallel-classification/custom-attributes/src/main/scala/Serving.scala
+++ b/examples/scala-parallel-classification/custom-attributes/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
 package com.test1
 
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
 
 class Serving extends LServing[Query, PredictedResult] {
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
index f4d98ee..650c7c3 100644
--- a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
+++ b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/build.sbt
@@ -4,9 +4,9 @@ assemblySettings
 
 name := "template-scala-parallel-ecommercerecommendation"
 
-organization := "io.prediction"
+organization := "org.apache.predictionio"
 
 libraryDependencies ++= Seq(
-  "io.prediction"    %% "core"          % pioVersion.value  % "provided",
+  "org.apache.predictionio"    %% "core"          % pioVersion.value  % "provided",
   "org.apache.spark" %% "spark-core"    % "1.2.0" % "provided",
   "org.apache.spark" %% "spark-mllib"   % "1.2.0" % "provided")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/project/pio-build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/project/pio-build.sbt b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/project/pio-build.sbt
index 8346a96..9aed0ee 100644
--- a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/project/pio-build.sbt
+++ b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/project/pio-build.sbt
@@ -1 +1 @@
-addSbtPlugin("io.prediction" % "pio-build" % "0.9.0")
+addSbtPlugin("org.apache.predictionio" % "pio-build" % "0.9.0")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/src/main/scala/ALSAlgorithm.scala
----------------------------------------------------------------------
diff --git a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/src/main/scala/ALSAlgorithm.scala b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/src/main/scala/ALSAlgorithm.scala
index 21e619e..59c95ca 100644
--- a/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/src/main/scala/ALSAlgorithm.scala
+++ b/examples/scala-parallel-ecommercerecommendation/train-with-rate-event/src/main/scala/ALSAlgorithm.scala
@@ -1,10 +1,10 @@
 package org.template.ecommercerecommendation
 
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
-import io.prediction.data.storage.BiMap
-import io.prediction.data.storage.Event
-import io.prediction.data.storage.Storage
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.storage.BiMap
+import org.apache.predictionio.data.storage.Event
+import org.apache.predictionio.data.storage.Storage
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._