diff --git a/build.gradle.kts b/build.gradle.kts
index f42d2e7..8b74ba1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 allprojects {
     group = "io.github.mfvanek"
-    version = "0.14.3"
+    version = "0.14.4"
 
     repositories {
         mavenLocal()
diff --git a/buildSrc/src/main/kotlin/pg-index-health-demo.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/pg-index-health-demo.java-conventions.gradle.kts
index 03aa876..587e783 100644
--- a/buildSrc/src/main/kotlin/pg-index-health-demo.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/pg-index-health-demo.java-conventions.gradle.kts
@@ -22,14 +22,14 @@ configurations.configureEach {
 }
 
 dependencies {
-    implementation(platform("io.github.mfvanek:pg-index-health-bom:0.14.3"))
+    implementation(platform("io.github.mfvanek:pg-index-health-bom:0.14.4"))
     implementation(platform("org.testcontainers:testcontainers-bom:1.20.4"))
 
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("org.postgresql:postgresql:42.7.4")
 
-    testImplementation(platform("org.junit:junit-bom:5.11.3"))
-    testImplementation(platform("org.assertj:assertj-bom:3.26.3"))
+    testImplementation(platform("org.junit:junit-bom:5.11.4"))
+    testImplementation(platform("org.assertj:assertj-bom:3.27.0"))
 
     errorprone("com.google.errorprone:error_prone_core:2.36.0")
     errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.28")
@@ -37,7 +37,7 @@ dependencies {
     spotbugsSlf4j("org.slf4j:slf4j-simple:2.0.16")
     spotbugsPlugins("jp.skypencil.findbugs.slf4j:bug-pattern:1.5.0")
     spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0")
-    spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.8")
+    spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.9")
 }
 
 tasks.withType<JavaCompile>().configureEach {
diff --git a/config/spotbugs/exclude.xml b/config/spotbugs/exclude.xml
index 93dc5b1..2b66829 100644
--- a/config/spotbugs/exclude.xml
+++ b/config/spotbugs/exclude.xml
@@ -9,11 +9,11 @@
     </Match>
     <Match>
         <Bug pattern="MDM_THREAD_YIELD"/>
-        <Class name="io.github.mfvanek.pg.index.health.demo.utils.StatisticsCollector"/>
+        <Class name="io.github.mfvanek.pg.index.health.demo.without.spring.utils.StatisticsCollector"/>
     </Match>
     <Match>
         <Bug pattern="SIL_SQL_IN_LOOP"/>
-        <Class name="io.github.mfvanek.pg.index.health.demo.utils.MigrationsGenerator"/>
+        <Class name="io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationsGenerator"/>
     </Match>
     <Match>
         <Bug pattern="PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS,SIL_SQL_IN_LOOP"/>
diff --git a/pg-index-health-demo-without-spring/build.gradle.kts b/pg-index-health-demo-without-spring/build.gradle.kts
index 046b635..afc40c8 100644
--- a/pg-index-health-demo-without-spring/build.gradle.kts
+++ b/pg-index-health-demo-without-spring/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     implementation("org.apache.commons:commons-dbcp2:2.13.0")
     implementation("org.testcontainers:testcontainers")
     implementation("org.testcontainers:postgresql")
-    implementation("ch.qos.logback:logback-classic:1.5.12")
+    implementation("ch.qos.logback:logback-classic:1.5.14")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/ConfigurationDemoApp.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/ConfigurationDemoApp.java
similarity index 73%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/ConfigurationDemoApp.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/ConfigurationDemoApp.java
index 33343c8..51e2c25 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/ConfigurationDemoApp.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/ConfigurationDemoApp.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.utils.ConfigurationCollector;
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.ConfigurationCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/DemoApp.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/DemoApp.java
similarity index 83%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/DemoApp.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/DemoApp.java
index d62ea4d..5c874bf 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/DemoApp.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/DemoApp.java
@@ -5,17 +5,17 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
 import io.github.mfvanek.pg.connection.PrimaryHostDeterminerImpl;
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;
 import io.github.mfvanek.pg.connection.factory.HighAvailabilityPgConnectionFactory;
 import io.github.mfvanek.pg.connection.factory.HighAvailabilityPgConnectionFactoryImpl;
 import io.github.mfvanek.pg.connection.factory.PgConnectionFactoryImpl;
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
-import io.github.mfvanek.pg.index.health.demo.utils.HealthDataCollector;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationRunner;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationsGenerator;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.HealthDataCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationRunner;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationsGenerator;
 import io.github.mfvanek.pg.model.constraint.ForeignKey;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import lombok.SneakyThrows;
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/StatisticsDemoApp.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/StatisticsDemoApp.java
similarity index 73%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/StatisticsDemoApp.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/StatisticsDemoApp.java
index 3e5bc66..7404912 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/StatisticsDemoApp.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/StatisticsDemoApp.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
-import io.github.mfvanek.pg.index.health.demo.utils.StatisticsCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.StatisticsCollector;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/ConfigurationCollector.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/ConfigurationCollector.java
similarity index 97%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/ConfigurationCollector.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/ConfigurationCollector.java
index 8ae84c8..60faaad 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/ConfigurationCollector.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/ConfigurationCollector.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection;
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnectionImpl;
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/Consts.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/Consts.java
similarity index 80%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/Consts.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/Consts.java
index 789254f..656e79e 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/Consts.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/Consts.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import lombok.experimental.UtilityClass;
 
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/HealthDataCollector.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/HealthDataCollector.java
similarity index 95%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/HealthDataCollector.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/HealthDataCollector.java
index d021cf1..a24128d 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/HealthDataCollector.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/HealthDataCollector.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;
 import io.github.mfvanek.pg.connection.factory.HighAvailabilityPgConnectionFactory;
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationRunner.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationRunner.java
similarity index 95%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationRunner.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationRunner.java
index 81683d5..2df5fd9 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationRunner.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationRunner.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import liquibase.Liquibase;
 import liquibase.Scope;
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationsGenerator.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationsGenerator.java
similarity index 97%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationsGenerator.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationsGenerator.java
index fff65f7..7db0d05 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationsGenerator.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationsGenerator.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection;
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;
diff --git a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/StatisticsCollector.java b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/StatisticsCollector.java
similarity index 97%
rename from pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/StatisticsCollector.java
rename to pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/StatisticsCollector.java
index 80877e1..1bafcf1 100644
--- a/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/utils/StatisticsCollector.java
+++ b/pg-index-health-demo-without-spring/src/main/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/StatisticsCollector.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnection;
 import io.github.mfvanek.pg.connection.HighAvailabilityPgConnectionImpl;
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/ConfigurationDemoAppTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/ConfigurationDemoAppTest.java
similarity index 77%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/ConfigurationDemoAppTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/ConfigurationDemoAppTest.java
index 80a4227..2b50bb3 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/ConfigurationDemoAppTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/ConfigurationDemoAppTest.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.support.LogsAwareTestBase;
-import io.github.mfvanek.pg.index.health.demo.utils.ConfigurationCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.LogsAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.ConfigurationCollector;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/IndexesMaintenanceTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/DatabaseStructureStaticAnalysisTest.java
similarity index 97%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/IndexesMaintenanceTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/DatabaseStructureStaticAnalysisTest.java
index 7031be2..3be0e01 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/IndexesMaintenanceTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/DatabaseStructureStaticAnalysisTest.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
 import io.github.mfvanek.pg.connection.PgConnection;
 import io.github.mfvanek.pg.connection.PgConnectionImpl;
@@ -33,7 +33,7 @@
 import io.github.mfvanek.pg.core.checks.host.TablesNotLinkedToOthersCheckOnHost;
 import io.github.mfvanek.pg.core.checks.host.TablesWithoutDescriptionCheckOnHost;
 import io.github.mfvanek.pg.core.checks.host.TablesWithoutPrimaryKeyCheckOnHost;
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import io.github.mfvanek.pg.model.column.Column;
 import io.github.mfvanek.pg.model.column.ColumnWithSerialType;
 import io.github.mfvanek.pg.model.constraint.Constraint;
@@ -66,7 +66,7 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
 @SuppressWarnings({"checkstyle:ClassDataAbstractionCoupling", "checkstyle:ClassFanOutComplexity"})
-class IndexesMaintenanceTest extends DatabaseAwareTestBase {
+class DatabaseStructureStaticAnalysisTest extends DatabaseAwareTestBase {
 
     private static final int SKIPPED_CHECKS_COUNT = 4; // indexes with bloat, tables with bloat, unused indexes, tables with missing indexes
     private static final String BUYER_TABLE = "demo.buyer";
@@ -77,7 +77,7 @@ class IndexesMaintenanceTest extends DatabaseAwareTestBase {
     private final PgContext ctx = PgContext.of("demo");
     private final List<DatabaseCheckOnHost<? extends DbObject>> checks;
 
-    IndexesMaintenanceTest() {
+    DatabaseStructureStaticAnalysisTest() {
         final PgConnection pgConnection = PgConnectionImpl.of(getDataSource(), getHost());
         this.checks = List.of(
             new InvalidIndexesCheckOnHost(pgConnection),
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/DemoAppTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/DemoAppTest.java
similarity index 79%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/DemoAppTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/DemoAppTest.java
index fc3fab5..76d14f5 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/DemoAppTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/DemoAppTest.java
@@ -5,12 +5,12 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
 import io.github.mfvanek.pg.core.checks.common.Diagnostic;
-import io.github.mfvanek.pg.index.health.demo.support.LogsAwareTestBase;
-import io.github.mfvanek.pg.index.health.demo.utils.HealthDataCollector;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationRunner;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.LogsAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.HealthDataCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationRunner;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/JsonbTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/JsonbTest.java
similarity index 94%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/JsonbTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/JsonbTest.java
index 5dae853..0f9dd80 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/JsonbTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/JsonbTest.java
@@ -5,9 +5,9 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.postgresql.util.PGobject;
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/StatisticsDemoAppTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/StatisticsDemoAppTest.java
similarity index 79%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/StatisticsDemoAppTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/StatisticsDemoAppTest.java
index bf7d5ef..945e0a8 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/StatisticsDemoAppTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/StatisticsDemoAppTest.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo;
+package io.github.mfvanek.pg.index.health.demo.without.spring;
 
-import io.github.mfvanek.pg.index.health.demo.support.LogsAwareTestBase;
-import io.github.mfvanek.pg.index.health.demo.utils.StatisticsCollector;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.LogsAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.StatisticsCollector;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/support/DatabaseAwareTestBase.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/support/DatabaseAwareTestBase.java
similarity index 89%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/support/DatabaseAwareTestBase.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/support/DatabaseAwareTestBase.java
index dfa6887..ce1a9f0 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/support/DatabaseAwareTestBase.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/support/DatabaseAwareTestBase.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.support;
+package io.github.mfvanek.pg.index.health.demo.without.spring.support;
 
 import io.github.mfvanek.pg.connection.PrimaryHostDeterminerImpl;
 import io.github.mfvanek.pg.connection.factory.ConnectionCredentials;
@@ -14,8 +14,8 @@
 import io.github.mfvanek.pg.connection.factory.PgConnectionFactoryImpl;
 import io.github.mfvanek.pg.connection.host.PgHost;
 import io.github.mfvanek.pg.connection.host.PgHostImpl;
-import io.github.mfvanek.pg.index.health.demo.utils.Consts;
-import io.github.mfvanek.pg.index.health.demo.utils.MigrationRunner;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.Consts;
+import io.github.mfvanek.pg.index.health.demo.without.spring.utils.MigrationRunner;
 import io.github.mfvanek.pg.testing.PostgreSqlContainerWrapper;
 import org.junit.jupiter.api.BeforeAll;
 
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/support/LogsAwareTestBase.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/support/LogsAwareTestBase.java
similarity index 96%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/support/LogsAwareTestBase.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/support/LogsAwareTestBase.java
index 9203f1a..010b6d3 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/support/LogsAwareTestBase.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/support/LogsAwareTestBase.java
@@ -5,7 +5,7 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.support;
+package io.github.mfvanek.pg.index.health.demo.without.spring.support;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/ConfigurationCollectorTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/ConfigurationCollectorTest.java
similarity index 84%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/ConfigurationCollectorTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/ConfigurationCollectorTest.java
index 8d1c7dc..cd22af9 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/ConfigurationCollectorTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/ConfigurationCollectorTest.java
@@ -5,9 +5,9 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import io.github.mfvanek.pg.model.settings.PgParamImpl;
 import org.junit.jupiter.api.Test;
 
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/HealthDataCollectorTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/HealthDataCollectorTest.java
similarity index 95%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/HealthDataCollectorTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/HealthDataCollectorTest.java
index 8e75990..227f616 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/HealthDataCollectorTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/HealthDataCollectorTest.java
@@ -5,11 +5,11 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.core.checks.common.Diagnostic;
 import io.github.mfvanek.pg.core.utils.ClockHolder;
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationsGeneratorTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationsGeneratorTest.java
similarity index 89%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationsGeneratorTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationsGeneratorTest.java
index 9a8650e..3f0e0c0 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/MigrationsGeneratorTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/MigrationsGeneratorTest.java
@@ -5,9 +5,9 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import io.github.mfvanek.pg.model.constraint.ForeignKey;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;
diff --git a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/StatisticsCollectorTest.java b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/StatisticsCollectorTest.java
similarity index 85%
rename from pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/StatisticsCollectorTest.java
rename to pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/StatisticsCollectorTest.java
index 1ed05a4..ef02935 100644
--- a/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/utils/StatisticsCollectorTest.java
+++ b/pg-index-health-demo-without-spring/src/test/java/io/github/mfvanek/pg/index/health/demo/without/spring/utils/StatisticsCollectorTest.java
@@ -5,10 +5,10 @@
  * Licensed under the Apache License 2.0
  */
 
-package io.github.mfvanek.pg.index.health.demo.utils;
+package io.github.mfvanek.pg.index.health.demo.without.spring.utils;
 
 import io.github.mfvanek.pg.core.utils.ClockHolder;
-import io.github.mfvanek.pg.index.health.demo.support.DatabaseAwareTestBase;
+import io.github.mfvanek.pg.index.health.demo.without.spring.support.DatabaseAwareTestBase;
 import org.junit.jupiter.api.Test;
 
 import java.time.Clock;
diff --git a/pg-index-health-spring-boot-demo/src/test/java/io/github/mfvanek/pg/index/health/demo/IndexesMaintenanceTest.java b/pg-index-health-spring-boot-demo/src/test/java/io/github/mfvanek/pg/index/health/demo/DatabaseStructureStaticAnalysisTest.java
similarity index 99%
rename from pg-index-health-spring-boot-demo/src/test/java/io/github/mfvanek/pg/index/health/demo/IndexesMaintenanceTest.java
rename to pg-index-health-spring-boot-demo/src/test/java/io/github/mfvanek/pg/index/health/demo/DatabaseStructureStaticAnalysisTest.java
index 48e81f2..298dc24 100644
--- a/pg-index-health-spring-boot-demo/src/test/java/io/github/mfvanek/pg/index/health/demo/IndexesMaintenanceTest.java
+++ b/pg-index-health-spring-boot-demo/src/test/java/io/github/mfvanek/pg/index/health/demo/DatabaseStructureStaticAnalysisTest.java
@@ -38,7 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.InstanceOfAssertFactories.list;
 
-class IndexesMaintenanceTest extends BasePgIndexHealthDemoSpringBootTest {
+class DatabaseStructureStaticAnalysisTest extends BasePgIndexHealthDemoSpringBootTest {
 
     private static final String BUYER_TABLE = "demo.buyer";
     private static final String ORDER_ITEM_TABLE = "demo.order_item";