diff --git a/src/test/features/cypress.feature b/src/test/features/client/browser-test/cypress.feature
similarity index 100%
rename from src/test/features/cypress.feature
rename to src/test/features/client/browser-test/cypress.feature
diff --git a/src/test/features/playwright.feature b/src/test/features/client/browser-test/playwright.feature
similarity index 100%
rename from src/test/features/playwright.feature
rename to src/test/features/client/browser-test/playwright.feature
diff --git a/src/test/features/java-base.feature b/src/test/features/server/java-base.feature
similarity index 100%
rename from src/test/features/java-base.feature
rename to src/test/features/server/java-base.feature
diff --git a/src/test/features/arch-unit.feature b/src/test/features/server/javatool/arch-unit.feature
similarity index 100%
rename from src/test/features/arch-unit.feature
rename to src/test/features/server/javatool/arch-unit.feature
diff --git a/src/test/features/frontend-maven.feature b/src/test/features/server/javatool/frontend-maven.feature
similarity index 100%
rename from src/test/features/frontend-maven.feature
rename to src/test/features/server/javatool/frontend-maven.feature
diff --git a/src/test/features/jacoco-threshold.feature b/src/test/features/server/javatool/jacoco-threshold.feature
similarity index 100%
rename from src/test/features/jacoco-threshold.feature
rename to src/test/features/server/javatool/jacoco-threshold.feature
diff --git a/src/test/features/java-enums.feature b/src/test/features/server/javatool/java-enums.feature
similarity index 100%
rename from src/test/features/java-enums.feature
rename to src/test/features/server/javatool/java-enums.feature
diff --git a/src/test/features/memoizers.feature b/src/test/features/server/javatool/memoizers.feature
similarity index 100%
rename from src/test/features/memoizers.feature
rename to src/test/features/server/javatool/memoizers.feature
diff --git a/src/test/features/sonar.feature b/src/test/features/server/sonar.feature
similarity index 100%
rename from src/test/features/sonar.feature
rename to src/test/features/server/sonar.feature
diff --git a/src/test/features/async.feature b/src/test/features/server/springboot/async.feature
similarity index 100%
rename from src/test/features/async.feature
rename to src/test/features/server/springboot/async.feature
diff --git a/src/test/features/banner.feature b/src/test/features/server/springboot/banner.feature
similarity index 100%
rename from src/test/features/banner.feature
rename to src/test/features/server/springboot/banner.feature
diff --git a/src/test/features/server/broker/apache-kafka.feature b/src/test/features/server/springboot/broker/apache-kafka.feature
similarity index 100%
rename from src/test/features/server/broker/apache-kafka.feature
rename to src/test/features/server/springboot/broker/apache-kafka.feature
diff --git a/src/test/features/server/broker/pulsar.feature b/src/test/features/server/springboot/broker/pulsar.feature
similarity index 100%
rename from src/test/features/server/broker/pulsar.feature
rename to src/test/features/server/springboot/broker/pulsar.feature
diff --git a/src/test/features/server/cache/caffeine-cache.feature b/src/test/features/server/springboot/cache/caffeine-cache.feature
similarity index 100%
rename from src/test/features/server/cache/caffeine-cache.feature
rename to src/test/features/server/springboot/cache/caffeine-cache.feature
diff --git a/src/test/features/server/cache/ehcache.feature b/src/test/features/server/springboot/cache/ehcache.feature
similarity index 100%
rename from src/test/features/server/cache/ehcache.feature
rename to src/test/features/server/springboot/cache/ehcache.feature
diff --git a/src/test/features/server/cache/simple-cache.feature b/src/test/features/server/springboot/cache/simple-cache.feature
similarity index 100%
rename from src/test/features/server/cache/simple-cache.feature
rename to src/test/features/server/springboot/cache/simple-cache.feature
diff --git a/src/test/features/cucumber.feature b/src/test/features/server/springboot/cucumber.feature
similarity index 100%
rename from src/test/features/cucumber.feature
rename to src/test/features/server/springboot/cucumber.feature
diff --git a/src/test/features/server/database/cassandra.feature b/src/test/features/server/springboot/database/cassandra.feature
similarity index 100%
rename from src/test/features/server/database/cassandra.feature
rename to src/test/features/server/springboot/database/cassandra.feature
diff --git a/src/test/features/hibernate-2nd-level-cache.feature b/src/test/features/server/springboot/database/hibernate-2nd-level-cache.feature
similarity index 100%
rename from src/test/features/hibernate-2nd-level-cache.feature
rename to src/test/features/server/springboot/database/hibernate-2nd-level-cache.feature
diff --git a/src/test/features/server/database/mariadb.feature b/src/test/features/server/springboot/database/mariadb.feature
similarity index 100%
rename from src/test/features/server/database/mariadb.feature
rename to src/test/features/server/springboot/database/mariadb.feature
diff --git a/src/test/features/server/database/mongodb.feature b/src/test/features/server/springboot/database/mongodb.feature
similarity index 100%
rename from src/test/features/server/database/mongodb.feature
rename to src/test/features/server/springboot/database/mongodb.feature
diff --git a/src/test/features/server/database/mssql.feature b/src/test/features/server/springboot/database/mssql.feature
similarity index 100%
rename from src/test/features/server/database/mssql.feature
rename to src/test/features/server/springboot/database/mssql.feature
diff --git a/src/test/features/server/database/mysql.feature b/src/test/features/server/springboot/database/mysql.feature
similarity index 100%
rename from src/test/features/server/database/mysql.feature
rename to src/test/features/server/springboot/database/mysql.feature
diff --git a/src/test/features/server/database/neo4j.feature b/src/test/features/server/springboot/database/neo4j.feature
similarity index 100%
rename from src/test/features/server/database/neo4j.feature
rename to src/test/features/server/springboot/database/neo4j.feature
diff --git a/src/test/features/server/database/postgresql.feature b/src/test/features/server/springboot/database/postgresql.feature
similarity index 100%
rename from src/test/features/server/database/postgresql.feature
rename to src/test/features/server/springboot/database/postgresql.feature
diff --git a/src/test/features/server/database/redis.feature b/src/test/features/server/springboot/database/redis.feature
similarity index 100%
rename from src/test/features/server/database/redis.feature
rename to src/test/features/server/springboot/database/redis.feature
diff --git a/src/test/features/server/dbmigration/flyway.feature b/src/test/features/server/springboot/dbmigration/flyway.feature
similarity index 100%
rename from src/test/features/server/dbmigration/flyway.feature
rename to src/test/features/server/springboot/dbmigration/flyway.feature
diff --git a/src/test/features/server/dbmigration/liquibase.feature b/src/test/features/server/springboot/dbmigration/liquibase.feature
similarity index 100%
rename from src/test/features/server/dbmigration/liquibase.feature
rename to src/test/features/server/springboot/dbmigration/liquibase.feature
diff --git a/src/test/features/server/database/mongock.feature b/src/test/features/server/springboot/dbmigration/mongock.feature
similarity index 100%
rename from src/test/features/server/database/mongock.feature
rename to src/test/features/server/springboot/dbmigration/mongock.feature
diff --git a/src/test/features/server/dbmigration/neo4j-migrations.feature b/src/test/features/server/springboot/dbmigration/neo4j-migrations.feature
similarity index 100%
rename from src/test/features/server/dbmigration/neo4j-migrations.feature
rename to src/test/features/server/springboot/dbmigration/neo4j-migrations.feature
diff --git a/src/test/features/dev-tools.feature b/src/test/features/server/springboot/dev-tools.feature
similarity index 100%
rename from src/test/features/dev-tools.feature
rename to src/test/features/server/springboot/dev-tools.feature
diff --git a/src/test/features/internationalized-errors.feature b/src/test/features/server/springboot/internationalized-errors.feature
similarity index 100%
rename from src/test/features/internationalized-errors.feature
rename to src/test/features/server/springboot/internationalized-errors.feature
diff --git a/src/test/features/logstash.feature b/src/test/features/server/springboot/logstash.feature
similarity index 100%
rename from src/test/features/logstash.feature
rename to src/test/features/server/springboot/logstash.feature
diff --git a/src/test/features/pagination.feature b/src/test/features/server/springboot/pagination.feature
similarity index 100%
rename from src/test/features/pagination.feature
rename to src/test/features/server/springboot/pagination.feature
diff --git a/src/test/features/cucumber-authentication.feature b/src/test/features/server/springboot/security/cucumber-authentication.feature
similarity index 100%
rename from src/test/features/cucumber-authentication.feature
rename to src/test/features/server/springboot/security/cucumber-authentication.feature
diff --git a/src/test/features/jwt-authentication.feature b/src/test/features/server/springboot/security/jwt-authentication.feature
similarity index 100%
rename from src/test/features/jwt-authentication.feature
rename to src/test/features/server/springboot/security/jwt-authentication.feature
diff --git a/src/test/features/kipe-authorization.feature b/src/test/features/server/springboot/security/kipe-authorization.feature
similarity index 100%
rename from src/test/features/kipe-authorization.feature
rename to src/test/features/server/springboot/security/kipe-authorization.feature
diff --git a/src/test/features/kipe-expression.feature b/src/test/features/server/springboot/security/kipe-expression.feature
similarity index 100%
rename from src/test/features/kipe-expression.feature
rename to src/test/features/server/springboot/security/kipe-expression.feature
diff --git a/src/test/features/oauth2.feature b/src/test/features/server/springboot/security/oauth2.feature
similarity index 100%
rename from src/test/features/oauth2.feature
rename to src/test/features/server/springboot/security/oauth2.feature
diff --git a/src/test/features/spring-boot-core.feature b/src/test/features/server/springboot/spring-boot-core.feature
similarity index 100%
rename from src/test/features/spring-boot-core.feature
rename to src/test/features/server/springboot/spring-boot-core.feature
diff --git a/src/test/features/spring-boot-docker.feature b/src/test/features/server/springboot/spring-boot-docker.feature
similarity index 100%
rename from src/test/features/spring-boot-docker.feature
rename to src/test/features/server/springboot/spring-boot-docker.feature
diff --git a/src/test/features/spring-mvc.feature b/src/test/features/server/springboot/spring-mvc.feature
similarity index 100%
rename from src/test/features/spring-mvc.feature
rename to src/test/features/server/springboot/spring-mvc.feature
diff --git a/src/test/features/springboot-actuator.feature b/src/test/features/server/springboot/springboot-actuator.feature
similarity index 100%
rename from src/test/features/springboot-actuator.feature
rename to src/test/features/server/springboot/springboot-actuator.feature
diff --git a/src/test/features/cloud-config.feature b/src/test/features/server/springboot/springcloud/cloud-config.feature
similarity index 100%
rename from src/test/features/cloud-config.feature
rename to src/test/features/server/springboot/springcloud/cloud-config.feature
diff --git a/src/test/features/consul.feature b/src/test/features/server/springboot/springcloud/consul.feature
similarity index 100%
rename from src/test/features/consul.feature
rename to src/test/features/server/springboot/springcloud/consul.feature
diff --git a/src/test/features/eureka.feature b/src/test/features/server/springboot/springcloud/eureka.feature
similarity index 100%
rename from src/test/features/eureka.feature
rename to src/test/features/server/springboot/springcloud/eureka.feature
diff --git a/src/test/features/gateway.feature b/src/test/features/server/springboot/springcloud/gateway.feature
similarity index 100%
rename from src/test/features/gateway.feature
rename to src/test/features/server/springboot/springcloud/gateway.feature
diff --git a/src/test/features/springdoc.feature b/src/test/features/server/springboot/springdoc.feature
similarity index 100%
rename from src/test/features/springdoc.feature
rename to src/test/features/server/springboot/springdoc.feature
diff --git a/src/test/features/webflux.feature b/src/test/features/server/springboot/webflux.feature
similarity index 100%
rename from src/test/features/webflux.feature
rename to src/test/features/server/springboot/webflux.feature
diff --git a/src/test/features/codespace.feature b/src/test/features/setup/codespace.feature
similarity index 100%
rename from src/test/features/codespace.feature
rename to src/test/features/setup/codespace.feature
diff --git a/src/test/features/gitpod.feature b/src/test/features/setup/gitpod.feature
similarity index 100%
rename from src/test/features/gitpod.feature
rename to src/test/features/setup/gitpod.feature
diff --git a/src/test/features/infinitest.feature b/src/test/features/setup/infinitest.feature
similarity index 100%
rename from src/test/features/infinitest.feature
rename to src/test/features/setup/infinitest.feature
diff --git a/src/test/features/statistics.feature b/src/test/features/statistics.feature
index bd4613fac8c..93c1b4eeaaa 100644
--- a/src/test/features/statistics.feature
+++ b/src/test/features/statistics.feature
@@ -7,7 +7,7 @@ Feature: application statistics
     Then I should have statistics
       | Applied modules | 1 |
 
-  Scenario: Should have mutliple applied module
+  Scenario: Should have multiple applied module
     Given I apply modules to default project
       | maven-java  |
       | spring-boot |