Index: app/dist/tarball/Makefile.tarball
===================================================================
--- app/dist/tarball/Makefile.tarball	(revision 028d99f4213ab98737bddb0a4c63ba82e193de4f)
+++ app/dist/tarball/Makefile.tarball	(revision d33e555ed7200c1e9897443874c3b89bbeef42bb)
@@ -1,12 +1,18 @@
-LIB_DIR=${HOME}/.local/lib/utt
-SHARE_DIR=${HOME}/.local/share/utt
-CONF_DIR=${HOME}/.utt
+UTT_LIB_DIR=${HOME}/.local/lib/utt
+UTT_SHARE_DIR=${HOME}/.local/share/utt
+UTT_CONF_DIR=${HOME}/.utt
 
 .PHONY: install
 install:
-	mkdir ${LIB_DIR}
-	cp lib/* ${LIB_DIR}
-	mkdir ${SHARE_DIR}
-	cp share/* ${SHARE_DIR}
-	mkdir ${CONF_DIR}
-	cp conf/* ${CONF_DIR}
+	mkdir -p ${UTT_LIB_DIR}
+	cp -r lib/utt/* ${UTT_LIB_DIR}
+	mkdir -p ${UTT_SHARE_DIR}
+	cp -r share/utt/* ${UTT_SHARE_DIR}
+	mkdir -p ${UTT_CONF_DIR}
+	cp -r etc/utt/* ${UTT_CONF_DIR}
+
+.PHONY: uninstall
+uninstall:
+	rm -r ${UTT_LIB_DIR}
+	rm -r ${UTT_SHARE_DIR}
+	rm -r ${CONF_DIR}