diff --git a/linphone-desktop/resources.qrc b/linphone-desktop/resources.qrc
index f3e5705cb..cd00d54ce 100644
--- a/linphone-desktop/resources.qrc
+++ b/linphone-desktop/resources.qrc
@@ -167,21 +167,21 @@
     <file>assets/images/video_call_normal.svg</file>
     <file>assets/images/video_call_pressed.svg</file>
     <file>ui/modules/Common/Animations/BusyIndicator.qml</file>
-    <file>ui/modules/Common/Borders.qml</file>
-    <file>ui/modules/Common/Collapse.qml</file>
-    <file>ui/modules/Common/Colors.qml</file>
-    <file>ui/modules/Common/Constants.qml</file>
+    <file>ui/modules/Common/Constants/Colors.qml</file>
+    <file>ui/modules/Common/Constants/Constants.qml</file>
     <file>ui/modules/Common/Dialog/ConfirmDialog.qml</file>
     <file>ui/modules/Common/Dialog/DialogDescription.qml</file>
     <file>ui/modules/Common/Dialog/DialogPlus.qml</file>
-    <file>ui/modules/Common/DroppableTextArea.qml</file>
-    <file>ui/modules/Common/ForceScrollBar.qml</file>
-    <file>ui/modules/Common/Form/AbstractTextButton.qml</file>
     <file>ui/modules/Common/Form/ActionBar.qml</file>
     <file>ui/modules/Common/Form/ActionButton.qml</file>
     <file>ui/modules/Common/Form/ActionSwitch.qml</file>
+    <file>ui/modules/Common/Form/Buttons/AbstractTextButton.qml</file>
+    <file>ui/modules/Common/Form/Buttons/ExclusiveButtons.qml</file>
+    <file>ui/modules/Common/Form/Buttons/SmallButton.qml</file>
+    <file>ui/modules/Common/Form/Buttons/TextButtonA.qml</file>
+    <file>ui/modules/Common/Form/Buttons/TextButtonB.qml</file>
     <file>ui/modules/Common/Form/CheckBoxText.qml</file>
-    <file>ui/modules/Common/Form/ExclusiveButtons.qml</file>
+    <file>ui/modules/Common/Form/DroppableTextArea.qml</file>
     <file>ui/modules/Common/Form/Fields/NumericField.qml</file>
     <file>ui/modules/Common/Form/Fields/TextAreaField.qml</file>
     <file>ui/modules/Common/Form/Fields/TextField.qml</file>
@@ -194,40 +194,41 @@
     <file>ui/modules/Common/Form/Placements/FormHeader.qml</file>
     <file>ui/modules/Common/Form/Placements/FormLine.qml</file>
     <file>ui/modules/Common/Form/Placements/Form.qml</file>
-    <file>ui/modules/Common/Form/SmallButton.qml</file>
+    <file>ui/modules/Common/Form/SearchBox.qml</file>
     <file>ui/modules/Common/Form/StaticListForm.qml</file>
     <file>ui/modules/Common/Form/Switch.qml</file>
     <file>ui/modules/Common/Form/Tab/TabBar.qml</file>
     <file>ui/modules/Common/Form/Tab/TabButton.qml</file>
     <file>ui/modules/Common/Form/Tab/TabContainer.qml</file>
-    <file>ui/modules/Common/Form/TextButtonA.qml</file>
-    <file>ui/modules/Common/Form/TextButtonB.qml</file>
     <file>ui/modules/Common/Form/TransparentComboBox.qml</file>
     <file>ui/modules/Common/Form/TransparentTextInput.qml</file>
+    <file>ui/modules/Common/Helpers/InvertedMouseArea.qml</file>
+    <file>ui/modules/Common/Helpers/SmartConnect.qml</file>
     <file>ui/modules/Common/Image/Icon.qml</file>
     <file>ui/modules/Common/Image/RoundedImage.qml</file>
-    <file>ui/modules/Common/InvertedMouseArea.qml</file>
     <file>ui/modules/Common/Menu/ActionMenuEntry.qml</file>
     <file>ui/modules/Common/Menu/ActionMenu.qml</file>
     <file>ui/modules/Common/Menu/Menu.qml</file>
