diff --git a/Makefile b/Makefile
index 163ea83a..71554e01 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,15 @@
 ROOT=.
-include ${ROOT}/mk/hdr.mk
-include ${ROOT}/mk/wmii.mk
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk
 
-PDIRS = \
+DIRS = \
 	doc	     \
 	man	     \
+	lib	     \
 	cmd	     \
-	libwmii_hack \
 	rc	     \
 	alternative_wmiircs
 
-DIRS =	\
-	libstuff  \
-	libbio    \
-	libfmt	  \
-	libregexp \
-	libutf	  \
-	$(PDIRS)
-
 DOCS = README \
        LICENSE
 
@@ -34,6 +26,5 @@ deb:
 	dpkg-buildpackage -rfakeroot -b -nc
 	[ -d .hg ] && hg revert debian/changelog
 
-include ${ROOT}/mk/dir.mk
-INSTDIRS = $(PDIRS)
+include $(ROOT)/mk/dir.mk
 
diff --git a/NEWS b/NEWS
index 640ab7c8..840f309f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+3.1b1:
+    * Xft is now loaded on demand
+    * colrules widths may now be specified in pixels
 
 3.9b1:
     * wmii9menu is now Xinerama aware.
diff --git a/cmd/click/Makefile b/cmd/click/Makefile
index aa9e8181..05ded7de 100644
--- a/cmd/click/Makefile
+++ b/cmd/click/Makefile
@@ -1,8 +1,8 @@
 ROOT= ../..
-include ${ROOT}/mk/hdr.mk
-include ${ROOT}/mk/wmii.mk
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk
 
-main.c: ${ROOT}/mk/wmii.mk
+main.c: $(ROOT)/mk/wmii.mk
 
 TARG =	click
 HFILES=	dat.h fns.h
@@ -14,5 +14,5 @@ LIBS += -lm -lXtst $(LIBS9)
 CFLAGS += -DIXP_NEEDAPI=86
 OBJ =	main
 
-include ${ROOT}/mk/one.mk
+include $(ROOT)/mk/one.mk
 
diff --git a/cmd/strut/Makefile b/cmd/strut/Makefile
index 762be076..6e1cbf35 100644
--- a/cmd/strut/Makefile
+++ b/cmd/strut/Makefile
@@ -1,8 +1,8 @@
 ROOT= ../..
-include ${ROOT}/mk/hdr.mk
-include ${ROOT}/mk/wmii.mk
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk
 
-main.c: ${ROOT}/mk/wmii.mk
+main.c: $(ROOT)/mk/wmii.mk
 
 TARG =	wistrut
 HFILES=	dat.h fns.h
@@ -16,5 +16,5 @@ OBJ =	main	\
 	ewmh	\
 	win
 
-include ${ROOT}/mk/one.mk
+include $(ROOT)/mk/one.mk
 
diff --git a/include/Makefile b/include/Makefile
index 1362284b..dfaf1750 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,6 +1,6 @@
 ROOT= ..
-include ${ROOT}/mk/hdr.mk
+include $(ROOT)/mk/hdr.mk
 
 HFILES = ixp.h ixp_fcall.h
 
-include ${ROOT}/mk/common.mk
+include $(ROOT)/mk/common.mk
diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644
index 00000000..4d452561
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,18 @@
+ROOT=..
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk
+
+PDIRS = \
+	libwmii_hack
+
+DIRS =	\
+	libstuff  \
+	libbio    \
+	libfmt	  \
+	libregexp \
+	libutf	  \
+	$(PDIRS)
+
+include $(ROOT)/mk/dir.mk
+INSTDIRS = $(PDIRS)
+
diff --git a/libbio/Makefile b/lib/libbio/Makefile
similarity index 74%
rename from libbio/Makefile
rename to lib/libbio/Makefile
index 11dabb65..9781d063 100644
--- a/libbio/Makefile
+++ b/lib/libbio/Makefile
@@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk
 
 VERSION=2.0
 TARG=libbio
@@ -23,5 +23,5 @@ OBJ=\
 	bseek\
 	bwrite
 
-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk
 
diff --git a/libbio/NOTICE b/lib/libbio/NOTICE
similarity index 100%
rename from libbio/NOTICE
rename to lib/libbio/NOTICE
diff --git a/libbio/README b/lib/libbio/README
similarity index 100%
rename from libbio/README
rename to lib/libbio/README
diff --git a/libbio/bbuffered.c b/lib/libbio/bbuffered.c
similarity index 100%
rename from libbio/bbuffered.c
rename to lib/libbio/bbuffered.c
diff --git a/libbio/bcat.c b/lib/libbio/bcat.c
similarity index 100%
rename from libbio/bcat.c
rename to lib/libbio/bcat.c
diff --git a/libbio/bfildes.c b/lib/libbio/bfildes.c
similarity index 100%
rename from libbio/bfildes.c
rename to lib/libbio/bfildes.c
diff --git a/libbio/bflush.c b/lib/libbio/bflush.c
similarity index 100%
rename from libbio/bflush.c
rename to lib/libbio/bflush.c
diff --git a/libbio/bgetc.c b/lib/libbio/bgetc.c
similarity index 100%
rename from libbio/bgetc.c
rename to lib/libbio/bgetc.c
diff --git a/libbio/bgetd.c b/lib/libbio/bgetd.c
similarity index 100%
rename from libbio/bgetd.c
rename to lib/libbio/bgetd.c
diff --git a/libbio/bgetrune.c b/lib/libbio/bgetrune.c
similarity index 100%
rename from libbio/bgetrune.c
rename to lib/libbio/bgetrune.c
diff --git a/libbio/binit.c b/lib/libbio/binit.c
similarity index 100%
rename from libbio/binit.c
rename to lib/libbio/binit.c
diff --git a/libbio/bio.3 b/lib/libbio/bio.3
similarity index 100%
rename from libbio/bio.3
rename to lib/libbio/bio.3
diff --git a/libbio/boffset.c b/lib/libbio/boffset.c
similarity index 100%
rename from libbio/boffset.c
rename to lib/libbio/boffset.c
diff --git a/libbio/bprint.c b/lib/libbio/bprint.c
similarity index 100%
rename from libbio/bprint.c
rename to lib/libbio/bprint.c
diff --git a/libbio/bputc.c b/lib/libbio/bputc.c
similarity index 100%
rename from libbio/bputc.c
rename to lib/libbio/bputc.c
diff --git a/libbio/bputrune.c b/lib/libbio/bputrune.c
similarity index 100%
rename from libbio/bputrune.c
rename to lib/libbio/bputrune.c
diff --git a/libbio/brdline.c b/lib/libbio/brdline.c
similarity index 100%
rename from libbio/brdline.c
rename to lib/libbio/brdline.c
diff --git a/libbio/brdstr.c b/lib/libbio/brdstr.c
similarity index 100%
rename from libbio/brdstr.c
rename to lib/libbio/brdstr.c
diff --git a/libbio/bread.c b/lib/libbio/bread.c
similarity index 100%
rename from libbio/bread.c
rename to lib/libbio/bread.c
diff --git a/libbio/bseek.c b/lib/libbio/bseek.c
similarity index 100%
rename from libbio/bseek.c
rename to lib/libbio/bseek.c
diff --git a/libbio/bvprint.c b/lib/libbio/bvprint.c
similarity index 100%
rename from libbio/bvprint.c
rename to lib/libbio/bvprint.c
diff --git a/libbio/bwrite.c b/lib/libbio/bwrite.c
similarity index 100%
rename from libbio/bwrite.c
rename to lib/libbio/bwrite.c
diff --git a/libfmt/Makefile b/lib/libfmt/Makefile
similarity index 86%
rename from libfmt/Makefile
rename to lib/libfmt/Makefile
index b4598a49..8afee20f 100644
--- a/libfmt/Makefile
+++ b/lib/libfmt/Makefile
@@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk
 
 VERSION=2.0
 TARG=libfmt
@@ -44,5 +44,5 @@ OBJ=\
 	vsnprint\
 	$(NUM)
 
-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk
 
