diff --git a/.project b/.project
deleted file mode 100644
index 303ccdf1f..000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>apparmor-profile-tools</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>
diff --git a/.pydevproject b/.pydevproject
deleted file mode 100644
index 9d8f69996..000000000
--- a/.pydevproject
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/apparmor-profile-tools</path>
-</pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Python3.3</pydev_property>
-</pydev_project>
diff --git a/README.md b/utils.new/README.md
similarity index 100%
rename from README.md
rename to utils.new/README.md
diff --git a/Translate/README b/utils.new/Translate/README
similarity index 100%
rename from Translate/README
rename to utils.new/Translate/README
diff --git a/Translate/messages.pot b/utils.new/Translate/messages.pot
similarity index 100%
rename from Translate/messages.pot
rename to utils.new/Translate/messages.pot
diff --git a/Tools/aa-audit b/utils.new/aa-audit
similarity index 100%
rename from Tools/aa-audit
rename to utils.new/aa-audit
diff --git a/Tools/manpages/aa-audit.pod b/utils.new/aa-audit.pod
similarity index 100%
rename from Tools/manpages/aa-audit.pod
rename to utils.new/aa-audit.pod
diff --git a/Tools/aa-autodep b/utils.new/aa-autodep
similarity index 100%
rename from Tools/aa-autodep
rename to utils.new/aa-autodep
diff --git a/Tools/manpages/aa-autodep.pod b/utils.new/aa-autodep.pod
similarity index 100%
rename from Tools/manpages/aa-autodep.pod
rename to utils.new/aa-autodep.pod
diff --git a/Tools/aa-cleanprof b/utils.new/aa-cleanprof
similarity index 100%
rename from Tools/aa-cleanprof
rename to utils.new/aa-cleanprof
diff --git a/Tools/manpages/aa-cleanprof.pod b/utils.new/aa-cleanprof.pod
similarity index 100%
rename from Tools/manpages/aa-cleanprof.pod
rename to utils.new/aa-cleanprof.pod
diff --git a/Tools/aa-complain b/utils.new/aa-complain
similarity index 100%
rename from Tools/aa-complain
rename to utils.new/aa-complain
diff --git a/Tools/manpages/aa-complain.pod b/utils.new/aa-complain.pod
similarity index 100%
rename from Tools/manpages/aa-complain.pod
rename to utils.new/aa-complain.pod
diff --git a/Tools/aa-disable b/utils.new/aa-disable
similarity index 100%
rename from Tools/aa-disable
rename to utils.new/aa-disable
diff --git a/Tools/manpages/aa-disable.pod b/utils.new/aa-disable.pod
similarity index 100%
rename from Tools/manpages/aa-disable.pod
rename to utils.new/aa-disable.pod
diff --git a/Tools/aa-enforce b/utils.new/aa-enforce
similarity index 100%
rename from Tools/aa-enforce
rename to utils.new/aa-enforce
diff --git a/Tools/manpages/aa-enforce.pod b/utils.new/aa-enforce.pod
similarity index 100%
rename from Tools/manpages/aa-enforce.pod
rename to utils.new/aa-enforce.pod
diff --git a/Tools/aa-genprof b/utils.new/aa-genprof
similarity index 100%
rename from Tools/aa-genprof
rename to utils.new/aa-genprof
diff --git a/Tools/manpages/aa-genprof.pod b/utils.new/aa-genprof.pod
similarity index 100%
rename from Tools/manpages/aa-genprof.pod
rename to utils.new/aa-genprof.pod
diff --git a/Tools/aa-logprof b/utils.new/aa-logprof
similarity index 100%
rename from Tools/aa-logprof
rename to utils.new/aa-logprof
diff --git a/Tools/manpages/aa-logprof.pod b/utils.new/aa-logprof.pod
similarity index 100%
rename from Tools/manpages/aa-logprof.pod
rename to utils.new/aa-logprof.pod
diff --git a/Tools/aa-mergeprof b/utils.new/aa-mergeprof
similarity index 100%
rename from Tools/aa-mergeprof
rename to utils.new/aa-mergeprof
diff --git a/Tools/manpages/aa-mergeprof.pod b/utils.new/aa-mergeprof.pod
similarity index 100%
rename from Tools/manpages/aa-mergeprof.pod
rename to utils.new/aa-mergeprof.pod
diff --git a/Tools/aa-unconfined b/utils.new/aa-unconfined
similarity index 100%
rename from Tools/aa-unconfined
rename to utils.new/aa-unconfined
diff --git a/Tools/manpages/aa-unconfined.pod b/utils.new/aa-unconfined.pod
similarity index 100%
rename from Tools/manpages/aa-unconfined.pod
rename to utils.new/aa-unconfined.pod
diff --git a/apparmor/__init__.py b/utils.new/apparmor/__init__.py
similarity index 100%
rename from apparmor/__init__.py
rename to utils.new/apparmor/__init__.py
diff --git a/apparmor/aa.py b/utils.new/apparmor/aa.py
similarity index 100%
rename from apparmor/aa.py
rename to utils.new/apparmor/aa.py
diff --git a/apparmor/aamode.py b/utils.new/apparmor/aamode.py
similarity index 100%
rename from apparmor/aamode.py
rename to utils.new/apparmor/aamode.py
diff --git a/apparmor/cleanprofile.py b/utils.new/apparmor/cleanprofile.py
similarity index 100%
rename from apparmor/cleanprofile.py
rename to utils.new/apparmor/cleanprofile.py
diff --git a/apparmor/common.py b/utils.new/apparmor/common.py
similarity index 100%
rename from apparmor/common.py
rename to utils.new/apparmor/common.py
diff --git a/apparmor/config.py b/utils.new/apparmor/config.py
similarity index 100%
rename from apparmor/config.py
rename to utils.new/apparmor/config.py
diff --git a/apparmor/logparser.py b/utils.new/apparmor/logparser.py
similarity index 100%
rename from apparmor/logparser.py
rename to utils.new/apparmor/logparser.py
diff --git a/apparmor/severity.py b/utils.new/apparmor/severity.py
similarity index 100%
rename from apparmor/severity.py
rename to utils.new/apparmor/severity.py
diff --git a/apparmor/tools.py b/utils.new/apparmor/tools.py
similarity index 100%
rename from apparmor/tools.py
rename to utils.new/apparmor/tools.py
diff --git a/apparmor/ui.py b/utils.new/apparmor/ui.py
similarity index 100%
rename from apparmor/ui.py
rename to utils.new/apparmor/ui.py
diff --git a/apparmor/yasti.py b/utils.new/apparmor/yasti.py
similarity index 100%
rename from apparmor/yasti.py
rename to utils.new/apparmor/yasti.py
diff --git a/Testing/aa_test.py b/utils.new/test/aa_test.py
similarity index 100%
rename from Testing/aa_test.py
rename to utils.new/test/aa_test.py
diff --git a/Testing/cleanprof_test.in b/utils.new/test/cleanprof_test.in
similarity index 100%
rename from Testing/cleanprof_test.in
rename to utils.new/test/cleanprof_test.in
diff --git a/Testing/cleanprof_test.out b/utils.new/test/cleanprof_test.out
similarity index 100%
rename from Testing/cleanprof_test.out
rename to utils.new/test/cleanprof_test.out
diff --git a/Testing/common_test.py b/utils.new/test/common_test.py
similarity index 100%
rename from Testing/common_test.py
rename to utils.new/test/common_test.py
diff --git a/Testing/config_test.py b/utils.new/test/config_test.py
similarity index 100%
rename from Testing/config_test.py
rename to utils.new/test/config_test.py
diff --git a/Testing/easyprof.conf b/utils.new/test/easyprof.conf
similarity index 100%
rename from Testing/easyprof.conf
rename to utils.new/test/easyprof.conf
diff --git a/Testing/logprof.conf b/utils.new/test/logprof.conf
similarity index 100%
rename from Testing/logprof.conf
rename to utils.new/test/logprof.conf
diff --git a/Testing/minitools_test.py b/utils.new/test/minitools_test.py
similarity index 100%
rename from Testing/minitools_test.py
rename to utils.new/test/minitools_test.py
diff --git a/Testing/regex_tests.ini b/utils.new/test/regex_tests.ini
similarity index 100%
rename from Testing/regex_tests.ini
rename to utils.new/test/regex_tests.ini
diff --git a/Testing/runtests-py2.sh b/utils.new/test/runtests-py2.sh
similarity index 100%
rename from Testing/runtests-py2.sh
rename to utils.new/test/runtests-py2.sh
diff --git a/Testing/runtests-py3.sh b/utils.new/test/runtests-py3.sh
similarity index 100%
rename from Testing/runtests-py3.sh
rename to utils.new/test/runtests-py3.sh
diff --git a/Testing/severity.db b/utils.new/test/severity.db
similarity index 100%
rename from Testing/severity.db
rename to utils.new/test/severity.db
diff --git a/Testing/severity_broken.db b/utils.new/test/severity_broken.db
similarity index 100%
rename from Testing/severity_broken.db
rename to utils.new/test/severity_broken.db
diff --git a/Testing/severity_test.py b/utils.new/test/severity_test.py
similarity index 100%
rename from Testing/severity_test.py
rename to utils.new/test/severity_test.py