diff --git a/Makefile b/Makefile
index 1a8863f..4447e50 100644
--- a/Makefile
+++ b/Makefile
@@ -27,32 +27,32 @@ BIN_ISO = \
 	bin/deployiso
 
 SYSCONF = \
-	conf/manjaro-tools.conf
+	data/manjaro-tools.conf
 
 SETS_PKG = \
-	conf/pkg.d/default.set
+	data/pkg.d/default.set
 
 SETS_ISO = \
-	conf/iso.d/default.set \
-	conf/iso.d/official.set \
-	conf/iso.d/community.set \
-	conf/iso.d/community-minimal.set
+	data/iso.d/default.set \
+	data/iso.d/official.set \
+	data/iso.d/community.set \
+	data/iso.d/community-minimal.set
 
 SHARED = \
-	conf/pacman-default.conf \
-	conf/pacman-multilib.conf \
-	conf/pacman-mirrors-stable.conf \
-	conf/pacman-mirrors-testing.conf \
-	conf/pacman-mirrors-unstable.conf
+	data/pacman-default.conf \
+	data/pacman-multilib.conf \
+	data/pacman-mirrors-stable.conf \
+	data/pacman-mirrors-testing.conf \
+	data/pacman-mirrors-unstable.conf
 
 SHARED_PKG = \
-	conf/makepkg-i686.conf \
-	conf/base-devel-udev \
-	conf/makepkg-x86_64.conf
+	data/makepkg-i686.conf \
+	data/base-devel-udev \
+	data/makepkg-x86_64.conf
 
 SHARED_ISO = \
-	conf/pacman-gfx.conf \
-	conf/profile.conf.example
+	data/pacman-gfx.conf \
+	data/profile.conf.example
 
 LIBS = \
 	lib/util.sh \
@@ -107,7 +107,6 @@ MAN_XML = \
 all: $(BIN) $(BIN_PKG) $(BIN_ISO) doc #bin/bash_completion bin/zsh_completion
 
 edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/manjaro-tools|g" \
-	-e "s|@bindir[@]|$(DESTDIR)$(PREFIX)/bin|g" \
 	-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/manjaro-tools|g" \
 	-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/manjaro-tools|g" \
 	-e "s|@version@|${Version}|"
@@ -140,9 +139,6 @@ install_base:
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools
 	install -m0644 ${SHARED} $(DESTDIR)$(PREFIX)/share/manjaro-tools
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/man/man1
-	gzip -c man/buildset.1 > $(DESTDIR)$(PREFIX)/share/man/man1/buildset.1.gz
-
 # 	install -Dm0644 bin/bash_completion $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/manjaro_tools
 # 	install -Dm0644 bin/zsh_completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_manjaro_tools
 
@@ -203,7 +199,6 @@ uninstall_base:
 	for f in ${BIN}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	for f in ${SHARED}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
 	for f in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)/lib/manjaro-tools/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/buildset.1.gz
 
 # 	rm $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/manjaro_tools
 # 	rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_manjaro_tools
diff --git a/README.md b/README.md
index 723a307..dc0a991 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ $HOME/.config/manjaro-tools/manjaro-tools.conf
 If the userconfig is present, manjaro-tools will load the userconfig values, however, if variables have been set in the systemwide
 
 ~~~
-/etc/manjaro-tools/manjaro-tools/manjaro-tools.conf
+/etc/manjaro-tools/manjaro-tools.conf
 ~~~
 
 these values take precedence over the userconfig.
diff --git a/bin/buildiso.in b/bin/buildiso.in
index 87c065a..2c298af 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -11,7 +11,6 @@
 
 version=@version@
 
-BINDIR='@bindir@'
 LIBDIR='@libdir@'
 PKGDATADIR='@pkgdatadir@'
 SYSCONFDIR='@sysconfdir@'
diff --git a/conf/base-devel-udev b/data/base-devel-udev
similarity index 100%
rename from conf/base-devel-udev
rename to data/base-devel-udev
diff --git a/conf/iso.d/community-minimal.set b/data/iso.d/community-minimal.set
similarity index 100%
rename from conf/iso.d/community-minimal.set
rename to data/iso.d/community-minimal.set
diff --git a/conf/iso.d/community.set b/data/iso.d/community.set
similarity index 100%
rename from conf/iso.d/community.set
rename to data/iso.d/community.set
diff --git a/conf/iso.d/default.set b/data/iso.d/default.set
similarity index 100%
rename from conf/iso.d/default.set
rename to data/iso.d/default.set
diff --git a/conf/iso.d/official.set b/data/iso.d/official.set
similarity index 100%
rename from conf/iso.d/official.set
rename to data/iso.d/official.set
diff --git a/conf/makepkg-i686.conf b/data/makepkg-i686.conf
similarity index 100%
rename from conf/makepkg-i686.conf
rename to data/makepkg-i686.conf
diff --git a/conf/makepkg-x86_64.conf b/data/makepkg-x86_64.conf
similarity index 100%
rename from conf/makepkg-x86_64.conf
rename to data/makepkg-x86_64.conf
diff --git a/conf/manjaro-tools.conf b/data/manjaro-tools.conf
similarity index 100%
rename from conf/manjaro-tools.conf
rename to data/manjaro-tools.conf
diff --git a/conf/pacman-default.conf b/data/pacman-default.conf
similarity index 100%
rename from conf/pacman-default.conf
rename to data/pacman-default.conf
diff --git a/conf/pacman-gfx.conf b/data/pacman-gfx.conf
similarity index 100%
rename from conf/pacman-gfx.conf
rename to data/pacman-gfx.conf
diff --git a/conf/pacman-mirrors-stable.conf b/data/pacman-mirrors-stable.conf
similarity index 100%
rename from conf/pacman-mirrors-stable.conf
rename to data/pacman-mirrors-stable.conf
diff --git a/conf/pacman-mirrors-testing.conf b/data/pacman-mirrors-testing.conf
similarity index 100%
rename from conf/pacman-mirrors-testing.conf
rename to data/pacman-mirrors-testing.conf
diff --git a/conf/pacman-mirrors-unstable.conf b/data/pacman-mirrors-unstable.conf
similarity index 100%
rename from conf/pacman-mirrors-unstable.conf
rename to data/pacman-mirrors-unstable.conf
diff --git a/conf/pacman-multilib.conf b/data/pacman-multilib.conf
similarity index 100%
rename from conf/pacman-multilib.conf
rename to data/pacman-multilib.conf
diff --git a/conf/pkg.d/default.set b/data/pkg.d/default.set
similarity index 100%
rename from conf/pkg.d/default.set
rename to data/pkg.d/default.set
diff --git a/conf/profile.conf.example b/data/profile.conf.example
similarity index 100%
rename from conf/profile.conf.example
rename to data/profile.conf.example