diff --git a/Makefile b/Makefile
index 55f286379..046d7ae8b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ dist: distclean locales
 	cp *.inx dist
 	mkdir -p dist/inkstitch/bin/locales
 	cp -a locales/* dist/inkstitch/bin/locales
-	cp -a templates dist/inkstitch/bin/
+	cp -a print dist/inkstitch/bin/
 	if [ "$$BUILD" = "windows" ]; then \
 		cd dist; zip -r ../inkstitch-$(VERSION)-win32.zip *; \
 	else \
diff --git a/embroider_print.py b/embroider_print.py
index 65f55a977..00fc9a3c1 100644
--- a/embroider_print.py
+++ b/embroider_print.py
@@ -79,9 +79,9 @@ class PrintPreviewServer(Thread):
 
     def __set_resources_path(self):
         if getattr(sys, 'frozen', False):
-            self.resources_path = os.path.join(sys._MEIPASS, 'resources')
+            self.resources_path = os.path.join(sys._MEIPASS, 'print', 'resources')
         else:
-            self.resources_path = os.path.join(os.path.dirname(__file__), 'resources')
+            self.resources_path = os.path.join(os.path.dirname(__file__), 'print', 'resources')
 
     def __setup_app(self):
         self.__set_resources_path()
@@ -126,9 +126,9 @@ class PrintPreviewServer(Thread):
 class Print(InkstitchExtension):
     def build_environment(self):
         if getattr( sys, 'frozen', False ) :
-            template_dir = os.path.join(sys._MEIPASS, "templates")
+            template_dir = os.path.join(sys._MEIPASS, "print", "templates")
         else:
-            template_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "templates")
+            template_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "print", "templates")
 
         env = Environment(
             loader = FileSystemLoader(template_dir),
diff --git a/resources/barlow.ttf b/print/resources/barlow.ttf
similarity index 100%
rename from resources/barlow.ttf
rename to print/resources/barlow.ttf
diff --git a/resources/barlow_condensed.ttf b/print/resources/barlow_condensed.ttf
similarity index 100%
rename from resources/barlow_condensed.ttf
rename to print/resources/barlow_condensed.ttf
diff --git a/resources/inkstitch.js b/print/resources/inkstitch.js
similarity index 100%
rename from resources/inkstitch.js
rename to print/resources/inkstitch.js
diff --git a/resources/jquery-3.3.1.min.js b/print/resources/jquery-3.3.1.min.js
similarity index 100%
rename from resources/jquery-3.3.1.min.js
rename to print/resources/jquery-3.3.1.min.js
diff --git a/resources/style.css b/print/resources/style.css
similarity index 100%
rename from resources/style.css
rename to print/resources/style.css
diff --git a/templates/color_swatch.html b/print/templates/color_swatch.html
similarity index 100%
rename from templates/color_swatch.html
rename to print/templates/color_swatch.html
diff --git a/templates/footer.html b/print/templates/footer.html
similarity index 100%
rename from templates/footer.html
rename to print/templates/footer.html
diff --git a/templates/index.html b/print/templates/index.html
similarity index 100%
rename from templates/index.html
rename to print/templates/index.html
diff --git a/templates/index.html~ b/print/templates/index.html~
similarity index 100%
rename from templates/index.html~
rename to print/templates/index.html~
diff --git a/templates/print_detail.html b/print/templates/print_detail.html
similarity index 100%
rename from templates/print_detail.html
rename to print/templates/print_detail.html
diff --git a/templates/print_overview.html b/print/templates/print_overview.html
similarity index 100%
rename from templates/print_overview.html
rename to print/templates/print_overview.html