diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt
index 0e85ea97b..518fb7ce8 100644
--- a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt
@@ -1,36 +1,13 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR})
 
-FILE(GLOB SRC *.cpp *.h resources/*.rc)
-
-SET(CLIENT_CONFIG_HDR
-  client_config_dialog.h
-  display_settings_advanced_widget.h
-  display_settings_details_widget.h
-  display_settings_widget.h
-  general_settings_widget.h
-  sound_settings_widget.h
-  sys_info_d3d_widget.h
-  sys_info_opengl_widget.h
-  sys_info_widget.h
-  widget_base.h
-)
-
-SET(CLIENT_CONFIG_UIS
-  client_config_dialog.ui
-  display_settings_advanced_widget.ui
-  display_settings_details_widget.ui
-  display_settings_widget.ui
-  general_settings_widget.ui
-  sound_settings_widget.ui
-  sys_info_d3d_widget.ui
-  sys_info_opengl_widget.ui
-  sys_info_widget.ui
-)
+FILE(GLOB SRC src/*.cpp src/*.h resources/*.rc)
 
+FILE(GLOB CLIENT_CONFIG_HDR src/*.h)
+FILE(GLOB CLIENT_CONFIG_UIS ui/*.ui)
 FILE(GLOB CLIENT_CONFIG_TRANS translations/*.ts)
 
 CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY)
-SET(CLIENT_CONFIG_RCS resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc )
+SET(CLIENT_CONFIG_RCS resources/resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc )
 
 IF(WITH_QT)
   INCLUDE_DIRECTORIES(${QT_INCLUDES})
@@ -44,7 +21,7 @@ IF(WITH_QT)
   ADD_DEFINITIONS(${QT_DEFINITIONS})
 ELSE()
 #  uncomment this line if you want to update original translations
-#  QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS})
+#  QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS} OPTIONS -I ${CMAKE_CURRENT_SOURCE_DIR})
   QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS})
   QT5_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS})
   QT5_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR})
diff --git a/code/ryzom/tools/client/client_config_qt/resources.qrc b/code/ryzom/tools/client/client_config_qt/resources.qrc
deleted file mode 100644
index 1d86eaded..000000000
--- a/code/ryzom/tools/client/client_config_qt/resources.qrc
+++ /dev/null
@@ -1,16 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>resources/card_icon.png</file>
-        <file>resources/display_config_icon.png</file>
-        <file>resources/display_icon.png</file>
-        <file>resources/display_properties_icon.png</file>
-        <file>resources/general_icon.png</file>
-        <file>resources/left_bitmap_0.png</file>
-        <file>resources/network_icon.png</file>
-        <file>resources/sound_icon.png</file>
-        <file>resources/splash_screen.png</file>
-        <file>resources/top_right.png</file>
-        <file>resources/update_icon.png</file>
-        <file>resources/welcome_icon.png</file>
-    </qresource>
-</RCC>
diff --git a/code/ryzom/tools/client/client_config_qt/resources/resources.qrc b/code/ryzom/tools/client/client_config_qt/resources/resources.qrc
new file mode 100644
index 000000000..b45ca8b56
--- /dev/null
+++ b/code/ryzom/tools/client/client_config_qt/resources/resources.qrc
@@ -0,0 +1,16 @@
+<RCC>
+    <qresource prefix="/resources">
+        <file>card_icon.png</file>
+        <file>display_config_icon.png</file>
+        <file>display_icon.png</file>
+        <file>display_properties_icon.png</file>
+        <file>general_icon.png</file>
+        <file>left_bitmap_0.png</file>
+        <file>network_icon.png</file>
+        <file>sound_icon.png</file>
+        <file>splash_screen.png</file>
+        <file>top_right.png</file>
+        <file>update_icon.png</file>
+        <file>welcome_icon.png</file>
+    </qresource>
+</RCC>
diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
rename to code/ryzom/tools/client/client_config_qt/src/client_config_dialog.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.h b/code/ryzom/tools/client/client_config_qt/src/client_config_dialog.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/client_config_dialog.h
rename to code/ryzom/tools/client/client_config_qt/src/client_config_dialog.h
diff --git a/code/ryzom/tools/client/client_config_qt/config.cpp b/code/ryzom/tools/client/client_config_qt/src/config.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/config.cpp
rename to code/ryzom/tools/client/client_config_qt/src/config.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/config.h b/code/ryzom/tools/client/client_config_qt/src/config.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/config.h
rename to code/ryzom/tools/client/client_config_qt/src/config.h
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.h b/code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/display_settings_advanced_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_details_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.h b/code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_details_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/display_settings_details_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/display_settings_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.h b/code/ryzom/tools/client/client_config_qt/src/display_settings_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/display_settings_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/general_settings_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/general_settings_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.h b/code/ryzom/tools/client/client_config_qt/src/general_settings_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/general_settings_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/general_settings_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/main.cpp b/code/ryzom/tools/client/client_config_qt/src/main.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/main.cpp
rename to code/ryzom/tools/client/client_config_qt/src/main.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.h b/code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sound_settings_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/sound_settings_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.cpp b/code/ryzom/tools/client/client_config_qt/src/stdpch.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/stdpch.cpp
rename to code/ryzom/tools/client/client_config_qt/src/stdpch.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/stdpch.h b/code/ryzom/tools/client/client_config_qt/src/stdpch.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/stdpch.h
rename to code/ryzom/tools/client/client_config_qt/src/stdpch.h
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.h b/code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/sys_info_d3d_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.h b/code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/sys_info_opengl_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp b/code/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp
rename to code/ryzom/tools/client/client_config_qt/src/sys_info_widget.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.h b/code/ryzom/tools/client/client_config_qt/src/sys_info_widget.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_widget.h
rename to code/ryzom/tools/client/client_config_qt/src/sys_info_widget.h
diff --git a/code/ryzom/tools/client/client_config_qt/system.cpp b/code/ryzom/tools/client/client_config_qt/src/system.cpp
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/system.cpp
rename to code/ryzom/tools/client/client_config_qt/src/system.cpp
diff --git a/code/ryzom/tools/client/client_config_qt/system.h b/code/ryzom/tools/client/client_config_qt/src/system.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/system.h
rename to code/ryzom/tools/client/client_config_qt/src/system.h
diff --git a/code/ryzom/tools/client/client_config_qt/widget_base.h b/code/ryzom/tools/client/client_config_qt/src/widget_base.h
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/widget_base.h
rename to code/ryzom/tools/client/client_config_qt/src/widget_base.h
diff --git a/code/ryzom/tools/client/client_config_qt/translations/translations.qrc b/code/ryzom/tools/client/client_config_qt/translations/translations.qrc
index 15787fde3..e33a0aa44 100644
--- a/code/ryzom/tools/client/client_config_qt/translations/translations.qrc
+++ b/code/ryzom/tools/client/client_config_qt/translations/translations.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/translations">
         <file>ryzom_configuration_de.qm</file>
-        <file>ryzom_configuration_en.qm</file>
         <file>ryzom_configuration_es.qm</file>
         <file>ryzom_configuration_fr.qm</file>
         <file>ryzom_configuration_hu.qm</file>
diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui b/code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/client_config_dialog.ui
rename to code/ryzom/tools/client/client_config_qt/ui/client_config_dialog.ui
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/display_settings_advanced_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_details_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_details_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/display_settings_details_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/display_settings_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/display_settings_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/general_settings_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/general_settings_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sound_settings_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/sound_settings_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/sys_info_d3d_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/sys_info_opengl_widget.ui
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.ui b/code/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui
similarity index 100%
rename from code/ryzom/tools/client/client_config_qt/sys_info_widget.ui
rename to code/ryzom/tools/client/client_config_qt/ui/sys_info_widget.ui