@@ -32,6 +32,88 @@ openstack.common =
     quota_set = openstackclient.common.quota:SetQuota
     quota_show = openstackclient.common.quota:ShowQuota
 
+openstack.compute.v2 =
+    agent_create = openstackclient.compute.v2.agent:CreateAgent
+    agent_delete = openstackclient.compute.v2.agent:DeleteAgent
+    agent_list = openstackclient.compute.v2.agent:ListAgent
+    agent_set = openstackclient.compute.v2.agent:SetAgent
+
+    aggregate_add_host = openstackclient.compute.v2.aggregate:AddAggregateHost
+    aggregate_create = openstackclient.compute.v2.aggregate:CreateAggregate
+    aggregate_delete = openstackclient.compute.v2.aggregate:DeleteAggregate
+    aggregate_list = openstackclient.compute.v2.aggregate:ListAggregate
+    aggregate_remove_host = openstackclient.compute.v2.aggregate:RemoveAggregateHost
+    aggregate_set = openstackclient.compute.v2.aggregate:SetAggregate
+    aggregate_show = openstackclient.compute.v2.aggregate:ShowAggregate
+
+    compute_service_list = openstackclient.compute.v2.service:ListService
+    compute_service_set = openstackclient.compute.v2.service:SetService
+
+    console_log_show = openstackclient.compute.v2.console:ShowConsoleLog
+    console_url_show = openstackclient.compute.v2.console:ShowConsoleURL
+
+    flavor_create = openstackclient.compute.v2.flavor:CreateFlavor
+    flavor_delete = openstackclient.compute.v2.flavor:DeleteFlavor
+    flavor_list = openstackclient.compute.v2.flavor:ListFlavor
+    flavor_show = openstackclient.compute.v2.flavor:ShowFlavor
+
+    host_list = openstackclient.compute.v2.host:ListHost
+    host_show = openstackclient.compute.v2.host:ShowHost
+
+    hypervisor_list = openstackclient.compute.v2.hypervisor:ListHypervisor
+    hypervisor_show = openstackclient.compute.v2.hypervisor:ShowHypervisor
+
+    ip_fixed_add = openstackclient.compute.v2.fixedip:AddFixedIP
+    ip_fixed_remove = openstackclient.compute.v2.fixedip:RemoveFixedIP
+
+    ip_floating_add = openstackclient.compute.v2.floatingip:AddFloatingIP
+    ip_floating_create = openstackclient.compute.v2.floatingip:CreateFloatingIP
+    ip_floating_delete = openstackclient.compute.v2.floatingip:DeleteFloatingIP
+    ip_floating_list = openstackclient.compute.v2.floatingip:ListFloatingIP
+    ip_floating_remove = openstackclient.compute.v2.floatingip:RemoveFloatingIP
+
+    ip_floating_pool_list = openstackclient.compute.v2.floatingippool:ListFloatingIPPool
+
+    keypair_create = openstackclient.compute.v2.keypair:CreateKeypair
+    keypair_delete = openstackclient.compute.v2.keypair:DeleteKeypair
+    keypair_list = openstackclient.compute.v2.keypair:ListKeypair
+    keypair_show = openstackclient.compute.v2.keypair:ShowKeypair
+
+    project_usage_list = openstackclient.compute.v2.usage:ListUsage
+
+    security_group_create = openstackclient.compute.v2.security_group:CreateSecurityGroup
+    security_group_delete = openstackclient.compute.v2.security_group:DeleteSecurityGroup
+    security_group_list = openstackclient.compute.v2.security_group:ListSecurityGroup
+    security_group_set = openstackclient.compute.v2.security_group:SetSecurityGroup
+    security_group_show = openstackclient.compute.v2.security_group:ShowSecurityGroup
+    security_group_rule_create = openstackclient.compute.v2.security_group:CreateSecurityGroupRule
+    security_group_rule_delete = openstackclient.compute.v2.security_group:DeleteSecurityGroupRule
+    security_group_rule_list = openstackclient.compute.v2.security_group:ListSecurityGroupRule
+
+    server_add_security_group = openstackclient.compute.v2.server:AddServerSecurityGroup
+    server_add_volume = openstackclient.compute.v2.server:AddServerVolume
+    server_create = openstackclient.compute.v2.server:CreateServer
+    server_delete = openstackclient.compute.v2.server:DeleteServer
+    server_list = openstackclient.compute.v2.server:ListServer
+    server_lock = openstackclient.compute.v2.server:LockServer
+    server_migrate = openstackclient.compute.v2.server:MigrateServer
+    server_pause = openstackclient.compute.v2.server:PauseServer
+    server_reboot = openstackclient.compute.v2.server:RebootServer
+    server_rebuild = openstackclient.compute.v2.server:RebuildServer
+    server_remove_security_group = openstackclient.compute.v2.server:RemoveServerSecurityGroup
+    server_remove_volume = openstackclient.compute.v2.server:RemoveServerVolume
+    server_rescue = openstackclient.compute.v2.server:RescueServer
+    server_resize = openstackclient.compute.v2.server:ResizeServer
+    server_resume = openstackclient.compute.v2.server:ResumeServer
+    server_set = openstackclient.compute.v2.server:SetServer
+    server_show = openstackclient.compute.v2.server:ShowServer
+    server_ssh = openstackclient.compute.v2.server:SshServer
+    server_suspend = openstackclient.compute.v2.server:SuspendServer
+    server_unlock = openstackclient.compute.v2.server:UnlockServer
+    server_unpause = openstackclient.compute.v2.server:UnpauseServer
+    server_unrescue = openstackclient.compute.v2.server:UnrescueServer
+    server_unset = openstackclient.compute.v2.server:UnsetServer
+
 openstack.identity.v2_0 =
     ec2_credentials_create = openstackclient.identity.v2_0.ec2creds:CreateEC2Creds
     ec2_credentials_delete = openstackclient.identity.v2_0.ec2creds:DeleteEC2Creds
