diff --git a/Makefile b/Makefile
index 12eb545..5f7f996 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ SSH_KEYS_HOME := $(HOME)/.ssh
 SSH_CONFIG_FILE := $(SSH_KEYS_HOME)/config
 PERSONAL_SSH_KEYS_HOME := $(SSH_KEYS_HOME)/Personal
 SCRIPTS_CACHE_DIR := $(HOME)/.local/share/script_cache
+SCRIPTS_UTILS_DIR := $(HOME)/.local/opt/script_utils
 PROJECTS_ROOT := $(HOME)/Projects
 DOCUMENTS_ROOT := $(HOME)/Documents
 PICTURES_ROOT := $(HOME)/Pictures
@@ -150,6 +151,12 @@ link_apps_config: check_os
 	@echo "Linking apps config files..."
 	$(call link,config,.config)
 
+.PHONY: link_script_utils
+link_script_utils: check_os
+	@echo "Linking script_utils files..."
+	@mkdir -p $(SCRIPTS_UTILS_DIR)
+	$(call link,script_utils,.local/opt/script_utils)
+
 .PHONY: link_tool_versions
 link_tool_versions: check_os
 	@echo "Linking tool-versions file for asdf"
diff --git a/symlinks/bin/aurfetch b/symlinks/bin/aurfetch
index 1dead45..34faf89 100755
--- a/symlinks/bin/aurfetch
+++ b/symlinks/bin/aurfetch
@@ -2,7 +2,7 @@
 
 set -e
 
-. ~/.config/sh-utils/echo.sh
+. ~/.local/opt/script_utils/echo.sh
 
 usage () {
   case $1 in
diff --git a/symlinks/bin/create-java-executable b/symlinks/bin/create-java-executable
index 54f0107..7be44bd 100755
--- a/symlinks/bin/create-java-executable
+++ b/symlinks/bin/create-java-executable
@@ -20,4 +20,4 @@ if [ -z "$OUTPUT" ]; then
   OUTPUT=$filename
 fi
 
-cat ~/bin/java-helpers/java-stub.sh $FILE > $OUTPUT && chmod +x $OUTPUT
+cat ~/.local/opt/script_utils/java-stub.sh $FILE > $OUTPUT && chmod +x $OUTPUT
diff --git a/symlinks/bin/lsp b/symlinks/bin/lsp
index ac4bcae..7ac926a 100755
--- a/symlinks/bin/lsp
+++ b/symlinks/bin/lsp
@@ -2,7 +2,7 @@
 
 set -e
 
-. ~/.config/sh-utils/echo.sh
+. ~/.local/opt/script_utils/echo.sh
 
 usage () {
   case $1 in
@@ -178,7 +178,7 @@ VERSION="${POSITIONAL[2]}"
 echov "Detected server: $SERVER"
 echov "Detected version: $VERSION"
 
-LSP_HOME="$HOME/.local/opt"
+LSP_HOME="$HOME/.local/opt/lsp"
 
 declare -A SUPPORTED_SERVERS=(
 ["java"]="jdtls"
diff --git a/symlinks/bin/settings-selector b/symlinks/bin/settings-selector
index 93d3975..bca7909 100755
--- a/symlinks/bin/settings-selector
+++ b/symlinks/bin/settings-selector
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SETTINGS_DIRECTORY=$HOME/bin/settings
+SETTINGS_DIRECTORY=$HOME/.local/opt/script_utils/settings
 
 function get_settings()
 {
diff --git a/symlinks/config/sh-utils/echo.sh b/symlinks/script_utils/echo.sh
similarity index 100%
rename from symlinks/config/sh-utils/echo.sh
rename to symlinks/script_utils/echo.sh
diff --git a/symlinks/bin/java-helpers/java-stub.sh b/symlinks/script_utils/java-stub.sh
similarity index 100%
rename from symlinks/bin/java-helpers/java-stub.sh
rename to symlinks/script_utils/java-stub.sh
diff --git a/symlinks/bin/settings/install-package b/symlinks/script_utils/settings/install-package
similarity index 100%
rename from symlinks/bin/settings/install-package
rename to symlinks/script_utils/settings/install-package
diff --git a/symlinks/bin/settings/update-packages b/symlinks/script_utils/settings/update-packages
similarity index 100%
rename from symlinks/bin/settings/update-packages
rename to symlinks/script_utils/settings/update-packages