diff --git a/README.txt b/README.txt
index 944e74ec27..2f8c07f1ca 100644
--- a/README.txt
+++ b/README.txt
@@ -23,7 +23,7 @@ our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), de
                           openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,
                           greenhousedata-element-vcloud, softlayer, cloudsigma (generic),
                           cloudstack (generic), ninefold-compute, openstack-nov (keystone),
-                          hpcloud-compute
+                          hpcloud-compute, trystack-nova
 
   * note * the pom dependency org.jclouds/jclouds-allcompute gives you access to
            to all of these providers
diff --git a/allcompute/pom.xml b/allcompute/pom.xml
index c4f4cc21c9..750bae610f 100644
--- a/allcompute/pom.xml
+++ b/allcompute/pom.xml
@@ -200,5 +200,10 @@
             <artifactId>hpcloud-compute</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jclouds.provider</groupId>
+            <artifactId>trystack-nova</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/labs/pom.xml b/labs/pom.xml
index fa991fbb3b..a2dc41f3be 100644
--- a/labs/pom.xml
+++ b/labs/pom.xml
@@ -39,6 +39,5 @@
        <module>elb</module>
        <module>aws-elb</module>
        <module>savvis-symphonyvpdc</module>
-       <module>trystack-nova</module>
     </modules>
 </project>
diff --git a/providers/pom.xml b/providers/pom.xml
index c0e175d405..88c4d0c8ab 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -70,5 +70,6 @@
         <module>ninefold-compute</module>
         <module>hpcloud-compute</module>
         <module>hpcloud-objectstorage</module>
+        <module>trystack-nova</module>
     </modules>
 </project>
diff --git a/labs/trystack-nova/pom.xml b/providers/trystack-nova/pom.xml
similarity index 99%
rename from labs/trystack-nova/pom.xml
rename to providers/trystack-nova/pom.xml
index 9ffed3c0cf..c33d9e65fe 100644
--- a/labs/trystack-nova/pom.xml
+++ b/providers/trystack-nova/pom.xml
@@ -27,7 +27,7 @@
     <version>1.5.0-SNAPSHOT</version>
     <relativePath>../../project/pom.xml</relativePath>
   </parent>
-  <groupId>org.jclouds.labs</groupId>
+  <groupId>org.jclouds.provider</groupId>
   <artifactId>trystack-nova</artifactId>
   <name>jclouds TryStack.org Compute provider</name>
   <description>OpenStack Nova implementation targeted to TryStack.org</description>
diff --git a/labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java
similarity index 100%
rename from labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java
rename to providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java
diff --git a/labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaPropertiesBuilder.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaPropertiesBuilder.java
similarity index 100%
rename from labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaPropertiesBuilder.java
rename to providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaPropertiesBuilder.java
diff --git a/labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
similarity index 100%
rename from labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
rename to providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
diff --git a/labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java
similarity index 100%
rename from labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java
rename to providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java
diff --git a/labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/config/TryStackNovaServiceContextModule.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/config/TryStackNovaServiceContextModule.java
similarity index 100%
rename from labs/trystack-nova/src/main/java/org/jclouds/trystack/nova/config/TryStackNovaServiceContextModule.java
rename to providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/config/TryStackNovaServiceContextModule.java
diff --git a/labs/trystack-nova/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/trystack-nova/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
similarity index 100%
rename from labs/trystack-nova/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
rename to providers/trystack-nova/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/TryStackNovaProviderTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/TryStackNovaProviderTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/TryStackNovaProviderTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/TryStackNovaProviderTest.java
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaComputeServiceLiveTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaComputeServiceLiveTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaComputeServiceLiveTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaComputeServiceLiveTest.java
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaTemplateBuilderLiveTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaTemplateBuilderLiveTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaTemplateBuilderLiveTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/compute/TryStackNovaTemplateBuilderLiveTest.java
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaFlavorClientLiveTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaFlavorClientLiveTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaFlavorClientLiveTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaFlavorClientLiveTest.java
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaImageClientLiveTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaImageClientLiveTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaImageClientLiveTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaImageClientLiveTest.java
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaKeyPairClientLiveTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaKeyPairClientLiveTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaKeyPairClientLiveTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaKeyPairClientLiveTest.java
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaSecurityGroupClientLiveTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaSecurityGroupClientLiveTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaSecurityGroupClientLiveTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaSecurityGroupClientLiveTest.java
diff --git a/labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaServerClientLiveTest.java b/providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaServerClientLiveTest.java
similarity index 100%
rename from labs/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaServerClientLiveTest.java
rename to providers/trystack-nova/src/test/java/org/jclouds/trystack/nova/features/TryStackNovaServerClientLiveTest.java