diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 2b2a567..f064c72 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -11,7 +11,7 @@
       <driver-ref>postgresql</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.postgresql.Driver</jdbc-driver>
-      <jdbc-url>jdbc:postgresql://localhost:5433/test</jdbc-url>
+      <jdbc-url>jdbc:postgresql://localhost:15432/test</jdbc-url>
     </data-source>
     <data-source source="LOCAL" name="sonar@localhost" uuid="ee78beab-120d-4740-ad21-d4d9e2121d25">
       <driver-ref>postgresql</driver-ref>
diff --git a/build.gradle.kts b/build.gradle.kts
index 4aa8aeb..2802b2d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -71,7 +71,7 @@ val migration by tasks.registering {
     dependsOn(tasks.named("composeUp"))
 
     doLast {
-        val config = ConfigFactory.parseFile(file("$buildDir/../src/main/resources/application.conf")).resolve()
+        val config = ConfigFactory.parseFile(file("$buildDir/resources/main/application.conf")).resolve()
         val connection = Connection(
             host = config.getString("db.host"),
             port = config.getInt("db.port"),
@@ -81,8 +81,8 @@ val migration by tasks.registering {
         )
         Migrations(
             connection,
-            file("$buildDir/../src/main/resources/sql/migrations").toURI(),
-            file("$buildDir/../src/main/resources/sql/functions").toURI()
+            file("$buildDir/resources/main/sql/migrations").toURI(),
+            file("$buildDir/resources/main/sql/functions").toURI()
         ).run {
             run()
         }
@@ -94,7 +94,7 @@ val migrationTest by tasks.registering {
     dependsOn(tasks.named("testComposeUp"))
     finalizedBy(tasks.named("testComposeDown"))
     doLast {
-        val config = ConfigFactory.parseFile(file("$buildDir/../src/test/resources/application-test.conf")).resolve()
+        val config = ConfigFactory.parseFile(file("$buildDir/resources/test/application-test.conf")).resolve()
         val connection = Connection(
             host = config.getString("db.host"),
             port = config.getInt("db.port"),
@@ -104,8 +104,8 @@ val migrationTest by tasks.registering {
         )
         Migrations(
             connection,
-            file("$buildDir/../src/main/resources/sql/migrations").toURI(),
-            file("$buildDir/../src/main/resources/sql/functions").toURI()
+            file("$buildDir/resources/main/sql/migrations").toURI(),
+            file("$buildDir/resources/main/sql/functions").toURI()
         ).run {
             run()
             connection.disconnect()
@@ -115,11 +115,13 @@ val migrationTest by tasks.registering {
 
 val testSql by tasks.registering {
     group = "verification"
+    dependsOn(tasks.named("processResources"))
+    dependsOn(tasks.named("processTestResources"))
     dependsOn(tasks.named("testComposeUp"))
     finalizedBy(tasks.named("testComposeDown"))
 
     doLast {
-        val config = ConfigFactory.parseFile(file("$buildDir/../src/test/resources/application-test.conf")).resolve()
+        val config = ConfigFactory.parseFile(file("$buildDir/resources/test/application-test.conf")).resolve()
 
         val connection = Connection(
             host = config.getString("db.host"),
@@ -131,16 +133,16 @@ val testSql by tasks.registering {
 
         Migrations(
             connection,
-            file("$buildDir/../src/main/resources/sql/migrations").toURI(),
-            file("$buildDir/../src/main/resources/sql/functions").toURI(),
-            file("$buildDir/../src/test/sql/fixtures").toURI()
+            file("$buildDir/resources/main/sql/migrations").toURI(),
+            file("$buildDir/resources/main/sql/functions").toURI(),
+            file("$buildDir/resources/test/sql/fixtures").toURI()
         ).run {
             run()
         }
 
         Requester.RequesterFactory(
             connection = connection,
-            queriesDirectory = file("$buildDir/../src/test/sql").toURI()
+            queriesDirectory = file("$buildDir/resources/test/sql").toURI()
         ).createRequester().run {
             getQueries().map {
                 try {
diff --git a/src/test/sql/.gitignore b/src/test/resources/sql/.gitignore
similarity index 100%
rename from src/test/sql/.gitignore
rename to src/test/resources/sql/.gitignore
diff --git a/src/test/sql/article.sql b/src/test/resources/sql/article.sql
similarity index 100%
rename from src/test/sql/article.sql
rename to src/test/resources/sql/article.sql
diff --git a/src/test/sql/citizen.sql b/src/test/resources/sql/citizen.sql
similarity index 100%
rename from src/test/sql/citizen.sql
rename to src/test/resources/sql/citizen.sql
diff --git a/src/test/sql/comment.sql b/src/test/resources/sql/comment.sql
similarity index 100%
rename from src/test/sql/comment.sql
rename to src/test/resources/sql/comment.sql
diff --git a/src/test/sql/constitution.sql b/src/test/resources/sql/constitution.sql
similarity index 100%
rename from src/test/sql/constitution.sql
rename to src/test/resources/sql/constitution.sql
diff --git a/src/test/sql/fixtures/1-fixture_user.sql b/src/test/resources/sql/fixtures/1-fixture_user.sql
similarity index 100%
rename from src/test/sql/fixtures/1-fixture_user.sql
rename to src/test/resources/sql/fixtures/1-fixture_user.sql
diff --git a/src/test/sql/fixtures/2-fixture_citizen.sql b/src/test/resources/sql/fixtures/2-fixture_citizen.sql
similarity index 100%
rename from src/test/sql/fixtures/2-fixture_citizen.sql
rename to src/test/resources/sql/fixtures/2-fixture_citizen.sql
diff --git a/src/test/sql/fixtures/3-fixture_workgroup.sql b/src/test/resources/sql/fixtures/3-fixture_workgroup.sql
similarity index 100%
rename from src/test/sql/fixtures/3-fixture_workgroup.sql
rename to src/test/resources/sql/fixtures/3-fixture_workgroup.sql
diff --git a/src/test/sql/fixtures/4-fixture_article.sql b/src/test/resources/sql/fixtures/4-fixture_article.sql
similarity index 100%
rename from src/test/sql/fixtures/4-fixture_article.sql
rename to src/test/resources/sql/fixtures/4-fixture_article.sql
diff --git a/src/test/sql/follow.sql b/src/test/resources/sql/follow.sql
similarity index 100%
rename from src/test/sql/follow.sql
rename to src/test/resources/sql/follow.sql
diff --git a/src/test/sql/opinion.sql b/src/test/resources/sql/opinion.sql
similarity index 100%
rename from src/test/sql/opinion.sql
rename to src/test/resources/sql/opinion.sql
diff --git a/src/test/sql/test.sh b/src/test/resources/sql/test.sh
similarity index 100%
rename from src/test/sql/test.sh
rename to src/test/resources/sql/test.sh
diff --git a/src/test/sql/user.sql b/src/test/resources/sql/user.sql
similarity index 100%
rename from src/test/sql/user.sql
rename to src/test/resources/sql/user.sql
diff --git a/src/test/sql/vote.sql b/src/test/resources/sql/vote.sql
similarity index 100%
rename from src/test/sql/vote.sql
rename to src/test/resources/sql/vote.sql
diff --git a/src/test/sql/workgroup.sql b/src/test/resources/sql/workgroup.sql
similarity index 100%
rename from src/test/sql/workgroup.sql
rename to src/test/resources/sql/workgroup.sql