diff --git a/bin/tmuxifier b/bin/tmuxifier
index 1d58357..0b19df5 100755
--- a/bin/tmuxifier
+++ b/bin/tmuxifier
@@ -9,7 +9,7 @@ else
 fi
 
 # Load tmuxifier environment variables.
-source "$TMUXIFIER/env.sh"
+source "$TMUXIFIER/lib/env.sh"
 
 export PATH="$TMUXIFIER/libexec:$PATH"
 
diff --git a/env.sh b/lib/env.sh
similarity index 100%
rename from env.sh
rename to lib/env.sh
diff --git a/runtime.sh b/lib/runtime.sh
similarity index 87%
rename from runtime.sh
rename to lib/runtime.sh
index 7666b44..fbd7963 100644
--- a/runtime.sh
+++ b/lib/runtime.sh
@@ -3,7 +3,7 @@
 #
 
 # Load tmuxifier environment.
-source "$TMUXIFIER/env.sh"
+source "$TMUXIFIER/lib/env.sh"
 
 # Setup default variables.
 session_root="$HOME"
diff --git a/libexec/tmuxifier-load-session b/libexec/tmuxifier-load-session
index e596cbe..5aae955 100755
--- a/libexec/tmuxifier-load-session
+++ b/libexec/tmuxifier-load-session
@@ -16,7 +16,7 @@ if [ -z "$1" ]; then
 fi
 
 # Load runtime functions.
-source "$TMUXIFIER/runtime.sh"
+source "$TMUXIFIER/lib/runtime.sh"
 
 # Load session file.
 load_session "$1"
diff --git a/libexec/tmuxifier-load-window b/libexec/tmuxifier-load-window
index 8a15a91..cb5e5ef 100755
--- a/libexec/tmuxifier-load-window
+++ b/libexec/tmuxifier-load-window
@@ -16,7 +16,7 @@ if [ -z "$1" ]; then
 fi
 
 # Load runtime functions.
-source "$TMUXIFIER/runtime.sh"
+source "$TMUXIFIER/lib/runtime.sh"
 
 if [ ! -z $TMUX ]; then
   session="$(tmuxifier-current-session)"