diff --git a/mw b/bin/mw
similarity index 98%
rename from mw
rename to bin/mw
index 94874bf..6f2934f 100755
--- a/mw
+++ b/bin/mw
@@ -1,7 +1,5 @@
 #!/bin/sh
 muttdir="$HOME/.config/mutt"		# Main mutt config location
-bindir="$HOME/.config/mutt/bin"		# Location of scripts run by mutt or the wizard
-[ ! -f "$muttdir/domains.csv" ] || [ ! -d "$bindir" ] && printf "Read the README. Be sure to put the repo in the right place before running.\\n" && exit 1
 [ ! -f "$HOME/.password-store/.gpg-id" ] && printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init <yourgpgemail>\`.\\nIf you don't have a GPG public private key pair, run \`gpg --full-gen-key\` first.\\n" && exit
 accdir="$muttdir/accounts"		# Directory for account settings
 maildir="$HOME/.local/share/mail"	# Location of mail storage
diff --git a/bin/mailcap b/mailcap
similarity index 54%
rename from bin/mailcap
rename to mailcap
index 6dcca4d..20b8534 100644
--- a/bin/mailcap
+++ b/mailcap
@@ -1,7 +1,7 @@
 text/plain; vim %s ;
-text/html; ~/.config/mutt/bin/openfile %s ;
+text/html; openfile %s ;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
-image/*; ~/.config/mutt/bin/muttimage %s ; copiousoutput
+image/*; muttimage %s ; copiousoutput
 video/*; setsid mpv --quiet %s &; copiousoutput
-application/pdf; ~/.config/mutt/bin/openfile %s ;
+application/pdf; openfile %s ;
 application/pgp-encrypted; gpg -d '%s'; copiousoutput;