diff --git a/.gitmodules b/.gitmodules
index 04b15f723..dacef67cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
-[submodule "documentation/OWASP-CRS-Documentation"]
-	path = documentation/OWASP-CRS-Documentation
+[submodule "docs/OWASP-CRS-Documentation"]
+	path = docs/OWASP-CRS-Documentation
 	url = https://github.com/SpiderLabs/OWASP-CRS-Documentation
 	branch = master
-[submodule "util/regression-tests/OWASP-CRS-regressions"]
-	path = util/regression-tests/OWASP-CRS-regressions
+[submodule "tests/regression/OWASP-CRS-regressions"]
+	path = tests/regression/OWASP-CRS-regressions
 	url = https://github.com/SpiderLabs/OWASP-CRS-regressions
 	branch = master
diff --git a/.travis.yml b/.travis.yml
index f4449ecb9..77b9a5193 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: python
 python:
   - "2.7"
-install: "pip install -r ./util/integration/requirements.txt"
+install: "pip install -r ./tests/integration/requirements.txt"
 script:
-    - py.test -vs ./util/integration/format_tests.py
+    - py.test -vs ./tests/integration/format_tests.py
 # safelist
 branches:
   only:
diff --git a/docs/OWASP-CRS-Documentation b/docs/OWASP-CRS-Documentation
new file mode 160000
index 000000000..df39d826f
--- /dev/null
+++ b/docs/OWASP-CRS-Documentation
@@ -0,0 +1 @@
+Subproject commit df39d826fe43081c00499ba3094276c735d1883b
diff --git a/documentation/README b/docs/documentation/README
similarity index 100%
rename from documentation/README
rename to docs/documentation/README
diff --git a/documentation/OWASP-CRS-Documentation b/documentation/OWASP-CRS-Documentation
deleted file mode 160000
index 6017f276d..000000000
--- a/documentation/OWASP-CRS-Documentation
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6017f276d2449795b4fc6462190c5e52a18891bc
diff --git a/crs-setup.conf.example b/examples/crs-setup.conf
similarity index 100%
rename from crs-setup.conf.example
rename to examples/crs-setup.conf
diff --git a/util/integration/format_tests.py b/tests/integration/format_tests.py
similarity index 100%
rename from util/integration/format_tests.py
rename to tests/integration/format_tests.py
diff --git a/util/integration/requirements.txt b/tests/integration/requirements.txt
similarity index 100%
rename from util/integration/requirements.txt
rename to tests/integration/requirements.txt
diff --git a/util/regression-tests/README b/tests/regression-tests/README
similarity index 100%
rename from util/regression-tests/README
rename to tests/regression-tests/README
diff --git a/util/regression-tests/OWASP-CRS-regressions b/util/regression-tests/OWASP-CRS-regressions
deleted file mode 160000
index 947a5ff5d..000000000
--- a/util/regression-tests/OWASP-CRS-regressions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 947a5ff5d17bed436fc42c804236300066f084ee