diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt
index 320ec32..cef1cd7 100644
--- a/tdenetworkmanager/src/CMakeLists.txt
+++ b/tdenetworkmanager/src/CMakeLists.txt
@@ -11,9 +11,14 @@
 
 add_definitions( -UQT_NO_ASCII_CAST )
 
+add_subdirectory( settings )
+add_subdirectory( configwidgets )
+
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${DBUS_TQT_INCLUDE_DIRS}
@@ -43,14 +48,7 @@ install( FILES knetworkmanager_plugin.desktop knetworkmanager_vpnplugin.desktop
 
 tde_add_tdeinit_executable( knetworkmanager AUTOMOC
   SOURCES
-    connection_setting_info.ui connection_setting_wireless_security_wep.ui connection_setting_gsm.ui
-    connection_setting_cdma.ui connection_setting_ipv4.ui connection_setting_ppp.ui
-    connection_setting_serial.ui connection_setting_wireless_security_wpacipher.ui
-    connection_setting_wireless_security_eap.ui connection_setting_wireless_security_wpapsk.ui
-    connection_setting_wireless_security_phase2.ui connection_setting_wireless_security_wpaversion.ui
-    connection_setting_wireless_security.ui connection_setting_wireless.ui
-    connection_setting_wireless_security_wepencryption.ui connection_settings.ui
-    connection_setting_wireless_security_auth.ui connection_setting_vpn.ui connection_editor.ui
+    connection_editor.ui
     vpnauthentication.ui main.cpp knetworkmanager.cpp knetworkmanager-tray.cpp
     knetworkmanager-hal_device_proxy.cpp knetworkmanager-nm_proxy.cpp knetworkmanager-device.cpp
     knetworkmanager-cdma_device.cpp knetworkmanager-cellular_device.cpp knetworkmanager-gsm_device.cpp
@@ -59,33 +57,19 @@ tde_add_tdeinit_executable( knetworkmanager AUTOMOC
     knetworkmanager-cellular_device_tray.cpp knetworkmanager-device_tray.cpp
     knetworkmanager-wired_device_tray.cpp knetworkmanager-wireless_device_tray.cpp
     knetworkmanager-accesspoint.cpp knetworkmanager-wireless_menuitem.cpp knetworkmanager-menuitem.cpp
-    knetworkmanager-menu_subhead.cpp knetworkmanager-connection_setting.cpp
-    knetworkmanager-connection_setting_info.cpp knetworkmanager-connection_setting_ipv4.cpp
-    knetworkmanager-connection_setting_wired.cpp knetworkmanager-connection_setting_wireless.cpp
-    knetworkmanager-connection_setting_wireless_security.cpp
-    knetworkmanager-connection_setting_8021x.cpp knetworkmanager-connection_setting_vpn.cpp
-    knetworkmanager-connection_setting_serial.cpp knetworkmanager-connection_setting_cdma.cpp
-    knetworkmanager-connection_setting_gsm.cpp knetworkmanager-connection_setting_ppp.cpp
+    knetworkmanager-menu_subhead.cpp 
     knetworkmanager-connection_dbus.cpp knetworkmanager-connection_secrets_dbus.cpp
     knetworkmanager-connection.cpp knetworkmanager-generic_connection.cpp
     knetworkmanager-cdma_connection.cpp knetworkmanager-gsm_connection.cpp
     knetworkmanager-ppp_connection.cpp knetworkmanager-wireless_connection.cpp
     knetworkmanager-wired_connection.cpp knetworkmanager-vpn_connection.cpp
-    knetworkmanager-connection_store.cpp knetworkmanager-connection_setting_cdma_widget.cpp
-    knetworkmanager-connection_setting_gsm_widget.cpp
-    knetworkmanager-connection_setting_info_widget.cpp
-    knetworkmanager-connection_setting_ipv4_widget.cpp
-    knetworkmanager-connection_setting_ppp_widget.cpp
-    knetworkmanager-connection_setting_serial_widget.cpp
-    knetworkmanager-connection_setting_wireless_security_widget.cpp
-    knetworkmanager-connection_setting_wireless_widget.cpp
-    knetworkmanager-connection_setting_vpn_widget.cpp knetworkmanager-connection_settings_dialog.cpp
-    knetworkmanager-connection_setting_widget_interface.cpp knetworkmanager-nmsettings.cpp
+    knetworkmanager-connection_store.cpp knetworkmanager-nmsettings.cpp
     sha1.cpp md5.cpp xmlmarshaller.cpp knetworkmanager-storage.cpp
     knetworkmanager-wireless_network.cpp knetworkmanager-wireless_manager.cpp
     knetworkmanager-connection_editor.cpp knetworkmanager-plugin.cpp knetworkmanager-vpnplugin.cpp
     knetworkmanager-pluginmanager.cpp knetworkmanager-vpnservice.cpp knetworkmanager-vpnmanager.cpp
     knetworkmanager-vpnauthenticationdialog.cpp devicetraycomponent.cpp traycomponent.cpp
     vpn_tray_component.cpp secret_storage_plugin.cpp
+  EMBED tdenetwork-connection-configwidgets-static tdenetwork-connection-settings-static
   LINK tdecore-shared tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES}
 )
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_cdma_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_cdma_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_gsm_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_gsm_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_info_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_info_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ipv4_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ppp_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_ppp_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_serial_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_serial_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_vpn_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_vpn_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_widget_interface.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_widget_interface.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_security_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.cpp
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.h b/tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_widget.h
rename to tdenetworkmanager/src/configwidgets/knetworkmanager-connection_setting_wireless_widget.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection.cpp b/tdenetworkmanager/src/knetworkmanager-connection.cpp
index f0da309..2c6ea8b 100644
--- a/tdenetworkmanager/src/knetworkmanager-connection.cpp
+++ b/tdenetworkmanager/src/knetworkmanager-connection.cpp
@@ -36,9 +36,6 @@
 #include <tqdbusdatamap.h>
 #include <tqdbusvariant.h>
 
-/* NM headers */
-#include <NetworkManager.h>
-
 /* knetworkmanager headers */
 #include "knetworkmanager.h"
 #include "knetworkmanager-connection.h"
diff --git a/tdenetworkmanager/src/knetworkmanager-connection.h b/tdenetworkmanager/src/knetworkmanager-connection.h
index a370700..695408c 100644
--- a/tdenetworkmanager/src/knetworkmanager-connection.h
+++ b/tdenetworkmanager/src/knetworkmanager-connection.h
@@ -29,8 +29,6 @@
 #include <tqobject.h>
 
 #include "knetworkmanager-connection_setting.h"
-#include "dbus/connection.h"
-#include "dbus/connectionnode.h"
 
 class AccessPoint;
 class TQT_DBusObjectPath;
diff --git a/tdenetworkmanager/src/knetworkmanager-device.h b/tdenetworkmanager/src/knetworkmanager-device.h
index 2a12ec8..bd6e863 100644
--- a/tdenetworkmanager/src/knetworkmanager-device.h
+++ b/tdenetworkmanager/src/knetworkmanager-device.h
@@ -26,8 +26,6 @@
 #ifndef KNETWORKMANAGER_DEVICE_H
 #define KNETWORKMANAGER_DEVICE_H
 
-#include <NetworkManager.h>
-
 #include "knetworkmanager.h"
 
 #include <stdint.h>
diff --git a/tdenetworkmanager/src/connection_setting_cdma.ui b/tdenetworkmanager/src/settings/connection_setting_cdma.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_cdma.ui
rename to tdenetworkmanager/src/settings/connection_setting_cdma.ui
diff --git a/tdenetworkmanager/src/connection_setting_gsm.ui b/tdenetworkmanager/src/settings/connection_setting_gsm.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_gsm.ui
rename to tdenetworkmanager/src/settings/connection_setting_gsm.ui
diff --git a/tdenetworkmanager/src/connection_setting_info.ui b/tdenetworkmanager/src/settings/connection_setting_info.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_info.ui
rename to tdenetworkmanager/src/settings/connection_setting_info.ui
diff --git a/tdenetworkmanager/src/connection_setting_ipv4.ui b/tdenetworkmanager/src/settings/connection_setting_ipv4.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_ipv4.ui
rename to tdenetworkmanager/src/settings/connection_setting_ipv4.ui
diff --git a/tdenetworkmanager/src/connection_setting_ppp.ui b/tdenetworkmanager/src/settings/connection_setting_ppp.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_ppp.ui
rename to tdenetworkmanager/src/settings/connection_setting_ppp.ui
diff --git a/tdenetworkmanager/src/connection_setting_serial.ui b/tdenetworkmanager/src/settings/connection_setting_serial.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_serial.ui
rename to tdenetworkmanager/src/settings/connection_setting_serial.ui
diff --git a/tdenetworkmanager/src/connection_setting_vpn.ui b/tdenetworkmanager/src/settings/connection_setting_vpn.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_vpn.ui
rename to tdenetworkmanager/src/settings/connection_setting_vpn.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless.ui b/tdenetworkmanager/src/settings/connection_setting_wireless.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_auth.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_auth.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_auth.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_auth.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_eap.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_eap.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_eap.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_eap.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_phase2.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_phase2.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_phase2.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_phase2.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_wep.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_wep.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_wep.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_wep.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_wepencryption.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_wepencryption.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_wepencryption.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_wepencryption.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_wpacipher.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpacipher.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_wpacipher.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_wpacipher.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_wpapsk.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpapsk.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_wpapsk.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_wpapsk.ui
diff --git a/tdenetworkmanager/src/connection_setting_wireless_security_wpaversion.ui b/tdenetworkmanager/src/settings/connection_setting_wireless_security_wpaversion.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_setting_wireless_security_wpaversion.ui
rename to tdenetworkmanager/src/settings/connection_setting_wireless_security_wpaversion.ui
diff --git a/tdenetworkmanager/src/connection_settings.ui b/tdenetworkmanager/src/settings/connection_settings.ui
similarity index 100%
rename from tdenetworkmanager/src/connection_settings.ui
rename to tdenetworkmanager/src/settings/connection_settings.ui
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_8021x.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_8021x.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_cdma.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_cdma.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_gsm.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_gsm.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_info.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_info.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_info.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_info.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_info.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ipv4.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ipv4.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_ppp.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_ppp.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_serial.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_serial.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_serial.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_serial.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_serial.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_vpn.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_vpn.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wired.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wired.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wired.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wired.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wired.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_setting_wireless_security.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_setting_wireless_security.h
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.cpp b/tdenetworkmanager/src/settings/knetworkmanager-connection_settings_dialog.cpp
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.cpp
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_settings_dialog.cpp
diff --git a/tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.h b/tdenetworkmanager/src/settings/knetworkmanager-connection_settings_dialog.h
similarity index 100%
rename from tdenetworkmanager/src/knetworkmanager-connection_settings_dialog.h
rename to tdenetworkmanager/src/settings/knetworkmanager-connection_settings_dialog.h