diff --git a/user/configdir/init.el b/user/configdir/emacs/init.el
similarity index 100%
rename from user/configdir/init.el
rename to user/configdir/emacs/init.el
diff --git a/user/configdir/fxde-core/config/menu b/user/configdir/fxde/fxde-core/config/menu
similarity index 100%
rename from user/configdir/fxde-core/config/menu
rename to user/configdir/fxde/fxde-core/config/menu
diff --git a/user/configdir/fxde-core/config/sxhkdrc b/user/configdir/fxde/fxde-core/config/sxhkdrc
similarity index 100%
rename from user/configdir/fxde-core/config/sxhkdrc
rename to user/configdir/fxde/fxde-core/config/sxhkdrc
diff --git a/user/configdir/fxde-core/scripts/endsession.sh b/user/configdir/fxde/fxde-core/scripts/endsession.sh
similarity index 100%
rename from user/configdir/fxde-core/scripts/endsession.sh
rename to user/configdir/fxde/fxde-core/scripts/endsession.sh
diff --git a/user/configdir/fxde-core/scripts/winlist.sh b/user/configdir/fxde/fxde-core/scripts/winlist.sh
similarity index 100%
rename from user/configdir/fxde-core/scripts/winlist.sh
rename to user/configdir/fxde/fxde-core/scripts/winlist.sh
diff --git a/user/configdir/yashrc b/user/configdir/yash/conf/yashrc
similarity index 100%
rename from user/configdir/yashrc
rename to user/configdir/yash/conf/yashrc