diff --git a/scripts/byte-compile.el b/scripts/byte-compile.el
index 62bb4262c..0f35c9675 100755
--- a/scripts/byte-compile.el
+++ b/scripts/byte-compile.el
@@ -8,10 +8,7 @@
 (byte-recompile-file (expand-file-name "core.el" narf-core-dir) t 0)
 (byte-recompile-file (expand-file-name "core-vars.el" narf-core-dir) t 0)
 (byte-recompile-file (expand-file-name "core-defuns.el" narf-core-dir) t 0)
-(dolist (dir (append (list narf-core-dir narf-contrib-dir)
-                     (list (concat narf-modules-dir "lib/")
-                           (concat narf-core-dir "lib/")
-                           narf-modules-dir)))
+(dolist (dir (list narf-core-dir narf-modules-dir narf-core-dir))
   (byte-recompile-directory dir 0 nil))
 
 (byte-recompile-file (expand-file-name "my-bindings.el" narf-core-dir) t 0)
diff --git a/scripts/generate-autoloads.el b/scripts/generate-autoloads.el
index 530f66c7f..aba6a9bbe 100755
--- a/scripts/generate-autoloads.el
+++ b/scripts/generate-autoloads.el
@@ -1,14 +1,12 @@
 #!emacs --script
-(load (concat user-emacs-directory "init-packages.el"))
+(load (concat user-emacs-directory "bootstrap.el"))
 
 (let ((generated-autoload-file (concat narf-core-dir "autoloads.el")))
   (when (file-exists-p generated-autoload-file)
     (delete-file generated-autoload-file))
   (mapc (lambda (dir)
-          (update-directory-autoloads dir)
+          (update-directory-autoloads (concat dir "defuns"))
           (message "Scanned: %s" dir))
-        (list (concat narf-core-dir "lib")
-              (concat narf-modules-dir "lib")
-              narf-contrib-dir))
+        (list narf-core-dir narf-modules-dir))
   (message "Done!"))