diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/BaseFunctionalTestCase.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/BaseFunctionalTestCase.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/BaseFunctionalTestCase.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/BaseFunctionalTestCase.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/BaseSeleniumTestCase.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/BaseSeleniumTestCase.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/BaseSeleniumTestCase.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/BaseSeleniumTestCase.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/QuickStartServer.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/QuickStartServer.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/QuickStartServer.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/QuickStartServer.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/ProfileFT.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/ProfileFT.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/ProfileFT.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/ProfileFT.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/RegisterFT.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/RegisterFT.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/RegisterFT.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/RegisterFT.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/SecurityFT.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/SecurityFT.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/SecurityFT.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/SecurityFT.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/TaskGuiFT.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/TaskGuiFT.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/TaskGuiFT.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/TaskGuiFT.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/UserAdminFT.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/UserAdminFT.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/gui/UserAdminFT.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/gui/UserAdminFT.java
diff --git a/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/rest/TaskRestFT.java b/support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/rest/TaskRestFT.java
similarity index 100%
rename from support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/rest/TaskRestFT.java
rename to support/maven-archetype/src/main/resources/archetype-resources/src/test/functional/functional/rest/TaskRestFT.java