diff --git a/contrast-finder-webapp/nb-configuration.xml b/contrast-finder-webapp/nb-configuration.xml
deleted file mode 100644
index d3aa9882..00000000
--- a/contrast-finder-webapp/nb-configuration.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-    This file contains additional configuration written by modules in the NetBeans IDE.
-    The configuration is intended to be shared among all the users of project and
-    therefore it is assumed to be part of version control checkout.
-    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-    -->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-        Properties that influence various parts of the IDE, especially code formatting and the like. 
-        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-        That way multiple projects can share the same settings (useful for formatting rules for example).
-        Any value defined here will override the pom.xml file value but is only applicable to the current project.
-        -->
-        <netbeans.hint.j2eeVersion>1.6-web</netbeans.hint.j2eeVersion>
-        <org-netbeans-modules-html-editor-lib.default-html-public-id>HTML5</org-netbeans-modules-html-editor-lib.default-html-public-id>
-    </properties>
-</project-shared-configuration>
diff --git a/contrast-finder-webapp/src/main/resources/conf/contrast-finder.log b/contrast-finder-webapp/src/main/resources/conf/contrast-finder.log
deleted file mode 100644
index e69de29b..00000000
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf~ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf~
deleted file mode 100644
index 7b549f08..00000000
--- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf~
+++ /dev/null
@@ -1,74 +0,0 @@
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@page pageEncoding="UTF-8"%>
-<jsp:useBean id="now" class="java.util.Date" scope="page" />
-<footer class="container">
-    <div id="footer-msg">
-        <p><fmt:message key="footer.paragraphe"/></p>
-        <ul>
-            <li><fmt:message key="footer.tanaguru"/></li>
-            <li><fmt:message key="footer.kbaccess"/></li>
-        </ul>
-    </div>
-    <p id="footer-copyright">© <fmt:formatDate value="${now}" pattern="yyyy" /> <a href="http://www.Open-S.com/">Open-S</a> - Version 0.3 - <a href="http://blog.tanaguru.com/">Blog Tanaguru</a></p>
-</footer>
-<c:set var="analytics" value=""/>
-<c:if test="${not empty analytics}">
-    <script>
-        (function(i, s, o, g, r, a, m) {
-            i['GoogleAnalyticsObject'] = r;
-            i[r] = i[r] || function() {
-                (i[r].q = i[r].q || []).push(arguments)
-            }, i[r].l = 1 * new Date();
-            a = s.createElement(o),
-                    m = s.getElementsByTagName(o)[0];
-            a.async = 1;
-            a.src = g;
-            m.parentNode.insertBefore(a, m)
-        })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-
-        ga('create', '${analytics}', 'tanaguru.com');
-        ga('send', 'pageview');
-
-    </script>
-</c:if>
-
-<c:set var="piwikSiteId" value=""/>
-<c:if test="${not empty piwikSiteId}">
-    <!-- Piwik -->
-    <script type="text/javascript">
-        var _paq = _paq || [];
-        _paq.push(["trackPageView"]);
-        _paq.push(["enableLinkTracking"]);
-
-<<<<<<< HEAD
-    (function() {
-        var u = (("https:" == document.location.protocol) ? "https" : "http") + "://stats.open-s.com/";
-        _paq.push(["setTrackerUrl", u + "piwik.php"]);
-        _paq.push(["setSiteId", "${piwikSiteId}"]);
-        var d = document, g = d.createElement("script"), s = d.getElementsByTagName("script")[0];
-        g.type = "text/javascript";
-        g.defer = true;
-        g.async = true;
-        g.src = u + "piwik.js";
-        s.parentNode.insertBefore(g, s);
-    })();
-</script>
-<!-- End Piwik Code --> 
-</c:if>
-=======
-        (function() {
-            var u = (("https:" == document.location.protocol) ? "https" : "http") + "://stats.open-s.com/";
-            _paq.push(["setTrackerUrl", u + "piwik.php"]);
-            _paq.push(["setSiteId", "${piwikSiteId}"]);
-            var d = document, g = d.createElement("script"), s = d.getElementsByTagName("script")[0];
-            g.type = "text/javascript";
-            g.defer = true;
-            g.async = true;
-            g.src = u + "piwik.js";
-            s.parentNode.insertBefore(g, s);
-        })();
-    </script>
-    <!-- End Piwik Code --> 
-</c:if>
->>>>>>> release-0.3
diff --git a/docker/compile_and_build_docker_image.sh b/docker/compile_and_build_docker_image.sh
index 9fdc17d3..bddc9e59 100755
--- a/docker/compile_and_build_docker_image.sh
+++ b/docker/compile_and_build_docker_image.sh
@@ -124,7 +124,7 @@ fail() {
 #############################################
 
 
-TGZ_BASENAME="contrast-finder-webapp/target/contrast-finder"
+TGZ_BASENAME="webapp/target/contrast-finder"
 TGZ_EXT=".tar.gz"
 ADD_IP=''
 URL="http://localhost:${CONTAINER_EXPOSED_PORT}/contrast-finder/"
diff --git a/contrast-finder-api/pom.xml b/engine/api/pom.xml
similarity index 94%
rename from contrast-finder-api/pom.xml
rename to engine/api/pom.xml
index 4e1e1a91..b1d9e410 100644
--- a/contrast-finder-api/pom.xml
+++ b/engine/api/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-api</artifactId>
     <version>0.5.1-dev</version>
+    <name>api</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-api</name>
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>
diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java
similarity index 100%
rename from contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java
rename to engine/api/src/main/java/org/asqatasun/contrastfinder/AbstractColorFinder.java
diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java
similarity index 100%
rename from contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java
rename to engine/api/src/main/java/org/asqatasun/contrastfinder/ColorFinder.java
diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java
similarity index 100%
rename from contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java
rename to engine/api/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactory.java
diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java
similarity index 100%
rename from contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java
rename to engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaison.java
diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java
similarity index 100%
rename from contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java
rename to engine/api/src/main/java/org/asqatasun/contrastfinder/result/ColorResult.java
diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java
similarity index 100%
rename from contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java
rename to engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactory.java
diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java b/engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java
similarity index 100%
rename from contrast-finder-api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java
rename to engine/api/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactory.java
diff --git a/contrast-finder-api/src/test/java/org/asqatasun/contrast/finder/api/AppTest.java b/engine/api/src/test/java/org/asqatasun/contrast/finder/api/AppTest.java
similarity index 100%
rename from contrast-finder-api/src/test/java/org/asqatasun/contrast/finder/api/AppTest.java
rename to engine/api/src/test/java/org/asqatasun/contrast/finder/api/AppTest.java
diff --git a/contrast-finder-api/src/test/java/org/asqatasun/contrastfinder/AbstractColorFinderImplTest.java b/engine/api/src/test/java/org/asqatasun/contrastfinder/AbstractColorFinderImplTest.java
similarity index 100%
rename from contrast-finder-api/src/test/java/org/asqatasun/contrastfinder/AbstractColorFinderImplTest.java
rename to engine/api/src/test/java/org/asqatasun/contrastfinder/AbstractColorFinderImplTest.java
diff --git a/contrast-finder-hsv/pom.xml b/engine/hsv/pom.xml
similarity index 96%
rename from contrast-finder-hsv/pom.xml
rename to engine/hsv/pom.xml
index 92385a63..2f3e945d 100644
--- a/contrast-finder-hsv/pom.xml
+++ b/engine/hsv/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
     <version>0.5.1-dev</version>
+    <name>hsv</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-hsv</name>
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>
diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java
similarity index 100%
rename from contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java
rename to engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvFactory.java
diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java
similarity index 100%
rename from contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java
rename to engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderHsvPsychoFactory.java
diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java
similarity index 100%
rename from contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java
rename to engine/hsv/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderRgbFactory.java
diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java
similarity index 100%
rename from contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java
rename to engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/Boundary.java
diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java
similarity index 100%
rename from contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java
rename to engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsv.java
diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java
similarity index 100%
rename from contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java
rename to engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsycho.java
diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java b/engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java
similarity index 100%
rename from contrast-finder-hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java
rename to engine/hsv/src/main/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgb.java
diff --git a/contrast-finder-hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsychoTest.java b/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsychoTest.java
similarity index 100%
rename from contrast-finder-hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsychoTest.java
rename to engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvPsychoTest.java
diff --git a/contrast-finder-hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java b/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java
similarity index 100%
rename from contrast-finder-hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java
rename to engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderHsvTest.java
diff --git a/contrast-finder-hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgbTest.java b/engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgbTest.java
similarity index 100%
rename from contrast-finder-hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgbTest.java
rename to engine/hsv/src/test/java/org/asqatasun/contrastfinder/hsv/ColorFinderRgbTest.java
diff --git a/contrast-finder-hsv/src/test/resources/logback.xml b/engine/hsv/src/test/resources/logback.xml
similarity index 100%
rename from contrast-finder-hsv/src/test/resources/logback.xml
rename to engine/hsv/src/test/resources/logback.xml
diff --git a/contrast-finder-impl/pom.xml b/engine/impl/pom.xml
similarity index 93%
rename from contrast-finder-impl/pom.xml
rename to engine/impl/pom.xml
index 90eb2b6c..54eb0b7d 100644
--- a/contrast-finder-impl/pom.xml
+++ b/engine/impl/pom.xml
@@ -3,14 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
     <version>0.5.1-dev</version>
+    <name>impl</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-impl</name>
+
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>
diff --git a/contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java
similarity index 100%
rename from contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java
rename to engine/impl/src/main/java/org/asqatasun/contrastfinder/factory/ColorFinderFactoryImpl.java
diff --git a/contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java
similarity index 100%
rename from contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java
rename to engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorCombinaisonImpl.java
diff --git a/contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java
similarity index 100%
rename from contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java
rename to engine/impl/src/main/java/org/asqatasun/contrastfinder/result/ColorResultImpl.java
diff --git a/contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java
similarity index 100%
rename from contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java
rename to engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorCombinaisonFactoryImpl.java
diff --git a/contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java b/engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java
similarity index 100%
rename from contrast-finder-impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java
rename to engine/impl/src/main/java/org/asqatasun/contrastfinder/result/factory/ColorResultFactoryImpl.java
diff --git a/contrast-finder-impl/src/test/java/org/asqatasun/color/result/impl/AppTest.java b/engine/impl/src/test/java/org/asqatasun/color/result/impl/AppTest.java
similarity index 100%
rename from contrast-finder-impl/src/test/java/org/asqatasun/color/result/impl/AppTest.java
rename to engine/impl/src/test/java/org/asqatasun/color/result/impl/AppTest.java
diff --git a/engine/pom.xml b/engine/pom.xml
new file mode 100644
index 00000000..28ca4ed3
--- /dev/null
+++ b/engine/pom.xml
@@ -0,0 +1,34 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.asqatasun</groupId>
+        <artifactId>contrast-finder</artifactId>
+        <version>0.5.1-dev</version>
+    </parent>
+    <artifactId>engine</artifactId>
+    <version>0.5.1-dev</version>
+    <packaging>pom</packaging>
+
+    <name>contrast-finder-engine</name>
+    <url>https://contrast-finder.org</url>
+    <organization>
+        <name>Asqatasun.org</name>
+        <url>http://asqatasun.org</url>
+    </organization>
+    <licenses>
+        <license>
+            <name>GNU Affero General Public License v3.0</name>
+            <url>https://www.gnu.org/licenses/agpl-3.0.txt</url>
+            <distribution>manual</distribution>
+        </license>
+    </licenses>
+
+
+    <modules>
+        <module>api</module>
+        <module>utils</module>
+        <module>hsv</module>
+        <module>impl</module>
+    </modules>
+</project>
diff --git a/contrast-finder-utils/pom.xml b/engine/utils/pom.xml
similarity index 95%
rename from contrast-finder-utils/pom.xml
rename to engine/utils/pom.xml
index 9becdd57..fb32175f 100644
--- a/contrast-finder-utils/pom.xml
+++ b/engine/utils/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
+        <artifactId>engine</artifactId>
         <version>0.5.1-dev</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
     <version>0.5.1-dev</version>
+    <name>utils</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-utils</name>
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>
diff --git a/contrast-finder-utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java b/engine/utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java
similarity index 100%
rename from contrast-finder-utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java
rename to engine/utils/src/main/java/org/asqatasun/utils/colorconvertor/ColorConverter.java
diff --git a/contrast-finder-utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java b/engine/utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java
similarity index 100%
rename from contrast-finder-utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java
rename to engine/utils/src/main/java/org/asqatasun/utils/colornamelookup/ColorNameLookup.java
diff --git a/contrast-finder-utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java b/engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java
similarity index 100%
rename from contrast-finder-utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java
rename to engine/utils/src/main/java/org/asqatasun/utils/contrastchecker/ContrastChecker.java
diff --git a/contrast-finder-utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java b/engine/utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java
similarity index 100%
rename from contrast-finder-utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java
rename to engine/utils/src/main/java/org/asqatasun/utils/distancecalculator/DistanceCalculator.java
diff --git a/contrast-finder-utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java b/engine/utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java
similarity index 100%
rename from contrast-finder-utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java
rename to engine/utils/src/test/java/org/asqatasun/utils/colorconvertor/ColorConverterTest.java
diff --git a/contrast-finder-utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java b/engine/utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java
similarity index 100%
rename from contrast-finder-utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java
rename to engine/utils/src/test/java/org/asqatasun/utils/colornamelookup/ColorNameLookupTest.java
diff --git a/contrast-finder-utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java b/engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java
similarity index 100%
rename from contrast-finder-utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java
rename to engine/utils/src/test/java/org/asqatasun/utils/contrastchecker/ContrastCheckerTest.java
diff --git a/pom.xml b/pom.xml
index f3d5f233..64c4ce00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,8 @@
                                     the minimum version of Maven for maven plugins
                                     ............  mvn versions:display-plugin-updates     -->
     <modules>
-        <module>contrast-finder-api</module>
-        <module>contrast-finder-utils</module>
-        <module>contrast-finder-hsv</module>
-        <module>contrast-finder-impl</module>
-        <module>contrast-finder-webapp</module>
+        <module>engine</module>
+        <module>webapp</module>
     </modules>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/contrast-finder-webapp/pom.xml b/webapp/pom.xml
similarity index 98%
rename from contrast-finder-webapp/pom.xml
rename to webapp/pom.xml
index 9d3854ee..adc16262 100644
--- a/contrast-finder-webapp/pom.xml
+++ b/webapp/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>contrast-finder</artifactId>
         <version>0.5.1-dev</version>
     </parent>
-    <artifactId>contrast-finder-webapp</artifactId>
+    <artifactId>webapp</artifactId>
     <version>0.5.1-dev</version>
     <packaging>war</packaging>
 
@@ -231,6 +231,7 @@
                 </executions>
             </plugin>
         </plugins>
+        <finalName>contrast-finder-webapp-${project.version}</finalName>
     </build>
 
 </project>
diff --git a/contrast-finder-webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java
similarity index 100%
rename from contrast-finder-webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java
rename to webapp/src/main/java/org/asqatasun/contrastfinder/webapp/controller/IndexController.java
diff --git a/contrast-finder-webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java
similarity index 100%
rename from contrast-finder-webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java
rename to webapp/src/main/java/org/asqatasun/contrastfinder/webapp/model/ColorModel.java
diff --git a/contrast-finder-webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java b/webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java
similarity index 100%
rename from contrast-finder-webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java
rename to webapp/src/main/java/org/asqatasun/contrastfinder/webapp/validator/ColorModelValidator.java
diff --git a/contrast-finder-webapp/src/main/resources/conf/README.md b/webapp/src/main/resources/conf/README.md
similarity index 100%
rename from contrast-finder-webapp/src/main/resources/conf/README.md
rename to webapp/src/main/resources/conf/README.md
diff --git a/contrast-finder-webapp/src/main/resources/conf/contrast-finder.conf.dist b/webapp/src/main/resources/conf/contrast-finder.conf.dist
similarity index 100%
rename from contrast-finder-webapp/src/main/resources/conf/contrast-finder.conf.dist
rename to webapp/src/main/resources/conf/contrast-finder.conf.dist
diff --git a/contrast-finder-webapp/src/main/resources/descriptor.xml b/webapp/src/main/resources/descriptor.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/resources/descriptor.xml
rename to webapp/src/main/resources/descriptor.xml
diff --git a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties b/webapp/src/main/resources/i18n/contrast-finder.properties
similarity index 100%
rename from contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties
rename to webapp/src/main/resources/i18n/contrast-finder.properties
diff --git a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties b/webapp/src/main/resources/i18n/contrast-finder_en.properties
similarity index 100%
rename from contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties
rename to webapp/src/main/resources/i18n/contrast-finder_en.properties
diff --git a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties b/webapp/src/main/resources/i18n/contrast-finder_fr.properties
similarity index 100%
rename from contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties
rename to webapp/src/main/resources/i18n/contrast-finder_fr.properties
diff --git a/contrast-finder-webapp/src/main/resources/logback.xml b/webapp/src/main/resources/logback.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/resources/logback.xml
rename to webapp/src/main/resources/logback.xml
diff --git a/contrast-finder-webapp/src/main/webapp/Css/10-bootstrap.min.css b/webapp/src/main/webapp/Css/10-bootstrap.min.css
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Css/10-bootstrap.min.css
rename to webapp/src/main/webapp/Css/10-bootstrap.min.css
diff --git a/contrast-finder-webapp/src/main/webapp/Css/20-bootstrap-theme.min.css b/webapp/src/main/webapp/Css/20-bootstrap-theme.min.css
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Css/20-bootstrap-theme.min.css
rename to webapp/src/main/webapp/Css/20-bootstrap-theme.min.css
diff --git a/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css b/webapp/src/main/webapp/Css/30-contrast-finder.css
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css
rename to webapp/src/main/webapp/Css/30-contrast-finder.css
diff --git a/contrast-finder-webapp/src/main/webapp/Css/40-accessible-table-sorter.css b/webapp/src/main/webapp/Css/40-accessible-table-sorter.css
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Css/40-accessible-table-sorter.css
rename to webapp/src/main/webapp/Css/40-accessible-table-sorter.css
diff --git a/contrast-finder-webapp/src/main/webapp/Images/asc.png b/webapp/src/main/webapp/Images/asc.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/asc.png
rename to webapp/src/main/webapp/Images/asc.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/bg.png b/webapp/src/main/webapp/Images/bg.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/bg.png
rename to webapp/src/main/webapp/Images/bg.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/contrast_finder_logo.png b/webapp/src/main/webapp/Images/contrast_finder_logo.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/contrast_finder_logo.png
rename to webapp/src/main/webapp/Images/contrast_finder_logo.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/creative_common_logo.png b/webapp/src/main/webapp/Images/creative_common_logo.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/creative_common_logo.png
rename to webapp/src/main/webapp/Images/creative_common_logo.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/desc.png b/webapp/src/main/webapp/Images/desc.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/desc.png
rename to webapp/src/main/webapp/Images/desc.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/favicon.ico b/webapp/src/main/webapp/Images/favicon.ico
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/favicon.ico
rename to webapp/src/main/webapp/Images/favicon.ico
diff --git a/contrast-finder-webapp/src/main/webapp/Images/good.jpg b/webapp/src/main/webapp/Images/good.jpg
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/good.jpg
rename to webapp/src/main/webapp/Images/good.jpg
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-144x144.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-144x144.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-144x144.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-144x144.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-192x192.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-192x192.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-192x192.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-192x192.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-256x256.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-256x256.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-256x256.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-256x256.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-36x36.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-36x36.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-36x36.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-36x36.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-384x384.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-384x384.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-384x384.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-384x384.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-48x48.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-48x48.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-48x48.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-48x48.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-512x512.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-512x512.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-512x512.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-512x512.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-72x72.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-72x72.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-72x72.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-72x72.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-96x96.png b/webapp/src/main/webapp/Images/logo/favicon/android-chrome-96x96.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/android-chrome-96x96.png
rename to webapp/src/main/webapp/Images/logo/favicon/android-chrome-96x96.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-114x114.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-120x120.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-144x144.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-152x152.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-180x180.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-57x57.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-60x60.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-72x72.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-76x76.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-precomposed.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-precomposed.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-precomposed.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon-precomposed.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon.png b/webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon.png
rename to webapp/src/main/webapp/Images/logo/favicon/apple-touch-icon.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml b/webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml
rename to webapp/src/main/webapp/Images/logo/favicon/browserconfig.xml
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon-16x16.png b/webapp/src/main/webapp/Images/logo/favicon/favicon-16x16.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon-16x16.png
rename to webapp/src/main/webapp/Images/logo/favicon/favicon-16x16.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon-194x194.png b/webapp/src/main/webapp/Images/logo/favicon/favicon-194x194.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon-194x194.png
rename to webapp/src/main/webapp/Images/logo/favicon/favicon-194x194.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon-32x32.png b/webapp/src/main/webapp/Images/logo/favicon/favicon-32x32.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon-32x32.png
rename to webapp/src/main/webapp/Images/logo/favicon/favicon-32x32.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon.ico b/webapp/src/main/webapp/Images/logo/favicon/favicon.ico
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/favicon.ico
rename to webapp/src/main/webapp/Images/logo/favicon/favicon.ico
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/manifest.json b/webapp/src/main/webapp/Images/logo/favicon/manifest.json
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/manifest.json
rename to webapp/src/main/webapp/Images/logo/favicon/manifest.json
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-144x144.png b/webapp/src/main/webapp/Images/logo/favicon/mstile-144x144.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-144x144.png
rename to webapp/src/main/webapp/Images/logo/favicon/mstile-144x144.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-150x150.png b/webapp/src/main/webapp/Images/logo/favicon/mstile-150x150.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-150x150.png
rename to webapp/src/main/webapp/Images/logo/favicon/mstile-150x150.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-310x150.png b/webapp/src/main/webapp/Images/logo/favicon/mstile-310x150.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-310x150.png
rename to webapp/src/main/webapp/Images/logo/favicon/mstile-310x150.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-310x310.png b/webapp/src/main/webapp/Images/logo/favicon/mstile-310x310.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-310x310.png
rename to webapp/src/main/webapp/Images/logo/favicon/mstile-310x310.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-70x70.png b/webapp/src/main/webapp/Images/logo/favicon/mstile-70x70.png
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/mstile-70x70.png
rename to webapp/src/main/webapp/Images/logo/favicon/mstile-70x70.png
diff --git a/contrast-finder-webapp/src/main/webapp/Images/logo/favicon/safari-pinned-tab.svg b/webapp/src/main/webapp/Images/logo/favicon/safari-pinned-tab.svg
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Images/logo/favicon/safari-pinned-tab.svg
rename to webapp/src/main/webapp/Images/logo/favicon/safari-pinned-tab.svg
diff --git a/contrast-finder-webapp/src/main/webapp/Js/10-jquery.min.js b/webapp/src/main/webapp/Js/10-jquery.min.js
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Js/10-jquery.min.js
rename to webapp/src/main/webapp/Js/10-jquery.min.js
diff --git a/contrast-finder-webapp/src/main/webapp/Js/20-jquery.tablesorter.min.js b/webapp/src/main/webapp/Js/20-jquery.tablesorter.min.js
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Js/20-jquery.tablesorter.min.js
rename to webapp/src/main/webapp/Js/20-jquery.tablesorter.min.js
diff --git a/contrast-finder-webapp/src/main/webapp/Js/25-accessible.js b/webapp/src/main/webapp/Js/25-accessible.js
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Js/25-accessible.js
rename to webapp/src/main/webapp/Js/25-accessible.js
diff --git a/contrast-finder-webapp/src/main/webapp/Js/30-bootstrap.min.js b/webapp/src/main/webapp/Js/30-bootstrap.min.js
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Js/30-bootstrap.min.js
rename to webapp/src/main/webapp/Js/30-bootstrap.min.js
diff --git a/contrast-finder-webapp/src/main/webapp/Js/35-affix.js b/webapp/src/main/webapp/Js/35-affix.js
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Js/35-affix.js
rename to webapp/src/main/webapp/Js/35-affix.js
diff --git a/contrast-finder-webapp/src/main/webapp/Js/36-sample.color.js b/webapp/src/main/webapp/Js/36-sample.color.js
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/Js/36-sample.color.js
rename to webapp/src/main/webapp/Js/36-sample.color.js
diff --git a/contrast-finder-webapp/src/main/webapp/META-INF/context.xml b/webapp/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/META-INF/context.xml
rename to webapp/src/main/webapp/META-INF/context.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml b/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml
rename to webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml b/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml
rename to webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml b/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml
rename to webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml b/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml
rename to webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml b/webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml
rename to webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml b/webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml
rename to webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp
rename to webapp/src/main/webapp/WEB-INF/pages/form.jsp
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/spring/security.xml b/webapp/src/main/webapp/WEB-INF/spring/security.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/spring/security.xml
rename to webapp/src/main/webapp/WEB-INF/spring/security.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/cf-message.jspf b/webapp/src/main/webapp/WEB-INF/template/cf-message.jspf
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/template/cf-message.jspf
rename to webapp/src/main/webapp/WEB-INF/template/cf-message.jspf
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf b/webapp/src/main/webapp/WEB-INF/template/footer.jspf
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf
rename to webapp/src/main/webapp/WEB-INF/template/footer.jspf
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/head.jspf b/webapp/src/main/webapp/WEB-INF/template/head.jspf
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/template/head.jspf
rename to webapp/src/main/webapp/WEB-INF/template/head.jspf
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/template/header.jspf
rename to webapp/src/main/webapp/WEB-INF/template/header.jspf
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/template/template_variables.jspf
rename to webapp/src/main/webapp/WEB-INF/template/template_variables.jspf
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/WEB-INF/web.xml
rename to webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/contrast-finder-webapp/src/main/webapp/default.jsp b/webapp/src/main/webapp/default.jsp
similarity index 100%
rename from contrast-finder-webapp/src/main/webapp/default.jsp
rename to webapp/src/main/webapp/default.jsp