diff --git a/.config/bmdirs b/.config/directories
similarity index 100%
rename from .config/bmdirs
rename to .config/directories
diff --git a/.config/bmfiles b/.config/files
similarity index 84%
rename from .config/bmfiles
rename to .config/files
index b03b046..f62f578 100644
--- a/.config/bmfiles
+++ b/.config/files
@@ -1,5 +1,6 @@
-bf	~/.config/bmfiles
-bd	~/.config/bmdirs
+bf	~/.config/files
+bd	~/.config/directories
+bw	~/.config/bookmarks
 cfb	~/.bashrc
 cfa	~/.config/aliasrc
 cfz	~/.zshrc
diff --git a/.inputrc b/.config/inputrc
similarity index 100%
rename from .inputrc
rename to .config/inputrc
diff --git a/.local/bin/i3cmds/camtoggle b/.local/bin/camtoggle
similarity index 100%
rename from .local/bin/i3cmds/camtoggle
rename to .local/bin/camtoggle
diff --git a/.local/bin/tools/compiler b/.local/bin/compiler
similarity index 100%
rename from .local/bin/tools/compiler
rename to .local/bin/compiler
diff --git a/.local/bin/i3cmds/displayselect b/.local/bin/displayselect
similarity index 100%
rename from .local/bin/i3cmds/displayselect
rename to .local/bin/displayselect
diff --git a/.local/bin/tools/dmenuhandler b/.local/bin/dmenuhandler
similarity index 100%
rename from .local/bin/tools/dmenuhandler
rename to .local/bin/dmenuhandler
diff --git a/.local/bin/i3cmds/dmenumount b/.local/bin/dmenumount
similarity index 100%
rename from .local/bin/i3cmds/dmenumount
rename to .local/bin/dmenumount
diff --git a/.local/bin/tools/dmenupass b/.local/bin/dmenupass
similarity index 100%
rename from .local/bin/tools/dmenupass
rename to .local/bin/dmenupass
diff --git a/.local/bin/i3cmds/dmenurecord b/.local/bin/dmenurecord
similarity index 100%
rename from .local/bin/i3cmds/dmenurecord
rename to .local/bin/dmenurecord
diff --git a/.local/bin/i3cmds/dmenuumount b/.local/bin/dmenuumount
similarity index 100%
rename from .local/bin/i3cmds/dmenuumount
rename to .local/bin/dmenuumount
diff --git a/.local/bin/i3cmds/dmenuunicode b/.local/bin/dmenuunicode
similarity index 100%
rename from .local/bin/i3cmds/dmenuunicode
rename to .local/bin/dmenuunicode
diff --git a/.local/bin/tools/ext b/.local/bin/ext
similarity index 100%
rename from .local/bin/tools/ext
rename to .local/bin/ext
diff --git a/.local/bin/tools/extract b/.local/bin/extract
similarity index 100%
rename from .local/bin/tools/extract
rename to .local/bin/extract
diff --git a/.local/bin/tools/getbib b/.local/bin/getbib
similarity index 100%
rename from .local/bin/tools/getbib
rename to .local/bin/getbib
diff --git a/.local/bin/tools/getkeys b/.local/bin/getkeys
similarity index 100%
rename from .local/bin/tools/getkeys
rename to .local/bin/getkeys
diff --git a/.local/bin/i3cmds/hover b/.local/bin/i3cmds/hover
deleted file mode 100755
index 8d03a99..0000000
--- a/.local/bin/i3cmds/hover
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-[ -z "$1" ] && exit # If $1 is left, hovers in the bottom left, if right, the bottom right
-current=$(xdotool getwindowfocus)
-newwidth=$(($(xdotool getdisplaygeometry | awk '{print $2}') / 3))
-newheight=$(($(xdotool getdisplaygeometry | awk '{print $1}') / 3))
-xdotool windowsize "$current" $newheight $newwidth
-newsize=$(xdotool getwindowgeometry "$current" | grep Geometry | sed -e 's/x/ /g' | awk '{print $3}')
-newwidth=$(xdotool getwindowgeometry "$current" | grep Geometry | grep -o " [0-9]*")
-
-case "$1" in
-	left) horizontal=0; vertical=$(($(xdotool getdisplaygeometry | awk '{print $2}') - newsize)) ;;
-	right) horizontal=$(($(xdotool getdisplaygeometry | awk '{print $1}') - newwidth)) ; vertical=$(($(xdotool getdisplaygeometry | awk '{print $2}') - newsize)) ;;
-esac
-xdotool windowmove "$current" $horizontal $vertical
diff --git a/.local/bin/tools/ifinstalled b/.local/bin/ifinstalled
similarity index 100%
rename from .local/bin/tools/ifinstalled
rename to .local/bin/ifinstalled
diff --git a/.local/bin/tools/linkhandler b/.local/bin/linkhandler
similarity index 100%
rename from .local/bin/tools/linkhandler
rename to .local/bin/linkhandler
diff --git a/.local/bin/tools/lmc b/.local/bin/lmc
similarity index 100%
rename from .local/bin/tools/lmc
rename to .local/bin/lmc
diff --git a/.local/bin/i3cmds/maimpick b/.local/bin/maimpick
similarity index 100%
rename from .local/bin/i3cmds/maimpick
rename to .local/bin/maimpick
diff --git a/.local/bin/tools/opout b/.local/bin/opout
similarity index 100%
rename from .local/bin/tools/opout
rename to .local/bin/opout
diff --git a/.local/bin/tools/pauseallmpv b/.local/bin/pauseallmpv
similarity index 100%
rename from .local/bin/tools/pauseallmpv
rename to .local/bin/pauseallmpv
diff --git a/.local/bin/tools/podentr b/.local/bin/podentr
similarity index 100%
rename from .local/bin/tools/podentr
rename to .local/bin/podentr
diff --git a/.local/bin/i3cmds/prompt b/.local/bin/prompt
similarity index 100%
rename from .local/bin/i3cmds/prompt
rename to .local/bin/prompt
diff --git a/.local/bin/tools/qndl b/.local/bin/qndl
similarity index 100%
rename from .local/bin/tools/qndl
rename to .local/bin/qndl
diff --git a/.local/bin/tools/queueandnotify b/.local/bin/queueandnotify
similarity index 100%
rename from .local/bin/tools/queueandnotify
rename to .local/bin/queueandnotify
diff --git a/.local/bin/tools/remaps b/.local/bin/remaps
similarity index 100%
rename from .local/bin/tools/remaps
rename to .local/bin/remaps
diff --git a/.local/bin/tools/rotdir b/.local/bin/rotdir
similarity index 100%
rename from .local/bin/tools/rotdir
rename to .local/bin/rotdir
diff --git a/.local/bin/tools/rssadd b/.local/bin/rssadd
similarity index 100%
rename from .local/bin/tools/rssadd
rename to .local/bin/rssadd
diff --git a/.local/bin/i3cmds/samedir b/.local/bin/samedir
similarity index 100%
rename from .local/bin/i3cmds/samedir
rename to .local/bin/samedir
diff --git a/.local/bin/tools/setbg b/.local/bin/setbg
similarity index 100%
rename from .local/bin/tools/setbg
rename to .local/bin/setbg
diff --git a/.local/bin/tools/shortcuts b/.local/bin/shortcuts
similarity index 75%
rename from .local/bin/tools/shortcuts
rename to .local/bin/shortcuts
index 1c4f278..8c1dec9 100755
--- a/.local/bin/tools/shortcuts
+++ b/.local/bin/shortcuts
@@ -12,15 +12,15 @@ printf "# vim: filetype=sh\\n" > "$fish_shortcuts"
 printf "# vim: filetype=sh\\nalias " > "$shell_shortcuts"
 printf "\" vim: filetype=vim\\n" > "$vifm_shortcuts"
 
