diff --git a/init.zsh b/init.zsh
index 514d29d..0ee95ed 100755
--- a/init.zsh
+++ b/init.zsh
@@ -20,7 +20,7 @@ fi
   setopt LOCAL_OPTIONS EXTENDED_GLOB
 
   # autoload searches fpath for function locations; add enabled module function paths
-  fpath=(${ZIM_HOME}/functions.zwc ${ZIM_HOME}/modules/prompt/functions ${fpath})
+  fpath=(${ZIM_HOME}/modules/${^zmodules}/functions(/FN) ${fpath})
 
   for mod_function in ${ZIM_HOME}/modules/${^zmodules}/functions/^([_.]*|prompt_*_setup|README*|*.zwc|*.zwc.old)(-.N:t); do
     autoload -Uz ${mod_function}
diff --git a/login_init.zsh b/login_init.zsh
index c9fb88b..5735026 100755
--- a/login_init.zsh
+++ b/login_init.zsh
@@ -8,8 +8,7 @@
 #
 
 (
-  local file
-  local zmodule
+  local dir file
   setopt LOCAL_OPTIONS EXTENDED_GLOB
   autoload -U zrecompile
 
@@ -20,11 +19,13 @@
   zrecompile -pq ${ZDOTDIR:-${HOME}}/.zshrc
 
   # zcompile enabled module autoloaded functions
-  zrecompile -pq ${ZIM_HOME}/functions ${ZIM_HOME}/modules/${^zmodules}/functions/^([_.]*|prompt_*_setup|README*|*.zwc|*.zwc.old)(-.N)
+  for dir in ${ZIM_HOME}/modules/${^zmodules}/functions(/FN); do
+    zrecompile -pq ${dir}.zwc ${dir}/^([_.]*|prompt_*_setup|README*|*.zwc|*.zwc.old)(-.N)
+  done
 
   # zcompile enabled module init scripts
-  for zmodule (${zmodules}); do
-    zrecompile -pq ${ZIM_HOME}/modules/${zmodule}/init.zsh
+  for file in ${ZIM_HOME}/modules/${^zmodules}/init.zsh(-.N); do
+    zrecompile -pq ${file}
   done
 
   # zcompile all prompt setup scripts