@@ -157,88 +239,6 @@ openstack.image.v2 =
     image_save = openstackclient.image.v2.image:SaveImage
     image_show = openstackclient.image.v2.image:ShowImage
 
-openstack.compute.v2 =
-    agent_create = openstackclient.compute.v2.agent:CreateAgent
-    agent_delete = openstackclient.compute.v2.agent:DeleteAgent
-    agent_list = openstackclient.compute.v2.agent:ListAgent
-    agent_set = openstackclient.compute.v2.agent:SetAgent
-
-    aggregate_add_host = openstackclient.compute.v2.aggregate:AddAggregateHost
-    aggregate_create = openstackclient.compute.v2.aggregate:CreateAggregate
-    aggregate_delete = openstackclient.compute.v2.aggregate:DeleteAggregate
-    aggregate_list = openstackclient.compute.v2.aggregate:ListAggregate
-    aggregate_remove_host = openstackclient.compute.v2.aggregate:RemoveAggregateHost
-    aggregate_set = openstackclient.compute.v2.aggregate:SetAggregate
-    aggregate_show = openstackclient.compute.v2.aggregate:ShowAggregate
-
-    compute_service_list = openstackclient.compute.v2.service:ListService
-    compute_service_set = openstackclient.compute.v2.service:SetService
-
-    console_log_show = openstackclient.compute.v2.console:ShowConsoleLog
-    console_url_show = openstackclient.compute.v2.console:ShowConsoleURL
-
-    ip_fixed_add = openstackclient.compute.v2.fixedip:AddFixedIP
-    ip_fixed_remove = openstackclient.compute.v2.fixedip:RemoveFixedIP
-
-    flavor_create = openstackclient.compute.v2.flavor:CreateFlavor
-    flavor_delete = openstackclient.compute.v2.flavor:DeleteFlavor
-    flavor_list = openstackclient.compute.v2.flavor:ListFlavor
-    flavor_show = openstackclient.compute.v2.flavor:ShowFlavor
-
-    ip_floating_add = openstackclient.compute.v2.floatingip:AddFloatingIP
-    ip_floating_create = openstackclient.compute.v2.floatingip:CreateFloatingIP
-    ip_floating_delete = openstackclient.compute.v2.floatingip:DeleteFloatingIP
-    ip_floating_list = openstackclient.compute.v2.floatingip:ListFloatingIP
-    ip_floating_remove = openstackclient.compute.v2.floatingip:RemoveFloatingIP
-
-    ip_floating_pool_list = openstackclient.compute.v2.floatingippool:ListFloatingIPPool
-
-    host_list = openstackclient.compute.v2.host:ListHost
-    host_show = openstackclient.compute.v2.host:ShowHost
-
-    hypervisor_list = openstackclient.compute.v2.hypervisor:ListHypervisor
-    hypervisor_show = openstackclient.compute.v2.hypervisor:ShowHypervisor
-
-    keypair_create = openstackclient.compute.v2.keypair:CreateKeypair
-    keypair_delete = openstackclient.compute.v2.keypair:DeleteKeypair
-    keypair_list = openstackclient.compute.v2.keypair:ListKeypair
-    keypair_show = openstackclient.compute.v2.keypair:ShowKeypair
-
-    project_usage_list = openstackclient.compute.v2.usage:ListUsage
-
-    security_group_create = openstackclient.compute.v2.security_group:CreateSecurityGroup
-    security_group_delete = openstackclient.compute.v2.security_group:DeleteSecurityGroup
-    security_group_list = openstackclient.compute.v2.security_group:ListSecurityGroup
-    security_group_set = openstackclient.compute.v2.security_group:SetSecurityGroup
-    security_group_show = openstackclient.compute.v2.security_group:ShowSecurityGroup
-    security_group_rule_create = openstackclient.compute.v2.security_group:CreateSecurityGroupRule
-    security_group_rule_delete = openstackclient.compute.v2.security_group:DeleteSecurityGroupRule
-    security_group_rule_list = openstackclient.compute.v2.security_group:ListSecurityGroupRule
-
-    server_add_security_group = openstackclient.compute.v2.server:AddServerSecurityGroup
-    server_add_volume = openstackclient.compute.v2.server:AddServerVolume
-    server_create = openstackclient.compute.v2.server:CreateServer
-    server_delete = openstackclient.compute.v2.server:DeleteServer
-    server_list = openstackclient.compute.v2.server:ListServer
-    server_lock = openstackclient.compute.v2.server:LockServer
-    server_migrate = openstackclient.compute.v2.server:MigrateServer
-    server_pause = openstackclient.compute.v2.server:PauseServer
-    server_reboot = openstackclient.compute.v2.server:RebootServer
-    server_rebuild = openstackclient.compute.v2.server:RebuildServer
-    server_remove_security_group = openstackclient.compute.v2.server:RemoveServerSecurityGroup
-    server_remove_volume = openstackclient.compute.v2.server:RemoveServerVolume
-    server_rescue = openstackclient.compute.v2.server:RescueServer
-    server_resize = openstackclient.compute.v2.server:ResizeServer
-    server_resume = openstackclient.compute.v2.server:ResumeServer
-    server_set = openstackclient.compute.v2.server:SetServer
-    server_show = openstackclient.compute.v2.server:ShowServer
-    server_ssh = openstackclient.compute.v2.server:SshServer
-    server_suspend = openstackclient.compute.v2.server:SuspendServer
-    server_unlock = openstackclient.compute.v2.server:UnlockServer
-    server_unpause = openstackclient.compute.v2.server:UnpauseServer
-    server_unrescue = openstackclient.compute.v2.server:UnrescueServer
-    server_unset = openstackclient.compute.v2.server:UnsetServer
-
 openstack.object_store.v1 =
     container_list = openstackclient.object.v1.container:ListContainer
     object_list = openstackclient.object.v1.object:ListObject