diff --git a/.gitignore b/.gitignore
index 13ab655..b437909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-.bundle
-.vagrant
-
-/dojo/vendor
+/vagrant/.bundle
+/vagrant/.vagrant
 
+/vagrant/dojo/*
+/docker/dojo/*
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..5b94eb7
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,9 @@
+version: "2"
+
+services:
+
+    phpunit:
+        image: devdrops/phpunit:v7.0
+        volumes:
+            - ./dojo:/dojo
+
diff --git a/dojo/composer.json b/dojo/composer.json
deleted file mode 100644
index 6543669..0000000
--- a/dojo/composer.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "name": "devdrops/coding-dojo-php-boilerplate",
-    "description": "A boilerplate to get a coding dojo environment up and running.",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Davi Marcondes Moreira",
-            "email": "davi.marcondes.moreira@gmail.com"
-        }
-    ],
-    "require": {},
-    "autoload" : {
-        "psr-4": {
-            "Dojo\\": "src",
-            "DojoTests\\": "tests"
-        }
-    }
-}
diff --git a/dojo/phpunit.xml.dist b/dojo/phpunit.xml.dist
deleted file mode 100644
index 2b7c1d9..0000000
--- a/dojo/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    backupGlobals               = "false"
-    backupStaticAttributes      = "false"
-    colors                      = "true"
-    convertErrorsToExceptions   = "true"
-    convertNoticesToExceptions  = "true"
-    convertWarningsToExceptions = "true"
-    processIsolation            = "false"
-    stopOnFailure               = "false"
-    syntaxCheck                 = "true"
->
-
-</phpunit>
diff --git a/Vagrantfile b/vagrant/Vagrantfile
similarity index 100%
rename from Vagrantfile
rename to vagrant/Vagrantfile
diff --git a/provision/install-composer.sh b/vagrant/provision/install-composer.sh
similarity index 100%
rename from provision/install-composer.sh
rename to vagrant/provision/install-composer.sh
diff --git a/provision/install-php.sh b/vagrant/provision/install-php.sh
similarity index 100%
rename from provision/install-php.sh
rename to vagrant/provision/install-php.sh
diff --git a/provision/install-phpunit.sh b/vagrant/provision/install-phpunit.sh
similarity index 100%
rename from provision/install-phpunit.sh
rename to vagrant/provision/install-phpunit.sh
diff --git a/provision/install-system.sh b/vagrant/provision/install-system.sh
similarity index 100%
rename from provision/install-system.sh
rename to vagrant/provision/install-system.sh
diff --git a/provision/intro.sh b/vagrant/provision/intro.sh
similarity index 100%
rename from provision/intro.sh
rename to vagrant/provision/intro.sh