diff --git a/agileboot-system/pom.xml b/agileboot-system/pom.xml
new file mode 100644
index 0000000..ecfd1cc
--- /dev/null
+++ b/agileboot-system/pom.xml
@@ -0,0 +1,16 @@
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.agileboot</groupId>
+        <artifactId>agileboot</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>agileboot-system</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>wol-auth</module>
+    </modules>
+
+</project>
diff --git a/wol-auth/pom.xml b/agileboot-system/wol-auth/pom.xml
similarity index 95%
rename from wol-auth/pom.xml
rename to agileboot-system/wol-auth/pom.xml
index 98a4a92..6016441 100644
--- a/wol-auth/pom.xml
+++ b/agileboot-system/wol-auth/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.agileboot</groupId>
-        <artifactId>agileboot</artifactId>
+        <artifactId>agileboot-system</artifactId>
         <version>1.0.0</version>
     </parent>
 
@@ -35,4 +35,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/wol-auth/src/main/java/com/agileboot/auth/WolAuthApplication.java b/agileboot-system/wol-auth/src/main/java/com/agileboot/auth/WolAuthApplication.java
similarity index 100%
rename from wol-auth/src/main/java/com/agileboot/auth/WolAuthApplication.java
rename to agileboot-system/wol-auth/src/main/java/com/agileboot/auth/WolAuthApplication.java
diff --git a/wol-auth/src/main/resources/application.yml b/agileboot-system/wol-auth/src/main/resources/application.yml
similarity index 100%
rename from wol-auth/src/main/resources/application.yml
rename to agileboot-system/wol-auth/src/main/resources/application.yml
diff --git a/pom.xml b/pom.xml
index 71d67f0..3c0c9a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 
     <modules>
         <module>agileboot-common</module>
-        <module>wol-auth</module>
+        <module>agileboot-system</module>
         <module>wol-modules</module>
         <module>wol-boot-start</module>
         <module>wol-server-cloud</module>