diff --git a/.config/droidcam b/dotfiles/.config/droidcam
similarity index 100%
rename from .config/droidcam
rename to dotfiles/.config/droidcam
diff --git a/.config/dunst/dunstrc b/dotfiles/.config/dunst/dunstrc
similarity index 100%
rename from .config/dunst/dunstrc
rename to dotfiles/.config/dunst/dunstrc
diff --git a/.config/fontconfig/fonts.conf b/dotfiles/.config/fontconfig/fonts.conf
similarity index 100%
rename from .config/fontconfig/fonts.conf
rename to dotfiles/.config/fontconfig/fonts.conf
diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/dotfiles/.config/gtk-2.0/gtkfilechooser.ini
similarity index 100%
rename from .config/gtk-2.0/gtkfilechooser.ini
rename to dotfiles/.config/gtk-2.0/gtkfilechooser.ini
diff --git a/.config/gtk-3.0/bookmarks b/dotfiles/.config/gtk-3.0/bookmarks
similarity index 100%
rename from .config/gtk-3.0/bookmarks
rename to dotfiles/.config/gtk-3.0/bookmarks
diff --git a/.config/gtk-3.0/settings.ini b/dotfiles/.config/gtk-3.0/settings.ini
similarity index 100%
rename from .config/gtk-3.0/settings.ini
rename to dotfiles/.config/gtk-3.0/settings.ini
diff --git a/.config/mimeapps.list b/dotfiles/.config/mimeapps.list
similarity index 100%
rename from .config/mimeapps.list
rename to dotfiles/.config/mimeapps.list
diff --git a/.config/nvim/autoload/plug.vim b/dotfiles/.config/nvim/autoload/plug.vim
similarity index 100%
rename from .config/nvim/autoload/plug.vim
rename to dotfiles/.config/nvim/autoload/plug.vim
diff --git a/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim
similarity index 100%
rename from .config/nvim/init.vim
rename to dotfiles/.config/nvim/init.vim
diff --git a/.config/nvimpager/init.vim b/dotfiles/.config/nvimpager/init.vim
similarity index 100%
rename from .config/nvimpager/init.vim
rename to dotfiles/.config/nvimpager/init.vim
diff --git a/.config/octave/octave-gui.ini b/dotfiles/.config/octave/octave-gui.ini
similarity index 100%
rename from .config/octave/octave-gui.ini
rename to dotfiles/.config/octave/octave-gui.ini
diff --git a/.config/octave/octaverc b/dotfiles/.config/octave/octaverc
similarity index 100%
rename from .config/octave/octaverc
rename to dotfiles/.config/octave/octaverc
diff --git a/.config/picom/old_picom.conf b/dotfiles/.config/picom/old_picom.conf
similarity index 100%
rename from .config/picom/old_picom.conf
rename to dotfiles/.config/picom/old_picom.conf
diff --git a/.config/picom/picom.conf b/dotfiles/.config/picom/picom.conf
similarity index 100%
rename from .config/picom/picom.conf
rename to dotfiles/.config/picom/picom.conf
diff --git a/.config/picom/picom2.conf b/dotfiles/.config/picom/picom2.conf
similarity index 100%
rename from .config/picom/picom2.conf
rename to dotfiles/.config/picom/picom2.conf
diff --git a/.config/pipewire/media-session.d/default-nodes b/dotfiles/.config/pipewire/media-session.d/default-nodes
similarity index 100%
rename from .config/pipewire/media-session.d/default-nodes
rename to dotfiles/.config/pipewire/media-session.d/default-nodes
diff --git a/.config/pipewire/media-session.d/default-routes b/dotfiles/.config/pipewire/media-session.d/default-routes
similarity index 100%
rename from .config/pipewire/media-session.d/default-routes
rename to dotfiles/.config/pipewire/media-session.d/default-routes
diff --git a/.config/pipewire/media-session.d/restore-stream b/dotfiles/.config/pipewire/media-session.d/restore-stream
similarity index 100%
rename from .config/pipewire/media-session.d/restore-stream
rename to dotfiles/.config/pipewire/media-session.d/restore-stream
diff --git a/.config/user-dirs.dirs b/dotfiles/.config/user-dirs.dirs
similarity index 100%
rename from .config/user-dirs.dirs
rename to dotfiles/.config/user-dirs.dirs
diff --git a/.config/user-dirs.locale b/dotfiles/.config/user-dirs.locale
similarity index 100%
rename from .config/user-dirs.locale
rename to dotfiles/.config/user-dirs.locale
diff --git a/.config/zathura/zathurarc b/dotfiles/.config/zathura/zathurarc
similarity index 100%
rename from .config/zathura/zathurarc
rename to dotfiles/.config/zathura/zathurarc
diff --git a/.gtkrc-2.0 b/dotfiles/.gtkrc-2.0
similarity index 100%
rename from .gtkrc-2.0
rename to dotfiles/.gtkrc-2.0
diff --git a/.icons/default/index.theme b/dotfiles/.icons/default/index.theme
similarity index 100%
rename from .icons/default/index.theme
rename to dotfiles/.icons/default/index.theme
diff --git a/.ideavimrc b/dotfiles/.ideavimrc
similarity index 100%
rename from .ideavimrc
rename to dotfiles/.ideavimrc
diff --git a/.imwheelrc b/dotfiles/.imwheelrc
similarity index 100%
rename from .imwheelrc
rename to dotfiles/.imwheelrc
diff --git a/.nvidia-settings-rc b/dotfiles/.nvidia-settings-rc
similarity index 100%
rename from .nvidia-settings-rc
rename to dotfiles/.nvidia-settings-rc
diff --git a/.ssh/config b/dotfiles/.ssh/config
similarity index 100%
rename from .ssh/config
rename to dotfiles/.ssh/config
diff --git a/.xinitrc b/dotfiles/.xinitrc
similarity index 100%
rename from .xinitrc
rename to dotfiles/.xinitrc
diff --git a/.zprofile b/dotfiles/.zprofile
similarity index 100%
rename from .zprofile
rename to dotfiles/.zprofile
diff --git a/.zshrc b/dotfiles/.zshrc
similarity index 100%
rename from .zshrc
rename to dotfiles/.zshrc
diff --git a/.zshrc_aliases b/dotfiles/.zshrc_aliases
similarity index 100%
rename from .zshrc_aliases
rename to dotfiles/.zshrc_aliases
diff --git a/.zshrc_exports b/dotfiles/.zshrc_exports
similarity index 100%
rename from .zshrc_exports
rename to dotfiles/.zshrc_exports
diff --git a/linkFiles.sh b/linkFiles.sh
deleted file mode 100755
index cfcf89a..0000000
--- a/linkFiles.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-DOTFILES_HOME=$(pwd -P)
-DOTFILES_CONFIG="$(pwd -P)/.config"
-DOTFILES_ICONS="$(pwd -P)/.icons"
-DOTFILES_SSH="$(pwd -P)/.ssh"
-
-for src in $(find -H "$DOTFILES_HOME" -not -path '*.git*' -not -path '*.config*' -not -path '*.ssh*' -not -path '*.icons*'); do
-    if [ "$(basename "${src}")" = "CocoRice" ]; then
-		continue
-    fi
-
-    ln -s "$src" "$HOME/test/$(basename "${src}")"
-done
-
-for initialFolder in "$DOTFILES_CONFIG" "$DOTFILES_ICONS" "$DOTFILES_SSH"; do
-	for src in $(find -H "$initialFolder"); do
-		if [[ -d "$src" ]]; then
-			var=$(echo "$src" | awk '{ sub(/.*CocoRice\//, ""); print }')
-
-			if [[ ! -d "$HOME/test/$var" ]]; then
-				echo "$HOME/test/$var" "doesn't exists"
-				mkdir -p "$HOME/test/$var"
-			fi
-		fi
-
-		if [[ -f "$src" ]]; then
-			var=$(echo "$src" | awk '{ sub(/.*CocoRice\//, ""); print }')
-			ln -s "$src" "$HOME/test/$var"
-		fi
-	done
-done
\ No newline at end of file
diff --git a/scripts/linkFiles.sh b/scripts/linkFiles.sh
new file mode 100755
index 0000000..83334aa
--- /dev/null
+++ b/scripts/linkFiles.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+lastFolder=$(pwd -P)
+
+DOTFILES=$(echo "$(pwd -P)" | awk '{ sub(/CocoRice.*/, "CocoRice"); print }')
+cd $DOTFILES
+
+DOTFILES_HOME=$DOTFILES/dotfiles
+DOTFILES_CONFIG="$DOTFILES_HOME/.config"
+DOTFILES_ICONS="$DOTFILES_HOME/.icons"
+DOTFILES_SSH="$DOTFILES_HOME/.ssh"
+
+for srcFile in $(find -H "$DOTFILES_HOME" -not -path '*.git*' -not -path '*.config*' -not -path '*.ssh*' -not -path '*.icons*'); do
+    if [ "$(basename "${srcFile}")" = "CocoRice" ] || [ "$(basename "${srcFile}")" = "dotfiles" ]; then
+        continue
+    fi
+
+    ln -s "$srcFile" "$HOME/test/$(basename "${srcFile}")"
+done
+
+for initialFolder in "$DOTFILES_CONFIG" "$DOTFILES_ICONS" "$DOTFILES_SSH"; do
+    for srcFile in $(find -H "$initialFolder"); do
+        if [[ -d "$srcFile" ]]; then
+            var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\//, ""); print }')
+
+            if [[ ! -d "$HOME/test/$var" ]]; then
+                echo "$HOME/test/$var" "doesn't exists"
+                mkdir -p "$HOME/test/$var"
+            fi
+        fi
+
+        if [[ -f "$srcFile" ]]; then
+            var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\//, ""); print }')
+            ln -s "$srcFile" "$HOME/test/$var"
+        fi
+    done
+done
+
+cd $lastFolder
+
+# echo "$(dirname "$0")"
\ No newline at end of file