-# Format the `bmdirs` file in the correct syntax and sent it to all three configs.
-sed "s/\s*#.*$//;/^\s*$/d" "$HOME/.config/bmdirs" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \
+# Format the `directories` file in the correct syntax and sent it to all three configs.
+sed "s/\s*#.*$//;/^\s*$/d" "$HOME/.config/directories" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \
 	>(awk '{print "abbr", $1, "\"cd " $2 "; and ls -a\""}' >> "$fish_shortcuts") \
 	>(awk '{print "map g" $1, ":cd", $2 "<CR>\nmap t" $1, "<tab>:cd", $2 "<CR><tab>\nmap M" $1, "<tab>:cd", $2 "<CR><tab>:mo<CR>\nmap Y" $1, "<tab>:cd", $2 "<CR><tab>:co<CR>" }' >> "$vifm_shortcuts") \
 	>(awk '{print "config.bind(\";"$1"\", \"set downloads.location.directory "$2" ;; hint links download\")"}' >> "$qute_shortcuts") \
 	| awk '{print "map g"$1" cd "$2"\nmap t"$1" tab_new "$2"\nmap m"$1" shell mv -v %s "$2"\nmap Y"$1" shell cp -rv %s "$2}' >> "$ranger_shortcuts"
 
-# Format the `configs` file in the correct syntax and sent it to both configs.
-sed "s/\s*#.*$//;/^\s*$/d"  "$HOME/.config/bmfiles" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \
+# Format the `files` file in the correct syntax and sent it to both configs.
+sed "s/\s*#.*$//;/^\s*$/d"  "$HOME/.config/files" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \
 	>(awk '{print "abbr", $1, "\"$EDITOR "$2"\""}' >> "$fish_shortcuts") \
 	>(awk '{print "map", $1, ":e", $2 "<CR>" }' >> "$vifm_shortcuts") \
 	| awk '{print "map "$1" shell $EDITOR "$2}' >> "$ranger_shortcuts"
