diff --git a/1.cleanup_cache.hook b/hooks/1.cleanup_cache.hook
similarity index 100%
rename from 1.cleanup_cache.hook
rename to hooks/1.cleanup_cache.hook
diff --git a/2.archive_packages-client.hook b/hooks/2.archive_packages-client.hook
similarity index 100%
rename from 2.archive_packages-client.hook
rename to hooks/2.archive_packages-client.hook
diff --git a/2.archive_packages-server.hook b/hooks/2.archive_packages-server.hook
similarity index 100%
rename from 2.archive_packages-server.hook
rename to hooks/2.archive_packages-server.hook
diff --git a/archive_packages.sh b/scripts/archive_packages.sh
similarity index 100%
rename from archive_packages.sh
rename to scripts/archive_packages.sh
diff --git a/client.sh b/scripts/client.sh
similarity index 77%
rename from client.sh
rename to scripts/client.sh
index 513d55a..429f4e5 100644
--- a/client.sh
+++ b/scripts/client.sh
@@ -6,11 +6,11 @@ read -p "Enter your password: " -s password
 
 # Hooks
 mkdir /etc/pacman.d/hooks/
-cp 1.cleanup_cache.hook /etc/pacman.d/hooks/
-cp 2.archive_packages-client.hook /etc/pacman.d/hooks/2.archive_packages.hook
+cp hooks/1.cleanup_cache.hook /etc/pacman.d/hooks/
+cp hooks/2.archive_packages-client.hook /etc/pacman.d/hooks/2.archive_packages.hook
 
 # Script/s
-cp archive_packages.sh /root/
+cp scripts/archive_packages.sh /root/
 chmod +x /root/archive_packages.sh
 
 # Rsync credentials
diff --git a/delete.sh b/scripts/delete.sh
similarity index 100%
rename from delete.sh
rename to scripts/delete.sh
diff --git a/repo-add.sh b/scripts/repo-add.sh
similarity index 100%
rename from repo-add.sh
rename to scripts/repo-add.sh
diff --git a/server.sh b/scripts/server.sh
similarity index 90%
rename from server.sh
rename to scripts/server.sh
index fb10481..5b16446 100644
--- a/server.sh
+++ b/scripts/server.sh
@@ -8,11 +8,11 @@ read -p "Enter your password: " -s password
 
 # Hooks
 mkdir /etc/pacman.d/hooks/
-cp 1.cleanup_cache.hook /etc/pacman.d/hooks/
-cp 2.archive_packages-server.hook /etc/pacman.d/hooks/2.archive_packages.hook
+cp hooks/1.cleanup_cache.hook /etc/pacman.d/hooks/
+cp hooks/2.archive_packages-server.hook /etc/pacman.d/hooks/2.archive_packages.hook
 
 # Script/s
-cp repo-add.sh /root/
+cp scripts/repo-add.sh /root/
 chmod +x /root/repo-add.sh
 
 # Database