diff --git a/src/shell/qmlpackages/desktop/contents/components/AppletError.qml b/src/shell/qmlpackages/desktop/contents/applet/AppletError.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/AppletError.qml
rename to src/shell/qmlpackages/desktop/contents/applet/AppletError.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/CompactApplet.qml b/src/shell/qmlpackages/desktop/contents/applet/CompactApplet.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/CompactApplet.qml
rename to src/shell/qmlpackages/desktop/contents/applet/CompactApplet.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/DefaultCompactRepresentation.qml b/src/shell/qmlpackages/desktop/contents/applet/DefaultCompactRepresentation.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/DefaultCompactRepresentation.qml
rename to src/shell/qmlpackages/desktop/contents/applet/DefaultCompactRepresentation.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/AppletConfiguration.qml b/src/shell/qmlpackages/desktop/contents/configuration/AppletConfiguration.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/AppletConfiguration.qml
rename to src/shell/qmlpackages/desktop/contents/configuration/AppletConfiguration.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/ConfigCategoryDelegate.qml b/src/shell/qmlpackages/desktop/contents/configuration/ConfigCategoryDelegate.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/ConfigCategoryDelegate.qml
rename to src/shell/qmlpackages/desktop/contents/configuration/ConfigCategoryDelegate.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/ConfigurationContainmentActions.qml b/src/shell/qmlpackages/desktop/contents/configuration/ConfigurationContainmentActions.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/ConfigurationContainmentActions.qml
rename to src/shell/qmlpackages/desktop/contents/configuration/ConfigurationContainmentActions.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/ConfigurationContainmentAppearance.qml b/src/shell/qmlpackages/desktop/contents/configuration/ConfigurationContainmentAppearance.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/ConfigurationContainmentAppearance.qml
rename to src/shell/qmlpackages/desktop/contents/configuration/ConfigurationContainmentAppearance.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/ConfigurationShortcuts.qml b/src/shell/qmlpackages/desktop/contents/configuration/ConfigurationShortcuts.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/ConfigurationShortcuts.qml
rename to src/shell/qmlpackages/desktop/contents/configuration/ConfigurationShortcuts.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/ContainmentConfiguration.qml b/src/shell/qmlpackages/desktop/contents/configuration/ContainmentConfiguration.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/ContainmentConfiguration.qml
rename to src/shell/qmlpackages/desktop/contents/configuration/ContainmentConfiguration.qml
diff --git a/src/shell/qmlpackages/desktop/contents/components/PanelConfiguration.qml b/src/shell/qmlpackages/desktop/contents/configuration/PanelConfiguration.qml
similarity index 100%
rename from src/shell/qmlpackages/desktop/contents/components/PanelConfiguration.qml
rename to src/shell/qmlpackages/desktop/contents/configuration/PanelConfiguration.qml
diff --git a/src/shell/shellpackage.cpp b/src/shell/shellpackage.cpp
index 623021649..6baf2b63e 100644
--- a/src/shell/shellpackage.cpp
+++ b/src/shell/shellpackage.cpp
@@ -29,27 +29,34 @@ void ShellPackageStructure::initPackage(Plasma::Package *package)
     package->setDefaultPackageRoot("plasma/shells/");
 
     //Directories
-    package->addDirectoryDefinition("components", "components", i18n("UI components"));
-    package->addDirectoryDefinition("views", "views", i18n("User interface for the views that will show containments"));
+    package->addDirectoryDefinition("applet", "applet", i18n("Appelts furniture"));
+    package->addDirectoryDefinition("configuration", "configuration", i18n("Appelts furniture"));
     package->addDirectoryDefinition("explorer", "explorer", i18n("Explorer UI for adding widgets"));
+    package->addDirectoryDefinition("views", "views", i18n("User interface for the views that will show containments"));
 
-    package->setMimeTypes("components", QStringList() << "text/x-qml");
+    package->setMimeTypes("applet", QStringList() << "text/x-qml");
+    package->setMimeTypes("configuration", QStringList() << "text/x-qml");
     package->setMimeTypes("views", QStringList() << "text/x-qml");
 
     //Files
+    //Default layout
     package->addFileDefinition("defaultlayout", "layout.js", i18n("Default layout file"));
     package->addFileDefinition("defaults", "defaults", i18n("Default plugins for containments, containmentActions etc"));
-
     package->setMimeTypes("defaultlayout", QStringList() << "application/javascript");
     package->setMimeTypes("defaults", QStringList() << "text/plain");
 
-    package->addFileDefinition("appleterror", "components/AppletError.qml", i18n("Error message shown when an applet fails to load"));
-    package->addFileDefinition("compactapplet", "components/CompactApplet.qml", i18n("QML component that shows an applet in a popup"));
-    package->addFileDefinition("appletconfigurationui", "components/AppletConfiguration.qml", i18n("QML component for the configuration dialog for applets"));
-    package->addFileDefinition("containmentconfigurationui", "components/ContainmentConfiguration.qml", i18n("QML component for the configuration dialog for containments"));
-    package->addFileDefinition("defaultcompactrepresentation", "components/DefaultCompactRepresentation.qml", i18n("Compact representation of an applet when collapsed in a popup, for instance as an icon. applets can override this component."));
+    //Applet furniture
+    package->addFileDefinition("appleterror", "applet/AppletError.qml", i18n("Error message shown when an applet fails to load"));
+    package->addFileDefinition("compactapplet", "applet/CompactApplet.qml", i18n("QML component that shows an applet in a popup"));
+    package->addFileDefinition("defaultcompactrepresentation", "applet/DefaultCompactRepresentation.qml", i18n("Compact representation of an applet when collapsed in a popup, for instance as an icon. applets can override this component."));
+
+    //Configuration
+    package->addFileDefinition("appletconfigurationui", "configuration/AppletConfiguration.qml", i18n("QML component for the configuration dialog for applets"));
+    package->addFileDefinition("containmentconfigurationui", "configuration/ContainmentConfiguration.qml", i18n("QML component for the configuration dialog for containments"));
+    package->addFileDefinition("panelconfigurationui", "configuration/PanelConfiguration.qml", i18n("Panel configuration UI"));
+
+    //WIdget explorer
     package->addFileDefinition("widgetexplorer", "explorer/WidgetExplorer.qml", i18n("Widgets explorer UI"));
-    package->addFileDefinition("panelconfigurationui", "components/PanelConfiguration.qml", i18n("Panel configuration UI"));
     
     
     //package->setRequired("mainscript", true);