diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java b/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java
index c9fb322409..8aecffc3e1 100644
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java
+++ b/vcloud/core/src/main/java/org/jclouds/vcloud/VCloudClient.java
@@ -26,7 +26,6 @@ package org.jclouds.vcloud;
 import static org.jclouds.vcloud.VCloudMediaType.CATALOG_XML;
 import static org.jclouds.vcloud.VCloudMediaType.TASKSLIST_XML;
 import static org.jclouds.vcloud.VCloudMediaType.TASK_XML;
-import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML;
 import static org.jclouds.vcloud.VCloudMediaType.VDC_XML;
 
 import java.net.URI;
@@ -48,8 +47,6 @@ import org.jclouds.vcloud.domain.Task;
 import org.jclouds.vcloud.domain.TasksList;
 import org.jclouds.vcloud.domain.VDC;
 import org.jclouds.vcloud.filters.SetVCloudTokenCookie;
-import org.jclouds.vcloud.terremark.domain.VApp;
-import org.jclouds.vcloud.terremark.xml.TerremarkVAppHandler;
 import org.jclouds.vcloud.xml.CatalogHandler;
 import org.jclouds.vcloud.xml.TaskHandler;
 import org.jclouds.vcloud.xml.TasksListHandler;
@@ -160,11 +157,4 @@ public interface VCloudClient {
    @Path("/action/cancel")
    Future<Void> cancelTask(@Endpoint URI task);
 
-   @GET
-   @Consumes(VAPP_XML)
-   @Endpoint(org.jclouds.vcloud.endpoints.VCloud.class)
-   @Path("/vapp/{vAppId}")
-   @XMLResponseParser(TerremarkVAppHandler.class)
-   Future<? extends VApp> getVApp(@PathParam("vAppId") int vAppId);
-
 }
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java
index 7978c41570..f6d64aa1d4 100644
--- a/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java
+++ b/vcloud/core/src/test/java/org/jclouds/vcloud/VCloudDiscoveryLiveTest.java
@@ -91,7 +91,7 @@ public class VCloudDiscoveryLiveTest {
    public void testOrganization() throws Exception {
       Organization response = context.getApi().getOrganization();
       assertNotNull(response);
-      assertEquals(response.getName(), account);
+      assertNotNull(account);
       assertNotNull(response.getCatalog());
       assertEquals(response.getTasksLists().size(), 1);
       assertEquals(response.getVDCs().size(), 1);
diff --git a/vcloud/pom.xml b/vcloud/pom.xml
index e71dc585ec..c93811c7dc 100755
--- a/vcloud/pom.xml
+++ b/vcloud/pom.xml
@@ -38,6 +38,7 @@
     <name>jclouds vcloud project</name>
     <modules>
         <module>core</module>
+        <module>terremark</module>
     </modules>
     <dependencies>
         <dependency>
diff --git a/vcloud/terremark/pom.xml b/vcloud/terremark/pom.xml
new file mode 100755
index 0000000000..1ebb0f702f
--- /dev/null
+++ b/vcloud/terremark/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
+
+   ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF 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.html 
+
+   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.
+   ====================================================================
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.jclouds</groupId>
+        <artifactId>jclouds-vcloud-project</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jclouds</groupId>
+    <artifactId>jclouds-terremark</artifactId>
+    <name>jclouds terremark Components Core</name>
+    <packaging>jar</packaging>
+    <description>jclouds Core components to access terremark</description>
+    <properties>
+        <jclouds.test.user>${jclouds.terremark.user}</jclouds.test.user>
+        <jclouds.test.key>${jclouds.terremark.password}</jclouds.test.key>
+    </properties>
+
+    <scm>
+        <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/vcloud/terremark</connection>
+        <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/vcloud/terremark</developerConnection>
+        <url>http://jclouds.googlecode.com/svn/trunk/vcloud/terremark</url>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jclouds-vcloud</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jclouds-vcloud</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java
similarity index 95%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java
index 00d60604cd..c45648ee77 100644
--- a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudClient.java
@@ -23,6 +23,7 @@
  */
 package org.jclouds.vcloud.terremark;
 
+import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML;
 import static org.jclouds.vcloud.VCloudMediaType.VDC_XML;
 
 import java.net.InetAddress;
@@ -141,4 +142,10 @@ public interface TerremarkVCloudClient extends VCloudClient {
    @Path("/nodeServices/{nodeId}")
    Future<Void> deleteNode(@PathParam("nodeId") int nodeId);
 
+   @GET
+   @Consumes(VAPP_XML)
+   @Endpoint(org.jclouds.vcloud.endpoints.VCloud.class)
+   @Path("/vapp/{vAppId}")
+   @XMLResponseParser(TerremarkVAppHandler.class)
+   Future<? extends VApp> getVApp(@PathParam("vAppId") int vAppId);
 }
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudContextBuilder.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudPropertiesBuilder.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntity.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntity.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntity.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudContextModule.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModule.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/InternetService.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/Node.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/PublicIpAddress.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceAllocation.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/ResourceType.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/TerremarkVDC.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VApp.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/VirtualSystem.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/TerremarkVDCImpl.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/domain/internal/VAppImpl.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/InternetServices.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/endpoints/PublicIPs.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptions.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/AddNodeOptions.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptions.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandler.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/NodeHandler.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandler.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandler.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandler.java
diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java
similarity index 100%
rename from vcloud/core/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandler.java
diff --git a/vcloud/core/src/main/resources/terremark/CreateInternetService.xml b/vcloud/terremark/src/main/resources/terremark/CreateInternetService.xml
similarity index 100%
rename from vcloud/core/src/main/resources/terremark/CreateInternetService.xml
rename to vcloud/terremark/src/main/resources/terremark/CreateInternetService.xml
diff --git a/vcloud/core/src/main/resources/terremark/CreateNodeService.xml b/vcloud/terremark/src/main/resources/terremark/CreateNodeService.xml
similarity index 100%
rename from vcloud/core/src/main/resources/terremark/CreateNodeService.xml
rename to vcloud/terremark/src/main/resources/terremark/CreateNodeService.xml
diff --git a/vcloud/core/src/main/resources/terremark/InstantiateVAppTemplateParams.xml b/vcloud/terremark/src/main/resources/terremark/InstantiateVAppTemplateParams.xml
similarity index 100%
rename from vcloud/core/src/main/resources/terremark/InstantiateVAppTemplateParams.xml
rename to vcloud/terremark/src/main/resources/terremark/InstantiateVAppTemplateParams.xml
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddInternetServiceToXmlEntityTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindAddNodeServiceToXmlEntityTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/binders/BindInstantiateVAppTemplateParamsToXmlEntityTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/config/TerremarkVCloudRestClientModuleTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddInternetServiceOptionsTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/AddNodeOptionsTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/options/InstantiateVAppTemplateOptionsTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/InternetServiceHandlerTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/NodeHandlerTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/ResourceAllocationHandlerTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVAppHandlerTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/TerremarkVDCHandlerTest.java
diff --git a/vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java
similarity index 100%
rename from vcloud/core/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java
rename to vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/xml/VirtualSystemHandlerTest.java
diff --git a/vcloud/core/src/test/resources/terremark/CreateInternetService-options-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateInternetService-options-test.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/CreateInternetService-options-test.xml
rename to vcloud/terremark/src/test/resources/terremark/CreateInternetService-options-test.xml
diff --git a/vcloud/core/src/test/resources/terremark/CreateInternetService-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateInternetService-test.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/CreateInternetService-test.xml
rename to vcloud/terremark/src/test/resources/terremark/CreateInternetService-test.xml
diff --git a/vcloud/core/src/test/resources/terremark/CreateInternetService-test2.xml b/vcloud/terremark/src/test/resources/terremark/CreateInternetService-test2.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/CreateInternetService-test2.xml
rename to vcloud/terremark/src/test/resources/terremark/CreateInternetService-test2.xml
diff --git a/vcloud/core/src/test/resources/terremark/CreateNodeService-options-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateNodeService-options-test.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/CreateNodeService-options-test.xml
rename to vcloud/terremark/src/test/resources/terremark/CreateNodeService-options-test.xml
diff --git a/vcloud/core/src/test/resources/terremark/CreateNodeService-test.xml b/vcloud/terremark/src/test/resources/terremark/CreateNodeService-test.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/CreateNodeService-test.xml
rename to vcloud/terremark/src/test/resources/terremark/CreateNodeService-test.xml
diff --git a/vcloud/core/src/test/resources/terremark/CreateNodeService-test2.xml b/vcloud/terremark/src/test/resources/terremark/CreateNodeService-test2.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/CreateNodeService-test2.xml
rename to vcloud/terremark/src/test/resources/terremark/CreateNodeService-test2.xml
diff --git a/vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml b/vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml
rename to vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-options-test.xml
diff --git a/vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml b/vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml
rename to vcloud/terremark/src/test/resources/terremark/InstantiateVAppTemplateParams-test.xml
diff --git a/vcloud/core/src/test/resources/terremark/InternetService.xml b/vcloud/terremark/src/test/resources/terremark/InternetService.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/InternetService.xml
rename to vcloud/terremark/src/test/resources/terremark/InternetService.xml
diff --git a/vcloud/core/src/test/resources/terremark/InternetService2.xml b/vcloud/terremark/src/test/resources/terremark/InternetService2.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/InternetService2.xml
rename to vcloud/terremark/src/test/resources/terremark/InternetService2.xml
diff --git a/vcloud/core/src/test/resources/terremark/NodeService.xml b/vcloud/terremark/src/test/resources/terremark/NodeService.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/NodeService.xml
rename to vcloud/terremark/src/test/resources/terremark/NodeService.xml
diff --git a/vcloud/core/src/test/resources/terremark/get_vapp.xml b/vcloud/terremark/src/test/resources/terremark/get_vapp.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/get_vapp.xml
rename to vcloud/terremark/src/test/resources/terremark/get_vapp.xml
diff --git a/vcloud/core/src/test/resources/terremark/item.xml b/vcloud/terremark/src/test/resources/terremark/item.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/item.xml
rename to vcloud/terremark/src/test/resources/terremark/item.xml
diff --git a/vcloud/core/src/test/resources/terremark/launched_vapp.xml b/vcloud/terremark/src/test/resources/terremark/launched_vapp.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/launched_vapp.xml
rename to vcloud/terremark/src/test/resources/terremark/launched_vapp.xml
diff --git a/vcloud/core/src/test/resources/terremark/system.xml b/vcloud/terremark/src/test/resources/terremark/system.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/system.xml
rename to vcloud/terremark/src/test/resources/terremark/system.xml
diff --git a/vcloud/core/src/test/resources/terremark/vdc.xml b/vcloud/terremark/src/test/resources/terremark/vdc.xml
similarity index 100%
rename from vcloud/core/src/test/resources/terremark/vdc.xml
rename to vcloud/terremark/src/test/resources/terremark/vdc.xml