diff --git a/CMakeLists.txt b/CMakeLists.txt
index 298d3bb9..c3d334c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,5 +31,4 @@ macro_optional_add_subdirectory (knetpkg)
 macro_optional_add_subdirectory (kfirewall)
 macro_optional_add_subdirectory (khash)
 macro_optional_add_subdirectory (kprintjobs)
-macro_optional_add_subdirectory (xwallpaper)
-macro_optional_add_subdirectory (anipaper)
+macro_optional_add_subdirectory (plasma-wallpapers)
diff --git a/plasma-wallpapers/CMakeLists.txt b/plasma-wallpapers/CMakeLists.txt
new file mode 100644
index 00000000..8e228c48
--- /dev/null
+++ b/plasma-wallpapers/CMakeLists.txt
@@ -0,0 +1,13 @@
+project(plasma-wallpapers)
+
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+    include(FeatureSummary)
+
+    find_package(KDELibs4 4.23.0 REQUIRED)
+
+    include_directories(${KDE4_INCLUDES})
+    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+endif()
+
+add_subdirectory(anipaper)
+add_subdirectory(xwallpaper)
\ No newline at end of file
diff --git a/anipaper/CMakeLists.txt b/plasma-wallpapers/anipaper/CMakeLists.txt
similarity index 62%
rename from anipaper/CMakeLists.txt
rename to plasma-wallpapers/anipaper/CMakeLists.txt
index 7c4728af..69646cdf 100644
--- a/anipaper/CMakeLists.txt
+++ b/plasma-wallpapers/anipaper/CMakeLists.txt
@@ -1,14 +1,5 @@
 project(plasma-wallpaper-anipaper)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    include(FeatureSummary)
-
-    find_package(KDELibs4 4.23.0 REQUIRED)
-
-    include_directories(${KDE4_INCLUDES})
-    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-endif()
-
 set(anipaper_SRCS
     anipaper.cpp
 )
diff --git a/anipaper/anipaper.cpp b/plasma-wallpapers/anipaper/anipaper.cpp
similarity index 100%
rename from anipaper/anipaper.cpp
rename to plasma-wallpapers/anipaper/anipaper.cpp
diff --git a/anipaper/anipaper.h b/plasma-wallpapers/anipaper/anipaper.h
similarity index 100%
rename from anipaper/anipaper.h
rename to plasma-wallpapers/anipaper/anipaper.h
diff --git a/anipaper/plasma-wallpaper-anipaper.desktop b/plasma-wallpapers/anipaper/plasma-wallpaper-anipaper.desktop
similarity index 100%
rename from anipaper/plasma-wallpaper-anipaper.desktop
rename to plasma-wallpapers/anipaper/plasma-wallpaper-anipaper.desktop
diff --git a/xwallpaper/CMakeLists.txt b/plasma-wallpapers/xwallpaper/CMakeLists.txt
similarity index 63%
rename from xwallpaper/CMakeLists.txt
rename to plasma-wallpapers/xwallpaper/CMakeLists.txt
index c1d79bae..a8a6aa99 100644
--- a/xwallpaper/CMakeLists.txt
+++ b/plasma-wallpapers/xwallpaper/CMakeLists.txt
@@ -1,14 +1,5 @@
 project(plasma-wallpaper-xwallpaper)
 
-if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-    include(FeatureSummary)
-
-    find_package(KDELibs4 4.23.0 REQUIRED)
-
-    include_directories(${KDE4_INCLUDES})
-    add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-endif()
-
 set(xwallpaper_SRCS
     xwallpaper.cpp
 )
diff --git a/xwallpaper/plasma-wallpaper-xwallpaper.desktop b/plasma-wallpapers/xwallpaper/plasma-wallpaper-xwallpaper.desktop
similarity index 100%
rename from xwallpaper/plasma-wallpaper-xwallpaper.desktop
rename to plasma-wallpapers/xwallpaper/plasma-wallpaper-xwallpaper.desktop
diff --git a/xwallpaper/xwallpaper.cpp b/plasma-wallpapers/xwallpaper/xwallpaper.cpp
similarity index 100%
rename from xwallpaper/xwallpaper.cpp
rename to plasma-wallpapers/xwallpaper/xwallpaper.cpp
diff --git a/xwallpaper/xwallpaper.h b/plasma-wallpapers/xwallpaper/xwallpaper.h
similarity index 100%
rename from xwallpaper/xwallpaper.h
rename to plasma-wallpapers/xwallpaper/xwallpaper.h