diff --git a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/user/nat/command/CreateIpForwardingRuleCmd.java
similarity index 99%
rename from api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
rename to api/src/org/apache/cloudstack/api/user/nat/command/CreateIpForwardingRuleCmd.java
index 9d79fdbdf1b..8f4dff75fd9 100644
--- a/api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/nat/command/CreateIpForwardingRuleCmd.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.user.nat.command;
 
 import java.util.List;
 
diff --git a/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/user/nat/command/DeleteIpForwardingRuleCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java
rename to api/src/org/apache/cloudstack/api/user/nat/command/DeleteIpForwardingRuleCmd.java
index 78c3892a195..aa0d87fe6d2 100644
--- a/api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/nat/command/DeleteIpForwardingRuleCmd.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.user.nat.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/com/cloud/api/commands/DisableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/user/nat/command/DisableStaticNatCmd.java
similarity index 97%
rename from api/src/com/cloud/api/commands/DisableStaticNatCmd.java
rename to api/src/org/apache/cloudstack/api/user/nat/command/DisableStaticNatCmd.java
index 10c77c6ed3e..912ad997980 100644
--- a/api/src/com/cloud/api/commands/DisableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/nat/command/DisableStaticNatCmd.java
@@ -14,8 +14,9 @@
 // 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.user.nat.command;
 
+import com.cloud.api.commands.DeletePortForwardingRuleCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
diff --git a/api/src/com/cloud/api/commands/EnableStaticNatCmd.java b/api/src/org/apache/cloudstack/api/user/nat/command/EnableStaticNatCmd.java
similarity index 97%
rename from api/src/com/cloud/api/commands/EnableStaticNatCmd.java
rename to api/src/org/apache/cloudstack/api/user/nat/command/EnableStaticNatCmd.java
index b27566c3dc8..3398077dcc1 100644
--- a/api/src/com/cloud/api/commands/EnableStaticNatCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/nat/command/EnableStaticNatCmd.java
@@ -14,8 +14,9 @@
 // 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.user.nat.command;
 
+import org.apache.cloudstack.api.user.nat.command.CreateIpForwardingRuleCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.ApiConstants;
diff --git a/api/src/com/cloud/api/commands/ListIpForwardingRulesCmd.java b/api/src/org/apache/cloudstack/api/user/nat/command/ListIpForwardingRulesCmd.java
similarity index 98%
rename from api/src/com/cloud/api/commands/ListIpForwardingRulesCmd.java
rename to api/src/org/apache/cloudstack/api/user/nat/command/ListIpForwardingRulesCmd.java
index 95515794514..50c240804bf 100644
--- a/api/src/com/cloud/api/commands/ListIpForwardingRulesCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/nat/command/ListIpForwardingRulesCmd.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.user.nat.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index bd59f0c1621..2a13d320930 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -135,11 +135,11 @@ deletePortForwardingRule=com.cloud.api.commands.DeletePortForwardingRuleCmd;15
 #### updatePortForwardingRule=com.cloud.api.commands.UpdatePortForwardingRuleCmd;15
 
 #### NAT commands
-enableStaticNat=com.cloud.api.commands.EnableStaticNatCmd;15
-createIpForwardingRule=com.cloud.api.commands.CreateIpForwardingRuleCmd;15
-deleteIpForwardingRule=com.cloud.api.commands.DeleteIpForwardingRuleCmd;15
-listIpForwardingRules=com.cloud.api.commands.ListIpForwardingRulesCmd;15
-disableStaticNat=com.cloud.api.commands.DisableStaticNatCmd;15
+enableStaticNat=org.apache.cloudstack.api.user.nat.command.EnableStaticNatCmd;15
+createIpForwardingRule=org.apache.cloudstack.api.user.nat.command.CreateIpForwardingRuleCmd;15
+deleteIpForwardingRule=org.apache.cloudstack.api.user.nat.command.DeleteIpForwardingRuleCmd;15
+listIpForwardingRules=org.apache.cloudstack.api.user.nat.command.ListIpForwardingRulesCmd;15
+disableStaticNat=org.apache.cloudstack.api.user.nat.command.DisableStaticNatCmd;15
 
 #### load balancer commands
 createLoadBalancerRule=com.cloud.api.commands.CreateLoadBalancerRuleCmd;15