diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
index b5828acbc7e..81599a0c3c9 100644
--- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
+++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -18,7 +18,7 @@ package com.cloud.network.vpn;
 
 import java.util.List;
 
-import org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd;
+import org.apache.cloudstack.api.command.user.vpn.ListVpnUsersCmd;
 import org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceUnavailableException;
diff --git a/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
similarity index 99%
rename from api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java
rename to api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java
index d8292f226cd..ee20521a328 100644
--- a/api/src/org/apache/cloudstack/api/command/user/user/AddVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/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.command.user.user;
+package org.apache.cloudstack.api.command.user.vpn;
 
 import org.apache.log4j.Logger;
 
diff --git a/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
similarity index 98%
rename from api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java
rename to api/src/org/apache/cloudstack/api/command/user/vpn/ListVpnUsersCmd.java
index f98d3c8ec7b..6ac950e407a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/user/ListVpnUsersCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/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.command.user.user;
+package org.apache.cloudstack.api.command.user.vpn;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
similarity index 98%
rename from api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java
rename to api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java
index eee343ce760..2dbb0ade3e3 100644
--- a/api/src/org/apache/cloudstack/api/command/user/user/RemoveVpnUserCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/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.command.user.user;
+package org.apache.cloudstack.api.command.user.vpn;
 
 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 f5dd1cec684..11ef43e9256 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.command.user.user.AddVpnUserCmd;
+import org.apache.cloudstack.api.command.user.vpn.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 ccb98bf5ef8..df7768720f1 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -298,9 +298,9 @@ createRemoteAccessVpn=org.apache.cloudstack.api.command.user.vpn.CreateRemoteAcc
 deleteRemoteAccessVpn=org.apache.cloudstack.api.command.user.vpn.DeleteRemoteAccessVpnCmd;15
 listRemoteAccessVpns=org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd;15
 
-addVpnUser=org.apache.cloudstack.api.command.user.user.AddVpnUserCmd;15
-removeVpnUser=org.apache.cloudstack.api.command.user.user.RemoveVpnUserCmd;15
-listVpnUsers=org.apache.cloudstack.api.command.user.user.ListVpnUsersCmd;15
+addVpnUser=org.apache.cloudstack.api.command.user.vpn.AddVpnUserCmd;15
+removeVpnUser=org.apache.cloudstack.api.command.user.vpn.RemoveVpnUserCmd;15
+listVpnUsers=org.apache.cloudstack.api.command.user.vpn.ListVpnUsersCmd;15
 
 #### network offering commands
 createNetworkOffering=org.apache.cloudstack.api.command.admin.network.CreateNetworkOfferingCmd;1
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 46b5af95eb8..67d6b8ccbf3 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.command.user.user.ListVpnUsersCmd;
+import org.apache.cloudstack.api.command.user.vpn.ListVpnUsersCmd;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.command.user.vpn.ListRemoteAccessVpnsCmd;