-    <file>ui/modules/Common/Paned.qml</file>
+    <file>ui/modules/Common/Misc/Borders.qml</file>
+    <file>ui/modules/Common/Misc/Collapse.qml</file>
+    <file>ui/modules/Common/Misc/ForceScrollBar.qml</file>
+    <file>ui/modules/Common/Misc/Paned.qml</file>
     <file>ui/modules/Common/Popup/AbstractDropDownMenu.qml</file>
     <file>ui/modules/Common/Popup/DesktopPopup.qml</file>
     <file>ui/modules/Common/Popup/DropDownDynamicMenu.qml</file>
     <file>ui/modules/Common/Popup/DropDownMenu.qml</file>
     <file>ui/modules/Common/Popup/PopupShadow.qml</file>
     <file>ui/modules/Common/qmldir</file>
-    <file>ui/modules/Common/SearchBox.qml</file>
-    <file>ui/modules/Common/SmartConnect.qml</file>
     <file>ui/modules/Common/Styles/Animations/BusyIndicatorStyle.qml</file>
-    <file>ui/modules/Common/Styles/CollapseStyle.qml</file>
-    <file>ui/modules/Common/Styles/DialogStyle.qml</file>
-    <file>ui/modules/Common/Styles/DroppableTextAreaStyle.qml</file>
-    <file>ui/modules/Common/Styles/ForceScrollBarStyle.qml</file>
-    <file>ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml</file>
+    <file>ui/modules/Common/Styles/Dialog/DialogStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/ActionBarStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml</file>
-    <file>ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/Fields/TextAreaFieldStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/Fields/TextFieldStyle.qml</file>
@@ -237,21 +238,20 @@
     <file>ui/modules/Common/Styles/Form/Placements/FormHeaderStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/Placements/FormLineStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/Placements/FormStyle.qml</file>
-    <file>ui/modules/Common/Styles/Form/SmallButtonStyle.qml</file>
+    <file>ui/modules/Common/Styles/Form/SearchBoxStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/SwitchStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/Tab/TabButtonStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml</file>
-    <file>ui/modules/Common/Styles/Form/TextButtonAStyle.qml</file>
-    <file>ui/modules/Common/Styles/Form/TextButtonBStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml</file>
     <file>ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml</file>
     <file>ui/modules/Common/Styles/Menu/ActionMenuStyle.qml</file>
     <file>ui/modules/Common/Styles/Menu/MenuStyle.qml</file>
-    <file>ui/modules/Common/Styles/PanedStyle.qml</file>
-    <file>ui/modules/Common/Styles/PopupStyle.qml</file>
+    <file>ui/modules/Common/Styles/Misc/CollapseStyle.qml</file>
+    <file>ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml</file>
+    <file>ui/modules/Common/Styles/Misc/PanedStyle.qml</file>
+    <file>ui/modules/Common/Styles/Popup/PopupStyle.qml</file>
     <file>ui/modules/Common/Styles/qmldir</file>
-    <file>ui/modules/Common/Styles/SearchBoxStyle.qml</file>
-    <file>ui/modules/Common/Styles/TooltipStyle.qml</file>
+    <file>ui/modules/Common/Styles/Tooltip/TooltipStyle.qml</file>
     <file>ui/modules/Common/Tooltip/TooltipArea.qml</file>
     <file>ui/modules/Common/Tooltip/Tooltip.qml</file>
     <file>ui/modules/Common/View/ScrollableListView.qml</file>
