diff --git a/components.xml b/components.xml
index 9c799cd1f2..02b812cab7 100644
--- a/components.xml
+++ b/components.xml
@@ -2156,6 +2156,17 @@
                 <Email>admins@pisilinux.org</Email>
             </Maintainer>
         </Component>
+        <Component>
+            <Name>util.dock</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>accessories</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
         <Component>
             <Name>util.antivirus</Name>
             <LocalName xml:lang="en">FIXME</LocalName>
diff --git a/hardware/misc/hwloc/pspec.xml b/hardware/misc/hwloc/pspec.xml
index 55b27b5971..ce2a4fa28f 100644
--- a/hardware/misc/hwloc/pspec.xml
+++ b/hardware/misc/hwloc/pspec.xml
@@ -8,7 +8,7 @@
             <Name>Blue Devil</Name>
             <Email>bluedevil@sctzine.com</Email>
         </Packager>
-        <PartOf>harware.misc</PartOf>
+        <PartOf>hardware.misc</PartOf>
         <License>BSD</License>
         <IsA>library</IsA>
         <IsA>app:console</IsA>
diff --git a/multimedia/misc/gd/pspec.xml b/multimedia/misc/gd/pspec.xml
index 502df392be..fd72d59099 100644
--- a/multimedia/misc/gd/pspec.xml
+++ b/multimedia/misc/gd/pspec.xml
@@ -8,7 +8,7 @@
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
-        <PartOf>multimedia.mısc</PartOf>
+        <PartOf>multimedia.misc</PartOf>
         <License>as-is</License>
         <License>BSD</License>
         <IsA>library</IsA>
diff --git a/office/misc/evince/pspec.xml b/office/misc/evince/pspec.xml
index 8c01aa992c..8e798be2d2 100644
--- a/office/misc/evince/pspec.xml
+++ b/office/misc/evince/pspec.xml
@@ -9,7 +9,7 @@
             <Email>admin@pisilinux.org</Email>
         </Packager>
         <License>GPLv2</License>
-        <PartOf>gnome.addons</PartOf>
+        <PartOf>desktop.gnome.addons</PartOf>
         <IsA>app:gui</IsA>
         <Summary>A document viewer, built without GConf and GNOME keyring support</Summary>
         <Description>Evince is a document viewer for multiple document formats. The goal of evince is to replace the multiple document viewers that exist on the GNOME Desktop with a single simple application.</Description>
diff --git a/programming/library/libdispatch/libdispatch/actions.py b/programming/library/libdispatch/actions.py
similarity index 100%
rename from programming/library/libdispatch/libdispatch/actions.py
rename to programming/library/libdispatch/actions.py
diff --git a/programming/library/libdispatch/component.xml b/programming/library/libdispatch/component.xml
deleted file mode 100644
index 4f68303fdb..0000000000
--- a/programming/library/libdispatch/component.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<PISI>
-    <Name>programming.library.libdispatch</Name>
-</PISI> 
- 
diff --git a/programming/library/libdispatch/libdispatch/files/avoid-libkqueue.patch b/programming/library/libdispatch/files/avoid-libkqueue.patch
similarity index 100%
rename from programming/library/libdispatch/libdispatch/files/avoid-libkqueue.patch
rename to programming/library/libdispatch/files/avoid-libkqueue.patch
diff --git a/programming/library/libdispatch/libdispatch/files/remove-werror.patch b/programming/library/libdispatch/files/remove-werror.patch
similarity index 100%
rename from programming/library/libdispatch/libdispatch/files/remove-werror.patch
rename to programming/library/libdispatch/files/remove-werror.patch
diff --git a/programming/library/libdispatch/libdispatch/pspec.xml b/programming/library/libdispatch/pspec.xml
similarity index 100%
rename from programming/library/libdispatch/libdispatch/pspec.xml
rename to programming/library/libdispatch/pspec.xml
diff --git a/programming/misc/libnotify/pspec.xml b/programming/misc/libnotify/pspec.xml
index 78dc1fedd3..b94803dc89 100644
--- a/programming/misc/libnotify/pspec.xml
+++ b/programming/misc/libnotify/pspec.xml
@@ -9,7 +9,7 @@
             <Email>admins@pisilinux.org</Email>
         </Packager>
         <License>GPLv2</License>
-        <PartOf>programming.language.misc</PartOf>
+        <PartOf>programming.misc</PartOf>
         <IsA>library</IsA>
         <Summary>Desktop notification library</Summary>
         <Description>libnotify sends desktop notifications to a notification daemon.</Description>
diff --git a/util/misc/patchutils/patchutils/actions.py b/util/misc/patchutils/actions.py
similarity index 100%
rename from util/misc/patchutils/patchutils/actions.py
rename to util/misc/patchutils/actions.py
diff --git a/util/misc/patchutils/component.xml b/util/misc/patchutils/component.xml
deleted file mode 100644
index cf1d9634a0..0000000000
--- a/util/misc/patchutils/component.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<PISI>
-    <Name>util.misc.patchutils</Name>
-</PISI>
diff --git a/util/misc/patchutils/patchutils/pspec.xml b/util/misc/patchutils/pspec.xml
similarity index 100%
rename from util/misc/patchutils/patchutils/pspec.xml
rename to util/misc/patchutils/pspec.xml
diff --git a/util/misc/patchutils/patchutils/translations.xml b/util/misc/patchutils/translations.xml
similarity index 100%
rename from util/misc/patchutils/patchutils/translations.xml
rename to util/misc/patchutils/translations.xml
diff --git a/x11/misc/bumblebee/pspec.xml b/x11/misc/bumblebee/pspec.xml
index 2c1080e331..01521ac3ee 100644
--- a/x11/misc/bumblebee/pspec.xml
+++ b/x11/misc/bumblebee/pspec.xml
@@ -7,7 +7,7 @@
             <Email>idriskalp@gmail.com</Email> 
         </Packager>
         <License>GPLv3</License>
-        <PartOf>kernel.default.drivers</PartOf>
+        <PartOf>kernel.drivers</PartOf>
         <IsA>app:gui</IsA>
         <Summary>a project aiming to support NVIDIA Optimus technology under Linux.</Summary>
         <Description>The Bumblebee Project proudly presents version 3.0 of Bumblebee, a project aiming to support NVIDIA Optimus technology under Linux. After two months of hard work this version has finally been considered stable enough for release.</Description>