diff --git a/libfmt/NOTICE b/lib/libfmt/NOTICE
similarity index 100%
rename from libfmt/NOTICE
rename to lib/libfmt/NOTICE
diff --git a/libfmt/README b/lib/libfmt/README
similarity index 100%
rename from libfmt/README
rename to lib/libfmt/README
diff --git a/libfmt/charstod.c b/lib/libfmt/charstod.c
similarity index 100%
rename from libfmt/charstod.c
rename to lib/libfmt/charstod.c
diff --git a/libfmt/dofmt.c b/lib/libfmt/dofmt.c
similarity index 100%
rename from libfmt/dofmt.c
rename to lib/libfmt/dofmt.c
diff --git a/libfmt/dorfmt.c b/lib/libfmt/dorfmt.c
similarity index 100%
rename from libfmt/dorfmt.c
rename to lib/libfmt/dorfmt.c
diff --git a/libfmt/errfmt.c b/lib/libfmt/errfmt.c
similarity index 100%
rename from libfmt/errfmt.c
rename to lib/libfmt/errfmt.c
diff --git a/libfmt/fltfmt.c b/lib/libfmt/fltfmt.c
similarity index 100%
rename from libfmt/fltfmt.c
rename to lib/libfmt/fltfmt.c
diff --git a/libfmt/fmt.c b/lib/libfmt/fmt.c
similarity index 100%
rename from libfmt/fmt.c
rename to lib/libfmt/fmt.c
diff --git a/libfmt/fmtdef.h b/lib/libfmt/fmtdef.h
similarity index 100%
rename from libfmt/fmtdef.h
rename to lib/libfmt/fmtdef.h
diff --git a/libfmt/fmtfd.c b/lib/libfmt/fmtfd.c
similarity index 100%
rename from libfmt/fmtfd.c
rename to lib/libfmt/fmtfd.c
diff --git a/libfmt/fmtfdflush.c b/lib/libfmt/fmtfdflush.c
similarity index 100%
rename from libfmt/fmtfdflush.c
rename to lib/libfmt/fmtfdflush.c
diff --git a/libfmt/fmtinstall.3 b/lib/libfmt/fmtinstall.3
similarity index 100%
rename from libfmt/fmtinstall.3
rename to lib/libfmt/fmtinstall.3
diff --git a/libfmt/fmtlock.c b/lib/libfmt/fmtlock.c
similarity index 100%
rename from libfmt/fmtlock.c
rename to lib/libfmt/fmtlock.c
diff --git a/libfmt/fmtprint.c b/lib/libfmt/fmtprint.c
similarity index 100%
rename from libfmt/fmtprint.c
rename to lib/libfmt/fmtprint.c
diff --git a/libfmt/fmtquote.c b/lib/libfmt/fmtquote.c
similarity index 100%
rename from libfmt/fmtquote.c
rename to lib/libfmt/fmtquote.c
diff --git a/libfmt/fmtrune.c b/lib/libfmt/fmtrune.c
similarity index 100%
rename from libfmt/fmtrune.c
rename to lib/libfmt/fmtrune.c
diff --git a/libfmt/fmtstr.c b/lib/libfmt/fmtstr.c
similarity index 100%
rename from libfmt/fmtstr.c
rename to lib/libfmt/fmtstr.c
diff --git a/libfmt/fmtvprint.c b/lib/libfmt/fmtvprint.c
similarity index 100%
rename from libfmt/fmtvprint.c
rename to lib/libfmt/fmtvprint.c
diff --git a/libfmt/fprint.c b/lib/libfmt/fprint.c
similarity index 100%
rename from libfmt/fprint.c
rename to lib/libfmt/fprint.c
diff --git a/libfmt/libfmt.a b/lib/libfmt/libfmt.a
similarity index 100%
rename from libfmt/libfmt.a
rename to lib/libfmt/libfmt.a
diff --git a/libfmt/nan64.c b/lib/libfmt/nan64.c
similarity index 100%
rename from libfmt/nan64.c
rename to lib/libfmt/nan64.c
diff --git a/libfmt/pow10.c b/lib/libfmt/pow10.c
similarity index 100%
rename from libfmt/pow10.c
rename to lib/libfmt/pow10.c
diff --git a/libfmt/print.3 b/lib/libfmt/print.3
similarity index 100%
rename from libfmt/print.3
rename to lib/libfmt/print.3
diff --git a/libfmt/print.c b/lib/libfmt/print.c
similarity index 100%
rename from libfmt/print.c
rename to lib/libfmt/print.c
diff --git a/libfmt/runefmtstr.c b/lib/libfmt/runefmtstr.c
similarity index 100%
rename from libfmt/runefmtstr.c
rename to lib/libfmt/runefmtstr.c
diff --git a/libfmt/runeseprint.c b/lib/libfmt/runeseprint.c
similarity index 100%
rename from libfmt/runeseprint.c
rename to lib/libfmt/runeseprint.c
diff --git a/libfmt/runesmprint.c b/lib/libfmt/runesmprint.c
similarity index 100%
rename from libfmt/runesmprint.c
rename to lib/libfmt/runesmprint.c
diff --git a/libfmt/runesnprint.c b/lib/libfmt/runesnprint.c
similarity index 100%
rename from libfmt/runesnprint.c
rename to lib/libfmt/runesnprint.c
diff --git a/libfmt/runesprint.c b/lib/libfmt/runesprint.c
similarity index 100%
rename from libfmt/runesprint.c
rename to lib/libfmt/runesprint.c
diff --git a/libfmt/runevseprint.c b/lib/libfmt/runevseprint.c
similarity index 100%
rename from libfmt/runevseprint.c
rename to lib/libfmt/runevseprint.c
diff --git a/libfmt/runevsmprint.c b/lib/libfmt/runevsmprint.c
similarity index 100%
rename from libfmt/runevsmprint.c
rename to lib/libfmt/runevsmprint.c
diff --git a/libfmt/runevsnprint.c b/lib/libfmt/runevsnprint.c
similarity index 100%
rename from libfmt/runevsnprint.c
rename to lib/libfmt/runevsnprint.c
diff --git a/libfmt/seprint.c b/lib/libfmt/seprint.c
similarity index 100%
rename from libfmt/seprint.c
rename to lib/libfmt/seprint.c
diff --git a/libfmt/smprint.c b/lib/libfmt/smprint.c
similarity index 100%
rename from libfmt/smprint.c
rename to lib/libfmt/smprint.c
diff --git a/libfmt/snprint.c b/lib/libfmt/snprint.c
similarity index 100%
rename from libfmt/snprint.c
rename to lib/libfmt/snprint.c
diff --git a/libfmt/sprint.c b/lib/libfmt/sprint.c
similarity index 100%
rename from libfmt/sprint.c
rename to lib/libfmt/sprint.c
diff --git a/libfmt/strtod.c b/lib/libfmt/strtod.c
similarity index 100%
rename from libfmt/strtod.c
rename to lib/libfmt/strtod.c
diff --git a/libfmt/test.c b/lib/libfmt/test.c
similarity index 100%
rename from libfmt/test.c
rename to lib/libfmt/test.c
diff --git a/libfmt/test2.c b/lib/libfmt/test2.c
similarity index 100%
rename from libfmt/test2.c
rename to lib/libfmt/test2.c
diff --git a/libfmt/test3.c b/lib/libfmt/test3.c
similarity index 100%
rename from libfmt/test3.c
rename to lib/libfmt/test3.c
diff --git a/libfmt/vfprint.c b/lib/libfmt/vfprint.c
similarity index 100%
rename from libfmt/vfprint.c
rename to lib/libfmt/vfprint.c
diff --git a/libfmt/vseprint.c b/lib/libfmt/vseprint.c
similarity index 100%
rename from libfmt/vseprint.c
rename to lib/libfmt/vseprint.c
diff --git a/libfmt/vsmprint.c b/lib/libfmt/vsmprint.c
similarity index 100%
rename from libfmt/vsmprint.c
rename to lib/libfmt/vsmprint.c
diff --git a/libfmt/vsnprint.c b/lib/libfmt/vsnprint.c
similarity index 100%
rename from libfmt/vsnprint.c
rename to lib/libfmt/vsnprint.c
diff --git a/libregexp/Makefile b/lib/libregexp/Makefile
similarity index 62%
rename from libregexp/Makefile
rename to lib/libregexp/Makefile
index 807bc53d..595e1bb2 100644
--- a/libregexp/Makefile
+++ b/lib/libregexp/Makefile
@@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk
 
 VERSION=2.0
 TARG=libregexp9
@@ -13,5 +13,5 @@ OBJ=\
 	rregexec\
 	rregsub
 
-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk
 
diff --git a/libregexp/NOTICE b/lib/libregexp/NOTICE
similarity index 100%
rename from libregexp/NOTICE
rename to lib/libregexp/NOTICE
diff --git a/libregexp/README b/lib/libregexp/README
similarity index 100%
rename from libregexp/README
rename to lib/libregexp/README
diff --git a/libregexp/regaux.c b/lib/libregexp/regaux.c
similarity index 100%
rename from libregexp/regaux.c
rename to lib/libregexp/regaux.c
diff --git a/libregexp/regcomp.c b/lib/libregexp/regcomp.c
similarity index 100%
rename from libregexp/regcomp.c
rename to lib/libregexp/regcomp.c
diff --git a/libregexp/regerror.c b/lib/libregexp/regerror.c
similarity index 100%
rename from libregexp/regerror.c
rename to lib/libregexp/regerror.c
diff --git a/libregexp/regexec.c b/lib/libregexp/regexec.c
similarity index 100%
rename from libregexp/regexec.c
rename to lib/libregexp/regexec.c
diff --git a/libregexp/regexp9.3 b/lib/libregexp/regexp9.3
similarity index 100%
rename from libregexp/regexp9.3
rename to lib/libregexp/regexp9.3
diff --git a/libregexp/regexp9.7 b/lib/libregexp/regexp9.7
similarity index 100%
rename from libregexp/regexp9.7
rename to lib/libregexp/regexp9.7
diff --git a/libregexp/regsub.c b/lib/libregexp/regsub.c
similarity index 100%
rename from libregexp/regsub.c
rename to lib/libregexp/regsub.c
diff --git a/libregexp/rregexec.c b/lib/libregexp/rregexec.c
similarity index 100%
rename from libregexp/rregexec.c
rename to lib/libregexp/rregexec.c
diff --git a/libregexp/rregsub.c b/lib/libregexp/rregsub.c
similarity index 100%
rename from libregexp/rregsub.c
rename to lib/libregexp/rregsub.c
diff --git a/libregexp/test.c b/lib/libregexp/test.c
similarity index 100%
rename from libregexp/test.c
rename to lib/libregexp/test.c
diff --git a/libregexp/test2.c b/lib/libregexp/test2.c
similarity index 100%
rename from libregexp/test2.c
rename to lib/libregexp/test2.c
diff --git a/libstuff/Makefile b/lib/libstuff/Makefile
similarity index 98%
rename from libstuff/Makefile
rename to lib/libstuff/Makefile
index 3a349558..0a61f14f 100644
--- a/libstuff/Makefile
+++ b/lib/libstuff/Makefile
@@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk
 
 TARG=libstuff
 
