diff --git a/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java b/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java
index 228b9e73..603643fa 100644
--- a/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java
+++ b/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java
@@ -31,7 +31,7 @@ public class AuthenticationManager implements Reconfigurable {
   /**
    * Default authentication handler
    */
-  public static final String DEFAULT_AUTHENTICATION_HANDLER = "org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler";
+  public static final String DEFAULT_AUTHENTICATION_HANDLER = "org.apache.sqoop.security.authentication.SimpleAuthenticationHandler";
 
 
   /**
diff --git a/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java b/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java
index 76a13ffc..76998625 100644
--- a/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java
+++ b/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java
@@ -32,12 +32,12 @@ public class AuthorizationManager implements Reconfigurable {
   /**
    * Default authorization handler
    */
-  public static final String DEFAULT_AUTHORIZATION_HANDLER = "org.apache.sqoop.security.Authorization.DefaultAuthorizationHandler";
+  public static final String DEFAULT_AUTHORIZATION_HANDLER = "org.apache.sqoop.security.authorization.DefaultAuthorizationHandler";
 
   /**
    * Default authentication provider
    */
-  public static final String DEFAULT_AUTHENTICATION_PROVIDER = "org.apache.sqoop.security.Authorization.DefaultAuthenticationProvider";
+  public static final String DEFAULT_AUTHENTICATION_PROVIDER = "org.apache.sqoop.security.authorization.DefaultAuthenticationProvider";
 
   /**
    * Default authentication provider
diff --git a/core/src/main/java/org/apache/sqoop/security/SecurityConstants.java b/core/src/main/java/org/apache/sqoop/security/SecurityConstants.java
index eef818b1..fd548624 100644
--- a/core/src/main/java/org/apache/sqoop/security/SecurityConstants.java
+++ b/core/src/main/java/org/apache/sqoop/security/SecurityConstants.java
@@ -46,7 +46,7 @@ public final class SecurityConstants {
 
   /**
    * The config specifies the sqoop authentication handler class.
-   * The default type is org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler
+   * The default type is org.apache.sqoop.security.authentication.SimpleAuthenticationHandler
    * <tt>org.apache.sqoop.security.authentication.handler</tt>.
    */
   public static final String AUTHENTICATION_HANDLER =
@@ -110,7 +110,7 @@ public final class SecurityConstants {
 
   /**
    * The config specifies the sqoop authorization handler class.
-   * The default type is org.apache.sqoop.security.Authorization.DefaultAuthorizationHandler
+   * The default type is org.apache.sqoop.security.authorization.DefaultAuthorizationHandler
    * <tt>org.apache.sqoop.security.authorization.handler</tt>.
    */
   public static final String AUTHORIZATION_HANDLER =
@@ -118,7 +118,7 @@ public final class SecurityConstants {
 
   /**
    * The config specifies the sqoop authorization access controller class.
-   * The default type is org.apache.sqoop.security.Authorization.DefaultAuthorizationAccessController
+   * The default type is org.apache.sqoop.security.authorization.DefaultAuthorizationAccessController
    * <tt>org.apache.sqoop.security.authorization.access_controller</tt>.
    */
   public static final String AUTHORIZATION_ACCESS_CONTROLLER =
@@ -126,7 +126,7 @@ public final class SecurityConstants {
 
   /**
    * The config specifies the sqoop authorization validator class.
-   * The default type is org.apache.sqoop.security.Authorization.DefaultAuthorizationValidator
+   * The default type is org.apache.sqoop.security.authorization.DefaultAuthorizationValidator
    * <tt>org.apache.sqoop.security.authorization.validator</tt>.
    */
   public static final String AUTHORIZATION_VALIDATOR =
@@ -134,7 +134,7 @@ public final class SecurityConstants {
 
   /**
    * The config specifies the sqoop authentication provider class.
-   * The default type is org.apache.sqoop.security.Authorization.DefaultAuthenticationProvider
+   * The default type is org.apache.sqoop.security.authorization.DefaultAuthenticationProvider
    * <tt>org.apache.sqoop.security.authorization.authentication_provider</tt>.
    */
   public static final String AUTHENTICATION_PROVIDER =
diff --git a/dist/src/main/server/conf/sqoop.properties b/dist/src/main/server/conf/sqoop.properties
index e7de6130..5226a19c 100755
--- a/dist/src/main/server/conf/sqoop.properties
+++ b/dist/src/main/server/conf/sqoop.properties
@@ -145,10 +145,10 @@ org.apache.sqoop.execution.engine=org.apache.sqoop.execution.mapreduce.Mapreduce
 # Authentication configuration
 #
 #org.apache.sqoop.security.authentication.type=SIMPLE
-#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler
+#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.authentication.SimpleAuthenticationHandler
 #org.apache.sqoop.security.authentication.anonymous=true
 #org.apache.sqoop.security.authentication.type=KERBEROS
-#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.Authentication.KerberosAuthenticationHandler
+#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.authentication.KerberosAuthenticationHandler
 #org.apache.sqoop.security.authentication.kerberos.principal=sqoop/_HOST@NOVALOCAL
 #org.apache.sqoop.security.authentication.kerberos.keytab=/home/kerberos/sqoop.keytab
 #org.apache.sqoop.security.authentication.kerberos.http.principal=HTTP/_HOST@NOVALOCAL
@@ -161,10 +161,10 @@ org.apache.sqoop.execution.engine=org.apache.sqoop.execution.mapreduce.Mapreduce
 #
 # Authorization configuration
 #
-#org.apache.sqoop.security.authorization.handler=org.apache.sqoop.security.Authorization.DefaultAuthorizationHandler
-#org.apache.sqoop.security.authorization.access_controller=org.apache.sqoop.security.Authorization.DefaultAuthorizationAccessController
-#org.apache.sqoop.security.authorization.validator=org.apache.sqoop.security.Authorization.DefaultAuthorizationValidator
-#org.apache.sqoop.security.authorization.authentication_provider=org.apache.sqoop.security.Authorization.DefaultAuthenticationProvider
+#org.apache.sqoop.security.authorization.handler=org.apache.sqoop.security.authorization.DefaultAuthorizationHandler
+#org.apache.sqoop.security.authorization.access_controller=org.apache.sqoop.security.authorization.DefaultAuthorizationAccessController
+#org.apache.sqoop.security.authorization.validator=org.apache.sqoop.security.authorization.DefaultAuthorizationValidator
+#org.apache.sqoop.security.authorization.authentication_provider=org.apache.sqoop.security.authorization.DefaultAuthenticationProvider
 #org.apache.sqoop.security.authorization.server_name=SqoopServer1
 
 # External connectors load path
diff --git a/docs/src/site/sphinx/SecurityGuideOnSqoop2.rst b/docs/src/site/sphinx/SecurityGuideOnSqoop2.rst
index c38e276e..0a6d1921 100644
--- a/docs/src/site/sphinx/SecurityGuideOnSqoop2.rst
+++ b/docs/src/site/sphinx/SecurityGuideOnSqoop2.rst
@@ -30,7 +30,7 @@ Modify Sqoop configuration file, normally in <Sqoop Folder>/server/config/sqoop.
 ::
 
   org.apache.sqoop.authentication.type=SIMPLE
-  org.apache.sqoop.authentication.handler=org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler
+  org.apache.sqoop.authentication.handler=org.apache.sqoop.security.authentication.SimpleAuthenticationHandler
   org.apache.sqoop.anonymous=true
 
 -	Simple authentication is used by default. Commenting out authentication configuration will yield the use of simple authentication.
@@ -88,7 +88,7 @@ Modify Sqoop configuration file, normally in <Sqoop Folder>/server/config/sqoop.
 ::
 
   org.apache.sqoop.authentication.type=KERBEROS
-  org.apache.sqoop.authentication.handler=org.apache.sqoop.security.Authentication.KerberosAuthenticationHandler
+  org.apache.sqoop.authentication.handler=org.apache.sqoop.security.authentication.KerberosAuthenticationHandler
   org.apache.sqoop.authentication.kerberos.principal=sqoop/_HOST@<REALM>
   org.apache.sqoop.authentication.kerberos.keytab=/home/kerberos/sqoop.keytab
   org.apache.sqoop.authentication.kerberos.http.principal=HTTP/_HOST@<REALM>
@@ -132,7 +132,7 @@ If the Sqoop server has started successfully with Kerberos authentication, the f
 
 ::
 
-  2014-12-04 15:02:58,038 INFO  security.KerberosAuthenticationHandler [org.apache.sqoop.security.Authentication.KerberosAuthenticationHandler.secureLogin(KerberosAuthenticationHandler.java:84)] Using Kerberos authentication, principal [sqoop/_HOST@HADOOP.COM] keytab [/home/kerberos/sqoop.keytab]
+  2014-12-04 15:02:58,038 INFO  security.KerberosAuthenticationHandler [org.apache.sqoop.security.authentication.KerberosAuthenticationHandler.secureLogin(KerberosAuthenticationHandler.java:84)] Using Kerberos authentication, principal [sqoop/_HOST@HADOOP.COM] keytab [/home/kerberos/sqoop.keytab]
 
 If the Sqoop client was able to communicate with the Sqoop server, the following will be in <Sqoop Folder>/server/log/catalina.out:
 
diff --git a/security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java b/security/src/main/java/org/apache/sqoop/security/authentication/KerberosAuthenticationHandler.java
similarity index 98%
rename from security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java
rename to security/src/main/java/org/apache/sqoop/security/authentication/KerberosAuthenticationHandler.java
index db89a2d5..ee3a7b31 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java
+++ b/security/src/main/java/org/apache/sqoop/security/authentication/KerberosAuthenticationHandler.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.security.Authentication;
+package org.apache.sqoop.security.authentication;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.SecurityUtil;
diff --git a/security/src/main/java/org/apache/sqoop/security/Authentication/SimpleAuthenticationHandler.java b/security/src/main/java/org/apache/sqoop/security/authentication/SimpleAuthenticationHandler.java
similarity index 97%
rename from security/src/main/java/org/apache/sqoop/security/Authentication/SimpleAuthenticationHandler.java
rename to security/src/main/java/org/apache/sqoop/security/authentication/SimpleAuthenticationHandler.java
index 94f0feb9..4154cb94 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authentication/SimpleAuthenticationHandler.java
+++ b/security/src/main/java/org/apache/sqoop/security/authentication/SimpleAuthenticationHandler.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.security.Authentication;
+package org.apache.sqoop.security.authentication;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
diff --git a/security/src/main/java/org/apache/sqoop/security/Authorization/AuthorizationEngine.java b/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java
similarity index 99%
rename from security/src/main/java/org/apache/sqoop/security/Authorization/AuthorizationEngine.java
rename to security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java
index e6bf8be0..10f02c0d 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authorization/AuthorizationEngine.java
+++ b/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.security.Authorization;
+package org.apache.sqoop.security.authorization;
 
 import com.beust.jcommander.internal.Lists;
 import com.google.common.base.Predicate;
diff --git a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthenticationProvider.java
similarity index 97%
rename from security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java
rename to security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthenticationProvider.java
index 547040b3..8e6cf396 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java
+++ b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthenticationProvider.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.sqoop.security.Authorization;
+package org.apache.sqoop.security.authorization;
 
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation;
diff --git a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationAccessController.java b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationAccessController.java
similarity index 99%
rename from security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationAccessController.java
rename to security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationAccessController.java
index e84c7be0..f7d182b6 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationAccessController.java
+++ b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationAccessController.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.security.Authorization;
+package org.apache.sqoop.security.authorization;
 
 import org.apache.log4j.Logger;
 import org.apache.sqoop.common.SqoopException;
diff --git a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationHandler.java b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationHandler.java
similarity index 97%
rename from security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationHandler.java
rename to security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationHandler.java
index f68ca544..1adabef2 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationHandler.java
+++ b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationHandler.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.security.Authorization;
+package org.apache.sqoop.security.authorization;
 
 import org.apache.log4j.Logger;
 import org.apache.sqoop.common.MapContext;
@@ -34,12 +34,12 @@ public class DefaultAuthorizationHandler extends AuthorizationHandler {
   /**
    * Default authorization access controller
    */
-  public static final String DEFAULT_AUTHORIZATION_ACCESS_CONTROLLER = "org.apache.sqoop.security.Authorization.DefaultAuthorizationAccessController";
+  public static final String DEFAULT_AUTHORIZATION_ACCESS_CONTROLLER = "org.apache.sqoop.security.authorization.DefaultAuthorizationAccessController";
 
   /**
    * Default authorization validator
    */
-  public static final String DEFAULT_AUTHORIZATION_VALIDATOR = "org.apache.sqoop.security.Authorization.DefaultAuthorizationValidator";
+  public static final String DEFAULT_AUTHORIZATION_VALIDATOR = "org.apache.sqoop.security.authorization.DefaultAuthorizationValidator";
 
   private static final Logger LOG = Logger.getLogger(DefaultAuthorizationHandler.class);
 
diff --git a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationValidator.java b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationValidator.java
similarity index 97%
rename from security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationValidator.java
rename to security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationValidator.java
index aa8fe8dc..7590af04 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationValidator.java
+++ b/security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationValidator.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.security.Authorization;
+package org.apache.sqoop.security.authorization;
 
 import org.apache.log4j.Logger;
 import org.apache.sqoop.common.SqoopException;
diff --git a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
index 570c9741..5128a27b 100644
--- a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
@@ -33,7 +33,7 @@
 import org.apache.sqoop.json.JsonBean;
 import org.apache.sqoop.model.MConnector;
 import org.apache.sqoop.model.MResource;
-import org.apache.sqoop.security.Authorization.AuthorizationEngine;
+import org.apache.sqoop.security.authorization.AuthorizationEngine;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestContext.Method;
 import org.apache.sqoop.server.RequestHandler;
diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
index 793aa2f0..c96d66d8 100644
--- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
@@ -47,7 +47,7 @@
 import org.apache.sqoop.repository.Repository;
 import org.apache.sqoop.repository.RepositoryManager;
 import org.apache.sqoop.request.HttpEventContext;
-import org.apache.sqoop.security.Authorization.AuthorizationEngine;
+import org.apache.sqoop.security.authorization.AuthorizationEngine;
 import org.apache.sqoop.security.AuthorizationManager;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestHandler;
diff --git a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
index 6d4aa382..bf3a42a9 100644
--- a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
@@ -39,7 +39,7 @@
 import org.apache.sqoop.model.MResource;
 import org.apache.sqoop.repository.Repository;
 import org.apache.sqoop.repository.RepositoryManager;
-import org.apache.sqoop.security.Authorization.AuthorizationEngine;
+import org.apache.sqoop.security.authorization.AuthorizationEngine;
 import org.apache.sqoop.security.AuthorizationManager;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestHandler;
diff --git a/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java
index d2275e4f..b4c16f13 100644
--- a/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java
@@ -27,7 +27,7 @@
 import org.apache.sqoop.model.MSubmission;
 import org.apache.sqoop.repository.Repository;
 import org.apache.sqoop.repository.RepositoryManager;
-import org.apache.sqoop.security.Authorization.AuthorizationEngine;
+import org.apache.sqoop.security.authorization.AuthorizationEngine;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestContext.Method;
 import org.apache.sqoop.server.RequestHandler;