api: move and group all under command, org.apache.cloudstack.command.*

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

api/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java

@@ -16,7 +16,7 @@
 // under the License.
 package com.cloud.api.commands;
 
-import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;

api/src/com/cloud/configuration/ConfigurationService.java

@@ -20,25 +20,24 @@ import java.util.List;
 
 import javax.naming.NamingException;
 
-import org.apache.cloudstack.api.admin.ldap.command.LDAPRemoveCmd;
+import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd;
-import org.apache.cloudstack.api.admin.offering.command.*;
+import org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;
-import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd;
-import org.apache.cloudstack.api.admin.offering.command.CreateServiceOfferingCmd;
+import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;
-import org.apache.cloudstack.api.admin.vlan.command.CreateVlanIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.offering.*;
-import org.apache.cloudstack.api.admin.offering.command.CreateDiskOfferingCmd;
+import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd;
-import org.apache.cloudstack.api.admin.pod.command.DeletePodCmd;
+import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;
-import org.apache.cloudstack.api.admin.vlan.command.DeleteVlanIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
-import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
+import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd;
-import org.apache.cloudstack.api.admin.offering.command.DeleteDiskOfferingCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
-import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
-import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
+import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd;
-import org.apache.cloudstack.api.admin.ldap.command.LDAPConfigCmd;
+import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
-import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
+import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
-import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;
+import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd;
-import org.apache.cloudstack.api.admin.offering.command.UpdateDiskOfferingCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
-import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.offering.UpdateDiskOfferingCmd;
-import org.apache.cloudstack.api.admin.pod.command.UpdatePodCmd;
+import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
-import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan;

api/src/com/cloud/network/NetworkService.java

@@ -20,10 +20,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.cloudstack.api.admin.usage.command.ListTrafficTypeImplementorsCmd;
+import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;
-import org.apache.cloudstack.api.user.network.command.CreateNetworkCmd;
+import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
-import org.apache.cloudstack.api.user.network.command.ListNetworksCmd;
+import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
-import org.apache.cloudstack.api.user.network.command.RestartNetworkCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientCapacityException;

api/src/com/cloud/network/StorageNetworkService.java

@@ -19,11 +19,11 @@ package com.cloud.network;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.*;
-import org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.UpdateStorageNetworkIpRangeCmd;
-import org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.network.DeleteStorageNetworkIpRangeCmd;
-import org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd;
 import com.cloud.dc.StorageNetworkIpRange;
