diff --git a/client/usr/local/bin/rs-backup-run b/client/bin/rs-backup-run
similarity index 100%
rename from client/usr/local/bin/rs-backup-run
rename to client/bin/rs-backup-run
diff --git a/client/usr/local/etc/rs-backup/client-config.example b/client/etc/rs-backup/client-config.example
similarity index 100%
rename from client/usr/local/etc/rs-backup/client-config.example
rename to client/etc/rs-backup/client-config.example
diff --git a/client/usr/local/etc/rs-backup/include-files.example b/client/etc/rs-backup/include-files.example
similarity index 100%
rename from client/usr/local/etc/rs-backup/include-files.example
rename to client/etc/rs-backup/include-files.example
diff --git a/server/usr/local/bin/rs-rotate b/server/usr/bin/rs-rotate
similarity index 100%
rename from server/usr/local/bin/rs-rotate
rename to server/usr/bin/rs-rotate
diff --git a/server/usr/local/bin/rs-run-ssh-cmd b/server/usr/bin/rs-run-ssh-cmd
similarity index 100%
rename from server/usr/local/bin/rs-run-ssh-cmd
rename to server/usr/bin/rs-run-ssh-cmd
diff --git a/server/usr/local/etc/rs-backup/rsnapshot.conf.template b/server/usr/etc/rs-backup/rsnapshot.conf.template
similarity index 100%
rename from server/usr/local/etc/rs-backup/rsnapshot.conf.template
rename to server/usr/etc/rs-backup/rsnapshot.conf.template
diff --git a/server/usr/local/etc/rs-backup/rsync.conf.template b/server/usr/etc/rs-backup/rsync.conf.template
similarity index 100%
rename from server/usr/local/etc/rs-backup/rsync.conf.template
rename to server/usr/etc/rs-backup/rsync.conf.template
diff --git a/server/usr/local/etc/rs-backup/server-config.example b/server/usr/etc/rs-backup/server-config.example
similarity index 100%
rename from server/usr/local/etc/rs-backup/server-config.example
rename to server/usr/etc/rs-backup/server-config.example
diff --git a/server/usr/local/etc/rs-backup/.server-config.swp b/server/usr/local/etc/rs-backup/.server-config.swp
deleted file mode 100644
index b5982cd..0000000
Binary files a/server/usr/local/etc/rs-backup/.server-config.swp and /dev/null differ
diff --git a/server/usr/local/sbin/rs-add-ssh-key b/server/usr/sbin/rs-add-ssh-key
similarity index 100%
rename from server/usr/local/sbin/rs-add-ssh-key
rename to server/usr/sbin/rs-add-ssh-key
diff --git a/server/usr/local/sbin/rs-add-user b/server/usr/sbin/rs-add-user
similarity index 100%
rename from server/usr/local/sbin/rs-add-user
rename to server/usr/sbin/rs-add-user
diff --git a/server/usr/local/sbin/rs-rotate-cron b/server/usr/sbin/rs-rotate-cron
similarity index 100%
rename from server/usr/local/sbin/rs-rotate-cron
rename to server/usr/sbin/rs-rotate-cron
diff --git a/server/usr/local/sbin/rs-update-passwd b/server/usr/sbin/rs-update-passwd
similarity index 100%
rename from server/usr/local/sbin/rs-update-passwd
rename to server/usr/sbin/rs-update-passwd
diff --git a/server/usr/local/sbin/spin-down-storage b/server/usr/sbin/spin-down-storage
similarity index 100%
rename from server/usr/local/sbin/spin-down-storage
rename to server/usr/sbin/spin-down-storage