diff --git a/dwmd/LICENSE b/dwm/LICENSE
similarity index 100%
rename from dwmd/LICENSE
rename to dwm/LICENSE
diff --git a/dwmd/Makefile b/dwm/Makefile
similarity index 100%
rename from dwmd/Makefile
rename to dwm/Makefile
diff --git a/dwmd/README b/dwm/README
similarity index 100%
rename from dwmd/README
rename to dwm/README
diff --git a/dwmd/config.def.h b/dwm/config.def.h
similarity index 100%
rename from dwmd/config.def.h
rename to dwm/config.def.h
diff --git a/dwmd/config.h b/dwm/config.h
similarity index 100%
rename from dwmd/config.h
rename to dwm/config.h
diff --git a/dwmd/config.mk b/dwm/config.mk
similarity index 100%
rename from dwmd/config.mk
rename to dwm/config.mk
diff --git a/dwmd/drw.c b/dwm/drw.c
similarity index 100%
rename from dwmd/drw.c
rename to dwm/drw.c
diff --git a/dwmd/drw.h b/dwm/drw.h
similarity index 100%
rename from dwmd/drw.h
rename to dwm/drw.h
diff --git a/dwmd/drw.o b/dwm/drw.o
similarity index 100%
rename from dwmd/drw.o
rename to dwm/drw.o
diff --git a/dwmd/dwm b/dwm/dwm
similarity index 100%
rename from dwmd/dwm
rename to dwm/dwm
diff --git a/dwmd/dwm.1 b/dwm/dwm.1
similarity index 100%
rename from dwmd/dwm.1
rename to dwm/dwm.1
diff --git a/dwmd/dwm.c b/dwm/dwm.c
similarity index 100%
rename from dwmd/dwm.c
rename to dwm/dwm.c
diff --git a/dwmd/dwm.o b/dwm/dwm.o
similarity index 100%
rename from dwmd/dwm.o
rename to dwm/dwm.o
diff --git a/dwmd/dwm.png b/dwm/dwm.png
similarity index 100%
rename from dwmd/dwm.png
rename to dwm/dwm.png
diff --git a/dwmd/patches/azerty.diff b/dwm/patches/azerty.diff
similarity index 100%
rename from dwmd/patches/azerty.diff
rename to dwm/patches/azerty.diff
diff --git a/dwmd/patches/fullgaps.diff b/dwm/patches/fullgaps.diff
similarity index 100%
rename from dwmd/patches/fullgaps.diff
rename to dwm/patches/fullgaps.diff
diff --git a/dwmd/q b/dwm/q
similarity index 100%
rename from dwmd/q
rename to dwm/q
diff --git a/dwmd/transient.c b/dwm/transient.c
similarity index 100%
rename from dwmd/transient.c
rename to dwm/transient.c
diff --git a/dwmd/util.c b/dwm/util.c
similarity index 100%
rename from dwmd/util.c
rename to dwm/util.c
diff --git a/dwmd/util.h b/dwm/util.h
similarity index 100%
rename from dwmd/util.h
rename to dwm/util.h
diff --git a/dwmd/util.o b/dwm/util.o
similarity index 100%
rename from dwmd/util.o
rename to dwm/util.o
diff --git a/std/FAQ b/st/FAQ
similarity index 100%
rename from std/FAQ
rename to st/FAQ
diff --git a/std/LEGACY b/st/LEGACY
similarity index 100%
rename from std/LEGACY
rename to st/LEGACY
diff --git a/std/LICENSE b/st/LICENSE
similarity index 100%
rename from std/LICENSE
rename to st/LICENSE
diff --git a/std/Makefile b/st/Makefile
similarity index 100%
rename from std/Makefile
rename to st/Makefile
diff --git a/std/README b/st/README
similarity index 100%
rename from std/README
rename to st/README
diff --git a/std/TODO b/st/TODO
similarity index 100%
rename from std/TODO
rename to st/TODO
diff --git a/std/arg.h b/st/arg.h
similarity index 100%
rename from std/arg.h
rename to st/arg.h
diff --git a/std/config.def.h b/st/config.def.h
similarity index 100%
rename from std/config.def.h
rename to st/config.def.h
diff --git a/std/config.h b/st/config.h
similarity index 100%
rename from std/config.h
rename to st/config.h
diff --git a/std/config.mk b/st/config.mk
similarity index 100%
rename from std/config.mk
rename to st/config.mk
diff --git a/std/st b/st/st
similarity index 100%
rename from std/st
rename to st/st
diff --git a/std/st.1 b/st/st.1
similarity index 100%
rename from std/st.1
rename to st/st.1
diff --git a/std/st.c b/st/st.c
similarity index 100%
rename from std/st.c
rename to st/st.c
diff --git a/std/st.h b/st/st.h
similarity index 100%
rename from std/st.h
rename to st/st.h
diff --git a/std/st.info b/st/st.info
similarity index 100%
rename from std/st.info
rename to st/st.info
diff --git a/std/st.o b/st/st.o
similarity index 100%
rename from std/st.o
rename to st/st.o
diff --git a/std/win.h b/st/win.h
similarity index 100%
rename from std/win.h
rename to st/win.h
diff --git a/std/x.c b/st/x.c
similarity index 100%
rename from std/x.c
rename to st/x.c
diff --git a/std/x.o b/st/x.o
similarity index 100%
rename from std/x.o
rename to st/x.o