diff --git a/jung-algorithms/pom.xml b/jung-algorithms/pom.xml
index 7ca11d8ea..1f1138c69 100644
--- a/jung-algorithms/pom.xml
+++ b/jung-algorithms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sf.jung</groupId>
     <artifactId>jung-parent</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>jung-algorithms</artifactId>
   <name>JUNG - Algorithms</name>
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestBicomponentClusterer.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestBicomponentClusterer.java
index dafc559dc..9661d0433 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestBicomponentClusterer.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestBicomponentClusterer.java
@@ -19,7 +19,7 @@
 import junit.framework.TestSuite;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestEdgeBetweennessClusterer.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestEdgeBetweennessClusterer.java
index bf7403792..622c892f7 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestEdgeBetweennessClusterer.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/TestEdgeBetweennessClusterer.java
@@ -20,7 +20,7 @@
 import com.google.common.base.Supplier;
 
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/WeakComponentClustererTest.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/WeakComponentClustererTest.java
index 52ef2c01a..b5ac2c9ea 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/WeakComponentClustererTest.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/cluster/WeakComponentClustererTest.java
@@ -2,7 +2,7 @@
 
 import junit.framework.TestCase;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 
 public class WeakComponentClustererTest extends TestCase {
 	
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/filters/impl/TestKNeighborhoodFilter.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/filters/impl/TestKNeighborhoodFilter.java
index 445060a11..af0048e3c 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/filters/impl/TestKNeighborhoodFilter.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/filters/impl/TestKNeighborhoodFilter.java
@@ -11,8 +11,8 @@
 import edu.uci.ics.jung.algorithms.filters.KNeighborhoodFilter;
 import edu.uci.ics.jung.algorithms.filters.KNeighborhoodFilter.EdgeType;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 
 public class TestKNeighborhoodFilter extends TestCase {
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/flows/TestEdmondsKarpMaxFlow.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/flows/TestEdmondsKarpMaxFlow.java
index 6993f1e0e..0b9dc506d 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/flows/TestEdmondsKarpMaxFlow.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/flows/TestEdmondsKarpMaxFlow.java
@@ -22,7 +22,7 @@
 import com.google.common.base.Supplier;
 
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/TestLattice2D.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/TestLattice2D.java
index fec9b9e1e..f7be23cb9 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/TestLattice2D.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/TestLattice2D.java
@@ -7,10 +7,10 @@
 import com.google.common.base.Supplier;
 
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 
 public class TestLattice2D extends TestCase {
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestBarabasiAlbert.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestBarabasiAlbert.java
index ba50d3c2b..86328b3d0 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestBarabasiAlbert.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestBarabasiAlbert.java
@@ -11,13 +11,13 @@
 
 import com.google.common.base.Supplier;
 
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseGraph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
-import edu.uci.ics.jung.graph.UndirectedSparseGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseGraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 import junit.framework.Test;
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestEppsteinPowerLawGenerator.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestEppsteinPowerLawGenerator.java
index ba72951cb..07aa8b90f 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestEppsteinPowerLawGenerator.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestEppsteinPowerLawGenerator.java
@@ -17,7 +17,7 @@
 import com.google.common.base.Supplier;
 
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 
 /**
  * @author Scott White
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestErdosRenyi.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestErdosRenyi.java
index 5190befd6..181ccc3d4 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestErdosRenyi.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/generators/random/TestErdosRenyi.java
@@ -13,7 +13,7 @@
 
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 
 public class TestErdosRenyi extends TestCase {
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestBetweennessCentrality.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestBetweennessCentrality.java
index 87a6a37b1..167e50441 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestBetweennessCentrality.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestBetweennessCentrality.java
@@ -14,9 +14,9 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;
 
 /**
  * @author Scott White
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestKStepMarkov.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestKStepMarkov.java
index 9ff58be06..be93b9097 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestKStepMarkov.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestKStepMarkov.java
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestWeightedNIPaths.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestWeightedNIPaths.java
index 59c080543..136cc1ce6 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestWeightedNIPaths.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/importance/TestWeightedNIPaths.java
@@ -20,7 +20,7 @@
 import com.google.common.base.Supplier;
 
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 /**
  * @author Scott White, adapted to jung2 by Tom Nelson
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayout2Test.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayout2Test.java
index 71822ac9f..41c699554 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayout2Test.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayout2Test.java
@@ -9,7 +9,7 @@
 import edu.uci.ics.jung.algorithms.layout.util.VisRunner;
 import edu.uci.ics.jung.algorithms.util.IterativeContext;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 
 public class FRLayout2Test extends TestCase {
 	
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayoutTest.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayoutTest.java
index 9af60c168..c5e4ee38c 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayoutTest.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/layout/FRLayoutTest.java
@@ -9,7 +9,7 @@
 import edu.uci.ics.jung.algorithms.layout.util.VisRunner;
 import edu.uci.ics.jung.algorithms.util.IterativeContext;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 
 public class FRLayoutTest extends TestCase {
 	
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/metrics/TestTriad.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/metrics/TestTriad.java
index f221e8c82..82cbb9baa 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/metrics/TestTriad.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/metrics/TestTriad.java
@@ -3,7 +3,7 @@
 import junit.framework.TestCase;
 import edu.uci.ics.jung.algorithms.metrics.TriadicCensus;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 public class TestTriad extends TestCase {
 
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestBetweennessCentrality.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestBetweennessCentrality.java
index eda3f08d2..b769f1803 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestBetweennessCentrality.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestBetweennessCentrality.java
@@ -15,8 +15,8 @@
 
 import com.google.common.base.Function;
 
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 
 /**
  *
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITS.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITS.java
index 76cccd2f9..c64bbf6e8 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITS.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITS.java
@@ -14,7 +14,7 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITSWithPriors.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITSWithPriors.java
index af6404348..76e0816ab 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITSWithPriors.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestHITSWithPriors.java
@@ -18,7 +18,7 @@
 import junit.framework.TestSuite;
 import edu.uci.ics.jung.algorithms.scoring.util.ScoringUtils;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestKStepMarkov.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestKStepMarkov.java
index 3d5414d3b..b4e5d3084 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestKStepMarkov.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestKStepMarkov.java
@@ -11,7 +11,7 @@
 
 import edu.uci.ics.jung.algorithms.scoring.util.ScoringUtils;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 public class TestKStepMarkov extends TestCase 
 {
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRank.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRank.java
index 4a9d36290..96d519ef9 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRank.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRank.java
@@ -21,8 +21,8 @@
 import com.google.common.base.Supplier;
 
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 /**
  * @author Joshua O'Madadhain
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRankWithPriors.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRankWithPriors.java
index cb6756cec..b572bb952 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRankWithPriors.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestPageRankWithPriors.java
@@ -21,8 +21,8 @@
 
 import edu.uci.ics.jung.algorithms.scoring.util.ScoringUtils;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestVoltageScore.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestVoltageScore.java
index 907bbb6f3..9ba33114a 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestVoltageScore.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/scoring/TestVoltageScore.java
@@ -21,7 +21,7 @@
 import com.google.common.base.Functions;
 
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 /**
  * @author jrtom
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestBFSDistanceLabeler.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestBFSDistanceLabeler.java
index 93375a83d..e5ee95fbc 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestBFSDistanceLabeler.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestBFSDistanceLabeler.java
@@ -15,7 +15,7 @@
 import junit.framework.TestSuite;
 import edu.uci.ics.jung.algorithms.shortestpath.BFSDistanceLabeler;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 /**
  * @author Scott White, adapted to jung2 by Tom Nelson
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestPrimMinimumSpanningTree.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestPrimMinimumSpanningTree.java
index 184a844ef..25fede8f5 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestPrimMinimumSpanningTree.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestPrimMinimumSpanningTree.java
@@ -2,11 +2,11 @@
 
 import junit.framework.TestCase;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
-import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.Tree;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 public class TestPrimMinimumSpanningTree extends TestCase {
 	
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestShortestPath.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestShortestPath.java
index 309f2eb6b..1c180e2ee 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestShortestPath.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestShortestPath.java
@@ -21,10 +21,10 @@
 
 import edu.uci.ics.jung.algorithms.util.Indexer;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 
 /**
diff --git a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestUnweightedShortestPath.java b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestUnweightedShortestPath.java
index 89533ff96..2761675ae 100644
--- a/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestUnweightedShortestPath.java
+++ b/jung-algorithms/src/test/java/edu/uci/ics/jung/algorithms/shortestpath/TestUnweightedShortestPath.java
@@ -14,9 +14,9 @@
 
 import edu.uci.ics.jung.algorithms.util.Indexer;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 /**
  * @author Scott White
diff --git a/jung-api/pom.xml b/jung-api/pom.xml
index 5839a7388..42647085e 100644
--- a/jung-api/pom.xml
+++ b/jung-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sf.jung</groupId>
     <artifactId>jung-parent</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>jung-api</artifactId>
   <name>JUNG - API</name>
diff --git a/jung-graph-impl/pom.xml b/jung-graph-impl/pom.xml
index fdee4dc80..012c82720 100644
--- a/jung-graph-impl/pom.xml
+++ b/jung-graph-impl/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sf.jung</groupId>
     <artifactId>jung-parent</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>jung-graph-impl</artifactId>
   <name>JUNG - Graph Implementations</name>
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/AbstractGraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/AbstractGraph.java
similarity index 99%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/AbstractGraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/AbstractGraph.java
index ec2d38f61..519b14ccc 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/AbstractGraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/AbstractGraph.java
@@ -9,13 +9,14 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
+import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/AbstractTypedGraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/AbstractTypedGraph.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/AbstractTypedGraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/AbstractTypedGraph.java
index 620d1c803..1c9fc6da0 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/AbstractTypedGraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/AbstractTypedGraph.java
@@ -9,7 +9,7 @@
  * Created on Sep 1, 2008
  * 
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DelegateForest.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DelegateForest.java
similarity index 97%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DelegateForest.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DelegateForest.java
index 05f4d91ec..88ef20777 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DelegateForest.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DelegateForest.java
@@ -1,10 +1,14 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 
+import edu.uci.ics.jung.graph.DirectedGraph;
+import edu.uci.ics.jung.graph.Forest;
+import edu.uci.ics.jung.graph.GraphDecorator;
+import edu.uci.ics.jung.graph.Tree;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 import edu.uci.ics.jung.graph.util.TreeUtils;
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DelegateTree.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DelegateTree.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DelegateTree.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DelegateTree.java
index d30aa6ea8..54646e34a 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DelegateTree.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DelegateTree.java
@@ -1,4 +1,4 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,6 +9,9 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.DirectedGraph;
+import edu.uci.ics.jung.graph.GraphDecorator;
+import edu.uci.ics.jung.graph.Tree;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedOrderedSparseMultigraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedOrderedSparseMultigraph.java
similarity index 96%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedOrderedSparseMultigraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedOrderedSparseMultigraph.java
index e481640dd..2d4c7aa07 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedOrderedSparseMultigraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedOrderedSparseMultigraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -19,6 +19,8 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.DirectedGraph;
+import edu.uci.ics.jung.graph.MultiGraph;
 import edu.uci.ics.jung.graph.util.Pair;
 
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedSparseGraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedSparseGraph.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedSparseGraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedSparseGraph.java
index c6476a79b..2d2d2f28c 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedSparseGraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedSparseGraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,6 +20,7 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.DirectedGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedSparseMultigraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedSparseMultigraph.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedSparseMultigraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedSparseMultigraph.java
index 5fb52c01c..72f8185d1 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/DirectedSparseMultigraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/DirectedSparseMultigraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -20,6 +20,8 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.DirectedGraph;
+import edu.uci.ics.jung.graph.MultiGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/OrderedKAryTree.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/OrderedKAryTree.java
similarity index 99%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/OrderedKAryTree.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/OrderedKAryTree.java
index 4cf168c6e..13d57ccb2 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/OrderedKAryTree.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/OrderedKAryTree.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,6 +22,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
+import edu.uci.ics.jung.graph.DirectedGraph;
+import edu.uci.ics.jung.graph.Tree;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/OrderedSparseMultigraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/OrderedSparseMultigraph.java
similarity index 96%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/OrderedSparseMultigraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/OrderedSparseMultigraph.java
index 8c7622211..a0e4ecfc9 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/OrderedSparseMultigraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/OrderedSparseMultigraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -19,6 +19,8 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.MultiGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SetHypergraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SetHypergraph.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SetHypergraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SetHypergraph.java
index 8803e3e77..90d64ca48 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SetHypergraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SetHypergraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -22,6 +22,8 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.Hypergraph;
+import edu.uci.ics.jung.graph.MultiGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 
 /**
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SortedSparseMultigraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SortedSparseMultigraph.java
similarity index 97%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SortedSparseMultigraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SortedSparseMultigraph.java
index 6ebff4eaf..924310a04 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SortedSparseMultigraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SortedSparseMultigraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -20,6 +20,8 @@
 import com.google.common.base.Supplier;
 import com.google.common.collect.Ordering;
 
+import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.MultiGraph;
 import edu.uci.ics.jung.graph.util.Pair;
 
 /**
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SparseGraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SparseGraph.java
similarity index 99%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SparseGraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SparseGraph.java
index 517f04594..3615502f2 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SparseGraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SparseGraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,6 +20,7 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SparseMultigraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SparseMultigraph.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SparseMultigraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SparseMultigraph.java
index 5b6ab179c..fbe2fba30 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/SparseMultigraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/SparseMultigraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -20,6 +20,8 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.MultiGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedOrderedSparseMultigraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedOrderedSparseMultigraph.java
similarity index 96%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedOrderedSparseMultigraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedOrderedSparseMultigraph.java
index ead73a429..e1ad07ce9 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedOrderedSparseMultigraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedOrderedSparseMultigraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -19,6 +19,7 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.UndirectedGraph;
 import edu.uci.ics.jung.graph.util.Pair;
 
 /**
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedSparseGraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedSparseGraph.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedSparseGraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedSparseGraph.java
index c8d66ae40..36d737ea2 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedSparseGraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedSparseGraph.java
@@ -9,7 +9,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,6 +19,7 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.UndirectedGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedSparseMultigraph.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedSparseMultigraph.java
similarity index 98%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedSparseMultigraph.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedSparseMultigraph.java
index 3c14de501..394502c6f 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/UndirectedSparseMultigraph.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/UndirectedSparseMultigraph.java
@@ -20,7 +20,7 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,6 +32,8 @@
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.MultiGraph;
+import edu.uci.ics.jung.graph.UndirectedGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/util/TestGraphs.java b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/util/TestGraphs.java
similarity index 96%
rename from jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/util/TestGraphs.java
rename to jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/util/TestGraphs.java
index e9fb5eda2..5574979a1 100644
--- a/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/util/TestGraphs.java
+++ b/jung-graph-impl/src/main/java/edu/uci/ics/jung/graph/impl/util/TestGraphs.java
@@ -9,7 +9,7 @@
  * Created on Jul 2, 2003
  *  
  */
-package edu.uci.ics.jung.graph.util;
+package edu.uci.ics.jung.graph.impl.util;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -17,11 +17,12 @@
 import java.util.Set;
 
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.util.EdgeType;
 
 /**
  * Provides generators for several different test graphs.
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/DirectedSparseMultigraphTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/DirectedSparseMultigraphTest.java
similarity index 70%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/DirectedSparseMultigraphTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/DirectedSparseMultigraphTest.java
index a497e5ba5..ae1ed70ae 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/DirectedSparseMultigraphTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/DirectedSparseMultigraphTest.java
@@ -1,6 +1,7 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.AbstractDirectedSparseMultigraphTest;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 
 public class DirectedSparseMultigraphTest 
 	extends AbstractDirectedSparseMultigraphTest {
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/HypergraphTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/HypergraphTest.java
similarity index 71%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/HypergraphTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/HypergraphTest.java
index 0f2bd6dae..beddcbf02 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/HypergraphTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/HypergraphTest.java
@@ -9,13 +9,27 @@
  * "license.txt" or
  * https://github.com/jrtom/jung/blob/master/LICENSE for a description.
  */
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.AbstractHypergraphTest;
+import edu.uci.ics.jung.graph.Hypergraph;
+import edu.uci.ics.jung.graph.impl.DirectedOrderedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.OrderedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SetHypergraph;
+import edu.uci.ics.jung.graph.impl.SortedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseGraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedOrderedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
+
 
 public class HypergraphTest extends AbstractHypergraphTest
 {
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/OrderedSparseMultigraphTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/OrderedSparseMultigraphTest.java
similarity index 86%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/OrderedSparseMultigraphTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/OrderedSparseMultigraphTest.java
index 0e878cfa4..dde921dd3 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/OrderedSparseMultigraphTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/OrderedSparseMultigraphTest.java
@@ -1,10 +1,11 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import edu.uci.ics.jung.graph.OrderedSparseMultigraph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.AbstractOrderedSparseMultigraphTest;
+import edu.uci.ics.jung.graph.impl.OrderedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 
 public class OrderedSparseMultigraphTest extends AbstractOrderedSparseMultigraphTest {
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SortedSparseMultigraphTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SortedSparseMultigraphTest.java
similarity index 87%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SortedSparseMultigraphTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SortedSparseMultigraphTest.java
index eb5d7dce4..b746c02d7 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SortedSparseMultigraphTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SortedSparseMultigraphTest.java
@@ -1,8 +1,12 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import edu.uci.ics.jung.graph.AbstractSortedSparseMultigraphTest;
+import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.SortedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 
 public class SortedSparseMultigraphTest 
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseGraphAddRemoveAddEdgeTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseGraphAddRemoveAddEdgeTest.java
similarity index 86%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseGraphAddRemoveAddEdgeTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseGraphAddRemoveAddEdgeTest.java
index 09c287c01..0816b9e98 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseGraphAddRemoveAddEdgeTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseGraphAddRemoveAddEdgeTest.java
@@ -1,5 +1,6 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
+import edu.uci.ics.jung.graph.impl.SparseGraph;
 import junit.framework.TestCase;
 
 
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseMultigraphTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseMultigraphTest.java
similarity index 90%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseMultigraphTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseMultigraphTest.java
index aa2d21dc6..0b22f3617 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseMultigraphTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseMultigraphTest.java
@@ -1,9 +1,10 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.AbstractSparseMultigraphTest;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 
 public class SparseMultigraphTest 
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseTreeTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseTreeTest.java
similarity index 70%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseTreeTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseTreeTest.java
index 08601f007..ddc841495 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/SparseTreeTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/SparseTreeTest.java
@@ -1,7 +1,11 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
 import com.google.common.base.Supplier;
 
+import edu.uci.ics.jung.graph.AbstractSparseTreeTest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+
 public class SparseTreeTest extends AbstractSparseTreeTest {
 
 	/* (non-Javadoc)
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/TreeUtilsTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/TreeUtilsTest.java
similarity index 74%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/TreeUtilsTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/TreeUtilsTest.java
index b0bbc8f07..16e99f63b 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/TreeUtilsTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/TreeUtilsTest.java
@@ -1,6 +1,7 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
-import edu.uci.ics.jung.graph.DelegateTree;
+import edu.uci.ics.jung.graph.AbstractTreeUtilsTest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
 
 public class TreeUtilsTest extends AbstractTreeUtilsTest {
 	
diff --git a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/UndirectedSparseMultigraphTest.java b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/UndirectedSparseMultigraphTest.java
similarity index 70%
rename from jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/UndirectedSparseMultigraphTest.java
rename to jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/UndirectedSparseMultigraphTest.java
index 3f986a24d..56d39b613 100644
--- a/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/UndirectedSparseMultigraphTest.java
+++ b/jung-graph-impl/src/test/java/edu/uci/ics/jung/graph/impl/UndirectedSparseMultigraphTest.java
@@ -1,6 +1,7 @@
-package edu.uci.ics.jung.graph;
+package edu.uci.ics.jung.graph.impl;
 
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.AbstractUndirectedSparseMultigraphTest;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 
 public class UndirectedSparseMultigraphTest 
 	extends AbstractUndirectedSparseMultigraphTest {
diff --git a/jung-io/pom.xml b/jung-io/pom.xml
index 78fb706e4..f0bc3d456 100644
--- a/jung-io/pom.xml
+++ b/jung-io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sf.jung</groupId>
     <artifactId>jung-parent</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>jung-io</artifactId>
   <name>JUNG - I/O Support</name>
diff --git a/jung-io/src/test/java/edu/uci/ics/jung/io/PajekNetIOTest.java b/jung-io/src/test/java/edu/uci/ics/jung/io/PajekNetIOTest.java
index bff2e6760..f35420837 100644
--- a/jung-io/src/test/java/edu/uci/ics/jung/io/PajekNetIOTest.java
+++ b/jung-io/src/test/java/edu/uci/ics/jung/io/PajekNetIOTest.java
@@ -31,11 +31,11 @@
 import com.google.common.base.Supplier;
 
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
 import edu.uci.ics.jung.graph.UndirectedGraph;
-import edu.uci.ics.jung.graph.UndirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.graph.util.Pair;
 
diff --git a/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLReader.java b/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLReader.java
index 0d6869557..6a9b01579 100644
--- a/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLReader.java
+++ b/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLReader.java
@@ -30,11 +30,11 @@
 import com.google.common.base.Supplier;
 import com.google.common.collect.BiMap;
 
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.Hypergraph;
-import edu.uci.ics.jung.graph.SetHypergraph;
-import edu.uci.ics.jung.graph.UndirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SetHypergraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;
 
 /**
  * @author Scott White
diff --git a/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLWriter.java b/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLWriter.java
index a9feca2e9..a1720f492 100644
--- a/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLWriter.java
+++ b/jung-io/src/test/java/edu/uci/ics/jung/io/TestGraphMLWriter.java
@@ -31,10 +31,10 @@
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 
 public class TestGraphMLWriter extends TestCase
 {
diff --git a/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/DummyGraphObjectBase.java b/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/DummyGraphObjectBase.java
index 2df652d1d..7914b95cf 100644
--- a/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/DummyGraphObjectBase.java
+++ b/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/DummyGraphObjectBase.java
@@ -3,8 +3,8 @@
 import com.google.common.base.Function;
 
 import edu.uci.ics.jung.graph.Hypergraph;
-import edu.uci.ics.jung.graph.SetHypergraph;
-import edu.uci.ics.jung.graph.UndirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.SetHypergraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;
 
 public class DummyGraphObjectBase {
     
diff --git a/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/TestGraphMLReader2.java b/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/TestGraphMLReader2.java
index be92be1d0..bea69e560 100644
--- a/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/TestGraphMLReader2.java
+++ b/jung-io/src/test/java/edu/uci/ics/jung/io/graphml/TestGraphMLReader2.java
@@ -28,7 +28,7 @@
 import com.google.common.base.Function;
 
 import edu.uci.ics.jung.graph.Hypergraph;
-import edu.uci.ics.jung.graph.SetHypergraph;
+import edu.uci.ics.jung.graph.impl.SetHypergraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.io.GraphIOException;
 
diff --git a/jung-samples/pom.xml b/jung-samples/pom.xml
index 9df661ac8..8323aa912 100644
--- a/jung-samples/pom.xml
+++ b/jung-samples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sf.jung</groupId>
     <artifactId>jung-parent</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>jung-samples</artifactId>
   <name>JUNG - Samples</name>
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/AddNodeDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/AddNodeDemo.java
index 6afaf49f0..2697631c9 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/AddNodeDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/AddNodeDemo.java
@@ -30,11 +30,11 @@
 import edu.uci.ics.jung.algorithms.layout.FRLayout2;
 import edu.uci.ics.jung.algorithms.layout.SpringLayout;
 import edu.uci.ics.jung.algorithms.layout.util.Relaxer;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.ObservableGraph;
 import edu.uci.ics.jung.graph.event.GraphEvent;
 import edu.uci.ics.jung.graph.event.GraphEventListener;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.Graphs;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
 import edu.uci.ics.jung.visualization.control.DefaultModalGraphMouse;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnimatingAddNodeDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnimatingAddNodeDemo.java
index 25e57311d..2b89d4c06 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnimatingAddNodeDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnimatingAddNodeDemo.java
@@ -34,11 +34,11 @@
 import edu.uci.ics.jung.algorithms.layout.util.Relaxer;
 import edu.uci.ics.jung.algorithms.layout.util.VisRunner;
 import edu.uci.ics.jung.algorithms.util.IterativeContext;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.ObservableGraph;
 import edu.uci.ics.jung.graph.event.GraphEvent;
 import edu.uci.ics.jung.graph.event.GraphEventListener;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.Graphs;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
 import edu.uci.ics.jung.visualization.control.DefaultModalGraphMouse;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnnotationsDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnnotationsDemo.java
index 7ee4ef4a5..d776b17e5 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnnotationsDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/AnnotationsDemo.java
@@ -26,7 +26,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.RenderContext;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/BalloonLayoutDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/BalloonLayoutDemo.java
index 738c506b5..8e6eeaf80 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/BalloonLayoutDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/BalloonLayoutDemo.java
@@ -39,12 +39,12 @@
 
 import edu.uci.ics.jung.algorithms.layout.BalloonLayout;
 import edu.uci.ics.jung.algorithms.layout.TreeLayout;
-import edu.uci.ics.jung.graph.DelegateForest;
-import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Forest;
 import edu.uci.ics.jung.graph.Tree;
+import edu.uci.ics.jung.graph.impl.DelegateForest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
 import edu.uci.ics.jung.visualization.VisualizationServer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ClusteringDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ClusteringDemo.java
index 445b366a2..43536c02a 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ClusteringDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ClusteringDemo.java
@@ -57,7 +57,7 @@
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.algorithms.layout.util.Relaxer;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.io.PajekNetReader;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/DemoLensVertexImageShaperDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/DemoLensVertexImageShaperDemo.java
index e83247838..385cd29e1 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/DemoLensVertexImageShaperDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/DemoLensVertexImageShaperDemo.java
@@ -41,7 +41,7 @@
 import com.google.common.base.Functions;
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.LayeredIcon;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/DrawnIconVertexDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/DrawnIconVertexDemo.java
index 0d3cad2e3..fc3ebba78 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/DrawnIconVertexDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/DrawnIconVertexDemo.java
@@ -24,8 +24,8 @@
 import com.google.common.base.Function;
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/EdgeLabelDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/EdgeLabelDemo.java
index e0010de10..5825bf5ec 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/EdgeLabelDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/EdgeLabelDemo.java
@@ -41,7 +41,7 @@
 import edu.uci.ics.jung.algorithms.layout.CircleLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphEditorDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphEditorDemo.java
index cab6dadcb..f0894712d 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphEditorDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphEditorDemo.java
@@ -39,7 +39,7 @@
 import edu.uci.ics.jung.algorithms.layout.AbstractLayout;
 import edu.uci.ics.jung.algorithms.layout.StaticLayout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
 import edu.uci.ics.jung.visualization.annotations.AnnotationControls;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphFromGraphMLDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphFromGraphMLDemo.java
index 8cf837e8c..1ddcb2714 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphFromGraphMLDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphFromGraphMLDemo.java
@@ -29,7 +29,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.io.GraphMLReader;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphZoomScrollPaneDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphZoomScrollPaneDemo.java
index 31a59a718..022243ef3 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphZoomScrollPaneDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/GraphZoomScrollPaneDemo.java
@@ -29,7 +29,7 @@
 import com.google.common.base.Functions;
 
 import edu.uci.ics.jung.algorithms.layout.KKLayout;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ImageEdgeLabelDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ImageEdgeLabelDemo.java
index 94bc963a5..0d3752b60 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ImageEdgeLabelDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ImageEdgeLabelDemo.java
@@ -28,7 +28,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/InternalFrameSatelliteViewDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/InternalFrameSatelliteViewDemo.java
index dbccacd99..45eaaa9e3 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/InternalFrameSatelliteViewDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/InternalFrameSatelliteViewDemo.java
@@ -27,7 +27,7 @@
 import edu.uci.ics.jung.algorithms.layout.ISOMLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
 import edu.uci.ics.jung.visualization.control.CrossoverScalingControl;
 import edu.uci.ics.jung.visualization.control.DefaultModalGraphMouse;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/L2RTreeLayoutDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/L2RTreeLayoutDemo.java
index d32ea8b79..aae4bf4c8 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/L2RTreeLayoutDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/L2RTreeLayoutDemo.java
@@ -43,12 +43,12 @@
 import edu.uci.ics.jung.algorithms.layout.PolarPoint;
 import edu.uci.ics.jung.algorithms.layout.RadialTreeLayout;
 import edu.uci.ics.jung.algorithms.layout.TreeLayout;
-import edu.uci.ics.jung.graph.DelegateForest;
-import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Forest;
 import edu.uci.ics.jung.graph.Tree;
+import edu.uci.ics.jung.graph.impl.DelegateForest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
 import edu.uci.ics.jung.visualization.VisualizationServer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensDemo.java
index e331ca7b0..b495bdf4c 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensDemo.java
@@ -50,8 +50,8 @@
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.algorithms.layout.StaticLayout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseGraph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.SparseGraph;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensVertexImageShaperDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensVertexImageShaperDemo.java
index d411791bc..216a38029 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensVertexImageShaperDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/LensVertexImageShaperDemo.java
@@ -41,7 +41,7 @@
 import com.google.common.base.Functions;
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.LayeredIcon;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/MinimumSpanningTreeDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/MinimumSpanningTreeDemo.java
index cc2a9e6e7..4105d8373 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/MinimumSpanningTreeDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/MinimumSpanningTreeDemo.java
@@ -31,11 +31,11 @@
 import edu.uci.ics.jung.algorithms.layout.StaticLayout;
 import edu.uci.ics.jung.algorithms.layout.TreeLayout;
 import edu.uci.ics.jung.algorithms.shortestpath.MinimumSpanningForest2;
-import edu.uci.ics.jung.graph.DelegateForest;
-import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.Forest;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.DelegateForest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/MultiViewDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/MultiViewDemo.java
index 95d2883b2..d2090f5bf 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/MultiViewDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/MultiViewDemo.java
@@ -35,7 +35,7 @@
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.algorithms.layout.GraphElementAccessor;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/PersistentLayoutDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/PersistentLayoutDemo.java
index 579257a9d..8c41dcfe4 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/PersistentLayoutDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/PersistentLayoutDemo.java
@@ -19,7 +19,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
 import edu.uci.ics.jung.visualization.control.CrossoverScalingControl;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/PluggableRendererDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/PluggableRendererDemo.java
index 6224eefce..ee7ee8d53 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/PluggableRendererDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/PluggableRendererDemo.java
@@ -61,7 +61,7 @@
 import edu.uci.ics.jung.algorithms.scoring.util.VertexScoreTransformer;
 import edu.uci.ics.jung.algorithms.util.SelfLoopEdgePredicate;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.graph.util.Context;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/RadialTreeLensDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/RadialTreeLensDemo.java
index c727bf7b1..cd85ef58b 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/RadialTreeLensDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/RadialTreeLensDemo.java
@@ -40,12 +40,12 @@
 import edu.uci.ics.jung.algorithms.layout.PolarPoint;
 import edu.uci.ics.jung.algorithms.layout.RadialTreeLayout;
 import edu.uci.ics.jung.algorithms.layout.TreeLayout;
-import edu.uci.ics.jung.graph.DelegateForest;
-import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Forest;
 import edu.uci.ics.jung.graph.Tree;
+import edu.uci.ics.jung.graph.impl.DelegateForest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/SatelliteViewDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/SatelliteViewDemo.java
index 8c03c2d9e..26eee9cb7 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/SatelliteViewDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/SatelliteViewDemo.java
@@ -36,7 +36,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShortestPathDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShortestPathDemo.java
index d1754774f..5b60ee22a 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShortestPathDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShortestPathDemo.java
@@ -33,7 +33,7 @@
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.algorithms.shortestpath.BFSDistanceLabeler;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
 import edu.uci.ics.jung.graph.util.Pair;
 import edu.uci.ics.jung.visualization.Layer;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShowLayouts.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShowLayouts.java
index 4bb44d4b8..10790b821 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShowLayouts.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/ShowLayouts.java
@@ -39,8 +39,8 @@
 import edu.uci.ics.jung.algorithms.layout.SpringLayout2;
 import edu.uci.ics.jung.algorithms.layout.util.Relaxer;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.SparseMultigraph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.SparseMultigraph;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
 import edu.uci.ics.jung.visualization.control.CrossoverScalingControl;
 import edu.uci.ics.jung.visualization.control.DefaultModalGraphMouse;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/SimpleGraphDraw.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/SimpleGraphDraw.java
index a7550d60b..f9c9654e8 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/SimpleGraphDraw.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/SimpleGraphDraw.java
@@ -15,7 +15,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.UndirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.UndirectedSparseGraph;
 import edu.uci.ics.jung.io.PajekNetReader;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
 
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/SubLayoutDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/SubLayoutDemo.java
index a34377568..dc39dc285 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/SubLayoutDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/SubLayoutDemo.java
@@ -43,8 +43,8 @@
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.algorithms.layout.SpringLayout;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.graph.util.Pair;
-import edu.uci.ics.jung.graph.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeCollapseDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeCollapseDemo.java
index 5651ffd6a..06e2d083b 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeCollapseDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeCollapseDemo.java
@@ -45,13 +45,13 @@
 import edu.uci.ics.jung.algorithms.layout.PolarPoint;
 import edu.uci.ics.jung.algorithms.layout.RadialTreeLayout;
 import edu.uci.ics.jung.algorithms.layout.TreeLayout;
-import edu.uci.ics.jung.graph.DelegateForest;
-import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Forest;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.Tree;
+import edu.uci.ics.jung.graph.impl.DelegateForest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
 import edu.uci.ics.jung.visualization.VisualizationServer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeLayoutDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeLayoutDemo.java
index 83a914c3e..c70c3f7a0 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeLayoutDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/TreeLayoutDemo.java
@@ -42,12 +42,12 @@
 import edu.uci.ics.jung.algorithms.layout.PolarPoint;
 import edu.uci.ics.jung.algorithms.layout.RadialTreeLayout;
 import edu.uci.ics.jung.algorithms.layout.TreeLayout;
-import edu.uci.ics.jung.graph.DelegateForest;
-import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.DirectedGraph;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Forest;
 import edu.uci.ics.jung.graph.Tree;
+import edu.uci.ics.jung.graph.impl.DelegateForest;
+import edu.uci.ics.jung.graph.impl.DelegateTree;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
 import edu.uci.ics.jung.visualization.VisualizationServer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/TwoModelDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/TwoModelDemo.java
index 3c7a3b97d..38847e318 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/TwoModelDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/TwoModelDemo.java
@@ -26,7 +26,7 @@
 import edu.uci.ics.jung.algorithms.layout.ISOMLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/UnicodeLabelDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/UnicodeLabelDemo.java
index 7102ef15f..40148a6f1 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/UnicodeLabelDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/UnicodeLabelDemo.java
@@ -29,8 +29,8 @@
 import com.google.common.base.Functions;
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationViewer;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemo.java
index fbe82505e..766bacc4b 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemo.java
@@ -36,8 +36,8 @@
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.graph.util.Pair;
-import edu.uci.ics.jung.graph.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemoWithLayouts.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemoWithLayouts.java
index e942ad779..b4ba23828 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemoWithLayouts.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexCollapseDemoWithLayouts.java
@@ -47,8 +47,8 @@
 import edu.uci.ics.jung.algorithms.layout.SpringLayout;
 import edu.uci.ics.jung.algorithms.layout.SpringLayout2;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.graph.util.Pair;
-import edu.uci.ics.jung.graph.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexImageShaperDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexImageShaperDemo.java
index b1285b5be..e63a64c03 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexImageShaperDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexImageShaperDemo.java
@@ -42,7 +42,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.algorithms.layout.util.RandomLocationTransformer;
-import edu.uci.ics.jung.graph.DirectedSparseGraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.LayeredIcon;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java
index d12f2f5ed..603d8d104 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelAsShapeDemo.java
@@ -32,7 +32,7 @@
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelPositionDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelPositionDemo.java
index 9444615e0..de4d6c534 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelPositionDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VertexLabelPositionDemo.java
@@ -28,7 +28,7 @@
 
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
 import edu.uci.ics.jung.graph.Graph;
-import edu.uci.ics.jung.graph.util.TestGraphs;
+import edu.uci.ics.jung.graph.impl.util.TestGraphs;
 import edu.uci.ics.jung.visualization.DefaultVisualizationModel;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.VisualizationModel;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VisualizationImageServerDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VisualizationImageServerDemo.java
index 0e0b5fa0b..4c5d59b5a 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/VisualizationImageServerDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/VisualizationImageServerDemo.java
@@ -23,7 +23,7 @@
 import com.google.common.base.Functions;
 
 import edu.uci.ics.jung.algorithms.layout.KKLayout;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.VisualizationImageServer;
 import edu.uci.ics.jung.visualization.decorators.ToStringLabeller;
diff --git a/jung-samples/src/main/java/edu/uci/ics/jung/samples/WorldMapGraphDemo.java b/jung-samples/src/main/java/edu/uci/ics/jung/samples/WorldMapGraphDemo.java
index 285321f4a..5c2a7f146 100644
--- a/jung-samples/src/main/java/edu/uci/ics/jung/samples/WorldMapGraphDemo.java
+++ b/jung-samples/src/main/java/edu/uci/ics/jung/samples/WorldMapGraphDemo.java
@@ -34,8 +34,8 @@
 
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.algorithms.layout.StaticLayout;
-import edu.uci.ics.jung.graph.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.Graph;
+import edu.uci.ics.jung.graph.impl.DirectedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;
 import edu.uci.ics.jung.visualization.GraphZoomScrollPane;
 import edu.uci.ics.jung.visualization.Layer;
diff --git a/jung-visualization/pom.xml b/jung-visualization/pom.xml
index 82b75a72e..c15730f79 100644
--- a/jung-visualization/pom.xml
+++ b/jung-visualization/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>net.sf.jung</groupId>
     <artifactId>jung-parent</artifactId>
-    <version>2.2-SNAPSHOT</version>
+    <version>2.2.0</version>
   </parent>
   <artifactId>jung-visualization</artifactId>
   <name>JUNG - Visualization Support</name>
diff --git a/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/BasicVisualizationServerTest.java b/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/BasicVisualizationServerTest.java
index 1e5963dc2..a8f30ddb3 100644
--- a/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/BasicVisualizationServerTest.java
+++ b/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/BasicVisualizationServerTest.java
@@ -1,7 +1,7 @@
 package edu.uci.ics.jung.visualization;
 
 import edu.uci.ics.jung.algorithms.layout.CircleLayout;
-import edu.uci.ics.jung.graph.SparseGraph;
+import edu.uci.ics.jung.graph.impl.SparseGraph;
 import edu.uci.ics.jung.visualization.picking.PickedState;
 import junit.framework.TestCase;
 
diff --git a/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/control/TestCrossoverScalingControl.java b/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/control/TestCrossoverScalingControl.java
index 84669bf54..1bf2ba30a 100644
--- a/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/control/TestCrossoverScalingControl.java
+++ b/jung-visualization/src/test/java/edu/uci/ics/jung/visualization/control/TestCrossoverScalingControl.java
@@ -4,7 +4,7 @@
 
 import junit.framework.TestCase;
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
-import edu.uci.ics.jung.graph.SparseGraph;
+import edu.uci.ics.jung.graph.impl.SparseGraph;
 import edu.uci.ics.jung.visualization.BasicVisualizationServer;
 import edu.uci.ics.jung.visualization.VisualizationServer;
 
diff --git a/pom.xml b/pom.xml
index 2a34ad9e0..651209603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.sf.jung</groupId>
   <artifactId>jung-parent</artifactId>
-  <version>2.2-SNAPSHOT</version>
+  <version>2.2.0</version>
   <packaging>pom</packaging>
   <name>JUNG (parent metadata project)</name>
   <url>http://jrtom.github.io/jung/</url>