diff --git a/core/pom.xml b/core/pom.xml
index b4d9f8f..92b3c41 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -34,16 +34,16 @@
   <parent>
     <artifactId>piccolo2d-parent</artifactId>
     <groupId>org.piccolo2d</groupId>
-    <version>3.0-beta1-rc1</version>
+    <version>3.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-core</artifactId>
   <packaging>bundle</packaging>
   <name>Piccolo2D Core</name>
   <scm>
-    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/core</connection>
-    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/core</developerConnection>
-    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/core</url>
+    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/core</connection>
+    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/core</developerConnection>
+    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/core</url>
   </scm>
   <reporting>
     <plugins>
diff --git a/examples/pom.xml b/examples/pom.xml
index 9b03911..b8df72d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,7 +34,7 @@
   <parent>
     <artifactId>piccolo2d-parent</artifactId>
     <groupId>org.piccolo2d</groupId>
-    <version>3.0-beta1-rc1</version>
+    <version>3.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-examples</artifactId>
@@ -48,9 +48,9 @@
     </dependency>
   </dependencies>
   <scm>
-    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/examples</connection>
-    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/examples</developerConnection>
-    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/examples</url>
+    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/examples</connection>
+    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/examples</developerConnection>
+    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/examples</url>
   </scm>
   <build>
     <plugins>
diff --git a/extras/pom.xml b/extras/pom.xml
index ea3b5a3..1535f0f 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -34,7 +34,7 @@
   <parent>
     <artifactId>piccolo2d-parent</artifactId>
     <groupId>org.piccolo2d</groupId>
-    <version>3.0-beta1-rc1</version>
+    <version>3.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-extras</artifactId>
@@ -48,9 +48,9 @@
     </dependency>
   </dependencies>
   <scm>
-    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/extras</connection>
-    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/extras</developerConnection>
-    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/extras</url>
+    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras</connection>
+    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/extras</developerConnection>
+    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/extras</url>
   </scm>
   <reporting>
     <plugins>
diff --git a/parent/pom.xml b/parent/pom.xml
index efca527..304df62 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,7 +38,7 @@
   </parent>
   <groupId>org.piccolo2d</groupId>
   <artifactId>piccolo2d-parent</artifactId>
-  <version>3.0-beta1-rc1</version>
+  <version>3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Piccolo2D Parent</name>
   <description>A revolutionary way to create robust, full-featured graphical applications in Java and C#, with striking visual effects such as zooming, animation and multiple representations.</description>
@@ -81,9 +81,9 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/parent</connection>
-    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/parent</developerConnection>
-    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/parent</url>
+    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/parent</connection>
+    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/parent</developerConnection>
+    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/parent</url>
   </scm>
   <organization>
     <name>Piccolo2D</name>
diff --git a/pom.xml b/pom.xml
index 0f9e965..cd3ec65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,16 +34,16 @@
   <parent>
     <artifactId>piccolo2d-parent</artifactId>
     <groupId>org.piccolo2d</groupId>
-    <version>3.0-beta1-rc1</version>
+    <version>3.0-SNAPSHOT</version>
     <relativePath>./parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-complete</artifactId>
   <packaging>pom</packaging>
   <name>Piccolo2D</name>
   <scm>
-    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1</connection>
-    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1</developerConnection>
-    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1</url>
+    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike</connection>
+    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike</developerConnection>
+    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike</url>
   </scm>
   <reporting>
     <plugins>
diff --git a/swt-examples/pom.xml b/swt-examples/pom.xml
index 6ca2f69..46a4313 100644
--- a/swt-examples/pom.xml
+++ b/swt-examples/pom.xml
@@ -34,16 +34,16 @@
   <parent>
     <artifactId>piccolo2d-parent</artifactId>
     <groupId>org.piccolo2d</groupId>
-    <version>3.0-beta1-rc1</version>
+    <version>3.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-swt-examples</artifactId>
   <packaging>bundle</packaging>
   <name>Piccolo2D SWT Examples</name>
   <scm>
-    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/swt-examples</connection>
-    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/swt-examples</developerConnection>
-    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/swt-examples</url>
+    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt-examples</connection>
+    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt-examples</developerConnection>
+    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/swt-examples</url>
   </scm>
   <dependencies>
     <dependency>
diff --git a/swt/pom.xml b/swt/pom.xml
index 9a2605c..90435cb 100644
--- a/swt/pom.xml
+++ b/swt/pom.xml
@@ -34,7 +34,7 @@
   <parent>
     <artifactId>piccolo2d-parent</artifactId>
     <groupId>org.piccolo2d</groupId>
-    <version>3.0-beta1-rc1</version>
+    <version>3.0-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>piccolo2d-swt</artifactId>
@@ -54,9 +54,9 @@
     </dependency>
   </dependencies>
   <scm>
-    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/swt</connection>
-    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/swt</developerConnection>
-    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/tags/piccolo2d-complete-3.0-beta1-rc1/swt</url>
+    <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt</connection>
+    <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/branches/3.0-spike/swt</developerConnection>
+    <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/branches/3.0-spike/swt</url>
   </scm>
   <build>
     <plugins>