diff --git a/configurator/configurator.py b/configurator.py
similarity index 100%
rename from configurator/configurator.py
rename to configurator.py
diff --git a/configurator/__init__.py b/configurator/__init__.py
deleted file mode 100644
index 2c7d294..0000000
--- a/configurator/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import configurator
diff --git a/configurator/templates/simul.netcfg b/templates/simul.netcfg
similarity index 100%
rename from configurator/templates/simul.netcfg
rename to templates/simul.netcfg
diff --git a/configurator/templates/simul.polycfg b/templates/simul.polycfg
similarity index 100%
rename from configurator/templates/simul.polycfg
rename to templates/simul.polycfg
diff --git a/configurator/templates/simul.sumocfg b/templates/simul.sumocfg
similarity index 100%
rename from configurator/templates/simul.sumocfg
rename to templates/simul.sumocfg
diff --git a/configurator/templates/typemap/osmBidiRailNetconvert.typ.xml b/templates/typemap/osmBidiRailNetconvert.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmBidiRailNetconvert.typ.xml
rename to templates/typemap/osmBidiRailNetconvert.typ.xml
diff --git a/configurator/templates/typemap/osmNetconvert.typ.xml b/templates/typemap/osmNetconvert.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmNetconvert.typ.xml
rename to templates/typemap/osmNetconvert.typ.xml
diff --git a/configurator/templates/typemap/osmNetconvertBicycle.typ.xml b/templates/typemap/osmNetconvertBicycle.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmNetconvertBicycle.typ.xml
rename to templates/typemap/osmNetconvertBicycle.typ.xml
diff --git a/configurator/templates/typemap/osmNetconvertPedestrians.typ.xml b/templates/typemap/osmNetconvertPedestrians.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmNetconvertPedestrians.typ.xml
rename to templates/typemap/osmNetconvertPedestrians.typ.xml
diff --git a/configurator/templates/typemap/osmNetconvertShips.typ.xml b/templates/typemap/osmNetconvertShips.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmNetconvertShips.typ.xml
rename to templates/typemap/osmNetconvertShips.typ.xml
diff --git a/configurator/templates/typemap/osmNetconvertUrbanDe.typ.xml b/templates/typemap/osmNetconvertUrbanDe.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmNetconvertUrbanDe.typ.xml
rename to templates/typemap/osmNetconvertUrbanDe.typ.xml
diff --git a/configurator/templates/typemap/osmPolyconvert.boundaries.typ.xml b/templates/typemap/osmPolyconvert.boundaries.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmPolyconvert.boundaries.typ.xml
rename to templates/typemap/osmPolyconvert.boundaries.typ.xml
diff --git a/configurator/templates/typemap/osmPolyconvert.typ.xml b/templates/typemap/osmPolyconvert.typ.xml
similarity index 100%
rename from configurator/templates/typemap/osmPolyconvert.typ.xml
rename to templates/typemap/osmPolyconvert.typ.xml
diff --git a/tests/configurator_tests.py b/tests/configurator_tests.py
index 51bf002..ea7e017 100644
--- a/tests/configurator_tests.py
+++ b/tests/configurator_tests.py
@@ -3,7 +3,7 @@ import shutil
 import tempfile
 import unittest
 
-from configurator import configurator
+import configurator
 
 # Absolute path of the directory the script is in
 SCRIPTDIR = os.path.dirname(__file__)