diff --git a/data/data b/data/data
index 50f78b9..cb56549 100755
--- a/data/data
+++ b/data/data
@@ -54,8 +54,11 @@ get_cpu_temp() {
 
 get_current_desktop() {
 	case "$WM" in
-	(bspwm) printf "[%b] " "$(bspc query -D -d focused --names) 2>/dev/null" ;;
-	esac
+	(bspwm) 
+		DESKTOP="$(bspc query -D -d focused --names)" ;;
+		
+	esac || DESKTOP=""
+	printf "[%s] " "$DESKTOP"
 }
 
 get_memory_usage() {
diff --git a/etc/motd b/motd/motd
similarity index 100%
rename from etc/motd
rename to motd/motd
diff --git a/share/wordle/dictionary b/wordle/dictionary
similarity index 100%
rename from share/wordle/dictionary
rename to wordle/dictionary
diff --git a/share/wordle/solutions b/wordle/solutions
similarity index 100%
rename from share/wordle/solutions
rename to wordle/solutions
diff --git a/src/wordle.c b/wordle/wordle.c
similarity index 100%
rename from src/wordle.c
rename to wordle/wordle.c