@@ -168,5 +168,5 @@ OBJ=\
 	x11/windows/window	\
 	xext
 
-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk
 
diff --git a/libstuff/buffer.c b/lib/libstuff/buffer.c
similarity index 100%
rename from libstuff/buffer.c
rename to lib/libstuff/buffer.c
diff --git a/libstuff/clientutil.c b/lib/libstuff/clientutil.c
similarity index 100%
rename from libstuff/clientutil.c
rename to lib/libstuff/clientutil.c
diff --git a/libstuff/event/buttonpress.c b/lib/libstuff/event/buttonpress.c
similarity index 100%
rename from libstuff/event/buttonpress.c
rename to lib/libstuff/event/buttonpress.c
diff --git a/libstuff/event/buttonrelease.c b/lib/libstuff/event/buttonrelease.c
similarity index 100%
rename from libstuff/event/buttonrelease.c
rename to lib/libstuff/event/buttonrelease.c
diff --git a/libstuff/event/clientmessage.c b/lib/libstuff/event/clientmessage.c
similarity index 100%
rename from libstuff/event/clientmessage.c
rename to lib/libstuff/event/clientmessage.c
diff --git a/libstuff/event/configurenotify.c b/lib/libstuff/event/configurenotify.c
similarity index 100%
rename from libstuff/event/configurenotify.c
rename to lib/libstuff/event/configurenotify.c
diff --git a/libstuff/event/configurerequest.c b/lib/libstuff/event/configurerequest.c
similarity index 100%
rename from libstuff/event/configurerequest.c
rename to lib/libstuff/event/configurerequest.c
diff --git a/libstuff/event/destroynotify.c b/lib/libstuff/event/destroynotify.c
similarity index 100%
rename from libstuff/event/destroynotify.c
rename to lib/libstuff/event/destroynotify.c
diff --git a/libstuff/event/enternotify.c b/lib/libstuff/event/enternotify.c
similarity index 100%
rename from libstuff/event/enternotify.c
rename to lib/libstuff/event/enternotify.c
diff --git a/libstuff/event/event.c b/lib/libstuff/event/event.c
similarity index 100%
rename from libstuff/event/event.c
rename to lib/libstuff/event/event.c
diff --git a/libstuff/event/event.h b/lib/libstuff/event/event.h
similarity index 100%
rename from libstuff/event/event.h
rename to lib/libstuff/event/event.h
diff --git a/libstuff/event/expose.c b/lib/libstuff/event/expose.c
similarity index 100%
rename from libstuff/event/expose.c
rename to lib/libstuff/event/expose.c
diff --git a/libstuff/event/focusin.c b/lib/libstuff/event/focusin.c
similarity index 100%
rename from libstuff/event/focusin.c
rename to lib/libstuff/event/focusin.c
diff --git a/libstuff/event/focusout.c b/lib/libstuff/event/focusout.c
similarity index 100%
rename from libstuff/event/focusout.c
rename to lib/libstuff/event/focusout.c
diff --git a/libstuff/event/keypress.c b/lib/libstuff/event/keypress.c
similarity index 100%
rename from libstuff/event/keypress.c
rename to lib/libstuff/event/keypress.c
diff --git a/libstuff/event/leavenotify.c b/lib/libstuff/event/leavenotify.c
similarity index 100%
rename from libstuff/event/leavenotify.c
rename to lib/libstuff/event/leavenotify.c
diff --git a/libstuff/event/mapnotify.c b/lib/libstuff/event/mapnotify.c
similarity index 100%
rename from libstuff/event/mapnotify.c
rename to lib/libstuff/event/mapnotify.c
diff --git a/libstuff/event/mappingnotify.c b/lib/libstuff/event/mappingnotify.c
similarity index 100%
rename from libstuff/event/mappingnotify.c
rename to lib/libstuff/event/mappingnotify.c
diff --git a/libstuff/event/maprequest.c b/lib/libstuff/event/maprequest.c
similarity index 100%
rename from libstuff/event/maprequest.c
rename to lib/libstuff/event/maprequest.c
diff --git a/libstuff/event/motionnotify.c b/lib/libstuff/event/motionnotify.c
similarity index 100%
rename from libstuff/event/motionnotify.c
rename to lib/libstuff/event/motionnotify.c
diff --git a/libstuff/event/propertynotify.c b/lib/libstuff/event/propertynotify.c
similarity index 100%
rename from libstuff/event/propertynotify.c
rename to lib/libstuff/event/propertynotify.c
diff --git a/libstuff/event/unmapnotify.c b/lib/libstuff/event/unmapnotify.c
similarity index 100%
rename from libstuff/event/unmapnotify.c
rename to lib/libstuff/event/unmapnotify.c
diff --git a/libstuff/event/xtime.c b/lib/libstuff/event/xtime.c
similarity index 100%
rename from libstuff/event/xtime.c
rename to lib/libstuff/event/xtime.c
diff --git a/libstuff/geom/get_sticky.c b/lib/libstuff/geom/get_sticky.c
similarity index 100%
rename from libstuff/geom/get_sticky.c
rename to lib/libstuff/geom/get_sticky.c
diff --git a/libstuff/geom/quadrant.c b/lib/libstuff/geom/quadrant.c
similarity index 100%
rename from libstuff/geom/quadrant.c
rename to lib/libstuff/geom/quadrant.c
diff --git a/libstuff/geom/rect_contains_p.c b/lib/libstuff/geom/rect_contains_p.c
similarity index 100%
rename from libstuff/geom/rect_contains_p.c
rename to lib/libstuff/geom/rect_contains_p.c
diff --git a/libstuff/geom/rect_haspoint_p.c b/lib/libstuff/geom/rect_haspoint_p.c
similarity index 100%
rename from libstuff/geom/rect_haspoint_p.c
rename to lib/libstuff/geom/rect_haspoint_p.c
diff --git a/libstuff/geom/rect_intersect_p.c b/lib/libstuff/geom/rect_intersect_p.c
similarity index 100%
rename from libstuff/geom/rect_intersect_p.c
rename to lib/libstuff/geom/rect_intersect_p.c
diff --git a/libstuff/geom/rect_intersection.c b/lib/libstuff/geom/rect_intersection.c
similarity index 100%
rename from libstuff/geom/rect_intersection.c
rename to lib/libstuff/geom/rect_intersection.c
diff --git a/libstuff/init_screens.c b/lib/libstuff/init_screens.c
similarity index 100%
rename from libstuff/init_screens.c
rename to lib/libstuff/init_screens.c
diff --git a/libstuff/map.c b/lib/libstuff/map.c
similarity index 100%
rename from libstuff/map.c
rename to lib/libstuff/map.c
diff --git a/libstuff/printevent.c b/lib/libstuff/printevent.c
similarity index 100%
rename from libstuff/printevent.c
rename to lib/libstuff/printevent.c
diff --git a/libstuff/printevent.h b/lib/libstuff/printevent.h
similarity index 100%
rename from libstuff/printevent.h
rename to lib/libstuff/printevent.h
diff --git a/libstuff/util/_die.c b/lib/libstuff/util/_die.c
similarity index 100%
rename from libstuff/util/_die.c
rename to lib/libstuff/util/_die.c
diff --git a/libstuff/util/backtrace.c b/lib/libstuff/util/backtrace.c
similarity index 100%
rename from libstuff/util/backtrace.c
rename to lib/libstuff/util/backtrace.c
diff --git a/libstuff/util/closeexec.c b/lib/libstuff/util/closeexec.c
similarity index 100%
rename from libstuff/util/closeexec.c
rename to lib/libstuff/util/closeexec.c
diff --git a/libstuff/util/comm.c b/lib/libstuff/util/comm.c
similarity index 100%
rename from libstuff/util/comm.c
rename to lib/libstuff/util/comm.c
diff --git a/libstuff/util/doublefork.c b/lib/libstuff/util/doublefork.c
similarity index 100%
rename from libstuff/util/doublefork.c
rename to lib/libstuff/util/doublefork.c
diff --git a/libstuff/util/emalloc.c b/lib/libstuff/util/emalloc.c
similarity index 100%
rename from libstuff/util/emalloc.c
rename to lib/libstuff/util/emalloc.c
diff --git a/libstuff/util/emallocz.c b/lib/libstuff/util/emallocz.c
similarity index 100%
rename from libstuff/util/emallocz.c
rename to lib/libstuff/util/emallocz.c
diff --git a/libstuff/util/erealloc.c b/lib/libstuff/util/erealloc.c
similarity index 100%
rename from libstuff/util/erealloc.c
rename to lib/libstuff/util/erealloc.c
diff --git a/libstuff/util/estrdup.c b/lib/libstuff/util/estrdup.c
similarity index 100%
rename from libstuff/util/estrdup.c
rename to lib/libstuff/util/estrdup.c
diff --git a/libstuff/util/estrndup.c b/lib/libstuff/util/estrndup.c
similarity index 100%
rename from libstuff/util/estrndup.c
rename to lib/libstuff/util/estrndup.c
diff --git a/libstuff/util/fatal.c b/lib/libstuff/util/fatal.c
similarity index 100%
rename from libstuff/util/fatal.c
rename to lib/libstuff/util/fatal.c
diff --git a/libstuff/util/freelater.c b/lib/libstuff/util/freelater.c
similarity index 100%
rename from libstuff/util/freelater.c
rename to lib/libstuff/util/freelater.c
diff --git a/libstuff/util/getbase.c b/lib/libstuff/util/getbase.c
similarity index 100%
rename from libstuff/util/getbase.c
rename to lib/libstuff/util/getbase.c
diff --git a/libstuff/util/getint.c b/lib/libstuff/util/getint.c
similarity index 100%
rename from libstuff/util/getint.c
rename to lib/libstuff/util/getint.c
diff --git a/libstuff/util/getlong.c b/lib/libstuff/util/getlong.c
similarity index 100%
rename from libstuff/util/getlong.c
rename to lib/libstuff/util/getlong.c
diff --git a/libstuff/util/getulong.c b/lib/libstuff/util/getulong.c
similarity index 100%
rename from libstuff/util/getulong.c
rename to lib/libstuff/util/getulong.c
diff --git a/libstuff/util/grep.c b/lib/libstuff/util/grep.c
similarity index 100%
rename from libstuff/util/grep.c
rename to lib/libstuff/util/grep.c
diff --git a/libstuff/util/join.c b/lib/libstuff/util/join.c
similarity index 100%
rename from libstuff/util/join.c
rename to lib/libstuff/util/join.c
diff --git a/libstuff/util/max.c b/lib/libstuff/util/max.c
similarity index 100%
rename from libstuff/util/max.c
rename to lib/libstuff/util/max.c
diff --git a/libstuff/util/mfatal.c b/lib/libstuff/util/mfatal.c
similarity index 100%
rename from libstuff/util/mfatal.c
rename to lib/libstuff/util/mfatal.c
diff --git a/libstuff/util/min.c b/lib/libstuff/util/min.c
similarity index 100%
rename from libstuff/util/min.c
rename to lib/libstuff/util/min.c
diff --git a/libstuff/util/pathsearch.c b/lib/libstuff/util/pathsearch.c
similarity index 100%
rename from libstuff/util/pathsearch.c
rename to lib/libstuff/util/pathsearch.c
diff --git a/libstuff/util/refree.c b/lib/libstuff/util/refree.c
similarity index 100%
rename from libstuff/util/refree.c
rename to lib/libstuff/util/refree.c
diff --git a/libstuff/util/reinit.c b/lib/libstuff/util/reinit.c
similarity index 100%
rename from libstuff/util/reinit.c
rename to lib/libstuff/util/reinit.c
diff --git a/libstuff/util/spawn3.c b/lib/libstuff/util/spawn3.c
similarity index 100%
rename from libstuff/util/spawn3.c
rename to lib/libstuff/util/spawn3.c
diff --git a/libstuff/util/spawn3l.c b/lib/libstuff/util/spawn3l.c
similarity index 100%
rename from libstuff/util/spawn3l.c
rename to lib/libstuff/util/spawn3l.c
diff --git a/libstuff/util/stokenize.c b/lib/libstuff/util/stokenize.c
similarity index 100%
rename from libstuff/util/stokenize.c
rename to lib/libstuff/util/stokenize.c
diff --git a/libstuff/util/strcasestr.c b/lib/libstuff/util/strcasestr.c
similarity index 100%
rename from libstuff/util/strcasestr.c
rename to lib/libstuff/util/strcasestr.c
diff --git a/libstuff/util/strend.c b/lib/libstuff/util/strend.c
similarity index 100%
rename from libstuff/util/strend.c
rename to lib/libstuff/util/strend.c
diff --git a/libstuff/util/strlcat.c b/lib/libstuff/util/strlcat.c
similarity index 100%
rename from libstuff/util/strlcat.c
rename to lib/libstuff/util/strlcat.c
diff --git a/libstuff/util/strlcatprint.c b/lib/libstuff/util/strlcatprint.c
similarity index 100%
rename from libstuff/util/strlcatprint.c
rename to lib/libstuff/util/strlcatprint.c
diff --git a/libstuff/util/sxprint.c b/lib/libstuff/util/sxprint.c
similarity index 100%
rename from libstuff/util/sxprint.c
rename to lib/libstuff/util/sxprint.c
diff --git a/libstuff/util/tokenize.c b/lib/libstuff/util/tokenize.c
similarity index 100%
rename from libstuff/util/tokenize.c
rename to lib/libstuff/util/tokenize.c
diff --git a/libstuff/util/uniq.c b/lib/libstuff/util/uniq.c
similarity index 100%
rename from libstuff/util/uniq.c
rename to lib/libstuff/util/uniq.c
diff --git a/libstuff/util/unquote.c b/lib/libstuff/util/unquote.c
similarity index 100%
rename from libstuff/util/unquote.c
rename to lib/libstuff/util/unquote.c
diff --git a/libstuff/util/utflcpy.c b/lib/libstuff/util/utflcpy.c
similarity index 100%
rename from libstuff/util/utflcpy.c
rename to lib/libstuff/util/utflcpy.c
diff --git a/libstuff/util/util.h b/lib/libstuff/util/util.h
similarity index 100%
rename from libstuff/util/util.h
rename to lib/libstuff/util/util.h
diff --git a/libstuff/util/vector.c b/lib/libstuff/util/vector.c
similarity index 100%
rename from libstuff/util/vector.c
rename to lib/libstuff/util/vector.c
diff --git a/libstuff/util/vsxprint.c b/lib/libstuff/util/vsxprint.c
similarity index 100%
rename from libstuff/util/vsxprint.c
rename to lib/libstuff/util/vsxprint.c
diff --git a/libstuff/x11/colors/loadcolor.c b/lib/libstuff/x11/colors/loadcolor.c
similarity index 100%
rename from libstuff/x11/colors/loadcolor.c
rename to lib/libstuff/x11/colors/loadcolor.c
diff --git a/libstuff/x11/colors/namedcolor.c b/lib/libstuff/x11/colors/namedcolor.c
similarity index 100%
rename from libstuff/x11/colors/namedcolor.c
rename to lib/libstuff/x11/colors/namedcolor.c
diff --git a/libstuff/x11/colors/xftcolor.c b/lib/libstuff/x11/colors/xftcolor.c
similarity index 100%
rename from libstuff/x11/colors/xftcolor.c
rename to lib/libstuff/x11/colors/xftcolor.c
diff --git a/libstuff/x11/convpts.c b/lib/libstuff/x11/convpts.c
similarity index 100%
rename from libstuff/x11/convpts.c
rename to lib/libstuff/x11/convpts.c
diff --git a/libstuff/x11/drawing/border.c b/lib/libstuff/x11/drawing/border.c
similarity index 100%
rename from libstuff/x11/drawing/border.c
rename to lib/libstuff/x11/drawing/border.c
diff --git a/libstuff/x11/drawing/drawline.c b/lib/libstuff/x11/drawing/drawline.c
similarity index 100%
rename from libstuff/x11/drawing/drawline.c
rename to lib/libstuff/x11/drawing/drawline.c
diff --git a/libstuff/x11/drawing/drawpoly.c b/lib/libstuff/x11/drawing/drawpoly.c
similarity index 100%
rename from libstuff/x11/drawing/drawpoly.c
rename to lib/libstuff/x11/drawing/drawpoly.c
diff --git a/libstuff/x11/drawing/drawstring.c b/lib/libstuff/x11/drawing/drawstring.c
similarity index 100%
rename from libstuff/x11/drawing/drawstring.c
rename to lib/libstuff/x11/drawing/drawstring.c
diff --git a/libstuff/x11/drawing/fill.c b/lib/libstuff/x11/drawing/fill.c
similarity index 100%
rename from libstuff/x11/drawing/fill.c
rename to lib/libstuff/x11/drawing/fill.c
diff --git a/libstuff/x11/drawing/fillpoly.c b/lib/libstuff/x11/drawing/fillpoly.c
similarity index 100%
rename from libstuff/x11/drawing/fillpoly.c
rename to lib/libstuff/x11/drawing/fillpoly.c
diff --git a/libstuff/x11/errors.c b/lib/libstuff/x11/errors.c
similarity index 100%
rename from libstuff/x11/errors.c
rename to lib/libstuff/x11/errors.c
diff --git a/libstuff/x11/focus/getfocus.c b/lib/libstuff/x11/focus/getfocus.c
similarity index 100%
rename from libstuff/x11/focus/getfocus.c
rename to lib/libstuff/x11/focus/getfocus.c
diff --git a/libstuff/x11/focus/setfocus.c b/lib/libstuff/x11/focus/setfocus.c
similarity index 100%
rename from libstuff/x11/focus/setfocus.c
rename to lib/libstuff/x11/focus/setfocus.c
diff --git a/libstuff/x11/freestringlist.c b/lib/libstuff/x11/freestringlist.c
similarity index 100%
rename from libstuff/x11/freestringlist.c
rename to lib/libstuff/x11/freestringlist.c
diff --git a/libstuff/x11/geometry/XRect.c b/lib/libstuff/x11/geometry/XRect.c
similarity index 100%
rename from libstuff/x11/geometry/XRect.c
rename to lib/libstuff/x11/geometry/XRect.c
diff --git a/libstuff/x11/geometry/addpt.c b/lib/libstuff/x11/geometry/addpt.c
similarity index 100%
rename from libstuff/x11/geometry/addpt.c
rename to lib/libstuff/x11/geometry/addpt.c
diff --git a/libstuff/x11/geometry/divpt.c b/lib/libstuff/x11/geometry/divpt.c
similarity index 100%
rename from libstuff/x11/geometry/divpt.c
rename to lib/libstuff/x11/geometry/divpt.c
diff --git a/libstuff/x11/geometry/eqpt.c b/lib/libstuff/x11/geometry/eqpt.c
similarity index 100%
rename from libstuff/x11/geometry/eqpt.c
rename to lib/libstuff/x11/geometry/eqpt.c
diff --git a/libstuff/x11/geometry/eqrect.c b/lib/libstuff/x11/geometry/eqrect.c
similarity index 100%
rename from libstuff/x11/geometry/eqrect.c
rename to lib/libstuff/x11/geometry/eqrect.c
diff --git a/libstuff/x11/geometry/insetrect.c b/lib/libstuff/x11/geometry/insetrect.c
similarity index 100%
rename from libstuff/x11/geometry/insetrect.c
rename to lib/libstuff/x11/geometry/insetrect.c
diff --git a/libstuff/x11/geometry/mulpt.c b/lib/libstuff/x11/geometry/mulpt.c
similarity index 100%
rename from libstuff/x11/geometry/mulpt.c
rename to lib/libstuff/x11/geometry/mulpt.c
diff --git a/libstuff/x11/geometry/rectaddpt.c b/lib/libstuff/x11/geometry/rectaddpt.c
similarity index 100%
rename from libstuff/x11/geometry/rectaddpt.c
rename to lib/libstuff/x11/geometry/rectaddpt.c
diff --git a/libstuff/x11/geometry/rectsetorigin.c b/lib/libstuff/x11/geometry/rectsetorigin.c
similarity index 100%
rename from libstuff/x11/geometry/rectsetorigin.c
rename to lib/libstuff/x11/geometry/rectsetorigin.c
diff --git a/libstuff/x11/geometry/rectsubpt.c b/lib/libstuff/x11/geometry/rectsubpt.c
similarity index 100%
rename from libstuff/x11/geometry/rectsubpt.c
rename to lib/libstuff/x11/geometry/rectsubpt.c
diff --git a/libstuff/x11/geometry/subpt.c b/lib/libstuff/x11/geometry/subpt.c
similarity index 100%
rename from libstuff/x11/geometry/subpt.c
rename to lib/libstuff/x11/geometry/subpt.c
diff --git a/libstuff/x11/ignored_xerrors.c b/lib/libstuff/x11/ignored_xerrors.c
similarity index 100%
rename from libstuff/x11/ignored_xerrors.c
rename to lib/libstuff/x11/ignored_xerrors.c
diff --git a/libstuff/x11/images/allocimage.c b/lib/libstuff/x11/images/allocimage.c
similarity index 100%
rename from libstuff/x11/images/allocimage.c
rename to lib/libstuff/x11/images/allocimage.c
diff --git a/libstuff/x11/images/copyimage.c b/lib/libstuff/x11/images/copyimage.c
similarity index 100%
rename from libstuff/x11/images/copyimage.c
rename to lib/libstuff/x11/images/copyimage.c
diff --git a/libstuff/x11/images/freeimage.c b/lib/libstuff/x11/images/freeimage.c
similarity index 100%
rename from libstuff/x11/images/freeimage.c
rename to lib/libstuff/x11/images/freeimage.c
diff --git a/libstuff/x11/images/xftdrawable.c b/lib/libstuff/x11/images/xftdrawable.c
similarity index 100%
rename from libstuff/x11/images/xftdrawable.c
rename to lib/libstuff/x11/images/xftdrawable.c
diff --git a/libstuff/x11/initdisplay.c b/lib/libstuff/x11/initdisplay.c
similarity index 100%
rename from libstuff/x11/initdisplay.c
rename to lib/libstuff/x11/initdisplay.c
diff --git a/libstuff/x11/insanity/gravitate.c b/lib/libstuff/x11/insanity/gravitate.c
similarity index 100%
rename from libstuff/x11/insanity/gravitate.c
rename to lib/libstuff/x11/insanity/gravitate.c
diff --git a/libstuff/x11/insanity/sethints.c b/lib/libstuff/x11/insanity/sethints.c
similarity index 100%
rename from libstuff/x11/insanity/sethints.c
rename to lib/libstuff/x11/insanity/sethints.c
diff --git a/libstuff/x11/insanity/sizehint.c b/lib/libstuff/x11/insanity/sizehint.c
similarity index 100%
rename from libstuff/x11/insanity/sizehint.c
rename to lib/libstuff/x11/insanity/sizehint.c
diff --git a/libstuff/x11/keyboard/grabkeyboard.c b/lib/libstuff/x11/keyboard/grabkeyboard.c
similarity index 100%
rename from libstuff/x11/keyboard/grabkeyboard.c
rename to lib/libstuff/x11/keyboard/grabkeyboard.c
diff --git a/libstuff/x11/keyboard/ungrabkeyboard.c b/lib/libstuff/x11/keyboard/ungrabkeyboard.c
similarity index 100%
rename from libstuff/x11/keyboard/ungrabkeyboard.c
rename to lib/libstuff/x11/keyboard/ungrabkeyboard.c
diff --git a/libstuff/x11/keys/keycode.c b/lib/libstuff/x11/keys/keycode.c
similarity index 100%
rename from libstuff/x11/keys/keycode.c
rename to lib/libstuff/x11/keys/keycode.c
diff --git a/libstuff/x11/keys/parsekey.c b/lib/libstuff/x11/keys/parsekey.c
similarity index 100%
rename from libstuff/x11/keys/parsekey.c
rename to lib/libstuff/x11/keys/parsekey.c
diff --git a/libstuff/x11/mouse/grabpointer.c b/lib/libstuff/x11/mouse/grabpointer.c
similarity index 100%
rename from libstuff/x11/mouse/grabpointer.c
rename to lib/libstuff/x11/mouse/grabpointer.c
diff --git a/libstuff/x11/mouse/pointerscreen.c b/lib/libstuff/x11/mouse/pointerscreen.c
similarity index 100%
rename from libstuff/x11/mouse/pointerscreen.c
rename to lib/libstuff/x11/mouse/pointerscreen.c
diff --git a/libstuff/x11/mouse/querypointer.c b/lib/libstuff/x11/mouse/querypointer.c
similarity index 100%
rename from libstuff/x11/mouse/querypointer.c
rename to lib/libstuff/x11/mouse/querypointer.c
diff --git a/libstuff/x11/mouse/translate.c b/lib/libstuff/x11/mouse/translate.c
similarity index 100%
rename from libstuff/x11/mouse/translate.c
rename to lib/libstuff/x11/mouse/translate.c
diff --git a/libstuff/x11/mouse/ungrabpointer.c b/lib/libstuff/x11/mouse/ungrabpointer.c
similarity index 100%
rename from libstuff/x11/mouse/ungrabpointer.c
rename to lib/libstuff/x11/mouse/ungrabpointer.c
diff --git a/libstuff/x11/mouse/warppointer.c b/lib/libstuff/x11/mouse/warppointer.c
similarity index 100%
rename from libstuff/x11/mouse/warppointer.c
rename to lib/libstuff/x11/mouse/warppointer.c
diff --git a/libstuff/x11/properties/changeprop_char.c b/lib/libstuff/x11/properties/changeprop_char.c
similarity index 100%
rename from libstuff/x11/properties/changeprop_char.c
rename to lib/libstuff/x11/properties/changeprop_char.c
diff --git a/libstuff/x11/properties/changeprop_long.c b/lib/libstuff/x11/properties/changeprop_long.c
similarity index 100%
rename from libstuff/x11/properties/changeprop_long.c
rename to lib/libstuff/x11/properties/changeprop_long.c
diff --git a/libstuff/x11/properties/changeprop_short.c b/lib/libstuff/x11/properties/changeprop_short.c
similarity index 100%
rename from libstuff/x11/properties/changeprop_short.c
rename to lib/libstuff/x11/properties/changeprop_short.c
diff --git a/libstuff/x11/properties/changeprop_string.c b/lib/libstuff/x11/properties/changeprop_string.c
similarity index 100%
rename from libstuff/x11/properties/changeprop_string.c
rename to lib/libstuff/x11/properties/changeprop_string.c
diff --git a/libstuff/x11/properties/changeprop_textlist.c b/lib/libstuff/x11/properties/changeprop_textlist.c
similarity index 100%
rename from libstuff/x11/properties/changeprop_textlist.c
rename to lib/libstuff/x11/properties/changeprop_textlist.c
diff --git a/libstuff/x11/properties/changeprop_ulong.c b/lib/libstuff/x11/properties/changeprop_ulong.c
similarity index 100%
rename from libstuff/x11/properties/changeprop_ulong.c
rename to lib/libstuff/x11/properties/changeprop_ulong.c
diff --git a/libstuff/x11/properties/changeproperty.c b/lib/libstuff/x11/properties/changeproperty.c
similarity index 100%
rename from libstuff/x11/properties/changeproperty.c
rename to lib/libstuff/x11/properties/changeproperty.c
diff --git a/libstuff/x11/properties/delproperty.c b/lib/libstuff/x11/properties/delproperty.c
similarity index 100%
rename from libstuff/x11/properties/delproperty.c
rename to lib/libstuff/x11/properties/delproperty.c
diff --git a/libstuff/x11/properties/getprop.c b/lib/libstuff/x11/properties/getprop.c
similarity index 100%
rename from libstuff/x11/properties/getprop.c
rename to lib/libstuff/x11/properties/getprop.c
diff --git a/libstuff/x11/properties/getprop_long.c b/lib/libstuff/x11/properties/getprop_long.c
similarity index 100%
rename from libstuff/x11/properties/getprop_long.c
rename to lib/libstuff/x11/properties/getprop_long.c
diff --git a/libstuff/x11/properties/getprop_string.c b/lib/libstuff/x11/properties/getprop_string.c
similarity index 100%
rename from libstuff/x11/properties/getprop_string.c
rename to lib/libstuff/x11/properties/getprop_string.c
diff --git a/libstuff/x11/properties/getprop_textlist.c b/lib/libstuff/x11/properties/getprop_textlist.c
similarity index 100%
rename from libstuff/x11/properties/getprop_textlist.c
rename to lib/libstuff/x11/properties/getprop_textlist.c
diff --git a/libstuff/x11/properties/getprop_ulong.c b/lib/libstuff/x11/properties/getprop_ulong.c
similarity index 100%
rename from libstuff/x11/properties/getprop_ulong.c
rename to lib/libstuff/x11/properties/getprop_ulong.c
diff --git a/libstuff/x11/properties/getproperty.c b/lib/libstuff/x11/properties/getproperty.c
similarity index 100%
rename from libstuff/x11/properties/getproperty.c
rename to lib/libstuff/x11/properties/getproperty.c
diff --git a/libstuff/x11/properties/strlistdup.c b/lib/libstuff/x11/properties/strlistdup.c
similarity index 100%
rename from libstuff/x11/properties/strlistdup.c
rename to lib/libstuff/x11/properties/strlistdup.c
diff --git a/libstuff/x11/sendevent.c b/lib/libstuff/x11/sendevent.c
similarity index 100%
rename from libstuff/x11/sendevent.c
rename to lib/libstuff/x11/sendevent.c
diff --git a/libstuff/x11/sendmessage.c b/lib/libstuff/x11/sendmessage.c
similarity index 100%
rename from libstuff/x11/sendmessage.c
rename to lib/libstuff/x11/sendmessage.c
diff --git a/libstuff/x11/setgccol.c b/lib/libstuff/x11/setgccol.c
similarity index 100%
rename from libstuff/x11/setgccol.c
rename to lib/libstuff/x11/setgccol.c
diff --git a/libstuff/x11/shape/setshapemask.c b/lib/libstuff/x11/shape/setshapemask.c
similarity index 100%
rename from libstuff/x11/shape/setshapemask.c
rename to lib/libstuff/x11/shape/setshapemask.c
diff --git a/libstuff/x11/sync.c b/lib/libstuff/x11/sync.c
similarity index 100%
rename from libstuff/x11/sync.c
rename to lib/libstuff/x11/sync.c
diff --git a/libstuff/x11/text/freefont.c b/lib/libstuff/x11/text/freefont.c
similarity index 100%
rename from libstuff/x11/text/freefont.c
rename to lib/libstuff/x11/text/freefont.c
diff --git a/libstuff/x11/text/labelh.c b/lib/libstuff/x11/text/labelh.c
similarity index 100%
rename from libstuff/x11/text/labelh.c
rename to lib/libstuff/x11/text/labelh.c
diff --git a/libstuff/x11/text/loadfont.c b/lib/libstuff/x11/text/loadfont.c
similarity index 100%
rename from libstuff/x11/text/loadfont.c
rename to lib/libstuff/x11/text/loadfont.c
diff --git a/libstuff/x11/text/textextents_l.c b/lib/libstuff/x11/text/textextents_l.c
similarity index 100%
rename from libstuff/x11/text/textextents_l.c
rename to lib/libstuff/x11/text/textextents_l.c
diff --git a/libstuff/x11/text/textwidth.c b/lib/libstuff/x11/text/textwidth.c
similarity index 100%
rename from libstuff/x11/text/textwidth.c
rename to lib/libstuff/x11/text/textwidth.c
diff --git a/libstuff/x11/text/textwidth_l.c b/lib/libstuff/x11/text/textwidth_l.c
similarity index 100%
rename from libstuff/x11/text/textwidth_l.c
rename to lib/libstuff/x11/text/textwidth_l.c
diff --git a/libstuff/x11/windows/configwin.c b/lib/libstuff/x11/windows/configwin.c
similarity index 100%
rename from libstuff/x11/windows/configwin.c
rename to lib/libstuff/x11/windows/configwin.c
diff --git a/libstuff/x11/windows/createwindow.c b/lib/libstuff/x11/windows/createwindow.c
similarity index 100%
rename from libstuff/x11/windows/createwindow.c
rename to lib/libstuff/x11/windows/createwindow.c
diff --git a/libstuff/x11/windows/createwindow_visual.c b/lib/libstuff/x11/windows/createwindow_visual.c
similarity index 100%
rename from libstuff/x11/windows/createwindow_visual.c
rename to lib/libstuff/x11/windows/createwindow_visual.c
diff --git a/libstuff/x11/windows/destroywindow.c b/lib/libstuff/x11/windows/destroywindow.c
similarity index 100%
rename from libstuff/x11/windows/destroywindow.c
rename to lib/libstuff/x11/windows/destroywindow.c
diff --git a/libstuff/x11/windows/findwin.c b/lib/libstuff/x11/windows/findwin.c
similarity index 100%
rename from libstuff/x11/windows/findwin.c
rename to lib/libstuff/x11/windows/findwin.c
diff --git a/libstuff/x11/windows/getwinrect.c b/lib/libstuff/x11/windows/getwinrect.c
similarity index 100%
rename from libstuff/x11/windows/getwinrect.c
rename to lib/libstuff/x11/windows/getwinrect.c
diff --git a/libstuff/x11/windows/lowerwin.c b/lib/libstuff/x11/windows/lowerwin.c
similarity index 100%
rename from libstuff/x11/windows/lowerwin.c
rename to lib/libstuff/x11/windows/lowerwin.c
diff --git a/libstuff/x11/windows/mapwin.c b/lib/libstuff/x11/windows/mapwin.c
similarity index 100%
rename from libstuff/x11/windows/mapwin.c
rename to lib/libstuff/x11/windows/mapwin.c
diff --git a/libstuff/x11/windows/movewin.c b/lib/libstuff/x11/windows/movewin.c
similarity index 100%
rename from libstuff/x11/windows/movewin.c
rename to lib/libstuff/x11/windows/movewin.c
diff --git a/libstuff/x11/windows/raisewin.c b/lib/libstuff/x11/windows/raisewin.c
similarity index 100%
rename from libstuff/x11/windows/raisewin.c
rename to lib/libstuff/x11/windows/raisewin.c
diff --git a/libstuff/x11/windows/reparentwindow.c b/lib/libstuff/x11/windows/reparentwindow.c
similarity index 100%
rename from libstuff/x11/windows/reparentwindow.c
rename to lib/libstuff/x11/windows/reparentwindow.c
diff --git a/libstuff/x11/windows/reshapewin.c b/lib/libstuff/x11/windows/reshapewin.c
similarity index 100%
rename from libstuff/x11/windows/reshapewin.c
rename to lib/libstuff/x11/windows/reshapewin.c
diff --git a/libstuff/x11/windows/selectinput.c b/lib/libstuff/x11/windows/selectinput.c
similarity index 100%
rename from libstuff/x11/windows/selectinput.c
rename to lib/libstuff/x11/windows/selectinput.c
diff --git a/libstuff/x11/windows/setborder.c b/lib/libstuff/x11/windows/setborder.c
similarity index 100%
rename from libstuff/x11/windows/setborder.c
rename to lib/libstuff/x11/windows/setborder.c
diff --git a/libstuff/x11/windows/sethandler.c b/lib/libstuff/x11/windows/sethandler.c
similarity index 100%
rename from libstuff/x11/windows/sethandler.c
rename to lib/libstuff/x11/windows/sethandler.c
diff --git a/libstuff/x11/windows/setwinattr.c b/lib/libstuff/x11/windows/setwinattr.c
similarity index 100%
rename from libstuff/x11/windows/setwinattr.c
rename to lib/libstuff/x11/windows/setwinattr.c
diff --git a/libstuff/x11/windows/unmapwin.c b/lib/libstuff/x11/windows/unmapwin.c
similarity index 100%
rename from libstuff/x11/windows/unmapwin.c
rename to lib/libstuff/x11/windows/unmapwin.c
diff --git a/libstuff/x11/windows/window.c b/lib/libstuff/x11/windows/window.c
similarity index 100%
rename from libstuff/x11/windows/window.c
rename to lib/libstuff/x11/windows/window.c
diff --git a/libstuff/x11/x11.c b/lib/libstuff/x11/x11.c
similarity index 100%
rename from libstuff/x11/x11.c
rename to lib/libstuff/x11/x11.c
diff --git a/libstuff/x11/x11.h b/lib/libstuff/x11/x11.h
similarity index 100%
rename from libstuff/x11/x11.h
rename to lib/libstuff/x11/x11.h
diff --git a/libstuff/x11/xatom.c b/lib/libstuff/x11/xatom.c
similarity index 100%
rename from libstuff/x11/xatom.c
rename to lib/libstuff/x11/xatom.c
diff --git a/libstuff/x11/xft.c b/lib/libstuff/x11/xft.c
similarity index 100%
rename from libstuff/x11/xft.c
rename to lib/libstuff/x11/xft.c
diff --git a/libstuff/xext.c b/lib/libstuff/xext.c
similarity index 100%
rename from libstuff/xext.c
rename to lib/libstuff/xext.c
diff --git a/libutf/Makefile b/lib/libutf/Makefile
similarity index 80%
rename from libutf/Makefile
rename to lib/libutf/Makefile
index 0fdd571b..fee2da0c 100644
--- a/libutf/Makefile
+++ b/lib/libutf/Makefile
@@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk
 
 VERSION=2.0
 TARG=libutf
