diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5828afad..1fc0563c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ set(plasma_LIB_SRCS
     dataengine.cpp
     dataenginemanager.cpp
     datasource.cpp
+    packages.cpp
     phase.cpp
     plasma.cpp
     plasma_export.h
diff --git a/packages.cpp b/packages.cpp
new file mode 100644
index 000000000..e37dde8a1
--- /dev/null
+++ b/packages.cpp
@@ -0,0 +1,79 @@
+/******************************************************************************
+*   Copyright (C) 2007 by Aaron Seigo <aseigo@kde.org>                        *
+*                                                                             *
+*   This library is free software; you can redistribute it and/or             *
+*   modify it under the terms of the GNU Library General Public               *
+*   License as published by the Free Software Foundation; either              *
+*   version 2 of the License, or (at your option) any later version.          *
+*                                                                             *
+*   This library 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          *
+*   Library General Public License for more details.                          *
+*                                                                             *
+*   You should have received a copy of the GNU Library General Public License *
+*   along with this library; see the file COPYING.LIB.  If not, write to      *
+*   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,      *
+*   Boston, MA 02110-1301, USA.                                               *
+*******************************************************************************/
+
+#include <KLocale>
+
+#include "packages.h"
+
+namespace Plasma
+{
+
+PlasmoidStructure::PlasmoidStructure()
+    : Plasma::PackageStructure(QString("Plasmoid"))
+{
+    addDirectoryDefinition("images", "images", i18n("Images"));
+    QStringList mimetypes;
+    mimetypes << "image/svg+xml" << "image/png" << "image/jpeg";
+    setMimetypes("images", mimetypes);
+
+    addDirectoryDefinition("config", "config/xml", i18n("Configuration Definitions"));
+    addDirectoryDefinition("configui", "config/ui", i18n("Configuration UI"));
+    mimetypes.clear();
+    mimetypes << "text/xml";
+    setMimetypes("config", mimetypes);
+    setMimetypes("configui", mimetypes);
+
+    addDirectoryDefinition("scripts", "code", i18n("Executable Scripts"));
+    mimetypes.clear();
+    mimetypes << "text/*";
+    setMimetypes("scripts", mimetypes);
+
+    addFileDefinition("mainscript", "code/main", i18n("Main Script File"));
+    setRequired("mainscript", true);
+}
+
+ThemePackageStructure::ThemePackageStructure()
+    : Plasma::PackageStructure(QString("Plasma Theme"))
+{
+    addFileDefinition("dialogs/background", "dialogs/background.svg",
+                      i18n("Generic dialog background"));
+    addFileDefinition("dialogs/shutdowndlg", "dialogs/shutdowndlg.svg",
+                      i18n("Background for the log out dialog"));
+    addFileDefinition("dialogs/shutdowndlgbuttonglow", "dialogs/shutdowndlgbuttonglow.svg",
+                      i18n("Overlay for buttons on the log out dialog"));
+
+    addFileDefinition("widgets/background", "widgets/background.svg",
+                      i18n("Background image for plasmoids"));
+    addFileDefinition("widgets/clock", "widgets/clock.svg",
+                      i18n("Analog clock face"));
+    addFileDefinition("widgets/iconbutton", "widgets/iconbutton.svg",
+                      i18n("Back- and foregrounds for clickable icons"));
+    addFileDefinition("widgets/plot-background", "widgets/plot-background.svg",
+                      i18n("Background for graphing widgets"));
+    addFileDefinition("widgets/toolbox-button", "widgets/toolbox-button.svg",
+                      i18n("The desktop toolbox hotspot background"));
+
+    QStringList mimetypes;
+    mimetypes << "image/svg+xml";
+    setDefaultMimetypes(mimetypes);
+}
+
+} // namespace Plasma
+
+
diff --git a/packages.h b/packages.h
new file mode 100644
index 000000000..a5f36e612
--- /dev/null
+++ b/packages.h
@@ -0,0 +1,41 @@
+/******************************************************************************
+*   Copyright (C) 2007 by Aaron Seigo <aseigo@kde.org>                        *
+*                                                                             *
+*   This library is free software; you can redistribute it and/or             *
+*   modify it under the terms of the GNU Library General Public               *
+*   License as published by the Free Software Foundation; either              *
+*   version 2 of the License, or (at your option) any later version.          *
+*                                                                             *
+*   This library 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          *
+*   Library General Public License for more details.                          *
+*                                                                             *
+*   You should have received a copy of the GNU Library General Public License *
+*   along with this library; see the file COPYING.LIB.  If not, write to      *
+*   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,      *
+*   Boston, MA 02110-1301, USA.                                               *
+*******************************************************************************/
+
+#ifndef PLASMA_PACKAGES
+#define PLASMA_PACKAGES
+
+#include <plasma/packagestructure.h>
+
+namespace Plasma
+{
+
+class PlasmoidStructure : public PackageStructure
+{
+public:
+    PlasmoidStructure();
+};
+
+class ThemePackageStructure : public PackageStructure
+{
+public:
+    ThemePackageStructure();
+};
+
+} // namespace Plasma
+#endif