diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0ee6e0..d8da772 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ install(TARGETS
         DESTINATION
         ${CMAKE_INSTALL_BINDIR})
 install(FILES
-        share/${PROJECT_NAME}.1
+        docs/${PROJECT_NAME}.1
         DESTINATION
         ${CMAKE_INSTALL_MANDIR}/man1)
 install(FILES
diff --git a/share/gendocs.sh b/docs/build.sh
similarity index 89%
rename from share/gendocs.sh
rename to docs/build.sh
index 87e4508..4c380f4 100755
--- a/share/gendocs.sh
+++ b/docs/build.sh
@@ -7,5 +7,5 @@ echo "% POWERKIT(1) Version ${VERSION} | PowerKit Documentation" > tmp.md
 echo "% Ole-André Rodlie" >> tmp.md
 echo "% ${MONTH} ${YEAR}" >> tmp.md
 cat docs/README.md >> tmp.md
-$PANDOC tmp.md -s -t man > share/powerkit.1
+$PANDOC tmp.md -s -t man > docs/powerkit.1
 rm tmp.md
diff --git a/docs/images/screenshot-01.png b/docs/images/screenshot-01.png
deleted file mode 100644
index b4c416b..0000000
Binary files a/docs/images/screenshot-01.png and /dev/null differ
diff --git a/docs/images/screenshot-02.png b/docs/images/screenshot-02.png
deleted file mode 100644
index d544a12..0000000
Binary files a/docs/images/screenshot-02.png and /dev/null differ
diff --git a/docs/images/screenshot-03.png b/docs/images/screenshot-03.png
deleted file mode 100644
index 817bfdb..0000000
Binary files a/docs/images/screenshot-03.png and /dev/null differ
diff --git a/share/powerkit.1 b/docs/powerkit.1
similarity index 100%
rename from share/powerkit.1
rename to docs/powerkit.1
diff --git a/src/powerkit_common.h b/src/powerkit_common.h
index 203797d..13ef670 100644
--- a/src/powerkit_common.h
+++ b/src/powerkit_common.h
@@ -98,10 +98,7 @@ namespace PowerKit
 #define POWERKIT_PATH "/PowerKit"
 #define POWERKIT_FULL_PATH "/org/freedesktop/PowerKit"
 #define POWERKIT_MANAGER "org.freedesktop.PowerKit.Manager"
-
-#define PMD_SERVICE "org.freedesktop.PowerKit"
-#define PMD_PATH "/org/freedesktop/PowerKit"
-#define PMD_MANAGER "org.freedesktop.PowerKit.Manager"
+#define POWERKIT_CONFIG "org.freedesktop.PowerKit.Configuration"
 
 #define PM_SERVICE "org.freedesktop.PowerManagement"
 #define PM_PATH "/PowerManagement"