diff --git a/linphone-desktop/ui/modules/Common/Colors.qml b/linphone-desktop/ui/modules/Common/Constants/Colors.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Colors.qml
rename to linphone-desktop/ui/modules/Common/Constants/Colors.qml
diff --git a/linphone-desktop/ui/modules/Common/Constants.qml b/linphone-desktop/ui/modules/Common/Constants/Constants.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Constants.qml
rename to linphone-desktop/ui/modules/Common/Constants/Constants.qml
diff --git a/linphone-desktop/ui/modules/Common/Form/AbstractTextButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Form/AbstractTextButton.qml
rename to linphone-desktop/ui/modules/Common/Form/Buttons/AbstractTextButton.qml
diff --git a/linphone-desktop/ui/modules/Common/Form/ExclusiveButtons.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Form/ExclusiveButtons.qml
rename to linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
diff --git a/linphone-desktop/ui/modules/Common/Form/ExclusiveButtons.spec.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Form/ExclusiveButtons.spec.qml
rename to linphone-desktop/ui/modules/Common/Form/Buttons/ExclusiveButtons.spec.qml
diff --git a/linphone-desktop/ui/modules/Common/Form/SmallButton.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Form/SmallButton.qml
rename to linphone-desktop/ui/modules/Common/Form/Buttons/SmallButton.qml
diff --git a/linphone-desktop/ui/modules/Common/Form/TextButtonA.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonA.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Form/TextButtonA.qml
rename to linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonA.qml
diff --git a/linphone-desktop/ui/modules/Common/Form/TextButtonB.qml b/linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonB.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Form/TextButtonB.qml
rename to linphone-desktop/ui/modules/Common/Form/Buttons/TextButtonB.qml
diff --git a/linphone-desktop/ui/modules/Common/DroppableTextArea.qml b/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml
similarity index 99%
rename from linphone-desktop/ui/modules/Common/DroppableTextArea.qml
rename to linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml
index 27069b3f9..50e272a2a 100644
--- a/linphone-desktop/ui/modules/Common/DroppableTextArea.qml
+++ b/linphone-desktop/ui/modules/Common/Form/DroppableTextArea.qml
@@ -2,6 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 
+import Common 1.0
 import Common.Styles 1.0
 
 // =============================================================================
diff --git a/linphone-desktop/ui/modules/Common/SearchBox.qml b/linphone-desktop/ui/modules/Common/Form/SearchBox.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/SearchBox.qml
rename to linphone-desktop/ui/modules/Common/Form/SearchBox.qml
diff --git a/linphone-desktop/ui/modules/Common/InvertedMouseArea.qml b/linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/InvertedMouseArea.qml
rename to linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.qml
diff --git a/linphone-desktop/ui/modules/Common/InvertedMouseArea.spec.qml b/linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/InvertedMouseArea.spec.qml
rename to linphone-desktop/ui/modules/Common/Helpers/InvertedMouseArea.spec.qml
diff --git a/linphone-desktop/ui/modules/Common/SmartConnect.qml b/linphone-desktop/ui/modules/Common/Helpers/SmartConnect.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/SmartConnect.qml
rename to linphone-desktop/ui/modules/Common/Helpers/SmartConnect.qml
diff --git a/linphone-desktop/ui/modules/Common/Borders.qml b/linphone-desktop/ui/modules/Common/Misc/Borders.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Borders.qml
rename to linphone-desktop/ui/modules/Common/Misc/Borders.qml
diff --git a/linphone-desktop/ui/modules/Common/Collapse.qml b/linphone-desktop/ui/modules/Common/Misc/Collapse.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Collapse.qml
rename to linphone-desktop/ui/modules/Common/Misc/Collapse.qml
diff --git a/linphone-desktop/ui/modules/Common/ForceScrollBar.qml b/linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/ForceScrollBar.qml
rename to linphone-desktop/ui/modules/Common/Misc/ForceScrollBar.qml
diff --git a/linphone-desktop/ui/modules/Common/Paned.qml b/linphone-desktop/ui/modules/Common/Misc/Paned.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Paned.qml
rename to linphone-desktop/ui/modules/Common/Misc/Paned.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/DialogStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/DialogStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Dialog/DialogStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/AbstractTextButtonStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/SmallButtonStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/Form/SmallButtonStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/TextButtonAStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/Form/TextButtonAStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/Form/TextButtonBStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/Form/TextButtonBStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Form/Buttons/TextButtonBStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/DroppableTextAreaStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/DroppableTextAreaStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Form/DroppableTextAreaStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/SearchBoxStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Form/SearchBoxStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/SearchBoxStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Form/SearchBoxStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/CollapseStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Misc/CollapseStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/CollapseStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Misc/CollapseStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/ForceScrollBarStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/ForceScrollBarStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/PanedStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Misc/PanedStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/PanedStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Misc/PanedStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/PopupStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/PopupStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Popup/PopupStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/TooltipStyle.qml b/linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml
similarity index 100%
rename from linphone-desktop/ui/modules/Common/Styles/TooltipStyle.qml
rename to linphone-desktop/ui/modules/Common/Styles/Tooltip/TooltipStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/Styles/qmldir b/linphone-desktop/ui/modules/Common/Styles/qmldir
index 918c41046..1d2563f0d 100644
--- a/linphone-desktop/ui/modules/Common/Styles/qmldir
+++ b/linphone-desktop/ui/modules/Common/Styles/qmldir
@@ -6,13 +6,13 @@ module Common.Styles
 
 singleton BusyIndicatorStyle        1.0 Animations/BusyIndicatorStyle.qml
 
