diff --git a/pom.xml b/pom.xml
index 10e23da0ad..77c666b3ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1608,7 +1608,7 @@
                 <module>persistence-modules/spring-data-elasticsearch</module>
                 <module>core-java-concurrency</module>
 				<module>core-java-concurrency-collections</module>
-				<module>restx-demo</module>
+				<module>restx</module>
             </modules>
 
         </profile>
diff --git a/restx-demo/data/credentials.json b/restx/data/credentials.json
similarity index 100%
rename from restx-demo/data/credentials.json
rename to restx/data/credentials.json
diff --git a/restx-demo/data/users.json b/restx/data/users.json
similarity index 100%
rename from restx-demo/data/users.json
rename to restx/data/users.json
diff --git a/restx-demo/md.restx.json b/restx/md.restx.json
similarity index 100%
rename from restx-demo/md.restx.json
rename to restx/md.restx.json
diff --git a/restx-demo/pom.xml b/restx/pom.xml
similarity index 98%
rename from restx-demo/pom.xml
rename to restx/pom.xml
index da106b8191..c6233b968c 100644
--- a/restx-demo/pom.xml
+++ b/restx/pom.xml
@@ -4,8 +4,7 @@
          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>
 
-    <groupId>restx-demo</groupId>
-    <artifactId>restx-demo</artifactId>
+    <artifactId>restx</artifactId>
     <version>0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>restx-demo</name>
diff --git a/restx-demo/src/main/java/restx/demo/AppModule.java b/restx/src/main/java/restx/demo/AppModule.java
similarity index 100%
rename from restx-demo/src/main/java/restx/demo/AppModule.java
rename to restx/src/main/java/restx/demo/AppModule.java
diff --git a/restx-demo/src/main/java/restx/demo/AppServer.java b/restx/src/main/java/restx/demo/AppServer.java
similarity index 100%
rename from restx-demo/src/main/java/restx/demo/AppServer.java
rename to restx/src/main/java/restx/demo/AppServer.java
diff --git a/restx-demo/src/main/java/restx/demo/Roles.java b/restx/src/main/java/restx/demo/Roles.java
similarity index 100%
rename from restx-demo/src/main/java/restx/demo/Roles.java
rename to restx/src/main/java/restx/demo/Roles.java
diff --git a/restx-demo/src/main/java/restx/demo/domain/Message.java b/restx/src/main/java/restx/demo/domain/Message.java
similarity index 100%
rename from restx-demo/src/main/java/restx/demo/domain/Message.java
rename to restx/src/main/java/restx/demo/domain/Message.java
diff --git a/restx-demo/src/main/java/restx/demo/rest/HelloResource.java b/restx/src/main/java/restx/demo/rest/HelloResource.java
similarity index 100%
rename from restx-demo/src/main/java/restx/demo/rest/HelloResource.java
rename to restx/src/main/java/restx/demo/rest/HelloResource.java
diff --git a/restx-demo/src/main/resources/logback.xml b/restx/src/main/resources/logback.xml
similarity index 100%
rename from restx-demo/src/main/resources/logback.xml
rename to restx/src/main/resources/logback.xml
diff --git a/restx-demo/src/main/resources/restx/demo/settings.properties b/restx/src/main/resources/restx/demo/settings.properties
similarity index 100%
rename from restx-demo/src/main/resources/restx/demo/settings.properties
rename to restx/src/main/resources/restx/demo/settings.properties
diff --git a/restx-demo/src/main/webapp/WEB-INF/web.xml b/restx/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from restx-demo/src/main/webapp/WEB-INF/web.xml
rename to restx/src/main/webapp/WEB-INF/web.xml
diff --git a/restx-demo/src/test/java/restx/demo/rest/HelloResourceSpecTest.java b/restx/src/test/java/restx/demo/rest/HelloResourceSpecUnitTest.java
similarity index 100%
rename from restx-demo/src/test/java/restx/demo/rest/HelloResourceSpecTest.java
rename to restx/src/test/java/restx/demo/rest/HelloResourceSpecUnitTest.java
diff --git a/restx-demo/src/test/resources/specs/hello/should_admin_say_hello.spec.yaml b/restx/src/test/resources/specs/hello/should_admin_say_hello.spec.yaml
similarity index 100%
rename from restx-demo/src/test/resources/specs/hello/should_admin_say_hello.spec.yaml
rename to restx/src/test/resources/specs/hello/should_admin_say_hello.spec.yaml
diff --git a/restx-demo/src/test/resources/specs/hello/should_anyone_say_hello.spec.yaml b/restx/src/test/resources/specs/hello/should_anyone_say_hello.spec.yaml
similarity index 100%
rename from restx-demo/src/test/resources/specs/hello/should_anyone_say_hello.spec.yaml
rename to restx/src/test/resources/specs/hello/should_anyone_say_hello.spec.yaml
diff --git a/restx-demo/src/test/resources/specs/hello/should_missing_value_triggers_validation_error.spec.yaml b/restx/src/test/resources/specs/hello/should_missing_value_triggers_validation_error.spec.yaml
similarity index 100%
rename from restx-demo/src/test/resources/specs/hello/should_missing_value_triggers_validation_error.spec.yaml
rename to restx/src/test/resources/specs/hello/should_missing_value_triggers_validation_error.spec.yaml
diff --git a/restx-demo/src/test/resources/specs/hello/should_user1_say_hello.spec.yaml b/restx/src/test/resources/specs/hello/should_user1_say_hello.spec.yaml
similarity index 100%
rename from restx-demo/src/test/resources/specs/hello/should_user1_say_hello.spec.yaml
rename to restx/src/test/resources/specs/hello/should_user1_say_hello.spec.yaml
diff --git a/restx-demo/src/test/resources/specs/hello/should_user2_not_say_hello.spec.yaml b/restx/src/test/resources/specs/hello/should_user2_not_say_hello.spec.yaml
similarity index 100%
rename from restx-demo/src/test/resources/specs/hello/should_user2_not_say_hello.spec.yaml
rename to restx/src/test/resources/specs/hello/should_user2_not_say_hello.spec.yaml