@@ -26,5 +26,5 @@ OBJ=\
 	utfrune\
 	utfutf
 
-include ${ROOT}/mk/lib.mk
+include $(ROOT)/mk/lib.mk
 
diff --git a/libutf/NOTICE b/lib/libutf/NOTICE
similarity index 100%
rename from libutf/NOTICE
rename to lib/libutf/NOTICE
diff --git a/libutf/README b/lib/libutf/README
similarity index 100%
rename from libutf/README
rename to lib/libutf/README
diff --git a/libutf/isalpharune.3 b/lib/libutf/isalpharune.3
similarity index 100%
rename from libutf/isalpharune.3
rename to lib/libutf/isalpharune.3
diff --git a/libutf/libutf.a b/lib/libutf/libutf.a
similarity index 100%
rename from libutf/libutf.a
rename to lib/libutf/libutf.a
diff --git a/libutf/rune.3 b/lib/libutf/rune.3
similarity index 100%
rename from libutf/rune.3
rename to lib/libutf/rune.3
diff --git a/libutf/rune.c b/lib/libutf/rune.c
similarity index 100%
rename from libutf/rune.c
rename to lib/libutf/rune.c
diff --git a/libutf/runestrcat.3 b/lib/libutf/runestrcat.3
similarity index 100%
rename from libutf/runestrcat.3
rename to lib/libutf/runestrcat.3
diff --git a/libutf/runestrcat.c b/lib/libutf/runestrcat.c
similarity index 100%
rename from libutf/runestrcat.c
rename to lib/libutf/runestrcat.c
diff --git a/libutf/runestrchr.c b/lib/libutf/runestrchr.c
similarity index 100%
rename from libutf/runestrchr.c
rename to lib/libutf/runestrchr.c
diff --git a/libutf/runestrcmp.c b/lib/libutf/runestrcmp.c
similarity index 100%
rename from libutf/runestrcmp.c
rename to lib/libutf/runestrcmp.c
diff --git a/libutf/runestrcpy.c b/lib/libutf/runestrcpy.c
similarity index 100%
rename from libutf/runestrcpy.c
rename to lib/libutf/runestrcpy.c
diff --git a/libutf/runestrdup.c b/lib/libutf/runestrdup.c
similarity index 100%
rename from libutf/runestrdup.c
rename to lib/libutf/runestrdup.c
diff --git a/libutf/runestrecpy.c b/lib/libutf/runestrecpy.c
similarity index 100%
rename from libutf/runestrecpy.c
rename to lib/libutf/runestrecpy.c
diff --git a/libutf/runestrlen.c b/lib/libutf/runestrlen.c
similarity index 100%
rename from libutf/runestrlen.c
rename to lib/libutf/runestrlen.c
diff --git a/libutf/runestrncat.c b/lib/libutf/runestrncat.c
similarity index 100%
rename from libutf/runestrncat.c
rename to lib/libutf/runestrncat.c
diff --git a/libutf/runestrncmp.c b/lib/libutf/runestrncmp.c
similarity index 100%
rename from libutf/runestrncmp.c
rename to lib/libutf/runestrncmp.c
diff --git a/libutf/runestrncpy.c b/lib/libutf/runestrncpy.c
similarity index 100%
rename from libutf/runestrncpy.c
rename to lib/libutf/runestrncpy.c
diff --git a/libutf/runestrrchr.c b/lib/libutf/runestrrchr.c
similarity index 100%
rename from libutf/runestrrchr.c
rename to lib/libutf/runestrrchr.c
diff --git a/libutf/runestrstr.c b/lib/libutf/runestrstr.c
similarity index 100%
rename from libutf/runestrstr.c
rename to lib/libutf/runestrstr.c
diff --git a/libutf/runetype.c b/lib/libutf/runetype.c
similarity index 100%
rename from libutf/runetype.c
rename to lib/libutf/runetype.c
diff --git a/libutf/utf.7 b/lib/libutf/utf.7
similarity index 100%
rename from libutf/utf.7
rename to lib/libutf/utf.7
diff --git a/libutf/utfecpy.c b/lib/libutf/utfecpy.c
similarity index 100%
rename from libutf/utfecpy.c
rename to lib/libutf/utfecpy.c
diff --git a/libutf/utflen.c b/lib/libutf/utflen.c
similarity index 100%
rename from libutf/utflen.c
rename to lib/libutf/utflen.c
diff --git a/libutf/utfnlen.c b/lib/libutf/utfnlen.c
similarity index 100%
rename from libutf/utfnlen.c
rename to lib/libutf/utfnlen.c
diff --git a/libutf/utfrrune.c b/lib/libutf/utfrrune.c
similarity index 100%
rename from libutf/utfrrune.c
rename to lib/libutf/utfrrune.c
diff --git a/libutf/utfrune.c b/lib/libutf/utfrune.c
similarity index 100%
rename from libutf/utfrune.c
rename to lib/libutf/utfrune.c
diff --git a/libutf/utfutf.c b/lib/libutf/utfutf.c
similarity index 100%
rename from libutf/utfutf.c
rename to lib/libutf/utfutf.c
diff --git a/libwmii_hack/Makefile b/lib/libwmii_hack/Makefile
similarity index 80%
rename from libwmii_hack/Makefile
rename to lib/libwmii_hack/Makefile
index 5c8e5fd9..beb2732b 100644
--- a/libwmii_hack/Makefile
+++ b/lib/libwmii_hack/Makefile
@@ -1,5 +1,5 @@
-ROOT= ..
-include ${ROOT}/mk/hdr.mk
+ROOT= ../..
+include $(ROOT)/mk/hdr.mk
 
 hack.o hack.o_pic: util.c hack.h x11.h
 