-singleton CollapseStyle             1.0 CollapseStyle.qml
+singleton DialogStyle               1.0 Dialog/DialogStyle.qml
 
-singleton DialogStyle               1.0 DialogStyle.qml
-
-singleton DroppableTextAreaStyle    1.0 DroppableTextAreaStyle.qml
-
-singleton ForceScrollBarStyle       1.0 ForceScrollBarStyle.qml
+singleton AbstractTextButtonStyle   1.0 Form/Buttons/AbstractTextButtonStyle.qml
+singleton ExclusiveButtonsStyle     1.0 Form/Buttons/ExclusiveButtonsStyle.qml
+singleton SmallButtonStyle          1.0 Form/Buttons/SmallButtonStyle.qml
+singleton TextButtonAStyle          1.0 Form/Buttons/TextButtonAStyle.qml
+singleton TextButtonBStyle          1.0 Form/Buttons/TextButtonBStyle.qml
 
 singleton NumericFieldStyle         1.0 Form/Fields/NumericFieldStyle.qml
 singleton TextAreaFieldStyle        1.0 Form/Fields/TextAreaFieldStyle.qml
@@ -27,25 +27,22 @@ singleton FormStyle                 1.0 Form/Placements/FormStyle.qml
 singleton TabButtonStyle            1.0 Form/Tab/TabButtonStyle.qml
 singleton TabContainerStyle         1.0 Form/Tab/TabContainerStyle.qml
 
-singleton AbstractTextButtonStyle   1.0 Form/AbstractTextButtonStyle.qml
 singleton ActionBarStyle            1.0 Form/ActionBarStyle.qml
 singleton CheckBoxTextStyle         1.0 Form/CheckBoxTextStyle.qml
-singleton ExclusiveButtonsStyle     1.0 Form/ExclusiveButtonsStyle.qml
+singleton DroppableTextAreaStyle    1.0 Form/DroppableTextAreaStyle.qml
 singleton ListFormStyle             1.0 Form/ListFormStyle.qml
-singleton SmallButtonStyle          1.0 Form/SmallButtonStyle.qml
+singleton SearchBoxStyle            1.0 Form/SearchBoxStyle.qml
 singleton SwitchStyle               1.0 Form/SwitchStyle.qml
-singleton TextButtonAStyle          1.0 Form/TextButtonAStyle.qml
-singleton TextButtonBStyle          1.0 Form/TextButtonBStyle.qml
 singleton TransparentComboBoxStyle  1.0 Form/TransparentComboBoxStyle.qml
 singleton TransparentTextInputStyle 1.0 Form/TransparentTextInputStyle.qml
 
 singleton ActionMenuStyle           1.0 Menu/ActionMenuStyle.qml
 singleton MenuStyle                 1.0 Menu/MenuStyle.qml
 
-singleton PanedStyle                1.0 PanedStyle.qml
+singleton CollapseStyle             1.0 Misc/CollapseStyle.qml
+singleton ForceScrollBarStyle       1.0 Misc/ForceScrollBarStyle.qml
+singleton PanedStyle                1.0 Misc/PanedStyle.qml
 
-singleton PopupStyle                1.0 PopupStyle.qml
+singleton PopupStyle                1.0 Popup/PopupStyle.qml
 
-singleton SearchBoxStyle            1.0 SearchBoxStyle.qml
-
-singleton TooltipStyle              1.0 TooltipStyle.qml
+singleton TooltipStyle              1.0 Tooltip/TooltipStyle.qml
diff --git a/linphone-desktop/ui/modules/Common/qmldir b/linphone-desktop/ui/modules/Common/qmldir
index f7ac3b2d4..e0fd2b966 100644
--- a/linphone-desktop/ui/modules/Common/qmldir
+++ b/linphone-desktop/ui/modules/Common/qmldir
@@ -6,31 +6,32 @@ module Common
 
 # Constants --------------------------------------------------------------------
 
-singleton Colors     1.0 Colors.qml
-singleton Constants  1.0 Constants.qml
+singleton Colors     1.0 Constants/Colors.qml
+singleton Constants  1.0 Constants/Constants.qml
 
 # Components -------------------------------------------------------------------
 
