diff --git a/autosuggestions.zsh b/autosuggestions.zsh
index 34d482a..8ef4168 100644
--- a/autosuggestions.zsh
+++ b/autosuggestions.zsh
@@ -9,7 +9,7 @@
 # ```
 zmodload zsh/net/socket
 
-source "${0:a:h}/completion-client.zsh"
+source "${0:a:h}/lib/completion-client.zsh"
 
 # configuration variables
 AUTOSUGGESTION_HIGHLIGHT_COLOR='fg=8'
diff --git a/completion-client.zsh b/lib/completion-client.zsh
similarity index 93%
rename from completion-client.zsh
rename to lib/completion-client.zsh
index c8cd957..ac487ed 100755
--- a/completion-client.zsh
+++ b/lib/completion-client.zsh
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 zmodload zsh/net/socket
 
-AUTOSUGGEST_SERVER_SCRIPT="${0:a:h}/completion-server.zsh"
+AUTOSUGGEST_SERVER_SCRIPT="${0:a:h}/lib/completion-server.zsh"
 
 autosuggest-ensure-server() {
 	setopt local_options no_hup
diff --git a/completion-server-init.zsh b/lib/completion-server-init.zsh
similarity index 100%
rename from completion-server-init.zsh
rename to lib/completion-server-init.zsh
diff --git a/completion-server.zsh b/lib/completion-server.zsh
similarity index 97%
rename from completion-server.zsh
rename to lib/completion-server.zsh
index cd103f1..718193a 100755
--- a/completion-server.zsh
+++ b/lib/completion-server.zsh
@@ -75,7 +75,7 @@ print "autosuggestion server started, pid: $$" >&2
 zpty z ZLE_DISABLE_AUTOSUGGEST=1 zsh -i
 print 'interactive shell started'
 # Source the init script
-zpty -w z "source '${0:a:h}/completion-server-init.zsh'"
+zpty -w z "source '${0:a:h}/lib/completion-server-init.zsh'"
 
 # wait for ok from shell
 read-to-null &> /dev/null