diff --git a/test/test-colors b/colortest
similarity index 100%
rename from test/test-colors
rename to colortest
diff --git a/layout/tungsten.sh b/layout/tungsten.sh
deleted file mode 100755
index 627029a..0000000
--- a/layout/tungsten.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-xrandr --output HDMI-0 --mode 1920x1080 --pos 0x360 --rotate normal --output DisplayPort-0 --primary --mode 2560x1440 --rate 143.86 --pos 1920x0 --rotate normal
diff --git a/mpc/mpc-i3-consume b/mpc/mpc-consume
similarity index 100%
rename from mpc/mpc-i3-consume
rename to mpc/mpc-consume
diff --git a/mpc/mpc-i3-playlists b/mpc/mpc-playlists
similarity index 100%
rename from mpc/mpc-i3-playlists
rename to mpc/mpc-playlists
diff --git a/mpc/mpc-i3-repeat b/mpc/mpc-repeat
similarity index 100%
rename from mpc/mpc-i3-repeat
rename to mpc/mpc-repeat
diff --git a/mpc/mpc-i3-shuffle b/mpc/mpc-shuffle
similarity index 100%
rename from mpc/mpc-i3-shuffle
rename to mpc/mpc-shuffle
diff --git a/test/test-notifications b/test-notifications
similarity index 100%
rename from test/test-notifications
rename to test-notifications