diff --git a/MANIFEST.in b/MANIFEST.in
index aa7779b8f49754ed7e88889fb5e375e15afae5a5..0334d08b2a083ea4cc06f5feedf9bcfd1613a173 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,2 @@
 include README.md
-recursive-include templates/host *
-recursive-include templates/container *
+recursive-include lustmolch/templates *
diff --git a/lustmolch/lustmolch.py b/lustmolch/lustmolch.py
index 76f8a48fbcdae27cd59f7e3a99dbd47dde15ae00..881faefdc673f3f5864fd2c192289d706b4f13b7 100755
--- a/lustmolch/lustmolch.py
+++ b/lustmolch/lustmolch.py
@@ -12,7 +12,7 @@ from .config import config, DEFAULT_TEMPLATE_DIR
 
 logging.basicConfig(format='%(levelname)s:%(message)s', level=config['log_level'])
 
-env = Environment(loader=PackageLoader('lustmolch', str(Path(__file__).parent.parent / 'templates')))
+env = Environment(loader=PackageLoader('lustmolch', str(Path(__file__).parent / 'templates')))
 cfg_template = namedtuple('cfg_template', ['source', 'path', 'filename'])
 
 template_files_host = [
diff --git a/templates/container/80-container-host0.network b/lustmolch/templates/container/80-container-host0.network
similarity index 100%
rename from templates/container/80-container-host0.network
rename to lustmolch/templates/container/80-container-host0.network
diff --git a/templates/container/bootstrap.sh b/lustmolch/templates/container/bootstrap.sh
similarity index 100%
rename from templates/container/bootstrap.sh
rename to lustmolch/templates/container/bootstrap.sh
diff --git a/templates/container/sshd_config b/lustmolch/templates/container/sshd_config
similarity index 100%
rename from templates/container/sshd_config
rename to lustmolch/templates/container/sshd_config
diff --git a/templates/host/80-container-ve.network b/lustmolch/templates/host/80-container-ve.network
similarity index 100%
rename from templates/host/80-container-ve.network
rename to lustmolch/templates/host/80-container-ve.network
diff --git a/templates/host/nginx b/lustmolch/templates/host/nginx
similarity index 100%
rename from templates/host/nginx
rename to lustmolch/templates/host/nginx
diff --git a/templates/host/nspawn b/lustmolch/templates/host/nspawn
similarity index 100%
rename from templates/host/nspawn
rename to lustmolch/templates/host/nspawn
diff --git a/setup.py b/setup.py
index d1d52670c76fd279e91942e327ec59607045e202..fd3a02741d95e5a95063e1ad79f3a5a134df3598 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = '1.0.3'
+VERSION = '1.0.4'
 AUTHOR = 'Michael Loipführer'