diff --git a/api/src/com/cloud/network/StorageNetworkService.java b/api/src/com/cloud/network/StorageNetworkService.java
index 1cc92ede0c7..7a7c5cad91d 100755
--- a/api/src/com/cloud/network/StorageNetworkService.java
+++ b/api/src/com/cloud/network/StorageNetworkService.java
@@ -19,7 +19,7 @@ package com.cloud.network;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.cloud.api.commands.CreateStorageNetworkIpRangeCmd;
+import org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;
 import org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd;
 import org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd;
 import org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd;
diff --git a/api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/CreatePhysicalNetworkCmd.java
similarity index 99%
rename from api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java
rename to api/src/org/apache/cloudstack/api/admin/network/command/CreatePhysicalNetworkCmd.java
index 39829b2e883..5216e722852 100644
--- a/api/src/com/cloud/api/commands/CreatePhysicalNetworkCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/network/command/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 com.cloud.api.commands;
+package org.apache.cloudstack.api.admin.network.command;
 
 import java.util.List;
 
diff --git a/api/src/com/cloud/api/commands/CreateStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/CreateStorageNetworkIpRangeCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/CreateStorageNetworkIpRangeCmd.java
rename to api/src/org/apache/cloudstack/api/admin/network/command/CreateStorageNetworkIpRangeCmd.java
index 49a43952a91..5c0273bd701 100755
--- a/api/src/com/cloud/api/commands/CreateStorageNetworkIpRangeCmd.java
+++ b/api/src/org/apache/cloudstack/api/admin/network/command/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 com.cloud.api.commands;
+package org.apache.cloudstack.api.admin.network.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/org/apache/cloudstack/api/admin/network/command/listStorageNetworkIpRangeCmd.java b/api/src/org/apache/cloudstack/api/admin/network/command/ListStorageNetworkIpRangeCmd.java
similarity index 100%
rename from api/src/org/apache/cloudstack/api/admin/network/command/listStorageNetworkIpRangeCmd.java
rename to api/src/org/apache/cloudstack/api/admin/network/command/ListStorageNetworkIpRangeCmd.java
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 0504b27d7df..2c50991626b 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -344,7 +344,7 @@ updateHypervisorCapabilities=com.cloud.api.commands.UpdateHypervisorCapabilities
 listHypervisorCapabilities=com.cloud.api.commands.ListHypervisorCapabilitiesCmd;1
 
 #### Physical Network commands
-createPhysicalNetwork=com.cloud.api.commands.CreatePhysicalNetworkCmd;1
+createPhysicalNetwork=org.apache.cloudstack.api.admin.network.command.CreatePhysicalNetworkCmd;1
 deletePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.DeletePhysicalNetworkCmd;1
 listPhysicalNetworks=org.apache.cloudstack.api.admin.network.command.ListPhysicalNetworksCmd;1
 updatePhysicalNetwork=org.apache.cloudstack.api.admin.network.command.UpdatePhysicalNetworkCmd;1
@@ -364,7 +364,7 @@ updateTrafficType=com.cloud.api.commands.UpdateTrafficTypeCmd;1
 listTrafficTypeImplementors=com.cloud.api.commands.ListTrafficTypeImplementorsCmd;1
 
 #### Storage Network commands
-createStorageNetworkIpRange=com.cloud.api.commands.CreateStorageNetworkIpRangeCmd;1
+createStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;1
 deleteStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd;1
 listStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd;1
 updateStorageNetworkIpRange=org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd;1
diff --git a/server/src/com/cloud/network/StorageNetworkManagerImpl.java b/server/src/com/cloud/network/StorageNetworkManagerImpl.java
index 6413e49cc6f..04dfcd3431f 100755
--- a/server/src/com/cloud/network/StorageNetworkManagerImpl.java
+++ b/server/src/com/cloud/network/StorageNetworkManagerImpl.java
@@ -25,11 +25,11 @@ import java.util.Map;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.api.admin.network.command.CreateStorageNetworkIpRangeCmd;
 import org.apache.cloudstack.api.admin.network.command.ListStorageNetworkIpRangeCmd;
 import org.apache.cloudstack.api.admin.network.command.UpdateStorageNetworkIpRangeCmd;
 import org.apache.log4j.Logger;
 
-import com.cloud.api.commands.CreateStorageNetworkIpRangeCmd;
 import org.apache.cloudstack.api.admin.network.command.DeleteStorageNetworkIpRangeCmd;
 import com.cloud.dc.HostPodVO;
 import com.cloud.dc.StorageNetworkIpRange;