diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
index 80a23e9e757..6f6a817b8ba 100644
--- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
+++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -19,7 +19,7 @@ package com.cloud.network.vpn;
 import java.util.List;
 
 import org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd;
-import org.apache.cloudstack.api.user.vpn.command.ListVpnUsersCmd;
+import org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.RemoteAccessVpn;
diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java
similarity index 99%
rename from api/src/org/apache/cloudstack/api/user/vpn/command/AddVpnUserCmd.java
rename to api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.java
index 537356beea7..520db9d4126 100644
--- a/api/src/org/apache/cloudstack/api/user/vpn/command/AddVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/user/command/AddVpnUserCmd.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.user.vpn.command;
+package org.apache.cloudstack.api.user.user.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java
similarity index 98%
rename from api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnUsersCmd.java
rename to api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.java
index 72b3ec166d4..1b1bcbbc392 100644
--- a/api/src/org/apache/cloudstack/api/user/vpn/command/ListVpnUsersCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/user/command/ListVpnUsersCmd.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.user.vpn.command;
+package org.apache.cloudstack.api.user.user.command;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/api/src/org/apache/cloudstack/api/user/vpn/command/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java
similarity index 98%
rename from api/src/org/apache/cloudstack/api/user/vpn/command/RemoveVpnUserCmd.java
rename to api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.java
index ee230879d7e..51d44fe8ebc 100644
--- a/api/src/org/apache/cloudstack/api/user/vpn/command/RemoveVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/user/user/command/RemoveVpnUserCmd.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.user.vpn.command;
+package org.apache.cloudstack.api.user.user.command;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java b/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
index 0d2945da042..ce5d4f20286 100644
--- a/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
+++ b/api/test/src/com/cloud/api/commands/test/AddVpnUserCmdTest.java
@@ -19,7 +19,7 @@ package src.com.cloud.api.commands.test;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.cloudstack.api.user.vpn.command.AddVpnUserCmd;
+import org.apache.cloudstack.api.user.user.command.AddVpnUserCmd;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index cb3f0786244..de7cc2a5ad3 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -297,9 +297,9 @@ createRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.CreateRemoteAcc
 deleteRemoteAccessVpn=org.apache.cloudstack.api.user.vpn.command.DeleteRemoteAccessVpnCmd;15
 listRemoteAccessVpns=org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd;15
 
-addVpnUser=org.apache.cloudstack.api.user.vpn.command.AddVpnUserCmd;15
-removeVpnUser=org.apache.cloudstack.api.user.vpn.command.RemoveVpnUserCmd;15
-listVpnUsers=org.apache.cloudstack.api.user.vpn.command.ListVpnUsersCmd;15
+addVpnUser=org.apache.cloudstack.api.user.user.command.AddVpnUserCmd;15
+removeVpnUser=org.apache.cloudstack.api.user.user.command.RemoveVpnUserCmd;15
+listVpnUsers=org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd;15
 
 #### network offering commands
 createNetworkOffering=org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;1
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 5ccccf0aff3..1c60251867f 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.api.user.vpn.command.ListVpnUsersCmd;
+import org.apache.cloudstack.api.user.user.command.ListVpnUsersCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.user.vpn.command.ListRemoteAccessVpnsCmd;