diff --git a/lisp/cli/install.el b/lisp/cli/install.el
index 12eef1656..5b84aeac5 100644
--- a/lisp/cli/install.el
+++ b/lisp/cli/install.el
@@ -28,7 +28,7 @@
 This command does the following:
 
   1. Creates `$DOOMDIR' at ~/.config/doom (if it or ~/.doom.d doesn't exist),
-  2. Copies ~/.config/emacs/templates/init.example.el to `$DOOMDIR'/init.el (if
+  2. Copies ~/.config/emacs/static/init.example.el to `$DOOMDIR'/init.el (if
      it doesn't exist),
   3. Creates dummy files for `$DOOMDIR'/{config,packages}.el,
   4. Prompts you to generate an envvar file (same as `$ doom env`),
@@ -70,7 +70,7 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g.
                     (print! (item "Creating %s...") (path filename))
                     (with-temp-file filename (insert-file-contents template))
                     (print! (success "Done!")))))
-              (let ((template-dir (doom-path doom-emacs-dir "templates")))
+              (let ((template-dir (doom-path doom-emacs-dir "static/")))
                 `((,doom-module-init-file
                    . ,(file-name-with-extension (doom-path template-dir doom-module-init-file)
                                                 ".example.el"))
@@ -124,7 +124,7 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g.
 
     (print! (success "Finished! Doom is ready to go!\n"))
     (with-temp-buffer
-      (insert-file-contents (doom-path doom-emacs-dir "templates/QUICKSTART_INTRO"))
+      (insert-file-contents (doom-path doom-emacs-dir "static/QUICKSTART_INTRO"))
       (print! "%s" (buffer-string)))))
 
 (provide 'doom-cli-install)
diff --git a/templates/BUG_REPORT b/static/BUG_REPORT
similarity index 100%
rename from templates/BUG_REPORT
rename to static/BUG_REPORT
diff --git a/templates/QUICKSTART_INTRO b/static/QUICKSTART_INTRO
similarity index 100%
rename from templates/QUICKSTART_INTRO
rename to static/QUICKSTART_INTRO
diff --git a/templates/VANILLA_SANDBOX b/static/VANILLA_SANDBOX
similarity index 100%
rename from templates/VANILLA_SANDBOX
rename to static/VANILLA_SANDBOX
diff --git a/templates/config.example.el b/static/config.example.el
similarity index 100%
rename from templates/config.example.el
rename to static/config.example.el
diff --git a/templates/init.example.el b/static/init.example.el
similarity index 100%
rename from templates/init.example.el
rename to static/init.example.el
diff --git a/templates/packages.example.el b/static/packages.example.el
similarity index 99%
rename from templates/packages.example.el
rename to static/packages.example.el
index 9f59d9a67..b3322c7e6 100644
--- a/templates/packages.example.el
+++ b/static/packages.example.el
@@ -2,7 +2,7 @@
 ;;; $DOOMDIR/packages.el
 
 ;; To install a package with Doom you must declare them here and run 'doom sync'
-;; on the command line, then restart Emacs for the changes to take effect.
+;; on the command line, then restart Emacs for the changes to take effect -- or
 
 
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: