diff --git a/Readme.txt b/Readme.txt
index 3cb57c4..ececb3e 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -46,7 +46,7 @@
 <dependency>
   <groupId>org.piccolo2d</groupId>
   <artifactId>piccolo2d-core</artifactId>
-  <version>1.3</version>
+  <version>2.0</version>
 </dependency>
 
 in your pom.xml.  To include the Piccolo2D core classes and the
@@ -55,7 +55,7 @@
 <dependency>
   <groupId>org.piccolo2d</groupId>
   <artifactId>piccolo2d-extras</artifactId>
-  <version>1.3</version>
+  <version>2.0</version>
 </dependency>
 
 in your pom.xml.  To include the Piccolo2D core classes and the
@@ -64,7 +64,7 @@
 <dependency>
   <groupId>org.piccolo2d</groupId>
   <artifactId>piccolo2d-swt</artifactId>
-  <version>1.3</version>
+  <version>2.0</version>
 </dependency>
 
 in your pom.xml.  If your project does not use maven, simply include
diff --git a/core/pom.xml b/core/pom.xml
index f523b11..f9bed30 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -142,17 +142,17 @@
           </formats>
           <instrumentation>
             <ignores>
-              <ignore>edu.umd.cs.piccolo.examples.*</ignore>
-              <ignore>edu.umd.cs.piccolo.examples.pswing.*</ignore>
-              <ignore>edu.umd.cs.piccolo.examples.swt.*</ignore>
-              <ignore>edu.umd.cs.piccolo.tutorial.*</ignore>              
+              <ignore>org.piccolo2d.examples.*</ignore>
+              <ignore>org.piccolo2d.examples.pswing.*</ignore>
+              <ignore>org.piccolo2d.examples.swt.*</ignore>
+              <ignore>org.piccolo2d.tutorial.*</ignore>              
             </ignores>
             <excludes>
-              <exclude>edu/umd/cs/piccolo/examples/**</exclude>              
-              <exclude>edu/umd/cs/piccolox/**/*Test.class</exclude>
-              <exclude>edu/umd/cs/piccolo/**/*Test.class</exclude>
-              <exclude>edu/umd/cs/piccolox/**/Mock*.class</exclude>
-              <exclude>edu/umd/cs/piccolo/**/Mock*.class</exclude>
+              <exclude>org/piccolo2d/examples/**</exclude>              
+              <exclude>org/piccolo2d/**/*Test.class</exclude>
+              <exclude>org/piccolo2d/extras/**/*Test.class</exclude>
+              <exclude>org/piccolo2d/**/Mock*.class</exclude>
+              <exclude>org/piccolo2d/extras/**/Mock*.class</exclude>
             </excludes>
           </instrumentation>
         </configuration>
diff --git a/examples/examples.manifest b/examples/examples.manifest
deleted file mode 100644
index 31c08ce..0000000
--- a/examples/examples.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-Main-Class: edu.umd.cs.piccolo.examples.ExampleRunner
-Class-Path: piccolox.jar
-Created-By: Jesse Grosjean
\ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index c4898bb..2733a7e 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -61,7 +61,7 @@
         <configuration>
           <archive>
             <manifest>
-              <mainClass>edu.umd.cs.piccolo.examples.ExampleRunner</mainClass>
+              <mainClass>org.piccolo2d.examples.ExampleRunner</mainClass>
             </manifest>
           </archive>
           <descriptorRefs>
diff --git a/extras/pom.xml b/extras/pom.xml
index 2bba2c9..b19570e 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -155,13 +155,13 @@
           </formats>
           <instrumentation>
             <ignores>
-              <ignore>edu.umd.cs.piccolo.examples.*</ignore>
-              <ignore>edu.umd.cs.piccolo.examples.pswing.*</ignore>
-              <ignore>edu.umd.cs.piccolo.examples.swt.*</ignore>
-              <ignore>edu.umd.cs.piccolo.tutorial.*</ignore>
+              <ignore>org.piccolo2d.examples.*</ignore>
+              <ignore>org.piccolo2d.examples.pswing.*</ignore>
+              <ignore>org.piccolo2d.examples.swt.*</ignore>
+              <ignore>org.piccolo2d.tutorial.*</ignore>
             </ignores>
             <excludes>
-              <exclude>edu/umd/cs/piccolo/examples/**</exclude>
+              <exclude>org/piccolo2d/examples/**</exclude>
             </excludes>
           </instrumentation>
         </configuration>
diff --git a/swt-examples/pom.xml b/swt-examples/pom.xml
index a59c968..aaf8eec 100644
--- a/swt-examples/pom.xml
+++ b/swt-examples/pom.xml
@@ -61,7 +61,7 @@
         <configuration>
           <archive>
             <manifest>
-              <mainClass>edu.umd.cs.piccolox.swt.examples.SWTBasicExample</mainClass>
+              <mainClass>org.piccolo2d.extras.swt.examples.SWTBasicExample</mainClass>
             </manifest>
           </archive>
           <descriptorRefs>
diff --git a/swt/pom.xml b/swt/pom.xml
index aade6ff..16bca2e 100644
--- a/swt/pom.xml
+++ b/swt/pom.xml
@@ -155,13 +155,13 @@
           </formats>
           <instrumentation>
             <ignores>
-              <ignore>edu.umd.cs.piccolo.examples.*</ignore>
-              <ignore>edu.umd.cs.piccolo.examples.pswing.*</ignore>
-              <ignore>edu.umd.cs.piccolo.examples.swt.*</ignore>
-              <ignore>edu.umd.cs.piccolo.tutorial.*</ignore>
+              <ignore>org.piccolo2d.examples.*</ignore>
+              <ignore>org.piccolo2d.examples.pswing.*</ignore>
+              <ignore>org.piccolo2d.examples.swt.*</ignore>
+              <ignore>org.piccolo2d.tutorial.*</ignore>
             </ignores>
             <excludes>
-              <exclude>edu/umd/cs/piccolo/examples/**</exclude>
+              <exclude>org/piccolo2d/examples/**</exclude>
             </excludes>
           </instrumentation>
         </configuration>