diff --git a/plpgsql/pgunit/Dockerfile b/plpgsql/Dockerfile
similarity index 77%
rename from plpgsql/pgunit/Dockerfile
rename to plpgsql/Dockerfile
index 4c3cc347..40b6cd48 100644
--- a/plpgsql/pgunit/Dockerfile
+++ b/plpgsql/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12.1
+FROM postgres:12.1 as base
 WORKDIR /app
 
 ENV PGHOST=localhost
@@ -15,6 +15,9 @@ RUN apt-get update \
  && rm -rf /var/lib/apt/lists/*
 
 ADD ./*.sh /app/
-ADD ./*.sql /app/
+ADD ./src /app/src
+
+ADD ./pgunit/initialize.sh /app/
+ADD ./pgunit/*.sql /app/
 RUN chmod +x ./*.sh \
  && ./initializeDocker.sh
diff --git a/plpgsql/pgunit/docker-compose.yml b/plpgsql/docker-compose.yml
similarity index 100%
rename from plpgsql/pgunit/docker-compose.yml
rename to plpgsql/docker-compose.yml
diff --git a/plpgsql/initializeDatabase.sh b/plpgsql/initializeDatabase.sh
new file mode 100644
index 00000000..c2e6c02a
--- /dev/null
+++ b/plpgsql/initializeDatabase.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -ex
+
+echo "Create database"
+psql -d postgres -c 'DROP DATABASE IF EXISTS kata;'
+psql -d postgres -c 'CREATE DATABASE kata;'
+
+./initialize.sh
+
+echo "Add current code"
+psql -d kata -f src/item.sql
+psql -d kata -f src/new_item.sql
+psql -d kata -f src/update_quality.sql
diff --git a/plpgsql/pgunit/initializeDocker.sh b/plpgsql/initializeDocker.sh
similarity index 100%
rename from plpgsql/pgunit/initializeDocker.sh
rename to plpgsql/initializeDocker.sh
diff --git a/plpgsql/pgunit/initializeDatabase.sh b/plpgsql/pgunit/initialize.sh
similarity index 59%
rename from plpgsql/pgunit/initializeDatabase.sh
rename to plpgsql/pgunit/initialize.sh
index 12b1d33d..60557019 100644
--- a/plpgsql/pgunit/initializeDatabase.sh
+++ b/plpgsql/pgunit/initialize.sh
@@ -2,9 +2,7 @@
 
 set -ex
 
-echo "Create database"
-psql -d postgres -c 'DROP DATABASE IF EXISTS kata;'
-psql -d postgres -c 'CREATE DATABASE kata;'
+echo "Enable DBLINK"
 psql -d kata -c 'CREATE EXTENSION DBLINK;'
 
 echo "Initialize test framework"
@@ -14,8 +12,3 @@ wget https://raw.githubusercontent.com/adrianandrei-ca/pgunit/bc69dfc526ec3db55f
 
 echo "Initialize custom asserts"
 psql -d kata -f asserts.sql
-
-echo "Add current code"
-psql -d kata -f item.sql
-psql -d kata -f new_item.sql
-psql -d kata -f update_quality.sql
diff --git a/plpgsql/pgunit/item.sql b/plpgsql/src/item.sql
similarity index 100%
rename from plpgsql/pgunit/item.sql
rename to plpgsql/src/item.sql
diff --git a/plpgsql/pgunit/new_item.sql b/plpgsql/src/new_item.sql
similarity index 100%
rename from plpgsql/pgunit/new_item.sql
rename to plpgsql/src/new_item.sql
diff --git a/plpgsql/pgunit/update_quality.sql b/plpgsql/src/update_quality.sql
similarity index 100%
rename from plpgsql/pgunit/update_quality.sql
rename to plpgsql/src/update_quality.sql