@@ -13,5 +13,5 @@ OBJ =	hack	\
 	../libstuff/util/getlong		\
 	../libstuff/util/tokenize
 
-include ${ROOT}/mk/so.mk
+include $(ROOT)/mk/so.mk
 
diff --git a/libwmii_hack/hack.c b/lib/libwmii_hack/hack.c
similarity index 100%
rename from libwmii_hack/hack.c
rename to lib/libwmii_hack/hack.c
diff --git a/libwmii_hack/hack.h b/lib/libwmii_hack/hack.h
similarity index 100%
rename from libwmii_hack/hack.h
rename to lib/libwmii_hack/hack.h
diff --git a/libwmii_hack/util.c b/lib/libwmii_hack/util.c
similarity index 100%
rename from libwmii_hack/util.c
rename to lib/libwmii_hack/util.c
diff --git a/libwmii_hack/x11.c b/lib/libwmii_hack/x11.c
similarity index 100%
rename from libwmii_hack/x11.c
rename to lib/libwmii_hack/x11.c
diff --git a/libwmii_hack/x11.h b/lib/libwmii_hack/x11.h
similarity index 100%
rename from libwmii_hack/x11.h
rename to lib/libwmii_hack/x11.h
diff --git a/man/Makefile b/man/Makefile
index f64126ad..55dd8905 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,6 +1,6 @@
 ROOT=..