+import org.apache.cloudstack.api.command.admin.network.CreateStorageNetworkIpRangeCmd;
 
 public interface StorageNetworkService {
     StorageNetworkIpRange createIpRange(CreateStorageNetworkIpRangeCmd cmd) throws SQLException;

api/src/com/cloud/network/VirtualNetworkApplianceService.java

@@ -16,7 +16,7 @@
 // under the License.
 package com.cloud.network;
 
-import org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd;
+import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;

api/src/com/cloud/network/as/AutoScaleService.java

@@ -18,15 +18,12 @@ package com.cloud.network.as;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.admin.autoscale.command.CreateCounterCmd;
+import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd;
-import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScalePolicyCmd;
+import org.apache.cloudstack.api.command.user.autoscale.*;
-import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmGroupCmd;
+import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScalePolicyCmd;
-import org.apache.cloudstack.api.user.autoscale.command.CreateAutoScaleVmProfileCmd;
+import org.apache.cloudstack.api.command.user.autoscale.CreateAutoScaleVmProfileCmd;
-import org.apache.cloudstack.api.user.autoscale.command.*;
+import org.apache.cloudstack.api.command.user.autoscale.ListAutoScalePoliciesCmd;
-import org.apache.cloudstack.api.user.autoscale.command.ListAutoScalePoliciesCmd;
+import org.apache.cloudstack.api.command.user.autoscale.UpdateAutoScaleVmGroupCmd;
-import org.apache.cloudstack.api.user.autoscale.command.ListConditionsCmd;
-import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmGroupCmd;
-import org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmProfileCmd;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.exception.ResourceUnavailableException;
 

api/src/com/cloud/network/element/VirtualRouterElementService.java

@@ -18,8 +18,8 @@ package com.cloud.network.element;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd;
+import org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;
-import org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd;
+import org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;
 import com.cloud.network.VirtualRouterProvider;
 import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
 import com.cloud.utils.component.PluggableService;

api/src/com/cloud/network/firewall/FirewallService.java

@@ -19,7 +19,7 @@ package com.cloud.network.firewall;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.firewall.command.ListFirewallRulesCmd;
+import org.apache.cloudstack.api.command.user.firewall.ListFirewallRulesCmd;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.rules.FirewallRule;

api/src/com/cloud/network/firewall/NetworkACLService.java

@@ -19,7 +19,7 @@ package com.cloud.network.firewall;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.network.command.ListNetworkACLsCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworkACLsCmd;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.rules.FirewallRule;

api/src/com/cloud/network/lb/LoadBalancingRulesService.java

@@ -18,9 +18,9 @@ package com.cloud.network.lb;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.lb.command.*;
+import org.apache.cloudstack.api.command.user.loadbalancer.*;
-import org.apache.cloudstack.api.user.lb.command.CreateLBStickinessPolicyCmd;
+import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd;
-import org.apache.cloudstack.api.user.lb.command.UpdateLoadBalancerRuleCmd;
+import org.apache.cloudstack.api.command.user.loadbalancer.UpdateLoadBalancerRuleCmd;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
@@ -28,7 +28,6 @@ import com.cloud.network.rules.LoadBalancer;
 import com.cloud.network.rules.StickinessPolicy;
 import com.cloud.uservm.UserVm;
 import com.cloud.utils.Pair;
-import org.apache.cloudstack.api.user.lb.command.ListLoadBalancerRulesCmd;
 
 
 public interface LoadBalancingRulesService {

api/src/com/cloud/network/rules/RulesService.java

@@ -18,7 +18,7 @@ package com.cloud.network.rules;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.firewall.command.ListPortForwardingRulesCmd;
+import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;

api/src/com/cloud/network/security/SecurityGroupService.java

@@ -18,9 +18,8 @@ package com.cloud.network.security;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.securitygroup.command.*;
+import org.apache.cloudstack.api.command.user.securitygroup.*;
-import org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupIngressCmd;
+import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;
-import org.apache.cloudstack.api.user.securitygroup.command.CreateSecurityGroupCmd;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceInUseException;

api/src/com/cloud/network/vpn/RemoteAccessVpnService.java

@@ -18,8 +18,8 @@ package com.cloud.network.vpn;
 
 import java.util.List;
 
+import org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd;
 import org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd;
-import org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.RemoteAccessVpn;

api/src/com/cloud/resource/ResourceService.java

@@ -18,16 +18,12 @@ package com.cloud.resource;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.admin.cluster.command.AddClusterCmd;
+import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
-import org.apache.cloudstack.api.admin.cluster.command.DeleteClusterCmd;
+import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
-import org.apache.cloudstack.api.admin.host.command.AddHostCmd;
+import org.apache.cloudstack.api.command.admin.host.*;
-import org.apache.cloudstack.api.admin.host.command.AddSecondaryStorageCmd;
+import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd;
-import org.apache.cloudstack.api.admin.swift.command.AddSwiftCmd;
+import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd;
-import org.apache.cloudstack.api.admin.host.command.CancelMaintenanceCmd;
+import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd;
-import org.apache.cloudstack.api.admin.swift.command.ListSwiftsCmd;
-import org.apache.cloudstack.api.admin.host.command.PrepareForMaintenanceCmd;
-import org.apache.cloudstack.api.admin.host.command.*;
-import org.apache.cloudstack.api.admin.host.command.UpdateHostCmd;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceInUseException;
@@ -36,7 +32,7 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.org.Cluster;
 import com.cloud.storage.Swift;
 import com.cloud.utils.fsm.NoTransitionException;
-import org.apache.cloudstack.api.admin.host.command.ReconnectHostCmd;
+import org.apache.cloudstack.api.command.admin.host.ReconnectHostCmd;
 
 public interface ResourceService {
     /**

api/src/com/cloud/server/ManagementService.java

@@ -24,44 +24,44 @@ import java.util.Set;
 
 import com.cloud.alert.Alert;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.admin.cluster.command.ListClustersCmd;
+import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
-import org.apache.cloudstack.api.admin.host.command.ListHostsCmd;
+import org.apache.cloudstack.api.command.admin.host.ListHostsCmd;
-import org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd;
+import org.apache.cloudstack.api.command.admin.host.UpdateHostPasswordCmd;
-import org.apache.cloudstack.api.admin.pod.command.ListPodsByCmd;
+import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd;
-import org.apache.cloudstack.api.admin.resource.command.ListAlertsCmd;
+import org.apache.cloudstack.api.command.admin.resource.ListAlertsCmd;
-import org.apache.cloudstack.api.admin.resource.command.ListCapacityCmd;
+import org.apache.cloudstack.api.command.admin.resource.ListCapacityCmd;
-import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;
+import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd;
-import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd;
+import org.apache.cloudstack.api.command.admin.domain.UpdateDomainCmd;
-import org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;
+import org.apache.cloudstack.api.command.admin.storagepool.ListStoragePoolsCmd;
-import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;
+import org.apache.cloudstack.api.command.admin.systemvm.*;
-import org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;
+import org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd;
-import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;
+import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd;
-import org.apache.cloudstack.api.user.ssh.command.CreateSSHKeyPairCmd;
+import org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd;
-import org.apache.cloudstack.api.user.ssh.command.DeleteSSHKeyPairCmd;
+import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd;
-import org.apache.cloudstack.api.admin.systemvm.command.DestroySystemVmCmd;
+import org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd;
+import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd;
+import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
+import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;
+import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;
+import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;
 import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd;
-import org.apache.cloudstack.api.user.template.command.ListTemplatesCmd;
+import org.apache.cloudstack.api.command.user.template.UpdateTemplateCmd;
-import org.apache.cloudstack.api.user.template.command.UpdateTemplateCmd;
 import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
-import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;
+import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
-import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;
+import org.apache.cloudstack.api.command.user.event.ListEventsCmd;
-import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
+import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd;
-import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;
+import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
-import org.apache.cloudstack.api.user.iso.command.ListIsosCmd;
+import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;
-import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd;
+import org.apache.cloudstack.api.command.admin.systemvm.ListSystemVMsCmd;
-import org.apache.cloudstack.api.admin.storagepool.command.ListStoragePoolsCmd;
-import org.apache.cloudstack.api.admin.systemvm.command.ListSystemVMsCmd;
 import org.apache.cloudstack.api.user.vmgroup.command.ListVMGroupsCmd;
-import org.apache.cloudstack.api.admin.vlan.command.ListVlanIpRangesCmd;
 import org.apache.cloudstack.api.user.zone.command.ListZonesByCmd;
-import org.apache.cloudstack.api.admin.systemvm.command.RebootSystemVmCmd;
+import org.apache.cloudstack.api.command.admin.systemvm.RebootSystemVmCmd;
-import org.apache.cloudstack.api.user.ssh.command.RegisterSSHKeyPairCmd;
+import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
-import org.apache.cloudstack.api.admin.systemvm.command.StopSystemVmCmd;
+import org.apache.cloudstack.api.command.admin.systemvm.StopSystemVmCmd;
-import org.apache.cloudstack.api.admin.domain.command.UpdateDomainCmd;
+import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
-import org.apache.cloudstack.api.user.iso.command.UpdateIsoCmd;
 import org.apache.cloudstack.api.user.vmgroup.command.UpdateVMGroupCmd;
-import org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd;
+import org.apache.cloudstack.api.command.admin.systemvm.UpgradeSystemVMCmd;
-import org.apache.cloudstack.api.admin.resource.command.UploadCustomCertificateCmd;
+import org.apache.cloudstack.api.command.admin.resource.UploadCustomCertificateCmd;
 import com.cloud.api.view.vo.DomainRouterJoinVO;
 import com.cloud.api.view.vo.EventJoinVO;
 import com.cloud.async.AsyncJob;
@@ -71,7 +71,6 @@ import com.cloud.dc.DataCenter;
 import com.cloud.dc.Pod;
 import com.cloud.dc.Vlan;
 import com.cloud.domain.Domain;
-import com.cloud.event.Event;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.exception.PermissionDeniedException;

api/src/com/cloud/server/TaggedResourceService.java

@@ -19,7 +19,7 @@ package com.cloud.server;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.cloudstack.api.user.tag.command.ListTagsCmd;
+import org.apache.cloudstack.api.command.user.tag.ListTagsCmd;
 
 import com.cloud.api.view.vo.ResourceTagJoinVO;
 import com.cloud.server.ResourceTag.TaggedResourceType;

api/src/com/cloud/storage/StorageService.java

@@ -19,11 +19,11 @@ package com.cloud.storage;
 import java.net.UnknownHostException;
 import java.util.List;
 
-import org.apache.cloudstack.api.admin.storagepool.command.CancelPrimaryStorageMaintenanceCmd;
+import org.apache.cloudstack.api.command.admin.storagepool.CancelPrimaryStorageMaintenanceCmd;
-import org.apache.cloudstack.api.admin.storagepool.command.CreateStoragePoolCmd;
+import org.apache.cloudstack.api.command.admin.storagepool.CreateStoragePoolCmd;
-import org.apache.cloudstack.api.admin.storagepool.command.UpdateStoragePoolCmd;
+import org.apache.cloudstack.api.command.admin.storagepool.DeletePoolCmd;
+import org.apache.cloudstack.api.command.admin.storagepool.UpdateStoragePoolCmd;
 import org.apache.cloudstack.api.user.volume.command.CreateVolumeCmd;
-import org.apache.cloudstack.api.admin.storagepool.command.DeletePoolCmd;
 import org.apache.cloudstack.api.user.volume.command.ListVolumesCmd;
 import org.apache.cloudstack.api.user.volume.command.UploadVolumeCmd;
 import com.cloud.exception.ConcurrentOperationException;

api/src/com/cloud/storage/snapshot/SnapshotService.java

@@ -18,11 +18,11 @@ package com.cloud.storage.snapshot;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.user.snapshot.command.CreateSnapshotPolicyCmd;
+import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd;
-import org.apache.cloudstack.api.user.snapshot.command.DeleteSnapshotPoliciesCmd;
+import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;
+import org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd;
 import com.cloud.api.commands.ListRecurringSnapshotScheduleCmd;
-import org.apache.cloudstack.api.user.snapshot.command.ListSnapshotPoliciesCmd;
+import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;
-import org.apache.cloudstack.api.user.snapshot.command.ListSnapshotsCmd;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.storage.Snapshot;

api/src/com/cloud/template/TemplateService.java

@@ -19,14 +19,14 @@ package com.cloud.template;
 import java.net.URISyntaxException;
 import java.util.List;
 
-import org.apache.cloudstack.api.user.iso.command.RegisterIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
-import org.apache.cloudstack.api.user.template.command.CopyTemplateCmd;
+import org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd;
-import org.apache.cloudstack.api.user.iso.command.DeleteIsoCmd;
+import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
-import org.apache.cloudstack.api.user.template.command.DeleteTemplateCmd;
+import org.apache.cloudstack.api.command.user.template.*;
-import org.apache.cloudstack.api.user.iso.command.ExtractIsoCmd;
+import org.apache.cloudstack.api.command.user.template.CopyTemplateCmd;
-import org.apache.cloudstack.api.user.template.command.ExtractTemplateCmd;
+import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
 import com.cloud.api.commands.ListTemplateOrIsoPermissionsCmd;
-import org.apache.cloudstack.api.user.template.command.RegisterTemplateCmd;
+import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
 import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.exception.ResourceAllocationException;

api/src/com/cloud/user/AccountService.java

@@ -21,12 +21,12 @@ import java.util.Map;
 
 import com.cloud.acl.ControlledEntity;
 import com.cloud.acl.SecurityChecker.AccessType;
-import org.apache.cloudstack.api.admin.user.command.DeleteUserCmd;
+import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
-import org.apache.cloudstack.api.admin.user.command.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
-import org.apache.cloudstack.api.admin.user.command.UpdateUserCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
-import org.apache.cloudstack.api.user.account.command.ListAccountsCmd;
+import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
-import org.apache.cloudstack.api.admin.user.command.ListUsersCmd;
+import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
-import org.apache.cloudstack.api.admin.account.command.UpdateAccountCmd;
+import org.apache.cloudstack.api.command.user.account.ListAccountsCmd;
 import com.cloud.domain.Domain;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.PermissionDeniedException;

api/src/com/cloud/user/DomainService.java

@@ -18,8 +18,8 @@ package com.cloud.user;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.admin.domain.command.ListDomainChildrenCmd;
+import org.apache.cloudstack.api.command.admin.domain.ListDomainChildrenCmd;
-import org.apache.cloudstack.api.admin.domain.command.ListDomainsCmd;
+import org.apache.cloudstack.api.command.admin.domain.ListDomainsCmd;
 import com.cloud.domain.Domain;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.utils.Pair;

api/src/com/cloud/vm/UserVmService.java

@@ -21,9 +21,9 @@ import java.util.Map;
 
 import javax.naming.InsufficientResourcesException;
 
-import org.apache.cloudstack.api.admin.vm.command.AssignVMCmd;
+import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
+import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;
 import org.apache.cloudstack.api.user.volume.command.AttachVolumeCmd;
-import org.apache.cloudstack.api.user.template.command.CreateTemplateCmd;
 import org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd;
 import org.apache.cloudstack.api.user.vmgroup.command.DeleteVMGroupCmd;
 import org.apache.cloudstack.api.user.vm.command.DeployVMCmd;
@@ -31,7 +31,7 @@ import org.apache.cloudstack.api.user.vm.command.DestroyVMCmd;
 import org.apache.cloudstack.api.user.volume.command.DetachVolumeCmd;
 import org.apache.cloudstack.api.user.vm.command.ListVMsCmd;
 import org.apache.cloudstack.api.user.vm.command.RebootVMCmd;
-import org.apache.cloudstack.api.admin.vm.command.RecoverVMCmd;
+import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
 import org.apache.cloudstack.api.user.vm.command.ResetVMPasswordCmd;
 import org.apache.cloudstack.api.user.vm.command.RestoreVMCmd;
 import org.apache.cloudstack.api.user.vm.command.StartVMCmd;

api/src/org/apache/cloudstack/api/ResponseGenerator.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
 import org.apache.cloudstack.api.ApiConstants.VMDetails;
-import org.apache.cloudstack.api.user.job.command.QueryAsyncJobResultCmd;
+import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
 import com.cloud.api.response.AccountResponse;
 import com.cloud.api.response.AsyncJobResponse;
 import com.cloud.api.response.AutoScalePolicyResponse;
@@ -48,7 +48,6 @@ import com.cloud.api.response.InstanceGroupResponse;
 import com.cloud.api.response.IpForwardingRuleResponse;
 import com.cloud.api.response.LBStickinessResponse;
 import com.cloud.api.response.LDAPConfigResponse;
-import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.LoadBalancerResponse;
 import com.cloud.api.response.NetworkACLResponse;
 import com.cloud.api.response.NetworkOfferingResponse;
@@ -127,7 +126,6 @@ import com.cloud.network.rules.PortForwardingRule;
 import com.cloud.network.rules.StaticNatRule;
 import com.cloud.network.rules.StickinessPolicy;
 import com.cloud.network.security.SecurityGroup;
-import com.cloud.network.security.SecurityGroupRules;
 import com.cloud.network.security.SecurityRule;
 import com.cloud.network.vpc.PrivateGateway;
 import com.cloud.network.vpc.StaticRoute;

api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.account.command;
+package org.apache.cloudstack.api.command.admin.account;
 
 import java.util.Collection;
 import java.util.Map;

api/src/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.account.command;
+package org.apache.cloudstack.api.command.admin.account;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.account.command;
+package org.apache.cloudstack.api.command.admin.account;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.account.command;
+package org.apache.cloudstack.api.command.admin.account;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.account.command;
+package org.apache.cloudstack.api.command.admin.account;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.account.command;
+package org.apache.cloudstack.api.command.admin.account;
 
 import java.util.Collection;
 import java.util.Map;

api/src/org/apache/cloudstack/api/command/admin/autoscale/CreateCounterCmd.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.cloudstack.api.admin.autoscale.command;
+package org.apache.cloudstack.api.command.admin.autoscale;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.cloudstack.api.admin.autoscale.command;
+package org.apache.cloudstack.api.command.admin.autoscale;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.cloudstack.api.admin.cluster.command;
+package org.apache.cloudstack.api.command.admin.cluster;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.cluster.command;
+package org.apache.cloudstack.api.command.admin.cluster;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java

@@ -14,12 +14,12 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.cluster.command;
+package org.apache.cloudstack.api.command.admin.cluster;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;
+import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;

api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.cluster.command;
+package org.apache.cloudstack.api.command.admin.cluster;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.config.command;
+package org.apache.cloudstack.api.command.admin.config;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.config.command;
+package org.apache.cloudstack.api.command.admin.config;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.config.command;
+package org.apache.cloudstack.api.command.admin.config;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.config.command;
+package org.apache.cloudstack.api.command.admin.config;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.domain.command;
+package org.apache.cloudstack.api.command.admin.domain;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.domain.command;
+package org.apache.cloudstack.api.command.admin.domain;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.domain.command;
+package org.apache.cloudstack.api.command.admin.domain;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.domain.command;
+package org.apache.cloudstack.api.command.admin.domain;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.domain.command;
+package org.apache.cloudstack.api.command.admin.domain;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import java.util.List;
 

api/src/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import java.util.ArrayList;
 import java.util.EnumSet;

api/src/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import java.util.List;
 

api/src/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.host.command;
+package org.apache.cloudstack.api.command.admin.host;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPConfigCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.ldap.command;
+package org.apache.cloudstack.api.command.admin.ldap;
 
 
 import javax.naming.NamingException;

api/src/org/apache/cloudstack/api/command/admin/ldap/LDAPRemoveCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.ldap.command;
+package org.apache.cloudstack.api.command.admin.ldap;
 
 
 import org.apache.log4j.Logger;

api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.Map;
 
@@ -33,7 +33,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.host.Host;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
 import com.cloud.server.ManagementService;
-import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse;
+import org.apache.cloudstack.api.response.NetworkDeviceResponse;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.exception.CloudRuntimeException;
 

api/src/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.List;
 

api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.ArrayList;
 import java.util.Collection;

api/src/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.List;
 

api/src/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkDeviceCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +29,7 @@ import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.network.ExternalNetworkDeviceManager;
-import org.apache.cloudstack.api.admin.network.response.NetworkDeviceResponse;
+import org.apache.cloudstack.api.response.NetworkDeviceResponse;
 import com.cloud.api.response.ListResponse;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;

api/src/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.List;
 

api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import java.util.List;
 

api/src/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.network.command;
+package org.apache.cloudstack.api.command.admin.network;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.offering.command;
+package org.apache.cloudstack.api.command.admin.offering;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.offering.command;
+package org.apache.cloudstack.api.command.admin.offering;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.offering.command;
+package org.apache.cloudstack.api.command.admin.offering;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.offering.command;
+package org.apache.cloudstack.api.command.admin.offering;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.offering.command;
+package org.apache.cloudstack.api.command.admin.offering;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;

api/src/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.offering.command;
+package org.apache.cloudstack.api.command.admin.offering;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.pod.command;
+package org.apache.cloudstack.api.command.admin.pod;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.pod.command;
+package org.apache.cloudstack.api.command.admin.pod;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.pod.command;
+package org.apache.cloudstack.api.command.admin.pod;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.pod.command;
+package org.apache.cloudstack.api.command.admin.pod;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.resource.command;
+package org.apache.cloudstack.api.command.admin.resource;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.resource.command;
+package org.apache.cloudstack.api.command.admin.resource;
 
 import java.text.DecimalFormat;
 import java.util.List;

api/src/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.resource.command;
+package org.apache.cloudstack.api.command.admin.resource;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java

@@ -14,10 +14,8 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
-import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -27,19 +25,12 @@ import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
 import org.apache.cloudstack.api.IdentityMapper;
 import org.apache.cloudstack.api.Implementation;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ApiConstants.VMDetails;
 
-import com.cloud.api.response.UserVmResponse;
 import com.cloud.api.view.vo.DomainRouterJoinVO;
-import com.cloud.api.view.vo.UserVmJoinVO;
 
 import com.cloud.api.response.DomainRouterResponse;
 import com.cloud.api.response.ListResponse;
-import com.cloud.api.response.UserVmResponse;
-import com.cloud.api.view.vo.DomainRouterJoinVO;
-import com.cloud.api.view.vo.UserVmJoinVO;
 import com.cloud.async.AsyncJob;
-import com.cloud.network.router.VirtualRouter;
 import com.cloud.utils.Pair;
 
 @Implementation(description="List routers.", responseObject=DomainRouterResponse.class)

api/src/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java

@@ -14,12 +14,12 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
+import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;

api/src/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.router.command;
+package org.apache.cloudstack.api.command.admin.router;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/storagepool/CancelPrimaryStorageMaintenanceCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.storagepool.command;
+package org.apache.cloudstack.api.command.admin.storagepool;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/storagepool/CreateStoragePoolCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.storagepool.command;
+package org.apache.cloudstack.api.command.admin.storagepool;
 
 import java.net.UnknownHostException;
 import java.util.Map;

api/src/org/apache/cloudstack/api/command/admin/storagepool/DeletePoolCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.storagepool.command;
+package org.apache.cloudstack.api.command.admin.storagepool;
 
 import org.apache.log4j.Logger;
 

api/src/org/apache/cloudstack/api/command/admin/storagepool/ListStoragePoolsCmd.java

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package org.apache.cloudstack.api.admin.storagepool.command;
+package org.apache.cloudstack.api.command.admin.storagepool;
 
 import java.util.ArrayList;
 import java.util.List;