diff --git a/Makefile b/Makefile
index ad280a3..0dfa38b 100644
--- a/Makefile
+++ b/Makefile
@@ -26,31 +26,31 @@ LIBUTFSRC =\
 
 LIBUTIL = libutil.a
 LIBUTILSRC =\
-	util/agetcwd.c\
-	util/agetline.c\
-	util/apathmax.c\
-	util/concat.c\
-	util/cp.c\
-	util/crypt.c\
-	util/ealloc.c\
-	util/enmasse.c\
-	util/eprintf.c\
-	util/eregcomp.c\
-	util/estrtod.c\
-	util/estrtol.c\
-	util/fnck.c\
-	util/getlines.c\
-	util/human.c\
-	util/md5.c\
-	util/mode.c\
-	util/putword.c\
-	util/recurse.c\
-	util/rm.c\
-	util/sha1.c\
-	util/sha256.c\
-	util/sha512.c\
-	util/strlcat.c\
-	util/strlcpy.c
+	libutil/agetcwd.c\
+	libutil/agetline.c\
+	libutil/apathmax.c\
+	libutil/concat.c\
+	libutil/cp.c\
+	libutil/crypt.c\
+	libutil/ealloc.c\
+	libutil/enmasse.c\
+	libutil/eprintf.c\
+	libutil/eregcomp.c\
+	libutil/estrtod.c\
+	libutil/estrtol.c\
+	libutil/fnck.c\
+	libutil/getlines.c\
+	libutil/human.c\
+	libutil/md5.c\
+	libutil/mode.c\
+	libutil/putword.c\
+	libutil/recurse.c\
+	libutil/rm.c\
+	libutil/sha1.c\
+	libutil/sha256.c\
+	libutil/sha512.c\
+	libutil/strlcat.c\
+	libutil/strlcpy.c
 
 LIB = $(LIBUTF) $(LIBUTIL)
 
@@ -168,7 +168,7 @@ uninstall:
 
 dist: clean
 	mkdir -p sbase-$(VERSION)
-	cp -r LICENSE Makefile README TODO config.mk $(SRC) $(MAN) util $(HDR) sbase-$(VERSION)
+	cp -r LICENSE Makefile README TODO config.mk $(SRC) $(MAN) libutf libutil $(HDR) sbase-$(VERSION)
 	tar -cf sbase-$(VERSION).tar sbase-$(VERSION)
 	gzip sbase-$(VERSION).tar
 	rm -rf sbase-$(VERSION)
diff --git a/util/agetcwd.c b/libutil/agetcwd.c
similarity index 100%
rename from util/agetcwd.c
rename to libutil/agetcwd.c
diff --git a/util/agetline.c b/libutil/agetline.c
similarity index 100%
rename from util/agetline.c
rename to libutil/agetline.c
diff --git a/util/apathmax.c b/libutil/apathmax.c
similarity index 100%
rename from util/apathmax.c
rename to libutil/apathmax.c
diff --git a/util/concat.c b/libutil/concat.c
similarity index 100%
rename from util/concat.c
rename to libutil/concat.c
diff --git a/util/cp.c b/libutil/cp.c
similarity index 100%
rename from util/cp.c
rename to libutil/cp.c
diff --git a/util/crypt.c b/libutil/crypt.c
similarity index 100%
rename from util/crypt.c
rename to libutil/crypt.c
diff --git a/util/ealloc.c b/libutil/ealloc.c
similarity index 100%
rename from util/ealloc.c
rename to libutil/ealloc.c
diff --git a/util/enmasse.c b/libutil/enmasse.c
similarity index 100%
rename from util/enmasse.c
rename to libutil/enmasse.c
diff --git a/util/eprintf.c b/libutil/eprintf.c
similarity index 100%
rename from util/eprintf.c
rename to libutil/eprintf.c
diff --git a/util/eregcomp.c b/libutil/eregcomp.c
similarity index 100%
rename from util/eregcomp.c
rename to libutil/eregcomp.c
diff --git a/util/estrtod.c b/libutil/estrtod.c
similarity index 100%
rename from util/estrtod.c
rename to libutil/estrtod.c
diff --git a/util/estrtol.c b/libutil/estrtol.c
similarity index 100%
rename from util/estrtol.c
rename to libutil/estrtol.c
diff --git a/util/fnck.c b/libutil/fnck.c
similarity index 100%
rename from util/fnck.c
rename to libutil/fnck.c
diff --git a/util/getlines.c b/libutil/getlines.c
similarity index 100%
rename from util/getlines.c
rename to libutil/getlines.c
diff --git a/util/human.c b/libutil/human.c
similarity index 100%
rename from util/human.c
rename to libutil/human.c
diff --git a/util/md5.c b/libutil/md5.c
similarity index 100%
rename from util/md5.c
rename to libutil/md5.c
diff --git a/util/mode.c b/libutil/mode.c
similarity index 100%
rename from util/mode.c
rename to libutil/mode.c
diff --git a/util/putword.c b/libutil/putword.c
similarity index 100%
rename from util/putword.c
rename to libutil/putword.c
diff --git a/util/recurse.c b/libutil/recurse.c
similarity index 100%
rename from util/recurse.c
rename to libutil/recurse.c
diff --git a/util/rm.c b/libutil/rm.c
similarity index 100%
rename from util/rm.c
rename to libutil/rm.c
diff --git a/util/sha1.c b/libutil/sha1.c
similarity index 100%
rename from util/sha1.c
rename to libutil/sha1.c
diff --git a/util/sha256.c b/libutil/sha256.c
similarity index 100%
rename from util/sha256.c
rename to libutil/sha256.c
diff --git a/util/sha512.c b/libutil/sha512.c
similarity index 100%
rename from util/sha512.c
rename to libutil/sha512.c
diff --git a/util/strlcat.c b/libutil/strlcat.c
similarity index 100%
rename from util/strlcat.c
rename to libutil/strlcat.c
diff --git a/util/strlcpy.c b/libutil/strlcpy.c
similarity index 100%
rename from util/strlcpy.c
rename to libutil/strlcpy.c