-include ${ROOT}/mk/hdr.mk
-include ${ROOT}/mk/wmii.mk
+include $(ROOT)/mk/hdr.mk
+include $(ROOT)/mk/wmii.mk
 
 TARG =	wmii.1	   \
 	wmiir.1	   \
@@ -9,5 +9,5 @@ TARG =	wmii.1	   \
 
 $(TARG): Makefile $(ROOT)/mk/wmii.mk header.t2t
 
-include ${ROOT}/mk/man.mk
+include $(ROOT)/mk/man.mk
 
diff --git a/mk/hdr.mk b/mk/hdr.mk
index f32d312d..1ce9c3a9 100644
--- a/mk/hdr.mk
+++ b/mk/hdr.mk
@@ -62,7 +62,7 @@ all:
 MAKEFILES=.depend
 .c.depend:
 	echo MKDEP $<
-	[ -n "${noisycc}" ] && echo $(MKDEP) $(COMPILE_FLAGS) $< || true
+	[ -n "$(noisycc)" ] && echo $(MKDEP) $(COMPILE_FLAGS) $< || true
 	eval "$(MKDEP) $(COMPILE_FLAGS)" $< >>.depend
 
 .sh.depend .rc.depend .1.depend .awk.depend:
@@ -76,20 +76,20 @@ MAKEFILES=.depend
 .o.out:
 	$(LINK) $@ $<
 .c.out:
