diff --git a/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/PlatformServices.java b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/PlatformServices.java
new file mode 100644
index 0000000000..ec1f29eed6
--- /dev/null
+++ b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/PlatformServices.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.demo.paas;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * @author Andrew Phillips
+ */
+public class PlatformServices implements ServletContextListener {
+
+    @Override
+    public void contextInitialized(ServletContextEvent arg0) {
+        throw new UnsupportedOperationException("TODO Auto-generated method stub");
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent arg0) {
+        throw new UnsupportedOperationException("TODO Auto-generated method stub");
+    }
+}
diff --git a/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/taskqueue/HttpRequestTask.java b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/service/taskqueue/HttpRequestTask.java
similarity index 99%
rename from demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/taskqueue/HttpRequestTask.java
rename to demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/service/taskqueue/HttpRequestTask.java
index 2192d5116b..36c35100ed 100644
--- a/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/taskqueue/HttpRequestTask.java
+++ b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/service/taskqueue/HttpRequestTask.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.demo.tweetstore.taskqueue;
+package org.jclouds.demo.paas.service.taskqueue;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.inject.name.Names.bindProperties;
diff --git a/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/taskqueue/TaskQueue.java b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/service/taskqueue/TaskQueue.java
similarity index 98%
rename from demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/taskqueue/TaskQueue.java
rename to demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/service/taskqueue/TaskQueue.java
index 9573747596..1f6d21b749 100644
--- a/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/taskqueue/TaskQueue.java
+++ b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/paas/service/taskqueue/TaskQueue.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.demo.tweetstore.taskqueue;
+package org.jclouds.demo.paas.service.taskqueue;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
index 48976e8b49..97a5802193 100644
--- a/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
+++ b/demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
@@ -43,12 +43,12 @@ import javax.servlet.ServletContextEvent;
 
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.BlobStoreContextFactory;
+import org.jclouds.demo.paas.service.taskqueue.HttpRequestTask;
+import org.jclouds.demo.paas.service.taskqueue.TaskQueue;
+import org.jclouds.demo.paas.service.taskqueue.HttpRequestTask.Factory;
 import org.jclouds.demo.tweetstore.config.util.CredentialsCollector;
 import org.jclouds.demo.tweetstore.controller.AddTweetsController;
 import org.jclouds.demo.tweetstore.controller.StoreTweetsController;
-import org.jclouds.demo.tweetstore.taskqueue.HttpRequestTask;
-import org.jclouds.demo.tweetstore.taskqueue.TaskQueue;
-import org.jclouds.demo.tweetstore.taskqueue.HttpRequestTask.Factory;
 import org.jclouds.http.HttpRequest;
 
 import twitter4j.Twitter;