diff --git a/.local/bin/i3cmds/showclip b/.local/bin/showclip
similarity index 100%
rename from .local/bin/i3cmds/showclip
rename to .local/bin/showclip
diff --git a/.local/bin/i3cmds/td-toggle b/.local/bin/td-toggle
similarity index 100%
rename from .local/bin/i3cmds/td-toggle
rename to .local/bin/td-toggle
diff --git a/.local/bin/tools/texclear b/.local/bin/texclear
similarity index 100%
rename from .local/bin/tools/texclear
rename to .local/bin/texclear
diff --git a/.local/bin/i3cmds/toggletouchpad b/.local/bin/toggletouchpad
similarity index 100%
rename from .local/bin/i3cmds/toggletouchpad
rename to .local/bin/toggletouchpad
diff --git a/.local/bin/i3cmds/torwrap b/.local/bin/torwrap
similarity index 100%
rename from .local/bin/i3cmds/torwrap
rename to .local/bin/torwrap
diff --git a/.local/bin/tools/transadd b/.local/bin/transadd
similarity index 100%
rename from .local/bin/tools/transadd
rename to .local/bin/transadd
diff --git a/.local/bin/i3cmds/tutorialvids b/.local/bin/tutorialvids
similarity index 100%
rename from .local/bin/i3cmds/tutorialvids
rename to .local/bin/tutorialvids
diff --git a/.profile b/.profile
index 4676320..f9a6b7f 100644
--- a/.profile
+++ b/.profile
@@ -2,17 +2,17 @@
 # Profile file. Runs on login.
 
 # Adds `~/.scripts` and all subdirectories to $PATH
-export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')"
+export PATH="$PATH:$HOME/.local/bin/"
 export EDITOR="nvim"
 export TERMINAL="st"
 export BROWSER="tabbed -r 2 surf -e lmao"
 export READER="zathura"
 export FILE="vifm"
-export BIB="$HOME/Documents/LaTeX/uni.bib"
-export REFER="$HOME/Documents/referbib"
-export SUDO_ASKPASS="$HOME/.local/bin/tools/dmenupass"
+export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"
 export NOTMUCH_CONFIG="$HOME/.config/notmuch-config"
 export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0"
+export LESSHISTFILE="-"
+export INPUTRC="$HOME/.config/inputrc"
 
 # less/man colors
 export LESS=-R