-# Animations
 BusyIndicator        1.0 Animations/BusyIndicator.qml
 
-# Chat
-Borders              1.0 Borders.qml
-
-# Collapse
-Collapse             1.0 Collapse.qml
-
-# Dialog
 ConfirmDialog        1.0 Dialog/ConfirmDialog.qml
 DialogPlus           1.0 Dialog/DialogPlus.qml
 
-# DroppableTextArea
-DroppableTextArea    1.0 DroppableTextArea.qml
+ActionBar            1.0 Form/ActionBar.qml
+ActionButton         1.0 Form/ActionButton.qml
+ActionSwitch         1.0 Form/ActionSwitch.qml
+CheckBoxText         1.0 Form/CheckBoxText.qml
+DroppableTextArea    1.0 Form/DroppableTextArea.qml
+ListForm             1.0 Form/ListForm.qml
+SearchBox            1.0 Form/SearchBox.qml
+StaticListForm       1.0 Form/StaticListForm.qml
+Switch               1.0 Form/Switch.qml
+TransparentComboBox  1.0 Form/TransparentComboBox.qml
+TransparentTextInput 1.0 Form/TransparentTextInput.qml
 
-# ForceScrollBar
-ForceScrollBar       1.0 ForceScrollBar.qml
+ExclusiveButtons     1.0 Form/Buttons/ExclusiveButtons.qml
+TextButtonA          1.0 Form/Buttons/TextButtonA.qml
+TextButtonB          1.0 Form/Buttons/TextButtonB.qml
 
-# Form
 NumericField         1.0 Form/Fields/NumericField.qml
 TextAreaField        1.0 Form/Fields/TextAreaField.qml
 TextField            1.0 Form/Fields/TextField.qml
@@ -48,49 +49,26 @@ TabBar               1.0 Form/Tab/TabBar.qml
 TabButton            1.0 Form/Tab/TabButton.qml
 TabContainer         1.0 Form/Tab/TabContainer.qml
 
-ActionBar            1.0 Form/ActionBar.qml
-ActionButton         1.0 Form/ActionButton.qml
-ActionSwitch         1.0 Form/ActionSwitch.qml
-CheckBoxText         1.0 Form/CheckBoxText.qml
-ExclusiveButtons     1.0 Form/ExclusiveButtons.qml
-LightButton          1.0 Form/LightButton.qml
-ListForm             1.0 Form/ListForm.qml
-StaticListForm       1.0 Form/StaticListForm.qml
-Switch               1.0 Form/Switch.qml
-TextButtonA          1.0 Form/TextButtonA.qml
-TextButtonB          1.0 Form/TextButtonB.qml
-TransparentComboBox  1.0 Form/TransparentComboBox.qml
-TransparentTextInput 1.0 Form/TransparentTextInput.qml
+InvertedMouseArea    1.0 Helpers/InvertedMouseArea.qml
+SmartConnect         1.0 Helpers/SmartConnect.qml
 
-# Image
 Icon                 1.0 Image/Icon.qml
 RoundedImage         1.0 Image/RoundedImage.qml
 
-# InvertedMouseArea
-InvertedMouseArea    1.0 InvertedMouseArea.qml
-
-# Menu
 ActionMenu           1.0 Menu/ActionMenu.qml
 ActionMenuEntry      1.0 Menu/ActionMenuEntry.qml
 Menu                 1.0 Menu/Menu.qml
 
-# Paned
-Paned                1.0 Paned.qml
+Borders              1.0 Misc/Borders.qml
+Collapse             1.0 Misc/Collapse.qml
+ForceScrollBar       1.0 Misc/ForceScrollBar.qml
+Paned                1.0 Misc/Paned.qml
 
-# Popup
 DesktopPopup         1.0 Popup/DesktopPopup.qml
 DropDownDynamicMenu  1.0 Popup/DropDownDynamicMenu.qml
 DropDownMenu         1.0 Popup/DropDownMenu.qml
 PopupShadow          1.0 Popup/PopupShadow.qml
 
-# SearchBox
-SearchBox            1.0 SearchBox.qml
-
-# SmartConnect
-SmartConnect         1.0 SmartConnect.qml
-
-# Tooltip
 TooltipArea          1.0 Tooltip/TooltipArea.qml
 
-# View
 ScrollableListView   1.0 View/ScrollableListView.qml