diff --git a/cms-server/pom.xml b/cms-server/pom.xml
index 3f9b86b9..c19b3c4b 100644
--- a/cms-server/pom.xml
+++ b/cms-server/pom.xml
@@ -50,6 +50,11 @@
 			<artifactId>cms-auth</artifactId>
 		</dependency>
 		
+		<dependency>
+			<groupId>com.condation.cms.modules</groupId>
+			<artifactId>cms-system-modules</artifactId>
+		</dependency>
+		
 		<dependency>
 			<groupId>com.condation.cms</groupId>
 			<artifactId>cms-test</artifactId>
diff --git a/modules/pom.xml b/modules/pom.xml
index b76b5063..e95241be 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -12,5 +12,6 @@
 	
 	<modules>
 		<module>example-module</module>
+	 <module>system-modules</module>
 	</modules>
 </project>
diff --git a/modules/system-modules/pom.xml b/modules/system-modules/pom.xml
new file mode 100644
index 00000000..9d92e814
--- /dev/null
+++ b/modules/system-modules/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.condation.cms.modules</groupId>
+		<artifactId>cms-modules</artifactId>
+		<version>7.2.0</version>
+	</parent>
+	<artifactId>cms-system-modules</artifactId>
+	<packaging>jar</packaging>
+    
+	<dependencies>
+		<dependency>
+			<groupId>com.condation.cms</groupId>
+			<artifactId>cms-api</artifactId>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/cms-auth/src/main/java/com/condation/cms/auth/AuthShortCodes.java b/modules/system-modules/src/main/java/com/condation/cms/modules/system/AuthShortCodes.java
similarity index 97%
rename from cms-auth/src/main/java/com/condation/cms/auth/AuthShortCodes.java
rename to modules/system-modules/src/main/java/com/condation/cms/modules/system/AuthShortCodes.java
index 7f14f8e1..b15a624b 100644
--- a/cms-auth/src/main/java/com/condation/cms/auth/AuthShortCodes.java
+++ b/modules/system-modules/src/main/java/com/condation/cms/modules/system/AuthShortCodes.java
@@ -1,4 +1,4 @@
-package	com.condation.cms.auth;
+package	com.condation.cms.modules.system;
 
 /*-
  * #%L
diff --git a/pom.xml b/pom.xml
index ebec4cb7..9944cfe1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,11 @@
 				<artifactId>modules-api</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.condation.cms.modules</groupId>
+				<artifactId>cms-system-modules</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			
 			<dependency>
 				<groupId>org.apache.commons</groupId>