diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index a0b822bc7..33e4790cf 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,5 +1,37 @@
-if(KWIN_PLASMA_ACTIVE)
-    add_subdirectory(active)
-else(KWIN_PLASMA_ACTIVE)
-    add_subdirectory(desktop)
-endif(KWIN_PLASMA_ACTIVE)
+
+set(kwin_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.KWin.xml)
+
+########### next target ###############
+set(kwin_update_default_rules_SRCS update_default_rules.cpp)
+
+
+kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})
+
+target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} )
+
+install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/  )
+
+########### next target ###############
+set( kwin_update_tabbox_settings_SRCS update_tabbox_settings.cpp )
+
+kde4_add_executable( kwin_update_tabbox_settings ${kwin_update_tabbox_settings_SRCS} )
+
+target_link_libraries( kwin_update_tabbox_settings ${KDE4_KDECORE_LIBS} )
+
+install( TARGETS kwin_update_tabbox_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
+########### next target ###############
+set( kwin_update_tabbox_qml_settings_SRCS update_tabbox_qml_settings.cpp )
+
+kde4_add_executable( kwin_update_tabbox_qml_settings ${kwin_update_tabbox_qml_settings_SRCS} )
+
+target_link_libraries( kwin_update_tabbox_qml_settings ${KDE4_KDECORE_LIBS} )
+
+install( TARGETS kwin_update_tabbox_qml_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
+
+########### install files ###############
+
+install( FILES fsp_workarounds_1.kwinrules  DESTINATION  ${DATA_INSTALL_DIR}/kwin/default_rules )
+install( FILES pop.wav  DESTINATION  ${SOUND_INSTALL_DIR} )
+install( FILES kwin_fsp_workarounds_1.upd kwin_update_tabbox_settings.upd kwin_remove_effects.upd kwin_update_tabbox_qml_settings.upd kwin_remove_delay_focus.upd DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
+install( PROGRAMS kwin_remove_delay_focus.sh DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
+
diff --git a/data/active/CMakeLists.txt b/data/active/CMakeLists.txt
deleted file mode 100644
index a05401f1d..000000000
--- a/data/active/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-########### next target ###############
-set( kwin_update_tabbox_qml_settings_active_SRCS update_tabbox_qml_settings_active.cpp )
-
-kde4_add_executable( kwin_update_tabbox_qml_settings_active ${kwin_update_tabbox_qml_settings_active_SRCS} )
-
-target_link_libraries( kwin_update_tabbox_qml_settings_active ${KDE4_KDECORE_LIBS} )
-
-install( TARGETS kwin_update_tabbox_qml_settings_active DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
-
-########### install files ###############
-
-install( FILES kwin_update_tabbox_qml_settings_active.upd DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
diff --git a/data/active/kwin_update_tabbox_qml_settings_active.upd b/data/active/kwin_update_tabbox_qml_settings_active.upd
deleted file mode 100644
index 9467efc10..000000000
--- a/data/active/kwin_update_tabbox_qml_settings_active.upd
+++ /dev/null
@@ -1,2 +0,0 @@
-Id=Kwin-4.8
-Script=kwin_update_tabbox_qml_settings_active
diff --git a/data/active/update_tabbox_qml_settings_active.cpp b/data/active/update_tabbox_qml_settings_active.cpp
deleted file mode 100644
index 36c2ffde6..000000000
--- a/data/active/update_tabbox_qml_settings_active.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/********************************************************************
-KWin - the KDE window manager
-This file is part of the KDE project.
-
-Copyright (C) 2012 Lamarque V. Souza <Lamarque.Souza.ext@basyskom.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*********************************************************************/
-
-#include <kconfig.h>
-#include <kconfiggroup.h>
-#include <kcomponentdata.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kglobal.h>
-#include <QtDBus/QtDBus>
-
-void updateTabBoxConfig(KConfigGroup &tabbox, bool migrate)
-{
-    if (migrate) {
-        tabbox.writeEntry("LayoutName", "window_strip");
-    }
-    tabbox.sync();
-}
-
-int main( int argc, char* argv[] )
-{
-    KAboutData about( "kwin_update_tabbox_qml_settings_active", "kwin", KLocalizedString(), 0 );
-    KCmdLineArgs::init( argc, argv, &about );
-    KComponentData inst( &about );
-    Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated descriptions
-    KConfig config("kwinrc");
-    KConfigGroup tabbox = config.group("TabBox");
-    const bool tabboxSwitchLayout = tabbox.readEntry<QString>("LayoutName", "") != QLatin1String("window_strip");
-    updateTabBoxConfig(tabbox, tabboxSwitchLayout);
-    config.sync();
-    // Send signal to all kwin instances
-    QDBusMessage message =
-    QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
-    QDBusConnection::sessionBus().send(message);    
-}
diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt
deleted file mode 100644
index 33e4790cf..000000000
--- a/data/desktop/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-
-set(kwin_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.KWin.xml)
-
-########### next target ###############
-set(kwin_update_default_rules_SRCS update_default_rules.cpp)
-
-
-kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})
-
-target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} )
-
-install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/  )
-
-########### next target ###############
-set( kwin_update_tabbox_settings_SRCS update_tabbox_settings.cpp )
-
-kde4_add_executable( kwin_update_tabbox_settings ${kwin_update_tabbox_settings_SRCS} )
-
-target_link_libraries( kwin_update_tabbox_settings ${KDE4_KDECORE_LIBS} )
-
-install( TARGETS kwin_update_tabbox_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
-########### next target ###############
-set( kwin_update_tabbox_qml_settings_SRCS update_tabbox_qml_settings.cpp )
-
-kde4_add_executable( kwin_update_tabbox_qml_settings ${kwin_update_tabbox_qml_settings_SRCS} )
-
-target_link_libraries( kwin_update_tabbox_qml_settings ${KDE4_KDECORE_LIBS} )
-
-install( TARGETS kwin_update_tabbox_qml_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
-
-########### install files ###############
-
-install( FILES fsp_workarounds_1.kwinrules  DESTINATION  ${DATA_INSTALL_DIR}/kwin/default_rules )
-install( FILES pop.wav  DESTINATION  ${SOUND_INSTALL_DIR} )
-install( FILES kwin_fsp_workarounds_1.upd kwin_update_tabbox_settings.upd kwin_remove_effects.upd kwin_update_tabbox_qml_settings.upd kwin_remove_delay_focus.upd DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
-install( PROGRAMS kwin_remove_delay_focus.sh DESTINATION  ${KCONF_UPDATE_INSTALL_DIR} )
-
diff --git a/data/desktop/fsp_workarounds_1.kwinrules b/data/fsp_workarounds_1.kwinrules
similarity index 100%
rename from data/desktop/fsp_workarounds_1.kwinrules
rename to data/fsp_workarounds_1.kwinrules
diff --git a/data/desktop/kwin_fsp_workarounds_1.upd b/data/kwin_fsp_workarounds_1.upd
similarity index 100%
rename from data/desktop/kwin_fsp_workarounds_1.upd
rename to data/kwin_fsp_workarounds_1.upd
diff --git a/data/desktop/kwin_remove_delay_focus.sh b/data/kwin_remove_delay_focus.sh
similarity index 100%
rename from data/desktop/kwin_remove_delay_focus.sh
rename to data/kwin_remove_delay_focus.sh
diff --git a/data/desktop/kwin_remove_delay_focus.upd b/data/kwin_remove_delay_focus.upd
similarity index 100%
rename from data/desktop/kwin_remove_delay_focus.upd
rename to data/kwin_remove_delay_focus.upd
diff --git a/data/desktop/kwin_remove_effects.upd b/data/kwin_remove_effects.upd
similarity index 100%
rename from data/desktop/kwin_remove_effects.upd
rename to data/kwin_remove_effects.upd
diff --git a/data/desktop/kwin_update_tabbox_qml_settings.upd b/data/kwin_update_tabbox_qml_settings.upd
similarity index 100%
rename from data/desktop/kwin_update_tabbox_qml_settings.upd
rename to data/kwin_update_tabbox_qml_settings.upd
diff --git a/data/desktop/kwin_update_tabbox_settings.upd b/data/kwin_update_tabbox_settings.upd
similarity index 100%
rename from data/desktop/kwin_update_tabbox_settings.upd
rename to data/kwin_update_tabbox_settings.upd
diff --git a/data/desktop/pop.wav b/data/pop.wav
similarity index 100%
rename from data/desktop/pop.wav
rename to data/pop.wav
diff --git a/data/desktop/update_default_rules.cpp b/data/update_default_rules.cpp
similarity index 100%
rename from data/desktop/update_default_rules.cpp
rename to data/update_default_rules.cpp
diff --git a/data/desktop/update_tabbox_qml_settings.cpp b/data/update_tabbox_qml_settings.cpp
similarity index 100%
rename from data/desktop/update_tabbox_qml_settings.cpp
rename to data/update_tabbox_qml_settings.cpp
diff --git a/data/desktop/update_tabbox_settings.cpp b/data/update_tabbox_settings.cpp
similarity index 100%
rename from data/desktop/update_tabbox_settings.cpp
rename to data/update_tabbox_settings.cpp