From 0690f16681c684c355268a7284669180abe23126 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 11 Jan 2011 11:28:07 -0800 Subject: [PATCH] sandbox-apis --- sandbox-apis/{sandbox => }/cloudwatch/pom.xml | 0 .../main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java | 0 .../src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java | 0 .../java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java | 0 .../java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java | 0 .../org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java | 0 .../src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java | 0 .../src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java | 0 .../main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java | 0 .../main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java | 0 .../cloudwatch/xml/GetMetricStatisticsResponseHandler.java | 0 .../java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java | 0 .../java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java | 0 .../cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java | 0 .../cloudwatch/src/test/resources/get_metric_statistics.xml | 0 .../{sandbox => }/cloudwatch/src/test/resources/log4j.xml | 0 sandbox-apis/{sandbox => }/deltacloud/README.txt | 0 sandbox-apis/{sandbox => }/deltacloud/pom.xml | 0 .../main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java | 0 .../src/main/java/org/jclouds/deltacloud/DeltacloudClient.java | 0 .../java/org/jclouds/deltacloud/DeltacloudContextBuilder.java | 0 .../java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java | 0 .../java/org/jclouds/deltacloud/collections/HardwareProfiles.java | 0 .../src/main/java/org/jclouds/deltacloud/collections/Images.java | 0 .../java/org/jclouds/deltacloud/collections/InstanceStates.java | 0 .../main/java/org/jclouds/deltacloud/collections/Instances.java | 0 .../src/main/java/org/jclouds/deltacloud/collections/Realms.java | 0 .../org/jclouds/deltacloud/config/DeltacloudRestClientModule.java | 0 .../src/main/java/org/jclouds/deltacloud/domain/Architecture.java | 0 .../java/org/jclouds/deltacloud/domain/DeltacloudCollection.java | 0 .../java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java | 0 .../src/main/java/org/jclouds/deltacloud/domain/Feature.java | 0 .../java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java | 0 .../java/org/jclouds/deltacloud/domain/HardwareParameter.java | 0 .../main/java/org/jclouds/deltacloud/domain/HardwareProfile.java | 0 .../main/java/org/jclouds/deltacloud/domain/HardwareProperty.java | 0 .../src/main/java/org/jclouds/deltacloud/domain/Image.java | 0 .../src/main/java/org/jclouds/deltacloud/domain/Instance.java | 0 .../main/java/org/jclouds/deltacloud/domain/InstanceAction.java | 0 .../main/java/org/jclouds/deltacloud/domain/InstanceState.java | 0 .../jclouds/deltacloud/domain/ParameterizedHardwareProperty.java | 0 .../java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java | 0 .../src/main/java/org/jclouds/deltacloud/domain/Realm.java | 0 .../src/main/java/org/jclouds/deltacloud/domain/RealmState.java | 0 .../src/main/java/org/jclouds/deltacloud/domain/Transition.java | 0 .../org/jclouds/deltacloud/domain/TransitionAutomatically.java | 0 .../java/org/jclouds/deltacloud/domain/TransitionOnAction.java | 0 .../jclouds/deltacloud/domain/internal/BaseHardwareProperty.java | 0 .../deltacloud/functions/ReturnVoidOnRedirectedDelete.java | 0 .../org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java | 0 .../deltacloud/handlers/DeltacloudRedirectionRetryHandler.java | 0 .../org/jclouds/deltacloud/options/CreateInstanceOptions.java | 0 .../org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java | 0 .../org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java | 0 .../java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java | 0 .../java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java | 0 .../java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java | 0 .../src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java | 0 .../src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java | 0 .../src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java | 0 .../java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java | 0 .../main/java/org/jclouds/deltacloud/xml/InstancesHandler.java | 0 .../src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java | 0 .../src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java | 0 .../java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java | 0 .../java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java | 0 .../org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java | 0 .../jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java | 0 .../handlers/DeltacloudRedirectionRetryHandlerTest.java | 0 .../org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java | 0 .../jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java | 0 .../org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java | 0 .../org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java | 0 .../test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java | 0 .../test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java | 0 .../test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java | 0 .../org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java | 0 .../java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java | 0 .../test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java | 0 .../test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java | 0 .../{sandbox => }/deltacloud/src/test/resources/links.xml | 0 .../{sandbox => }/deltacloud/src/test/resources/log4j.xml | 0 .../deltacloud/src/test/resources/test_get_hardware_profile.xml | 0 .../deltacloud/src/test/resources/test_get_image.xml | 0 .../deltacloud/src/test/resources/test_get_instance.xml | 0 .../deltacloud/src/test/resources/test_get_realm.xml | 0 .../deltacloud/src/test/resources/test_get_states.xml | 0 .../deltacloud/src/test/resources/test_list_hardware_profiles.xml | 0 .../deltacloud/src/test/resources/test_list_images.xml | 0 .../deltacloud/src/test/resources/test_list_instances.xml | 0 .../deltacloud/src/test/resources/test_list_realms.xml | 0 sandbox-apis/{sandbox => }/libvirt/README.txt | 0 sandbox-apis/{sandbox => }/libvirt/TODO | 0 sandbox-apis/{sandbox => }/libvirt/pom.xml | 0 .../libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java | 0 .../libvirt/src/main/java/org/jclouds/libvirt/Image.java | 0 .../src/main/java/org/jclouds/libvirt/LibvirtConstants.java | 0 .../java/org/jclouds/libvirt/compute/LibvirtComputeService.java | 0 .../libvirt/compute/LibvirtComputeServiceContextBuilder.java | 0 .../jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java | 0 .../org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java | 0 .../compute/domain/LibvirtComputeServiceContextModule.java | 0 .../jclouds/libvirt/compute/functions/DatacenterToLocation.java | 0 .../org/jclouds/libvirt/compute/functions/DomainToHardware.java | 0 .../jclouds/libvirt/compute/functions/DomainToNodeMetadata.java | 0 .../jclouds/libvirt/compute/functions/LibvirtImageToImage.java | 0 .../jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java | 0 .../libvirt/compute/strategy/LibvirtComputeServiceAdapter.java | 0 .../libvirt/compute/LibvirtComputeServiceContextBuilderTest.java | 0 .../jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java | 0 .../org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java | 0 sandbox-apis/{sandbox => }/libvirt/src/test/resources/log4j.xml | 0 sandbox-apis/{sandbox => }/nova-ec2/pom.xml | 0 .../main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java | 0 .../jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java | 0 .../jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java | 0 sandbox-apis/{sandbox => }/pcs/README.txt | 0 sandbox-apis/{sandbox => }/pcs/pom.xml | 0 .../pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java | 0 .../pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java | 0 .../src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java | 0 .../src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java | 0 .../jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java | 0 .../org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java | 0 .../jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java | 0 .../jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java | 0 .../org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java | 0 .../mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java | 0 .../org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java | 0 .../main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java | 0 .../java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java | 0 .../main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java | 0 .../main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java | 0 .../pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java | 0 .../java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java | 0 .../main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java | 0 .../java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java | 0 .../pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java | 0 .../src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java | 0 .../org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java | 0 .../org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java | 0 .../java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java | 0 .../mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java | 0 .../jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java | 0 .../mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java | 0 .../java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java | 0 .../org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java | 0 .../src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java | 0 .../java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java | 0 .../src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java | 0 .../main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java | 0 .../main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java | 0 .../src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java | 0 .../pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java | 0 .../src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java | 0 .../org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java | 0 .../mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java | 0 .../mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java | 0 .../jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java | 0 .../main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java | 0 .../main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java | 0 .../main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java | 0 .../pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java | 0 .../src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java | 0 .../src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java | 0 .../pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java | 0 .../java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java | 0 .../mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java | 0 .../jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java | 0 .../jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java | 0 .../pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java | 0 .../java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java | 0 .../java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java | 0 .../java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java | 0 .../java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java | 0 .../java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java | 0 sandbox-apis/{sandbox => }/pcs/src/test/resources/discovery.xml | 0 sandbox-apis/{sandbox => }/pcs/src/test/resources/log4j.xml | 0 .../{sandbox => }/pcs/src/test/resources/test_file_metadata.xml | 0 .../{sandbox => }/pcs/src/test/resources/test_root_container.xml | 0 sandbox-apis/{sandbox => }/simpledb/pom.xml | 0 .../src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java | 0 .../src/main/java/org/jclouds/simpledb/SimpleDBClient.java | 0 .../main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java | 0 .../main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java | 0 .../simpledb/binders/BindAttributesToIndexedFormParams.java | 0 .../org/jclouds/simpledb/config/SimpleDBRestClientModule.java | 0 .../src/main/java/org/jclouds/simpledb/domain/AttributePair.java | 0 .../src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java | 0 .../simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java | 0 .../java/org/jclouds/simpledb/domain/ListDomainsResponse.java | 0 .../java/org/jclouds/simpledb/options/ListDomainsOptions.java | 0 .../simpledb/src/main/java/org/jclouds/simpledb/package-info.java | 0 .../java/org/jclouds/simpledb/reference/SimpleDBParameters.java | 0 .../main/java/org/jclouds/simpledb/reference/package-info.java | 0 .../src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java | 0 .../java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java | 0 .../test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java | 0 .../test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java | 0 .../test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java | 0 .../java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java | 0 .../org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java | 0 .../{sandbox => }/simpledb/src/test/resources/list_domains.xml | 0 sandbox-apis/{sandbox => }/simpledb/src/test/resources/log4j.xml | 0 sandbox-apis/{sandbox => }/sqs/pom.xml | 0 .../sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java | 0 .../sqs/src/main/java/org/jclouds/sqs/SQSClient.java | 0 .../sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java | 0 .../sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java | 0 .../src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java | 0 .../sqs/src/main/java/org/jclouds/sqs/domain/Queue.java | 0 .../src/main/java/org/jclouds/sqs/functions/QueueLocation.java | 0 .../src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java | 0 .../src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java | 0 .../sqs/src/main/java/org/jclouds/sqs/package-info.java | 0 .../src/main/java/org/jclouds/sqs/reference/SQSParameters.java | 0 .../sqs/src/main/java/org/jclouds/sqs/reference/package-info.java | 0 .../main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java | 0 .../sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java | 0 .../sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java | 0 .../java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java | 0 .../sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java | 0 .../sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java | 0 .../java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java | 0 .../sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java | 0 .../sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java | 0 .../test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java | 0 .../test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java | 0 .../test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java | 0 .../java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java | 0 sandbox-apis/{sandbox => }/sqs/src/test/resources/list_queues.xml | 0 sandbox-apis/{sandbox => }/sqs/src/test/resources/log4j.xml | 0 sandbox-apis/{sandbox => }/vsphere/README.txt | 0 sandbox-apis/{sandbox => }/vsphere/TODO | 0 sandbox-apis/{sandbox => }/vsphere/pom.xml | 0 .../{sandbox => }/vsphere/src/main/java/org/jclouds/vi/Image.java | 0 .../vsphere/src/main/java/org/jclouds/vi/ViConstants.java | 0 .../src/main/java/org/jclouds/vi/compute/ViComputeService.java | 0 .../org/jclouds/vi/compute/ViComputeServiceContextBuilder.java | 0 .../java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java | 0 .../src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java | 0 .../jclouds/vi/compute/config/ViComputeServiceContextModule.java | 0 .../org/jclouds/vi/compute/functions/DatacenterToLocation.java | 0 .../java/org/jclouds/vi/compute/functions/ViImageToImage.java | 0 .../jclouds/vi/compute/functions/VirtualMachineToHardware.java | 0 .../vi/compute/functions/VirtualMachineToNodeMetadata.java | 0 .../org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java | 0 .../jclouds/vi/compute/ViComputeServiceContextBuilderTest.java | 0 .../java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java | 0 .../test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java | 0 sandbox-apis/{sandbox => }/vsphere/src/test/resources/log4j.xml | 0 251 files changed, 0 insertions(+), 0 deletions(-) rename sandbox-apis/{sandbox => }/cloudwatch/pom.xml (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/test/resources/get_metric_statistics.xml (100%) rename sandbox-apis/{sandbox => }/cloudwatch/src/test/resources/log4j.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/README.txt (100%) rename sandbox-apis/{sandbox => }/deltacloud/pom.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/links.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/log4j.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_get_hardware_profile.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_get_image.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_get_instance.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_get_realm.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_get_states.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_list_hardware_profiles.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_list_images.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_list_instances.xml (100%) rename sandbox-apis/{sandbox => }/deltacloud/src/test/resources/test_list_realms.xml (100%) rename sandbox-apis/{sandbox => }/libvirt/README.txt (100%) rename sandbox-apis/{sandbox => }/libvirt/TODO (100%) rename sandbox-apis/{sandbox => }/libvirt/pom.xml (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/Image.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java (100%) rename sandbox-apis/{sandbox => }/libvirt/src/test/resources/log4j.xml (100%) rename sandbox-apis/{sandbox => }/nova-ec2/pom.xml (100%) rename sandbox-apis/{sandbox => }/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java (100%) rename sandbox-apis/{sandbox => }/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java (100%) rename sandbox-apis/{sandbox => }/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/README.txt (100%) rename sandbox-apis/{sandbox => }/pcs/pom.xml (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/resources/discovery.xml (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/resources/log4j.xml (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/resources/test_file_metadata.xml (100%) rename sandbox-apis/{sandbox => }/pcs/src/test/resources/test_root_container.xml (100%) rename sandbox-apis/{sandbox => }/simpledb/pom.xml (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/package-info.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/simpledb/src/test/resources/list_domains.xml (100%) rename sandbox-apis/{sandbox => }/simpledb/src/test/resources/log4j.xml (100%) rename sandbox-apis/{sandbox => }/sqs/pom.xml (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/SQSClient.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/package-info.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/resources/list_queues.xml (100%) rename sandbox-apis/{sandbox => }/sqs/src/test/resources/log4j.xml (100%) rename sandbox-apis/{sandbox => }/vsphere/README.txt (100%) rename sandbox-apis/{sandbox => }/vsphere/TODO (100%) rename sandbox-apis/{sandbox => }/vsphere/pom.xml (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/Image.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/ViConstants.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java (100%) rename sandbox-apis/{sandbox => }/vsphere/src/test/resources/log4j.xml (100%) diff --git a/sandbox-apis/sandbox/cloudwatch/pom.xml b/sandbox-apis/cloudwatch/pom.xml similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/pom.xml rename to sandbox-apis/cloudwatch/pom.xml diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchAsyncClient.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchClient.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchContextBuilder.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchPropertiesBuilder.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchRestClientModule.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StandardUnit.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/functions/ISO8601Format.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/DatapointHandler.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java b/sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java rename to sandbox-apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java b/sandbox-apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java rename to sandbox-apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchAsyncClientTest.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java b/sandbox-apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java rename to sandbox-apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/CloudWatchClientLiveTest.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java b/sandbox-apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java rename to sandbox-apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerTest.java diff --git a/sandbox-apis/sandbox/cloudwatch/src/test/resources/get_metric_statistics.xml b/sandbox-apis/cloudwatch/src/test/resources/get_metric_statistics.xml similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/test/resources/get_metric_statistics.xml rename to sandbox-apis/cloudwatch/src/test/resources/get_metric_statistics.xml diff --git a/sandbox-apis/sandbox/cloudwatch/src/test/resources/log4j.xml b/sandbox-apis/cloudwatch/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/sandbox/cloudwatch/src/test/resources/log4j.xml rename to sandbox-apis/cloudwatch/src/test/resources/log4j.xml diff --git a/sandbox-apis/sandbox/deltacloud/README.txt b/sandbox-apis/deltacloud/README.txt similarity index 100% rename from sandbox-apis/sandbox/deltacloud/README.txt rename to sandbox-apis/deltacloud/README.txt diff --git a/sandbox-apis/sandbox/deltacloud/pom.xml b/sandbox-apis/deltacloud/pom.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/pom.xml rename to sandbox-apis/deltacloud/pom.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudContextBuilder.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudPropertiesBuilder.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/HardwareProfiles.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Images.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/InstanceStates.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Instances.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/collections/Realms.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/config/DeltacloudRestClientModule.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Architecture.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/DeltacloudCollection.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/EnumHardwareProperty.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Feature.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/FixedHardwareProperty.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareParameter.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProfile.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/HardwareProperty.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceAction.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/InstanceState.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/ParameterizedHardwareProperty.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RangeHardwareProperty.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/RealmState.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Transition.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionAutomatically.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/TransitionOnAction.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/internal/BaseHardwareProperty.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/functions/ReturnVoidOnRedirectedDelete.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/options/CreateInstanceOptions.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfileHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwareProfilesHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImageHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/ImagesHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstancesHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java b/sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java rename to sandbox-apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/RealmsHandler.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudAsyncClientTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/DeltacloudClientLiveTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/options/CreateInstanceOptionsTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/DeltacloudCollectionsHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfileHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/HardwareProfilesHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstancesHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java b/sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java rename to sandbox-apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/RealmsHandlerTest.java diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/links.xml b/sandbox-apis/deltacloud/src/test/resources/links.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/links.xml rename to sandbox-apis/deltacloud/src/test/resources/links.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/log4j.xml b/sandbox-apis/deltacloud/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/log4j.xml rename to sandbox-apis/deltacloud/src/test/resources/log4j.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_hardware_profile.xml b/sandbox-apis/deltacloud/src/test/resources/test_get_hardware_profile.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_hardware_profile.xml rename to sandbox-apis/deltacloud/src/test/resources/test_get_hardware_profile.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_image.xml b/sandbox-apis/deltacloud/src/test/resources/test_get_image.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_image.xml rename to sandbox-apis/deltacloud/src/test/resources/test_get_image.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_instance.xml b/sandbox-apis/deltacloud/src/test/resources/test_get_instance.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_instance.xml rename to sandbox-apis/deltacloud/src/test/resources/test_get_instance.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_realm.xml b/sandbox-apis/deltacloud/src/test/resources/test_get_realm.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_realm.xml rename to sandbox-apis/deltacloud/src/test/resources/test_get_realm.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_states.xml b/sandbox-apis/deltacloud/src/test/resources/test_get_states.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_get_states.xml rename to sandbox-apis/deltacloud/src/test/resources/test_get_states.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_hardware_profiles.xml b/sandbox-apis/deltacloud/src/test/resources/test_list_hardware_profiles.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_hardware_profiles.xml rename to sandbox-apis/deltacloud/src/test/resources/test_list_hardware_profiles.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_images.xml b/sandbox-apis/deltacloud/src/test/resources/test_list_images.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_images.xml rename to sandbox-apis/deltacloud/src/test/resources/test_list_images.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_instances.xml b/sandbox-apis/deltacloud/src/test/resources/test_list_instances.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_instances.xml rename to sandbox-apis/deltacloud/src/test/resources/test_list_instances.xml diff --git a/sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_realms.xml b/sandbox-apis/deltacloud/src/test/resources/test_list_realms.xml similarity index 100% rename from sandbox-apis/sandbox/deltacloud/src/test/resources/test_list_realms.xml rename to sandbox-apis/deltacloud/src/test/resources/test_list_realms.xml diff --git a/sandbox-apis/sandbox/libvirt/README.txt b/sandbox-apis/libvirt/README.txt similarity index 100% rename from sandbox-apis/sandbox/libvirt/README.txt rename to sandbox-apis/libvirt/README.txt diff --git a/sandbox-apis/sandbox/libvirt/TODO b/sandbox-apis/libvirt/TODO similarity index 100% rename from sandbox-apis/sandbox/libvirt/TODO rename to sandbox-apis/libvirt/TODO diff --git a/sandbox-apis/sandbox/libvirt/pom.xml b/sandbox-apis/libvirt/pom.xml similarity index 100% rename from sandbox-apis/sandbox/libvirt/pom.xml rename to sandbox-apis/libvirt/pom.xml diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/Datacenter.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Image.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/Image.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/Image.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/Image.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/LibvirtConstants.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeService.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilder.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextSpec.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/LibvirtPropertiesBuilder.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/domain/LibvirtComputeServiceContextModule.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DatacenterToLocation.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToHardware.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/DomainToNodeMetadata.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtImageToImage.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/functions/LibvirtNodeToLocation.java diff --git a/sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java b/sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java rename to sandbox-apis/libvirt/src/main/java/org/jclouds/libvirt/compute/strategy/LibvirtComputeServiceAdapter.java diff --git a/sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java b/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java rename to sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceContextBuilderTest.java diff --git a/sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java b/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java rename to sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtComputeServiceLiveTest.java diff --git a/sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java b/sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java rename to sandbox-apis/libvirt/src/test/java/org/jclouds/libvirt/compute/LibvirtExperimentLiveTest.java diff --git a/sandbox-apis/sandbox/libvirt/src/test/resources/log4j.xml b/sandbox-apis/libvirt/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/sandbox/libvirt/src/test/resources/log4j.xml rename to sandbox-apis/libvirt/src/test/resources/log4j.xml diff --git a/sandbox-apis/sandbox/nova-ec2/pom.xml b/sandbox-apis/nova-ec2/pom.xml similarity index 100% rename from sandbox-apis/sandbox/nova-ec2/pom.xml rename to sandbox-apis/nova-ec2/pom.xml diff --git a/sandbox-apis/sandbox/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java b/sandbox-apis/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java similarity index 100% rename from sandbox-apis/sandbox/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java rename to sandbox-apis/nova-ec2/src/main/java/org/jclouds/nova/ec2/NovaEC2PropertiesBuilder.java diff --git a/sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java b/sandbox-apis/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java rename to sandbox-apis/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2ComputeServiceLiveTest.java diff --git a/sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java b/sandbox-apis/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java rename to sandbox-apis/nova-ec2/src/test/java/org/jclouds/nova/ec2/compute/NovaEC2TemplateBuilderLiveTest.java diff --git a/sandbox-apis/sandbox/pcs/README.txt b/sandbox-apis/pcs/README.txt similarity index 100% rename from sandbox-apis/sandbox/pcs/README.txt rename to sandbox-apis/pcs/README.txt diff --git a/sandbox-apis/sandbox/pcs/pom.xml b/sandbox-apis/pcs/pom.xml similarity index 100% rename from sandbox-apis/sandbox/pcs/pom.xml rename to sandbox-apis/pcs/pom.xml diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSAsyncClient.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSClient.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSCloudAsyncClient.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/PCSContextBuilder.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayload.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayload.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/binders/BindPCSFileToMultipartForm.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToFileInfo.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/BlobToPCSFile.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/FileInfoToBlobMetadata.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/blobstore/functions/PCSFileToBlob.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSObjectModule.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/config/PCSRestClientModule.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerInfo.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ContainerList.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfo.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/FileInfoWithMetadata.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableFileInfo.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/MutableResourceInfo.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/PCSFile.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/ResourceInfo.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerInfoImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ContainerListImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/FileInfoWithMetadataImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableFileInfoImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/MutableResourceInfoImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/PCSFileImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/domain/internal/ResourceInfoImpl.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Contacts.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Metacontainers.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Projects.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Recyclebin.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/RootContainer.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Shares.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/Tags.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/endpoints/WebDAV.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/AddMetadataItemIntoMap.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnFalseIfContainerNotFound.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/functions/ReturnTrueIfContainerAlreadyExists.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/handlers/PCSClientErrorRetryHandler.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/options/PutBlockOptions.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHandler.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/ContainerHandler.java diff --git a/sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java rename to sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs2/xml/FileHandler.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSAsyncClientTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSClientLiveTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/PCSCloudTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/ProvidersInPropertiesTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindContainerNameToXmlPayloadTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/binders/BindFileInfoToXmlPayloadTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AddMetadataAndReturnIdTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/functions/AssembleBlobFromBlobMetadataCallTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/internal/StubPCSAsyncClient.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/options/PutBlockOptionsTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/CloudXlinkHanderTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/ContainerHandlerTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java b/sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java rename to sandbox-apis/pcs/src/test/java/org/jclouds/mezeo/pcs2/xml/FileMetadataHandlerTest.java diff --git a/sandbox-apis/sandbox/pcs/src/test/resources/discovery.xml b/sandbox-apis/pcs/src/test/resources/discovery.xml similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/resources/discovery.xml rename to sandbox-apis/pcs/src/test/resources/discovery.xml diff --git a/sandbox-apis/sandbox/pcs/src/test/resources/log4j.xml b/sandbox-apis/pcs/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/resources/log4j.xml rename to sandbox-apis/pcs/src/test/resources/log4j.xml diff --git a/sandbox-apis/sandbox/pcs/src/test/resources/test_file_metadata.xml b/sandbox-apis/pcs/src/test/resources/test_file_metadata.xml similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/resources/test_file_metadata.xml rename to sandbox-apis/pcs/src/test/resources/test_file_metadata.xml diff --git a/sandbox-apis/sandbox/pcs/src/test/resources/test_root_container.xml b/sandbox-apis/pcs/src/test/resources/test_root_container.xml similarity index 100% rename from sandbox-apis/sandbox/pcs/src/test/resources/test_root_container.xml rename to sandbox-apis/pcs/src/test/resources/test_root_container.xml diff --git a/sandbox-apis/sandbox/simpledb/pom.xml b/sandbox-apis/simpledb/pom.xml similarity index 100% rename from sandbox-apis/sandbox/simpledb/pom.xml rename to sandbox-apis/simpledb/pom.xml diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBAsyncClient.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBClient.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBContextBuilder.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/SimpleDBPropertiesBuilder.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/binders/BindAttributesToIndexedFormParams.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/config/SimpleDBRestClientModule.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/AttributePair.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/DomainMetadata.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/Item.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/domain/ListDomainsResponse.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/options/ListDomainsOptions.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/package-info.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/package-info.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/package-info.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/package-info.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/reference/SimpleDBParameters.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/reference/package-info.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ItemsHandler.java diff --git a/sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java rename to sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java diff --git a/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java b/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java rename to sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/ProvidersInPropertiesTest.java diff --git a/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java b/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java rename to sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBAsyncClientTest.java diff --git a/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java b/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java rename to sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/SimpleDBClientLiveTest.java diff --git a/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java b/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java rename to sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/options/ListDomainsOptionsTest.java diff --git a/sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java b/sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java rename to sandbox-apis/simpledb/src/test/java/org/jclouds/simpledb/xml/ListDomainsResponseHandlerTest.java diff --git a/sandbox-apis/sandbox/simpledb/src/test/resources/list_domains.xml b/sandbox-apis/simpledb/src/test/resources/list_domains.xml similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/test/resources/list_domains.xml rename to sandbox-apis/simpledb/src/test/resources/list_domains.xml diff --git a/sandbox-apis/sandbox/simpledb/src/test/resources/log4j.xml b/sandbox-apis/simpledb/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/sandbox/simpledb/src/test/resources/log4j.xml rename to sandbox-apis/simpledb/src/test/resources/log4j.xml diff --git a/sandbox-apis/sandbox/sqs/pom.xml b/sandbox-apis/sqs/pom.xml similarity index 100% rename from sandbox-apis/sandbox/sqs/pom.xml rename to sandbox-apis/sqs/pom.xml diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSAsyncClient.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSClient.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSClient.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSClient.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSContextBuilder.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/SQSPropertiesBuilder.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/config/SQSRestClientModule.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/domain/Queue.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/functions/QueueLocation.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/options/ListQueuesOptions.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/package-info.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/package-info.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/package-info.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/package-info.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/reference/SQSParameters.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/reference/package-info.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/ListQueuesResponseHandler.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/MD5Handler.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/QueueHandler.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexListQueuesResponseHandler.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexMD5Handler.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/RegexQueueHandler.java diff --git a/sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java b/sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java rename to sandbox-apis/sqs/src/main/java/org/jclouds/sqs/xml/internal/BaseRegexQueueHandler.java diff --git a/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java rename to sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSAsyncClientTest.java diff --git a/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java rename to sandbox-apis/sqs/src/test/java/org/jclouds/sqs/SQSClientLiveTest.java diff --git a/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java rename to sandbox-apis/sqs/src/test/java/org/jclouds/sqs/config/SQSRestClientModuleTest.java diff --git a/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java rename to sandbox-apis/sqs/src/test/java/org/jclouds/sqs/options/CreateQueueOptionsTest.java diff --git a/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java rename to sandbox-apis/sqs/src/test/java/org/jclouds/sqs/options/ListQueuesOptionsTest.java diff --git a/sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java b/sandbox-apis/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java rename to sandbox-apis/sqs/src/test/java/org/jclouds/sqs/xml/ListQueuesResponseHandlerTest.java diff --git a/sandbox-apis/sandbox/sqs/src/test/resources/list_queues.xml b/sandbox-apis/sqs/src/test/resources/list_queues.xml similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/resources/list_queues.xml rename to sandbox-apis/sqs/src/test/resources/list_queues.xml diff --git a/sandbox-apis/sandbox/sqs/src/test/resources/log4j.xml b/sandbox-apis/sqs/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/sandbox/sqs/src/test/resources/log4j.xml rename to sandbox-apis/sqs/src/test/resources/log4j.xml diff --git a/sandbox-apis/sandbox/vsphere/README.txt b/sandbox-apis/vsphere/README.txt similarity index 100% rename from sandbox-apis/sandbox/vsphere/README.txt rename to sandbox-apis/vsphere/README.txt diff --git a/sandbox-apis/sandbox/vsphere/TODO b/sandbox-apis/vsphere/TODO similarity index 100% rename from sandbox-apis/sandbox/vsphere/TODO rename to sandbox-apis/vsphere/TODO diff --git a/sandbox-apis/sandbox/vsphere/pom.xml b/sandbox-apis/vsphere/pom.xml similarity index 100% rename from sandbox-apis/sandbox/vsphere/pom.xml rename to sandbox-apis/vsphere/pom.xml diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/Image.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/Image.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/Image.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/Image.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/ViConstants.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/ViConstants.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/ViConstants.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/ViConstants.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeService.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextBuilder.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViComputeServiceContextSpec.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/ViPropertiesBuilder.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/config/ViComputeServiceContextModule.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/DatacenterToLocation.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/ViImageToImage.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToHardware.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/functions/VirtualMachineToNodeMetadata.java diff --git a/sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java b/sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java rename to sandbox-apis/vsphere/src/main/java/org/jclouds/vi/compute/strategy/ViComputeServiceAdapter.java diff --git a/sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java b/sandbox-apis/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java rename to sandbox-apis/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceContextBuilderTest.java diff --git a/sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java b/sandbox-apis/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java rename to sandbox-apis/vsphere/src/test/java/org/jclouds/vi/compute/ViComputeServiceLiveTest.java diff --git a/sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java b/sandbox-apis/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java rename to sandbox-apis/vsphere/src/test/java/org/jclouds/vi/compute/ViExperimentLiveTest.java diff --git a/sandbox-apis/sandbox/vsphere/src/test/resources/log4j.xml b/sandbox-apis/vsphere/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/sandbox/vsphere/src/test/resources/log4j.xml rename to sandbox-apis/vsphere/src/test/resources/log4j.xml