From 31c75e7874d3031e5e23e2a1901b55ec605579f9 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 14 Nov 2011 19:29:45 +0200 Subject: [PATCH] move cloudstack out of sandbox --- {sandbox-apis => apis}/cloudstack/pom.xml | 0 .../main/java/org/jclouds/cloudstack/CloudStackAsyncClient.java | 0 .../src/main/java/org/jclouds/cloudstack/CloudStackClient.java | 0 .../java/org/jclouds/cloudstack/CloudStackContextBuilder.java | 0 .../java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java | 0 .../BindAccountSecurityGroupPairsToIndexedQueryParams.java | 0 .../cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java | 0 .../cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java | 0 .../binders/BindSnapshotPolicyScheduleToQueryParam.java | 0 .../cloudstack/binders/BindTemplateMetadataToQueryParams.java | 0 .../compute/config/CloudStackComputeServiceContextModule.java | 0 .../cloudstack/compute/functions/ServiceOfferingToHardware.java | 0 .../jclouds/cloudstack/compute/functions/TemplateToImage.java | 0 .../cloudstack/compute/functions/TemplateToOperatingSystem.java | 0 .../compute/functions/VirtualMachineToNodeMetadata.java | 0 .../org/jclouds/cloudstack/compute/functions/ZoneToLocation.java | 0 .../cloudstack/compute/options/CloudStackTemplateOptions.java | 0 .../compute/strategy/CloudStackComputeServiceAdapter.java | 0 .../org/jclouds/cloudstack/config/CloudStackParserModule.java | 0 .../jclouds/cloudstack/config/CloudStackRestClientModule.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/Account.java | 0 .../java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java | 0 .../main/java/org/jclouds/cloudstack/domain/AsyncJobError.java | 0 .../main/java/org/jclouds/cloudstack/domain/Capabilities.java | 0 .../main/java/org/jclouds/cloudstack/domain/DiskOffering.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/Event.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java | 0 .../java/org/jclouds/cloudstack/domain/IPForwardingRule.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/ISO.java | 0 .../main/java/org/jclouds/cloudstack/domain/ISOExtraction.java | 0 .../main/java/org/jclouds/cloudstack/domain/ISOPermissions.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/IngressRule.java | 0 .../java/org/jclouds/cloudstack/domain/LoadBalancerRule.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/NIC.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/Network.java | 0 .../main/java/org/jclouds/cloudstack/domain/NetworkOffering.java | 0 .../main/java/org/jclouds/cloudstack/domain/NetworkService.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/NetworkType.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/OSType.java | 0 .../java/org/jclouds/cloudstack/domain/PermissionOperation.java | 0 .../java/org/jclouds/cloudstack/domain/PortForwardingRule.java | 0 .../main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java | 0 .../main/java/org/jclouds/cloudstack/domain/ResourceLimit.java | 0 .../main/java/org/jclouds/cloudstack/domain/SecurityGroup.java | 0 .../main/java/org/jclouds/cloudstack/domain/ServiceOffering.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/Snapshot.java | 0 .../main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java | 0 .../org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/StorageType.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/Template.java | 0 .../main/java/org/jclouds/cloudstack/domain/TemplateFilter.java | 0 .../java/org/jclouds/cloudstack/domain/TemplateMetadata.java | 0 .../java/org/jclouds/cloudstack/domain/TemplatePermission.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/TrafficType.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/User.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/VMGroup.java | 0 .../main/java/org/jclouds/cloudstack/domain/VirtualMachine.java | 0 .../src/main/java/org/jclouds/cloudstack/domain/Zone.java | 0 .../java/org/jclouds/cloudstack/features/AccountAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/AccountClient.java | 0 .../java/org/jclouds/cloudstack/features/AddressAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/AddressClient.java | 0 .../org/jclouds/cloudstack/features/AsyncJobAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/AsyncJobClient.java | 0 .../jclouds/cloudstack/features/ConfigurationAsyncClient.java | 0 .../org/jclouds/cloudstack/features/ConfigurationClient.java | 0 .../java/org/jclouds/cloudstack/features/EventAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/EventClient.java | 0 .../org/jclouds/cloudstack/features/FirewallAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/FirewallClient.java | 0 .../java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/GuestOSClient.java | 0 .../org/jclouds/cloudstack/features/HypervisorAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/HypervisorClient.java | 0 .../java/org/jclouds/cloudstack/features/ISOAsyncClient.java | 0 .../src/main/java/org/jclouds/cloudstack/features/ISOClient.java | 0 .../java/org/jclouds/cloudstack/features/LimitAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/LimitClient.java | 0 .../org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/LoadBalancerClient.java | 0 .../java/org/jclouds/cloudstack/features/NATAsyncClient.java | 0 .../src/main/java/org/jclouds/cloudstack/features/NATClient.java | 0 .../java/org/jclouds/cloudstack/features/NetworkAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/NetworkClient.java | 0 .../org/jclouds/cloudstack/features/OfferingAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/OfferingClient.java | 0 .../org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/SSHKeyPairClient.java | 0 .../jclouds/cloudstack/features/SecurityGroupAsyncClient.java | 0 .../org/jclouds/cloudstack/features/SecurityGroupClient.java | 0 .../org/jclouds/cloudstack/features/SnapshotAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/SnapshotClient.java | 0 .../org/jclouds/cloudstack/features/TemplateAsyncClient.java | 0 .../java/org/jclouds/cloudstack/features/TemplateClient.java | 0 .../java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/VMGroupClient.java | 0 .../jclouds/cloudstack/features/VirtualMachineAsyncClient.java | 0 .../org/jclouds/cloudstack/features/VirtualMachineClient.java | 0 .../java/org/jclouds/cloudstack/features/ZoneAsyncClient.java | 0 .../main/java/org/jclouds/cloudstack/features/ZoneClient.java | 0 .../main/java/org/jclouds/cloudstack/filters/QuerySigner.java | 0 .../cloudstack/functions/ParseAsyncJobFromHttpResponse.java | 0 .../cloudstack/functions/ParseAsyncJobsFromHttpResponse.java | 0 .../cloudstack/functions/ParseEventTypesFromHttpResponse.java | 0 .../cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java | 0 .../cloudstack/functions/ParseIdToNameFromHttpResponse.java | 0 .../jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java | 0 .../org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java | 0 .../ReturnVoidOnNotFoundOr404OrUnableToFindAccountOwner.java | 0 .../cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java | 0 .../cloudstack/functions/StaticNATVirtualMachineInNetwork.java | 0 .../org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java | 0 .../org/jclouds/cloudstack/options/AccountInDomainOptions.java | 0 .../jclouds/cloudstack/options/AssociateIPAddressOptions.java | 0 .../cloudstack/options/CreateIPForwardingRuleOptions.java | 0 .../org/jclouds/cloudstack/options/CreateNetworkOptions.java | 0 .../org/jclouds/cloudstack/options/CreateSnapshotOptions.java | 0 .../org/jclouds/cloudstack/options/CreateTemplateOptions.java | 0 .../org/jclouds/cloudstack/options/CreateVMGroupOptions.java | 0 .../java/org/jclouds/cloudstack/options/DeleteISOOptions.java | 0 .../org/jclouds/cloudstack/options/DeleteTemplateOptions.java | 0 .../jclouds/cloudstack/options/DeployVirtualMachineOptions.java | 0 .../java/org/jclouds/cloudstack/options/ExtractISOOptions.java | 0 .../org/jclouds/cloudstack/options/ExtractTemplateOptions.java | 0 .../java/org/jclouds/cloudstack/options/ListAccountsOptions.java | 0 .../org/jclouds/cloudstack/options/ListAsyncJobsOptions.java | 0 .../org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java | 0 .../java/org/jclouds/cloudstack/options/ListEventsOptions.java | 0 .../jclouds/cloudstack/options/ListIPForwardingRulesOptions.java | 0 .../java/org/jclouds/cloudstack/options/ListISOsOptions.java | 0 .../jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java | 0 .../jclouds/cloudstack/options/ListNetworkOfferingsOptions.java | 0 .../java/org/jclouds/cloudstack/options/ListNetworksOptions.java | 0 .../java/org/jclouds/cloudstack/options/ListOSTypesOptions.java | 0 .../cloudstack/options/ListPortForwardingRulesOptions.java | 0 .../jclouds/cloudstack/options/ListPublicIPAddressesOptions.java | 0 .../jclouds/cloudstack/options/ListResourceLimitsOptions.java | 0 .../org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java | 0 .../jclouds/cloudstack/options/ListSecurityGroupsOptions.java | 0 .../jclouds/cloudstack/options/ListServiceOfferingsOptions.java | 0 .../jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java | 0 .../org/jclouds/cloudstack/options/ListSnapshotsOptions.java | 0 .../org/jclouds/cloudstack/options/ListTemplatesOptions.java | 0 .../java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java | 0 .../jclouds/cloudstack/options/ListVirtualMachinesOptions.java | 0 .../java/org/jclouds/cloudstack/options/ListZonesOptions.java | 0 .../java/org/jclouds/cloudstack/options/RegisterISOOptions.java | 0 .../org/jclouds/cloudstack/options/RegisterTemplateOptions.java | 0 .../java/org/jclouds/cloudstack/options/UpdateISOOptions.java | 0 .../jclouds/cloudstack/options/UpdateISOPermissionsOptions.java | 0 .../org/jclouds/cloudstack/options/UpdateTemplateOptions.java | 0 .../cloudstack/options/UpdateTemplatePermissionsOptions.java | 0 .../org/jclouds/cloudstack/options/UpdateVMGroupOptions.java | 0 .../jclouds/cloudstack/predicates/CorrectHypervisorForZone.java | 0 .../main/java/org/jclouds/cloudstack/predicates/JobComplete.java | 0 .../jclouds/cloudstack/predicates/LoadBalancerRuleActive.java | 0 .../jclouds/cloudstack/predicates/NetworkOfferingPredicates.java | 0 .../org/jclouds/cloudstack/predicates/NetworkPredicates.java | 0 .../java/org/jclouds/cloudstack/predicates/OSCategoryIn.java | 0 .../jclouds/cloudstack/predicates/PublicIPAddressPredicates.java | 0 .../org/jclouds/cloudstack/predicates/TemplatePredicates.java | 0 .../java/org/jclouds/cloudstack/predicates/UserPredicates.java | 0 .../jclouds/cloudstack/predicates/VirtualMachineDestroyed.java | 0 .../org/jclouds/cloudstack/predicates/VirtualMachineRunning.java | 0 .../java/org/jclouds/cloudstack/predicates/ZonePredicates.java | 0 .../java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java | 0 .../org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java | 0 .../org/jclouds/cloudstack/util/SnapshotPolicySchedules.java | 0 .../java/org/jclouds/cloudstack/CloudStackAsyncClientTest.java | 0 .../java/org/jclouds/cloudstack/CloudStackClientLiveTest.java | 0 .../compute/CloudStackComputeServiceAdapterLiveTest.java | 0 .../cloudstack/compute/CloudStackComputeServiceLiveTest.java | 0 .../jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java | 0 .../compute/functions/ServiceOfferingToHardwareTest.java | 0 .../cloudstack/compute/functions/TemplateToImageTest.java | 0 .../compute/functions/TemplateToOperatingSystemTest.java | 0 .../compute/functions/VirtualMachineToNodeMetadataTest.java | 0 .../jclouds/cloudstack/compute/functions/ZoneToLocationTest.java | 0 .../compute/options/CloudStackTemplateOptionsTest.java | 0 .../org/jclouds/cloudstack/features/AccountAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/AccountClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/AddressAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/AddressClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/AsyncJobAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java | 0 .../cloudstack/features/BaseCloudStackAsyncClientTest.java | 0 .../cloudstack/features/BaseCloudStackClientLiveTest.java | 0 .../cloudstack/features/ConfigurationAsyncClientTest.java | 0 .../jclouds/cloudstack/features/ConfigurationClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/EventAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/EventClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/FirewallAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/FirewallClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/GuestOSAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/GuestOSClientLiveTest.java | 0 .../jclouds/cloudstack/features/HypervisorAsyncClientTest.java | 0 .../jclouds/cloudstack/features/HypervisorClientLiveTest.java | 0 .../java/org/jclouds/cloudstack/features/ISOAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/LimitAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/LimitClientLiveTest.java | 0 .../jclouds/cloudstack/features/LoadBalancerAsyncClientTest.java | 0 .../jclouds/cloudstack/features/LoadBalancerClientLiveTest.java | 0 .../java/org/jclouds/cloudstack/features/NATAsyncClientTest.java | 0 .../java/org/jclouds/cloudstack/features/NATClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/NetworkAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/NetworkClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/OfferingAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/OfferingClientLiveTest.java | 0 .../jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java | 0 .../jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java | 0 .../cloudstack/features/SecurityGroupAsyncClientTest.java | 0 .../jclouds/cloudstack/features/SecurityGroupClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/TemplateAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/TemplateClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java | 0 .../org/jclouds/cloudstack/features/VMGroupClientLiveTest.java | 0 .../cloudstack/features/VirtualMachineAsyncClientTest.java | 0 .../cloudstack/features/VirtualMachineClientLiveTest.java | 0 .../org/jclouds/cloudstack/features/ZoneAsyncClientTest.java | 0 .../java/org/jclouds/cloudstack/features/ZoneClientLiveTest.java | 0 .../java/org/jclouds/cloudstack/filters/QuerySignerTest.java | 0 .../cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java | 0 .../cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java | 0 .../functions/ReuseOrAssociateNewPublicIPAddressTest.java | 0 .../functions/StaticNATVirtualMachineInNetworkLiveTest.java | 0 .../jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java | 0 .../cloudstack/options/AssociateIPAddressOptionsTest.java | 0 .../cloudstack/options/CreateIPForwardingRuleOptionsTest.java | 0 .../org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java | 0 .../org/jclouds/cloudstack/options/ListAccountsOptionsTest.java | 0 .../org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java | 0 .../jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java | 0 .../cloudstack/options/ListIPForwardingRulesOptionsTest.java | 0 .../cloudstack/options/ListLoadBalancerRulesOptionsTest.java | 0 .../cloudstack/options/ListNetworkOfferingsOptionsTest.java | 0 .../org/jclouds/cloudstack/options/ListNetworksOptionsTest.java | 0 .../org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java | 0 .../cloudstack/options/ListPortForwardingRulesOptionsTest.java | 0 .../cloudstack/options/ListPublicIPAddressesOptionsTest.java | 0 .../cloudstack/options/ListSecurityGroupsOptionsTest.java | 0 .../cloudstack/options/ListServiceOfferingsOptionsTest.java | 0 .../org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java | 0 .../jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java | 0 .../org/jclouds/cloudstack/options/ListZonesOptionsTest.java | 0 .../org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java | 0 .../org/jclouds/cloudstack/parse/ListAccountsResponseTest.java | 0 .../jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java | 0 .../jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java | 0 .../jclouds/cloudstack/parse/ListHypervisorsResponseTest.java | 0 .../cloudstack/parse/ListIPForwardingRulesResponseTest.java | 0 .../cloudstack/parse/ListNetworkOfferingsResponseTest.java | 0 .../org/jclouds/cloudstack/parse/ListNetworksResponseTest.java | 0 .../jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java | 0 .../org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java | 0 .../cloudstack/parse/ListPortForwardingRulesResponseTest.java | 0 .../cloudstack/parse/ListPublicIPAddressesResponseTest.java | 0 .../jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java | 0 .../jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java | 0 .../cloudstack/parse/ListServiceOfferingsResponseTest.java | 0 .../org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java | 0 .../cloudstack/parse/ListVirtualMachinesResponseTest.java | 0 .../java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java | 0 .../org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java | 0 .../cloudstack/predicates/PublicIPAddressPredicatesTest.java | 0 .../cloudstack/src/test/resources/createkeypairresponse.json | 0 .../cloudstack/src/test/resources/deletenetworkresponse.json | 0 .../cloudstack/src/test/resources/listaccountsresponse.json | 0 .../cloudstack/src/test/resources/listasyncjobsresponse.json | 0 .../cloudstack/src/test/resources/listcapabilitiesresponse.json | 0 .../cloudstack/src/test/resources/listdiskofferingsresponse.json | 0 .../cloudstack/src/test/resources/listeventtypesresponse.json | 0 .../cloudstack/src/test/resources/listhypervisorsresponse.json | 0 .../src/test/resources/listipforwardingrulesresponse.json | 0 .../src/test/resources/listnetworkofferingsresponse.json | 0 .../cloudstack/src/test/resources/listnetworksresponse.json | 0 .../cloudstack/src/test/resources/listoscategoriesresponse.json | 0 .../cloudstack/src/test/resources/listostypesresponse.json | 0 .../src/test/resources/listportforwardingrulesresponse.json | 0 .../src/test/resources/listpublicipaddressesresponse.json | 0 .../src/test/resources/listresourcelimitsresponse.json | 0 .../src/test/resources/listsecuritygroupsresponse.json | 0 .../src/test/resources/listserviceofferingsresponse.json | 0 .../cloudstack/src/test/resources/listsshkeypairsresponse.json | 0 .../cloudstack/src/test/resources/listtemplatesresponse.json | 0 .../src/test/resources/listvirtualmachinesresponse.json | 0 .../cloudstack/src/test/resources/listzonesresponse.json | 0 {sandbox-apis => apis}/cloudstack/src/test/resources/log4j.xml | 0 .../test/resources/queryasyncjobresultresponse-ipaddress.json | 0 .../resources/queryasyncjobresultresponse-ipforwardingrule.json | 0 apis/pom.xml | 1 + 294 files changed, 1 insertion(+) rename {sandbox-apis => apis}/cloudstack/pom.xml (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackContextBuilder.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StorageType.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReturnVoidOnNotFoundOr404OrUnableToFindAccountOwner.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java (100%) rename {sandbox-apis => apis}/cloudstack/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneAsyncClientTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/createkeypairresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/deletenetworkresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listaccountsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listasyncjobsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listcapabilitiesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listdiskofferingsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listeventtypesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listhypervisorsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listipforwardingrulesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listnetworkofferingsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listnetworksresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listoscategoriesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listostypesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listportforwardingrulesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listpublicipaddressesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listresourcelimitsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listsecuritygroupsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listserviceofferingsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listsshkeypairsresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listtemplatesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listvirtualmachinesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/listzonesresponse.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/log4j.xml (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/queryasyncjobresultresponse-ipaddress.json (100%) rename {sandbox-apis => apis}/cloudstack/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json (100%) diff --git a/sandbox-apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml similarity index 100% rename from sandbox-apis/cloudstack/pom.xml rename to apis/cloudstack/pom.xml diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackContextBuilder.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackContextBuilder.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackContextBuilder.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackContextBuilder.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindAccountSecurityGroupPairsToIndexedQueryParams.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindCIDRsToCommaDelimitedQueryParam.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardware.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToImage.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystem.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/ZoneToLocation.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackParserModule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackRestClientModule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ExtractMode.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkType.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PermissionOperation.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StorageType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StorageType.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StorageType.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StorageType.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateFilter.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TrafficType.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponse.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponse.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameEntryFromHttpResponse.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseIdToNameFromHttpResponse.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseNamesFromHttpResponse.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReturnVoidOnNotFoundOr404OrUnableToFindAccountOwner.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReturnVoidOnNotFoundOr404OrUnableToFindAccountOwner.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReturnVoidOnNotFoundOr404OrUnableToFindAccountOwner.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReturnVoidOnNotFoundOr404OrUnableToFindAccountOwner.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddress.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetwork.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AccountInDomainOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateSnapshotOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAccountsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAsyncJobsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListOSTypesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotPoliciesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListZonesOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/CorrectHypervisorForZone.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/JobComplete.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/LoadBalancerRuleActive.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkOfferingPredicates.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/OSCategoryIn.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicates.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/TemplatePredicates.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/UserPredicates.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyed.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineRunning.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/ZonePredicates.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/GetCurrentUser.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/NetworksForCurrentUser.java diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java similarity index 100% rename from sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java rename to apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/SnapshotPolicySchedules.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/CloudStackClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ServiceOfferingToHardwareTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToImageTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/TemplateToOperatingSystemTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/ZoneToLocationTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AddressClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ConfigurationClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/HypervisorClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/OfferingClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SecurityGroupClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SnapshotAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneAsyncClientTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneAsyncClientTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneAsyncClientTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobsFromHttpResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/StaticNATVirtualMachineInNetworkLiveTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AssociateIPAddressOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateIPForwardingRuleOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateNetworkOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAccountsOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAsyncJobsOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListDiskOfferingsOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworkOfferingsOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListNetworksOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListOSTypesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListServiceOfferingsOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListTemplatesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVirtualMachesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListZonesOptionsTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListCapabilitiesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDiskOfferingsResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHypervisorsResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworkOfferingsResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSCategoriesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListOSTypesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPublicIPAddressesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSecurityGroupsResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListServiceOfferingsResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVirtualMachinesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListZonesResponseTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java similarity index 100% rename from sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java rename to apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/PublicIPAddressPredicatesTest.java diff --git a/sandbox-apis/cloudstack/src/test/resources/createkeypairresponse.json b/apis/cloudstack/src/test/resources/createkeypairresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/createkeypairresponse.json rename to apis/cloudstack/src/test/resources/createkeypairresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/deletenetworkresponse.json b/apis/cloudstack/src/test/resources/deletenetworkresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/deletenetworkresponse.json rename to apis/cloudstack/src/test/resources/deletenetworkresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listaccountsresponse.json b/apis/cloudstack/src/test/resources/listaccountsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listaccountsresponse.json rename to apis/cloudstack/src/test/resources/listaccountsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listasyncjobsresponse.json b/apis/cloudstack/src/test/resources/listasyncjobsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listasyncjobsresponse.json rename to apis/cloudstack/src/test/resources/listasyncjobsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listcapabilitiesresponse.json b/apis/cloudstack/src/test/resources/listcapabilitiesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listcapabilitiesresponse.json rename to apis/cloudstack/src/test/resources/listcapabilitiesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listdiskofferingsresponse.json b/apis/cloudstack/src/test/resources/listdiskofferingsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listdiskofferingsresponse.json rename to apis/cloudstack/src/test/resources/listdiskofferingsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listeventtypesresponse.json b/apis/cloudstack/src/test/resources/listeventtypesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listeventtypesresponse.json rename to apis/cloudstack/src/test/resources/listeventtypesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listhypervisorsresponse.json b/apis/cloudstack/src/test/resources/listhypervisorsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listhypervisorsresponse.json rename to apis/cloudstack/src/test/resources/listhypervisorsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json b/apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json rename to apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listnetworkofferingsresponse.json b/apis/cloudstack/src/test/resources/listnetworkofferingsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listnetworkofferingsresponse.json rename to apis/cloudstack/src/test/resources/listnetworkofferingsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listnetworksresponse.json b/apis/cloudstack/src/test/resources/listnetworksresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listnetworksresponse.json rename to apis/cloudstack/src/test/resources/listnetworksresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listoscategoriesresponse.json b/apis/cloudstack/src/test/resources/listoscategoriesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listoscategoriesresponse.json rename to apis/cloudstack/src/test/resources/listoscategoriesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listostypesresponse.json b/apis/cloudstack/src/test/resources/listostypesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listostypesresponse.json rename to apis/cloudstack/src/test/resources/listostypesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json b/apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json rename to apis/cloudstack/src/test/resources/listportforwardingrulesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json b/apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json rename to apis/cloudstack/src/test/resources/listpublicipaddressesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listresourcelimitsresponse.json b/apis/cloudstack/src/test/resources/listresourcelimitsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listresourcelimitsresponse.json rename to apis/cloudstack/src/test/resources/listresourcelimitsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json b/apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json rename to apis/cloudstack/src/test/resources/listsecuritygroupsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listserviceofferingsresponse.json b/apis/cloudstack/src/test/resources/listserviceofferingsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listserviceofferingsresponse.json rename to apis/cloudstack/src/test/resources/listserviceofferingsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listsshkeypairsresponse.json b/apis/cloudstack/src/test/resources/listsshkeypairsresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listsshkeypairsresponse.json rename to apis/cloudstack/src/test/resources/listsshkeypairsresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listtemplatesresponse.json b/apis/cloudstack/src/test/resources/listtemplatesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listtemplatesresponse.json rename to apis/cloudstack/src/test/resources/listtemplatesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listvirtualmachinesresponse.json b/apis/cloudstack/src/test/resources/listvirtualmachinesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listvirtualmachinesresponse.json rename to apis/cloudstack/src/test/resources/listvirtualmachinesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/listzonesresponse.json b/apis/cloudstack/src/test/resources/listzonesresponse.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/listzonesresponse.json rename to apis/cloudstack/src/test/resources/listzonesresponse.json diff --git a/sandbox-apis/cloudstack/src/test/resources/log4j.xml b/apis/cloudstack/src/test/resources/log4j.xml similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/log4j.xml rename to apis/cloudstack/src/test/resources/log4j.xml diff --git a/sandbox-apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipaddress.json b/apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipaddress.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipaddress.json rename to apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipaddress.json diff --git a/sandbox-apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json b/apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json similarity index 100% rename from sandbox-apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json rename to apis/cloudstack/src/test/resources/queryasyncjobresultresponse-ipforwardingrule.json diff --git a/apis/pom.xml b/apis/pom.xml index 9b066d3917..f35c1a535e 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -49,5 +49,6 @@ nova cloudwatch cloudsigma + cloudstack