-	$(COMPILE) ${<:.c=.o} $<
-	$(LINK) $@ ${<:.c=.o}
+	$(COMPILE) $(<:.c=.o) $<
+	$(LINK) $@ $(<:.c=.o)
 
 .rc.out .awk.out .sh.out:
 	echo FILTER $(BASE)$<
-	[ -n "${<:%.sh=}" ] || $(BINSH) -n $<
+	[ -n "$(<:%.sh=)" ] || $(BINSH) -n $<
 	set -e; \
-	[ -n "${noisycc}" ] && set -x; \
+	[ -n "$(noisycc)" ] && set -x; \
 	$(FILTER) $< >$@; \
 	chmod 0755 $@
 
 .man1.1:
 	echo TXT2TAGS $(BASE)$<
-	[ -n "${noisycc}" ] && set -x; \
+	[ -n "$(noisycc)" ] && set -x; \
 	txt2tags -o- $< >$@
 
 INSTALL= _install() { set -e; \
@@ -97,7 +97,7 @@ INSTALL= _install() { set -e; \
 		 d=$$(dirname $$3); \
 		 if [ ! -d $(DESTDIR)$$d ]; then echo MKDIR $$d; mkdir -p $(DESTDIR)$$d; fi; \
 		 echo INSTALL $$($(CLEANNAME) $(BASE)$$2); \
-		 [ -n "${noisycc}" ] && set -x; \
+		 [ -n "$(noisycc)" ] && set -x; \
 		 if [ "$$dashb" = -b ]; \
 		 then cp -f $$2 $(DESTDIR)$$3; \
 		 else $(FILTER) <$$2 >$(DESTDIR)$$3; \
@@ -107,7 +107,7 @@ INSTALL= _install() { set -e; \
 	 }; _install
 UNINSTALL= _uninstall() { set -e; \
 	           echo UNINSTALL $$($(CLEANNAME) $(BASE)$$2); \
-		   [ -n "${noisycc}" ] && set -x; \
+		   [ -n "$(noisycc)" ] && set -x; \
 		   rm -f $(DESTDIR)$$3; \
 	   }; _uninstall
 
@@ -131,12 +131,12 @@ UNINSTALL= _uninstall() { set -e; \
 .pdf.uninstall:
 	$(UNINSTALL) $< $(DOC)/$<
 
-INSTALMAN=   _installman()   { man=$${1\#\#*.}; $(INSTALL) 0644 $$1 $(MAN)/man$$man/$$1; }; _installman
-UNINSTALLMAN=_uninstallman() { man=$${1\#\#*.}; $(UNINSTALL) $$1 $(MAN)/man$$man/$$1; }; _uninstallman
+INSTALMAN=   _installman()   { man=$$(1\#\#*.); $(INSTALL) 0644 $$1 $(MAN)/man$$man/$$1; }; _installman
+UNINSTALLMAN=_uninstallman() { man=$$(1\#\#*.); $(UNINSTALL) $$1 $(MAN)/man$$man/$$1; }; _uninstallman
 MANSECTIONS=1 2 3 4 5 6 7 8 9
-${MANSECTIONS:%=.%.install}:
+$(MANSECTIONS:%=.%.install):
 	$(INSTALMAN) $<
-${MANSECTIONS:%=.%.uninstall}:
+$(MANSECTIONS:%=.%.uninstall):
 	$(UNINSTALL) $<
 
 .out.clean:
diff --git a/mk/lib.mk b/mk/lib.mk
index a557520a..111a3e5e 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -1,13 +1,13 @@
 PTARG = $(ROOT)/lib/$(TARG)
 LIB = $(PTARG).a
-OFILES = ${OBJ:=.o}
+OFILES = $(OBJ:=.o)
 
 all: $(HFILES) $(LIB) 
 
 install: $(PTARG).install
 uninstall: $(PTARG).uninstall
 clean: libclean
-depend: ${OBJ:=.depend}
+depend: $(OBJ:=.depend)
 
 libclean:
 	for i in $(LIB) $(OFILES); do \
@@ -26,7 +26,7 @@ $(LIB): $(OFILES)
 	$(AR) $@ $(OFILES)
 
 SOMKSH=case "$(MAKESO)" in 1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) echo $(ROOT)/mk/so.mk;; *) echo /dev/null;; esac
-SOMK:=${shell $(SOMKSH)}
+SOMK:=$(shell $(SOMKSH))
 SOMK!=$(SOMKSH)
 include $(SOMK)
 
diff --git a/mk/man.mk b/mk/man.mk
index 8eba8479..645b1263 100644
--- a/mk/man.mk
+++ b/mk/man.mk
@@ -1,7 +1,7 @@
 
 all: $(TARG)
-install: ${TARG:.1=.install}
-uninstall: ${TARG:.1=.uninstall}
+install: $(TARG:.1=.install)
+uninstall: $(TARG:.1=.uninstall)
 
 printinstall:
 	echo 'Install directories:'
diff --git a/mk/many.mk b/mk/many.mk
index 78ac1be7..57332d9d 100644
--- a/mk/many.mk
+++ b/mk/many.mk
@@ -1,10 +1,10 @@
-PROGS = ${TARG:=.out}
+PROGS = $(TARG:=.out)
 
 all: $(OFILES) $(PROGS)
 
-install: ${TARG:=.install}
-uninstall: ${TARG:=.uninstall}
-depend: ${OFILES:.o=.depend} ${TARG:=.depend}
+install: $(TARG:=.install)
+uninstall: $(TARG:=.uninstall)
+depend: $(OFILES:.o=.depend) $(TARG:=.depend)
 clean: manyclean
 
 printinstall:
@@ -12,7 +12,7 @@ printinstall:
 	echo '	Bin: $(BIN)'
 
 manyclean:
-	for i in ${TARG:=.o} ${TARG:=.out} $(OFILES); do \
+	for i in $(TARG:=.o) $(TARG:=.out) $(OFILES); do \
 		[ -e $$i ] && \
 		echo CLEAN $$($(CLEANNAME) $(BASE)$$i); \
 		rm -f $$i; \
diff --git a/mk/one.mk b/mk/one.mk
index 992f31ce..6a0e5b3d 100644
--- a/mk/one.mk
+++ b/mk/one.mk
@@ -1,12 +1,12 @@
 PROG = $(TARG).out
-OFILES = ${OBJ:=.o}
+OFILES = $(OBJ:=.o)
 
 all: $(PROG)
 
 install: $(TARG).install
 uninstall: $(TARG).uninstall
 clean: oneclean
-depend: ${OBJ:=.depend}
+depend: $(OBJ:=.depend)
 
 printinstall:
 	echo 'Install directories:'
diff --git a/mk/so.mk b/mk/so.mk
index 25cd81de..6fe5f4de 100644
--- a/mk/so.mk
+++ b/mk/so.mk
@@ -1,14 +1,14 @@
 SOPTARG = $(ROOT)/lib/$(TARG)
 SO = $(SOPTARG).$(SOEXT)
 SONAME = $(TARG).$(SOEXT)
-OFILES_PIC = ${OBJ:=.o_pic}
+OFILES_PIC = $(OBJ:=.o_pic)
 
 all: $(HFILES) $(SO) 
 
 install: $(SOPTARG).install
 uninstall: $(SOPTARG).uninstall
 clean: soclean
-depend: ${OBJ:=.depend}
+depend: $(OBJ:=.depend)
 
 soclean:
 	for i in $(SO) $(OFILES_PIC); do \