50 files changed, 111 insertions, 111 deletions
diff --git a/graph/pom.xml b/graphx/pom.xml
index fd3dcaad7c..fd3dcaad7c 100644
--- a/graph/pom.xml
+++ b/graphx/pom.xml
diff --git a/graph/src/main/scala/org/apache/spark/graph/Analytics.scala b/graphx/src/main/scala/org/apache/spark/graphx/Analytics.scala
index 14b9be73f1..0cafc3fdf9 100644
--- a/graph/src/main/scala/org/apache/spark/graph/Analytics.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/Analytics.scala
@@ -1,7 +1,7 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import org.apache.spark._
-import org.apache.spark.graph.algorithms._
+import org.apache.spark.graphx.algorithms._
 
 
 /**
@@ -49,7 +49,7 @@ object Analytics extends Logging {
      val serializer = "org.apache.spark.serializer.KryoSerializer"
      System.setProperty("spark.serializer", serializer)
      //System.setProperty("spark.shuffle.compress", "false")
-     System.setProperty("spark.kryo.registrator", "org.apache.spark.graph.GraphKryoRegistrator")
+     System.setProperty("spark.kryo.registrator", "org.apache.spark.graphx.GraphKryoRegistrator")
 
      taskType match {
        case "pagerank" => {
@@ -400,7 +400,7 @@ object Analytics extends Logging {
 
   //   System.setProperty("spark.serializer", "spark.KryoSerializer")
   //   //System.setProperty("spark.shuffle.compress", "false")
-  //   System.setProperty("spark.kryo.registrator", "spark.graph.GraphKryoRegistrator")
+  //   System.setProperty("spark.kryo.registrator", "spark.graphx.GraphKryoRegistrator")
 
   //   taskType match {
   //     case "pagerank" => {
diff --git a/graph/src/main/scala/org/apache/spark/graph/Edge.scala b/graphx/src/main/scala/org/apache/spark/graphx/Edge.scala
index 19c28bea68..29b46674f1 100644
--- a/graph/src/main/scala/org/apache/spark/graph/Edge.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/Edge.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 
 /**
diff --git a/graph/src/main/scala/org/apache/spark/graph/EdgeDirection.scala b/graphx/src/main/scala/org/apache/spark/graphx/EdgeDirection.scala
index a1468a152b..785f941650 100644
--- a/graph/src/main/scala/org/apache/spark/graph/EdgeDirection.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/EdgeDirection.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 
 /**
@@ -7,7 +7,7 @@ package org.apache.spark.graph
  */
 sealed abstract class EdgeDirection {
   /**
-   * Reverse the direction of an edge.  An in becomes out, 
+   * Reverse the direction of an edge.  An in becomes out,
    * out becomes in and both remains both.
    */
   def reverse: EdgeDirection = this match {
diff --git a/graph/src/main/scala/org/apache/spark/graph/EdgeRDD.scala b/graphx/src/main/scala/org/apache/spark/graphx/EdgeRDD.scala
index 78821bf568..e4ef460e6f 100644
--- a/graph/src/main/scala/org/apache/spark/graph/EdgeRDD.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/EdgeRDD.scala
@@ -1,9 +1,9 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import scala.reflect.{classTag, ClassTag}
 
 import org.apache.spark.{OneToOneDependency, Partition, Partitioner, TaskContext}
-import org.apache.spark.graph.impl.EdgePartition
+import org.apache.spark.graphx.impl.EdgePartition
 import org.apache.spark.rdd.RDD
 import org.apache.spark.storage.StorageLevel
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/EdgeTriplet.scala b/graphx/src/main/scala/org/apache/spark/graphx/EdgeTriplet.scala
index a5103ed3cb..b0565b7e0e 100644
--- a/graph/src/main/scala/org/apache/spark/graph/EdgeTriplet.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/EdgeTriplet.scala
@@ -1,6 +1,6 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
-import org.apache.spark.graph.impl.VertexPartition
+import org.apache.spark.graphx.impl.VertexPartition
 
 /**
  * An edge triplet represents two vertices and edge along with their
diff --git a/graph/src/main/scala/org/apache/spark/graph/Graph.scala b/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala
index 86282e607e..2b7c0a2583 100644
--- a/graph/src/main/scala/org/apache/spark/graph/Graph.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala
@@ -1,8 +1,8 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import scala.reflect.ClassTag
 
-import org.apache.spark.graph.impl._
+import org.apache.spark.graphx.impl._
 import org.apache.spark.rdd.RDD
 import org.apache.spark.storage.StorageLevel
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/GraphKryoRegistrator.scala b/graphx/src/main/scala/org/apache/spark/graphx/GraphKryoRegistrator.scala
index 296f3848f1..f8aab951f0 100644
--- a/graph/src/main/scala/org/apache/spark/graph/GraphKryoRegistrator.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphKryoRegistrator.scala
@@ -1,8 +1,8 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import com.esotericsoftware.kryo.Kryo
 
-import org.apache.spark.graph.impl._
+import org.apache.spark.graphx.impl._
 import org.apache.spark.serializer.KryoRegistrator
 import org.apache.spark.util.collection.BitSet
 import org.apache.spark.util.BoundedPriorityQueue
diff --git a/graph/src/main/scala/org/apache/spark/graph/GraphLab.scala b/graphx/src/main/scala/org/apache/spark/graphx/GraphLab.scala
index 22f4854019..437288405f 100644
--- a/graph/src/main/scala/org/apache/spark/graph/GraphLab.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphLab.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import scala.reflect.ClassTag
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/GraphLoader.scala b/graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala
index 7daac4fcc5..473cfb18cf 100644
--- a/graph/src/main/scala/org/apache/spark/graph/GraphLoader.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala
@@ -1,11 +1,11 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import java.util.{Arrays => JArrays}
 import scala.reflect.ClassTag
 
-import org.apache.spark.graph.impl.EdgePartitionBuilder
+import org.apache.spark.graphx.impl.EdgePartitionBuilder
 import org.apache.spark.{Logging, SparkContext}
-import org.apache.spark.graph.impl.{EdgePartition, GraphImpl}
+import org.apache.spark.graphx.impl.{EdgePartition, GraphImpl}
 import org.apache.spark.util.collection.PrimitiveVector
 
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/GraphOps.scala b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index e41287c1ed..cacfcb1c90 100644
--- a/graph/src/main/scala/org/apache/spark/graph/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import scala.reflect.ClassTag
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/PartitionStrategy.scala b/graphx/src/main/scala/org/apache/spark/graphx/PartitionStrategy.scala
index bc05fb812c..5e80a535f1 100644
--- a/graph/src/main/scala/org/apache/spark/graph/PartitionStrategy.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/PartitionStrategy.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 
 sealed trait PartitionStrategy extends Serializable {
diff --git a/graph/src/main/scala/org/apache/spark/graph/Pregel.scala b/graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala
index 3b84e2e5e4..8ddb788135 100644
--- a/graph/src/main/scala/org/apache/spark/graph/Pregel.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/Pregel.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import scala.reflect.ClassTag
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/VertexRDD.scala b/graphx/src/main/scala/org/apache/spark/graphx/VertexRDD.scala
index 25b0aed85a..cfee9b089f 100644
--- a/graph/src/main/scala/org/apache/spark/graph/VertexRDD.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/VertexRDD.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import scala.reflect.ClassTag
 
@@ -24,8 +24,8 @@ import org.apache.spark.SparkContext._
 import org.apache.spark.rdd._
 import org.apache.spark.storage.StorageLevel
 
-import org.apache.spark.graph.impl.MsgRDDFunctions
-import org.apache.spark.graph.impl.VertexPartition
+import org.apache.spark.graphx.impl.MsgRDDFunctions
+import org.apache.spark.graphx.impl.VertexPartition
 
 
 /**
diff --git a/graph/src/main/scala/org/apache/spark/graph/algorithms/ConnectedComponents.scala b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/ConnectedComponents.scala
index 2a6b8c0999..a0dd36da60 100644
--- a/graph/src/main/scala/org/apache/spark/graph/algorithms/ConnectedComponents.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/ConnectedComponents.scala
@@ -1,6 +1,6 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 
 
 object ConnectedComponents {
diff --git a/graph/src/main/scala/org/apache/spark/graph/algorithms/PageRank.scala b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/PageRank.scala
index 26b8dc5ab6..0292b7316d 100644
--- a/graph/src/main/scala/org/apache/spark/graph/algorithms/PageRank.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/PageRank.scala
@@ -1,7 +1,7 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import org.apache.spark.Logging
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 
 
 object PageRank extends Logging {
diff --git a/graph/src/main/scala/org/apache/spark/graph/algorithms/SVDPlusPlus.scala b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/SVDPlusPlus.scala
index 083aa30538..8fdfa3d907 100644
--- a/graph/src/main/scala/org/apache/spark/graph/algorithms/SVDPlusPlus.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/SVDPlusPlus.scala
@@ -1,7 +1,7 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import org.apache.spark.rdd._
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import scala.util.Random
 import org.apache.commons.math.linear._
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/algorithms/StronglyConnectedComponents.scala b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponents.scala
index 8031aa10ce..f64fc3ef0f 100644
--- a/graph/src/main/scala/org/apache/spark/graph/algorithms/StronglyConnectedComponents.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponents.scala
@@ -1,6 +1,6 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 
 object StronglyConnectedComponents {
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/algorithms/TriangleCount.scala b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/TriangleCount.scala
index 81774d52e4..b5a93c1bd1 100644
--- a/graph/src/main/scala/org/apache/spark/graph/algorithms/TriangleCount.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/algorithms/TriangleCount.scala
@@ -1,8 +1,8 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import scala.reflect.ClassTag
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 
 
 object TriangleCount {
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/EdgePartition.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartition.scala
index b4311fa9f8..4176563d22 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/EdgePartition.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartition.scala
@@ -1,8 +1,8 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.ClassTag
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import org.apache.spark.util.collection.PrimitiveKeyOpenHashMap
 
 /**
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/EdgePartitionBuilder.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartitionBuilder.scala
index 56624ef60a..d4f08497a2 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/EdgePartitionBuilder.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgePartitionBuilder.scala
@@ -1,9 +1,9 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.ClassTag
 import scala.util.Sorting
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import org.apache.spark.util.collection.{PrimitiveKeyOpenHashMap, PrimitiveVector}
 
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/EdgeTripletIterator.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgeTripletIterator.scala
index e95d79e3d6..79fd962ffd 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/EdgeTripletIterator.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/EdgeTripletIterator.scala
@@ -1,8 +1,8 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.ClassTag
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import org.apache.spark.util.collection.PrimitiveKeyOpenHashMap
 
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/GraphImpl.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/GraphImpl.scala
index 8f42e7d592..be9f188150 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/GraphImpl.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/GraphImpl.scala
@@ -1,14 +1,14 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.{classTag, ClassTag}
 
 import org.apache.spark.util.collection.PrimitiveVector
 import org.apache.spark.{HashPartitioner, Partitioner}
 import org.apache.spark.SparkContext._
-import org.apache.spark.graph._
-import org.apache.spark.graph.impl.GraphImpl._
-import org.apache.spark.graph.impl.MsgRDDFunctions._
-import org.apache.spark.graph.util.BytecodeUtils
+import org.apache.spark.graphx._
+import org.apache.spark.graphx.impl.GraphImpl._
+import org.apache.spark.graphx.impl.MsgRDDFunctions._
+import org.apache.spark.graphx.util.BytecodeUtils
 import org.apache.spark.rdd.{ShuffledRDD, RDD}
 import org.apache.spark.storage.StorageLevel
 import org.apache.spark.util.ClosureCleaner
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/MessageToPartition.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/MessageToPartition.scala
index b2fa728482..ad5daf8f6a 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/MessageToPartition.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/MessageToPartition.scala
@@ -1,9 +1,9 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.{classTag, ClassTag}
 
 import org.apache.spark.Partitioner
-import org.apache.spark.graph.{PartitionID, VertexID}
+import org.apache.spark.graphx.{PartitionID, VertexID}
 import org.apache.spark.rdd.{ShuffledRDD, RDD}
 
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/ReplicatedVertexView.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/ReplicatedVertexView.scala
index 7d29861db1..63180bc3af 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/ReplicatedVertexView.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/ReplicatedVertexView.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.{classTag, ClassTag}
 
@@ -6,7 +6,7 @@ import org.apache.spark.SparkContext._
 import org.apache.spark.rdd.RDD
 import org.apache.spark.util.collection.{PrimitiveVector, OpenHashSet}
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 
 /**
  * A view of the vertices after they are shipped to the join sites specified in
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/RoutingTable.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/RoutingTable.scala
index 96d9e9d7f8..3bd8b24133 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/RoutingTable.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/RoutingTable.scala
@@ -1,7 +1,7 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import org.apache.spark.SparkContext._
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import org.apache.spark.rdd.RDD
 import org.apache.spark.storage.StorageLevel
 import org.apache.spark.util.collection.PrimitiveVector
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/Serializers.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/Serializers.scala
index a3b0ea7689..1c3c87f08d 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/Serializers.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/Serializers.scala
@@ -1,10 +1,10 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import java.io.{EOFException, InputStream, OutputStream}
 import java.nio.ByteBuffer
 
 import org.apache.spark.SparkConf
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import org.apache.spark.serializer._
 
 class VertexIDMsgSerializer(conf: SparkConf) extends Serializer {
diff --git a/graph/src/main/scala/org/apache/spark/graph/impl/VertexPartition.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartition.scala
index 91244daa54..7c83497ca9 100644
--- a/graph/src/main/scala/org/apache/spark/graph/impl/VertexPartition.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/VertexPartition.scala
@@ -1,14 +1,14 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.ClassTag
 
 import org.apache.spark.util.collection.{BitSet, PrimitiveKeyOpenHashMap}
 
 import org.apache.spark.Logging
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 
 
-private[graph] object VertexPartition {
+private[graphx] object VertexPartition {
 
   def apply[VD: ClassTag](iter: Iterator[(VertexID, VD)]): VertexPartition[VD] = {
     val map = new PrimitiveKeyOpenHashMap[VertexID, VD]
@@ -30,7 +30,7 @@ private[graph] object VertexPartition {
 }
 
 
-private[graph]
+private[graphx]
 class VertexPartition[@specialized(Long, Int, Double) VD: ClassTag](
     val index: VertexIdToIndexMap,
     val values: Array[VD],
diff --git a/graph/src/main/scala/org/apache/spark/graph/package.scala b/graphx/src/main/scala/org/apache/spark/graphx/package.scala
index b98a11b918..96f0d91c9b 100644
--- a/graph/src/main/scala/org/apache/spark/graph/package.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/package.scala
@@ -3,7 +3,7 @@ package org.apache.spark
 import org.apache.spark.util.collection.OpenHashSet
 
 
-package object graph {
+package object graphx {
 
   type VertexID = Long
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/perf/BagelTest.scala b/graphx/src/main/scala/org/apache/spark/graphx/perf/BagelTest.scala
index eaff27a33e..81332e0800 100644
--- a/graph/src/main/scala/org/apache/spark/graph/perf/BagelTest.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/perf/BagelTest.scala
@@ -1,6 +1,6 @@
 ///// This file creates circular dependencies between examples bagle and graph
 
-// package org.apache.spark.graph.perf
+// package org.apache.spark.graphx.perf
 
 // import org.apache.spark._
 // import org.apache.spark.SparkContext._
@@ -8,7 +8,7 @@
 
 // import org.apache.spark.examples.bagel
 // //import org.apache.spark.bagel.examples._
-// import org.apache.spark.graph._
+// import org.apache.spark.graphx._
 
 
 // object BagelTest {
diff --git a/graph/src/main/scala/org/apache/spark/graph/perf/SparkTest.scala b/graphx/src/main/scala/org/apache/spark/graphx/perf/SparkTest.scala
index 01bd968550..24262640ab 100644
--- a/graph/src/main/scala/org/apache/spark/graph/perf/SparkTest.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/perf/SparkTest.scala
@@ -1,13 +1,13 @@
 ///// This file creates circular dependencies between examples bagle and graph
 
 
-// package org.apache.spark.graph.perf
+// package org.apache.spark.graphx.perf
 
 // import org.apache.spark._
 // import org.apache.spark.SparkContext._
 // import org.apache.spark.bagel.Bagel
 // import org.apache.spark.bagel.examples._
-// import org.apache.spark.graph._
+// import org.apache.spark.graphx._
 
 
 // object SparkTest {
diff --git a/graph/src/main/scala/org/apache/spark/graph/util/BytecodeUtils.scala b/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
index bc00ce2151..ec8d534333 100644
--- a/graph/src/main/scala/org/apache/spark/graph/util/BytecodeUtils.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph.util
+package org.apache.spark.graphx.util
 
 import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/util/GraphGenerators.scala b/graphx/src/main/scala/org/apache/spark/graphx/util/GraphGenerators.scala
index 51f45cb892..57117241ad 100644
--- a/graph/src/main/scala/org/apache/spark/graph/util/GraphGenerators.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/util/GraphGenerators.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph.util
+package org.apache.spark.graphx.util
 
 import scala.annotation.tailrec
 import scala.math._
@@ -10,10 +10,10 @@ import org.apache.spark.serializer._
 import org.apache.spark.rdd.RDD
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._
-import org.apache.spark.graph._
-import org.apache.spark.graph.Graph
-import org.apache.spark.graph.Edge
-import org.apache.spark.graph.impl.GraphImpl
+import org.apache.spark.graphx._
+import org.apache.spark.graphx.Graph
+import org.apache.spark.graphx.Edge
+import org.apache.spark.graphx.impl.GraphImpl
 
 /**
  * @todo cleanup and modularize code
@@ -31,7 +31,7 @@ object GraphGenerators {
     val serializer = "org.apache.spark.serializer.KryoSerializer"
     System.setProperty("spark.serializer", serializer)
     //System.setProperty("spark.shuffle.compress", "false")
-    System.setProperty("spark.kryo.registrator", "spark.graph.GraphKryoRegistrator")
+    System.setProperty("spark.kryo.registrator", "spark.graphx.GraphKryoRegistrator")
     val host = "local[4]"
     val sc = new SparkContext(host, "Lognormal graph generator")
 
diff --git a/graph/src/main/scala/org/apache/spark/graph/util/HashUtils.scala b/graphx/src/main/scala/org/apache/spark/graphx/util/HashUtils.scala
index cb18ef3d26..7a79d33350 100644
--- a/graph/src/main/scala/org/apache/spark/graph/util/HashUtils.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/util/HashUtils.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph.util
+package org.apache.spark.graphx.util
 
 
 object HashUtils {
diff --git a/graph/src/test/resources/log4j.properties b/graphx/src/test/resources/log4j.properties
index 896936d8c4..896936d8c4 100644
--- a/graph/src/test/resources/log4j.properties
+++ b/graphx/src/test/resources/log4j.properties
diff --git a/graph/src/test/scala/org/apache/spark/graph/GraphOpsSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/GraphOpsSuite.scala
index 132e6be24a..cc281fce99 100644
--- a/graph/src/test/scala/org/apache/spark/graph/GraphOpsSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/GraphOpsSuite.scala
@@ -1,8 +1,8 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import org.apache.spark.SparkContext
-import org.apache.spark.graph.Graph._
-import org.apache.spark.graph.impl.EdgePartition
+import org.apache.spark.graphx.Graph._
+import org.apache.spark.graphx.impl.EdgePartition
 import org.apache.spark.rdd._
 import org.scalatest.FunSuite
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/GraphSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/GraphSuite.scala
index 41f3a8311d..094fa722a0 100644
--- a/graph/src/test/scala/org/apache/spark/graph/GraphSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/GraphSuite.scala
@@ -1,9 +1,9 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import org.scalatest.FunSuite
 
 import org.apache.spark.SparkContext
-import org.apache.spark.graph.Graph._
+import org.apache.spark.graphx.Graph._
 import org.apache.spark.rdd._
 
 class GraphSuite extends FunSuite with LocalSparkContext {
diff --git a/graph/src/test/scala/org/apache/spark/graph/LocalSparkContext.scala b/graphx/src/test/scala/org/apache/spark/graphx/LocalSparkContext.scala
index 5c20d559aa..6aec2ea8a9 100644
--- a/graph/src/test/scala/org/apache/spark/graph/LocalSparkContext.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/LocalSparkContext.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import org.scalatest.Suite
 import org.scalatest.BeforeAndAfterEach
@@ -12,7 +12,7 @@ import org.apache.spark.SparkContext
 */
 trait LocalSparkContext {
   System.setProperty("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
-  System.setProperty("spark.kryo.registrator", "org.apache.spark.graph.GraphKryoRegistrator")
+  System.setProperty("spark.kryo.registrator", "org.apache.spark.graphx.GraphKryoRegistrator")
 
   /** Runs `f` on a new SparkContext and ensures that it is stopped afterwards. */
   def withSpark[T](f: SparkContext => T) = {
diff --git a/graph/src/test/scala/org/apache/spark/graph/PregelSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/PregelSuite.scala
index de7e3872ca..429622357f 100644
--- a/graph/src/test/scala/org/apache/spark/graph/PregelSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/PregelSuite.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import org.scalatest.FunSuite
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/SerializerSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/SerializerSuite.scala
index 2864ffd1ca..3ba412c1f8 100644
--- a/graph/src/test/scala/org/apache/spark/graph/SerializerSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/SerializerSuite.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import java.io.{EOFException, ByteArrayInputStream, ByteArrayOutputStream}
 
@@ -7,8 +7,8 @@ import scala.util.Random
 import org.scalatest.FunSuite
 
 import org.apache.spark._
-import org.apache.spark.graph.impl._
-import org.apache.spark.graph.impl.MsgRDDFunctions._
+import org.apache.spark.graphx.impl._
+import org.apache.spark.graphx.impl.MsgRDDFunctions._
 import org.apache.spark.serializer.SerializationStream
 
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/VertexRDDSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/VertexRDDSuite.scala
index e876b8e4e8..573b708e89 100644
--- a/graph/src/test/scala/org/apache/spark/graph/VertexRDDSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/VertexRDDSuite.scala
@@ -1,8 +1,8 @@
-package org.apache.spark.graph
+package org.apache.spark.graphx
 
 import org.apache.spark.SparkContext
-import org.apache.spark.graph.Graph._
-import org.apache.spark.graph.impl.EdgePartition
+import org.apache.spark.graphx.Graph._
+import org.apache.spark.graphx.impl.EdgePartition
 import org.apache.spark.rdd._
 import org.scalatest.FunSuite
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/algorithms/ConnectedComponentsSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/ConnectedComponentsSuite.scala
index 81a1b7337f..5e2ecfcde9 100644
--- a/graph/src/test/scala/org/apache/spark/graph/algorithms/ConnectedComponentsSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/ConnectedComponentsSuite.scala
@@ -1,11 +1,11 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import org.scalatest.FunSuite
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._
-import org.apache.spark.graph._
-import org.apache.spark.graph.util.GraphGenerators
+import org.apache.spark.graphx._
+import org.apache.spark.graphx.util.GraphGenerators
 import org.apache.spark.rdd._
 
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/algorithms/PageRankSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/PageRankSuite.scala
index 81d82a5a6b..e365b1e230 100644
--- a/graph/src/test/scala/org/apache/spark/graph/algorithms/PageRankSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/PageRankSuite.scala
@@ -1,13 +1,13 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import org.scalatest.FunSuite
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._
 import org.apache.spark.rdd._
 
-import org.apache.spark.graph.util.GraphGenerators
+import org.apache.spark.graphx.util.GraphGenerators
 
 
 object GridPageRank {
diff --git a/graph/src/test/scala/org/apache/spark/graph/algorithms/SVDPlusPlusSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/SVDPlusPlusSuite.scala
index a0a6eb33e3..06604198d7 100644
--- a/graph/src/test/scala/org/apache/spark/graph/algorithms/SVDPlusPlusSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/SVDPlusPlusSuite.scala
@@ -1,11 +1,11 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import org.scalatest.FunSuite
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._
-import org.apache.spark.graph._
-import org.apache.spark.graph.util.GraphGenerators
+import org.apache.spark.graphx._
+import org.apache.spark.graphx.util.GraphGenerators
 import org.apache.spark.rdd._
 
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/algorithms/StronglyConnectedComponentsSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponentsSuite.scala
index 4afb158a68..696b80944e 100644
--- a/graph/src/test/scala/org/apache/spark/graph/algorithms/StronglyConnectedComponentsSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/StronglyConnectedComponentsSuite.scala
@@ -1,11 +1,11 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import org.scalatest.FunSuite
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._
-import org.apache.spark.graph._
-import org.apache.spark.graph.util.GraphGenerators
+import org.apache.spark.graphx._
+import org.apache.spark.graphx.util.GraphGenerators
 import org.apache.spark.rdd._
 
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/algorithms/TriangleCountSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/TriangleCountSuite.scala
index 274ab11f0c..0e59912754 100644
--- a/graph/src/test/scala/org/apache/spark/graph/algorithms/TriangleCountSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/algorithms/TriangleCountSuite.scala
@@ -1,11 +1,11 @@
-package org.apache.spark.graph.algorithms
+package org.apache.spark.graphx.algorithms
 
 import org.scalatest.FunSuite
 
 import org.apache.spark.SparkContext
 import org.apache.spark.SparkContext._
-import org.apache.spark.graph._
-import org.apache.spark.graph.util.GraphGenerators
+import org.apache.spark.graphx._
+import org.apache.spark.graphx.util.GraphGenerators
 import org.apache.spark.rdd._
 
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/impl/EdgePartitionSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/impl/EdgePartitionSuite.scala
index fd0beee2f6..eb82436f09 100644
--- a/graph/src/test/scala/org/apache/spark/graph/impl/EdgePartitionSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/impl/EdgePartitionSuite.scala
@@ -1,11 +1,11 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
 import scala.reflect.ClassTag
 import scala.util.Random
 
 import org.scalatest.FunSuite
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 
 class EdgePartitionSuite extends FunSuite {
 
diff --git a/graph/src/test/scala/org/apache/spark/graph/impl/VertexPartitionSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/impl/VertexPartitionSuite.scala
index 72579a48c2..d37d64e8c8 100644
--- a/graph/src/test/scala/org/apache/spark/graph/impl/VertexPartitionSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/impl/VertexPartitionSuite.scala
@@ -1,6 +1,6 @@
-package org.apache.spark.graph.impl
+package org.apache.spark.graphx.impl
 
-import org.apache.spark.graph._
+import org.apache.spark.graphx._
 import org.scalatest.FunSuite
 
 class VertexPartitionSuite extends FunSuite {
diff --git a/graph/src/test/scala/org/apache/spark/graph/util/BytecodeUtilsSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/util/BytecodeUtilsSuite.scala
index d85e877ddf..11db339750 100644
--- a/graph/src/test/scala/org/apache/spark/graph/util/BytecodeUtilsSuite.scala
+++ b/graphx/src/test/scala/org/apache/spark/graphx/util/BytecodeUtilsSuite.scala
@@ -1,4 +1,4 @@
-package org.apache.spark.graph.util
+package org.apache.spark.graphx.util
 
 import org.scalatest.FunSuite
 
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index c2cd6fb45a..c2b1c0c35c 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -48,20 +48,20 @@ object SparkBuild extends Build {
   lazy val core = Project("core", file("core"), settings = coreSettings)
 
   lazy val repl = Project("repl", file("repl"), settings = replSettings)
-    .dependsOn(core, graph, bagel, mllib)
+    .dependsOn(core, graphx, bagel, mllib)
 
   lazy val tools = Project("tools", file("tools"), settings = toolsSettings) dependsOn(core) dependsOn(streaming)
 
   lazy val bagel = Project("bagel", file("bagel"), settings = bagelSettings) dependsOn(core)
 
-  lazy val graph = Project("graph", file("graph"), settings = graphSettings) dependsOn(core)
+  lazy val graphx = Project("graphx", file("graphx"), settings = graphxSettings) dependsOn(core)
 
   lazy val streaming = Project("streaming", file("streaming"), settings = streamingSettings) dependsOn(core)
 
   lazy val mllib = Project("mllib", file("mllib"), settings = mllibSettings) dependsOn(core)
 
   lazy val assemblyProj = Project("assembly", file("assembly"), settings = assemblyProjSettings)
-    .dependsOn(core, graph, bagel, mllib, repl, streaming) dependsOn(maybeYarn: _*)
+    .dependsOn(core, graphx, bagel, mllib, repl, streaming) dependsOn(maybeYarn: _*)
 
   lazy val assembleDeps = TaskKey[Unit]("assemble-deps", "Build assembly of dependencies and packages Spark projects")
 
@@ -111,10 +111,10 @@ object SparkBuild extends Build {
   lazy val allExternalRefs = Seq[ProjectReference](externalTwitter, externalKafka, externalFlume, externalZeromq, externalMqtt)
 
   lazy val examples = Project("examples", file("examples"), settings = examplesSettings)
-    .dependsOn(core, mllib, graph, bagel, streaming, externalTwitter) dependsOn(allExternal: _*)
+    .dependsOn(core, mllib, graphx, bagel, streaming, externalTwitter) dependsOn(allExternal: _*)
 
   // Everything except assembly, tools and examples belong to packageProjects
-  lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib, graph) ++ maybeYarnRef
+  lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib, graphx) ++ maybeYarnRef
 
   lazy val allProjects = packageProjects ++ allExternalRefs ++ Seq[ProjectReference](examples, tools, assemblyProj)
 
@@ -308,7 +308,7 @@ object SparkBuild extends Build {
     name := "spark-tools"
   ) ++ assemblySettings ++ extraAssemblySettings
 
-  def graphSettings = sharedSettings ++ Seq(
+  def graphxSettings = sharedSettings ++ Seq(
     name := "spark-graphx"
   )