diff --git a/SysBuild/BuildCluster/BaseLibs.dmk b/SysBuild/BuildCluster/BaseLibs.dmk
index 6c37279..0b5f46e 100644
--- a/SysBuild/BuildCluster/BaseLibs.dmk
+++ b/SysBuild/BuildCluster/BaseLibs.dmk
@@ -6,29 +6,29 @@
 0       tools/libxslt
 0       tools/libsigc++
 0       tools/parted
-0       tools/libmad
-0       tools/libid3tag
-0       tools/taglib
+0       multimedia/libmad
+0       multimedia/libid3tag
+0       multimedia/taglib
 0       tools/fam
-0       tools/libnet
+0       network/libnet
 0       tools/svgalib
-0       tools/openssl
+0       security/openssl
 0       tools/pcre
-0       tools/alsa-lib
+0       multimedia/alsa-lib
 1       tools/bluez-libs
-0       tools/libsidplay
+0       multimedia/libsidplay
 0       tools/libraw1394
 0       tools/libavc1394
 0       tools/libiec61883
-0       tools/libsamplerate
-0       tools/libao
-0       tools/libogg
-0       tools/libvorbis
+0       multimedia/libsamplerate
+0       multimedia/libao
+0       multimedia/libogg
+0       multimedia/libvorbis
 0       tools/libiconv
-0       tools/id3lib
-0       tools/libidn
-0       tools/libgpg-error
-0       tools/libgcrypt
+0       multimedia/id3lib
+0       network/libidn
+0       security/libgpg-error
+0       security/libgcrypt
 0       tools/libsmi
 0       tools/lzo
 0       tools/libghttp
@@ -37,16 +37,16 @@
 0       tools/libmng
 0       tools/glib-2
 0       tools/libIDL
-0       xsys/libmpeg3
-0       tools/libfame
-0       tools/libdvdcss
+0       multimedia/libmpeg3
+0       multimedia/libfame
+0       multimedia/libdvdcss
 0       tools/libcdio
 0       xsys/dist99
 0       tools/libart_lgpl
-0       xsys/libcroco
+0       tools/libcroco
 0       tools/libexif
-0       tools/libdvdread
-0       xsys/liboil
+0       multimedia/libdvdread
+0       tools/liboil
 #brauch cmake damits lefft
 #0       tools/libmusicbrainz
 #Keine Abhängigkeiten finden können
diff --git a/SysBuild/tools/alsa-lib b/SysBuild/multimedia/alsa-lib
similarity index 100%
rename from SysBuild/tools/alsa-lib
rename to SysBuild/multimedia/alsa-lib
diff --git a/SysBuild/tools/id3lib b/SysBuild/multimedia/id3lib
similarity index 100%
rename from SysBuild/tools/id3lib
rename to SysBuild/multimedia/id3lib
diff --git a/SysBuild/tools/libao b/SysBuild/multimedia/libao
similarity index 100%
rename from SysBuild/tools/libao
rename to SysBuild/multimedia/libao
diff --git a/SysBuild/tools/libdvdcss b/SysBuild/multimedia/libdvdcss
similarity index 100%
rename from SysBuild/tools/libdvdcss
rename to SysBuild/multimedia/libdvdcss
diff --git a/SysBuild/tools/libdvdread b/SysBuild/multimedia/libdvdread
similarity index 100%
rename from SysBuild/tools/libdvdread
rename to SysBuild/multimedia/libdvdread
diff --git a/SysBuild/tools/libfame b/SysBuild/multimedia/libfame
similarity index 100%
rename from SysBuild/tools/libfame
rename to SysBuild/multimedia/libfame
diff --git a/SysBuild/tools/libid3tag b/SysBuild/multimedia/libid3tag
similarity index 100%
rename from SysBuild/tools/libid3tag
rename to SysBuild/multimedia/libid3tag
diff --git a/SysBuild/tools/libmad b/SysBuild/multimedia/libmad
similarity index 100%
rename from SysBuild/tools/libmad
rename to SysBuild/multimedia/libmad
diff --git a/SysBuild/xsys/libmpeg3 b/SysBuild/multimedia/libmpeg3
similarity index 100%
rename from SysBuild/xsys/libmpeg3
rename to SysBuild/multimedia/libmpeg3
diff --git a/SysBuild/tools/libogg b/SysBuild/multimedia/libogg
similarity index 100%
rename from SysBuild/tools/libogg
rename to SysBuild/multimedia/libogg
diff --git a/SysBuild/tools/libsamplerate b/SysBuild/multimedia/libsamplerate
similarity index 100%
rename from SysBuild/tools/libsamplerate
rename to SysBuild/multimedia/libsamplerate
diff --git a/SysBuild/tools/libsidplay b/SysBuild/multimedia/libsidplay
similarity index 100%
rename from SysBuild/tools/libsidplay
rename to SysBuild/multimedia/libsidplay
diff --git a/SysBuild/tools/libvorbis b/SysBuild/multimedia/libvorbis
similarity index 100%
rename from SysBuild/tools/libvorbis
rename to SysBuild/multimedia/libvorbis
diff --git a/SysBuild/tools/taglib b/SysBuild/multimedia/taglib
similarity index 100%
rename from SysBuild/tools/taglib
rename to SysBuild/multimedia/taglib
diff --git a/SysBuild/tools/libidn b/SysBuild/network/libidn
similarity index 100%
rename from SysBuild/tools/libidn
rename to SysBuild/network/libidn
diff --git a/SysBuild/tools/libnet b/SysBuild/network/libnet
similarity index 100%
rename from SysBuild/tools/libnet
rename to SysBuild/network/libnet
diff --git a/SysBuild/tools/libgcrypt b/SysBuild/security/libgcrypt
similarity index 100%
rename from SysBuild/tools/libgcrypt
rename to SysBuild/security/libgcrypt
diff --git a/SysBuild/tools/libgpg-error b/SysBuild/security/libgpg-error
similarity index 100%
rename from SysBuild/tools/libgpg-error
rename to SysBuild/security/libgpg-error
diff --git a/SysBuild/tools/openssl b/SysBuild/security/openssl
similarity index 100%
rename from SysBuild/tools/openssl
rename to SysBuild/security/openssl
diff --git a/SysBuild/xsys/libcroco b/SysBuild/tools/libcroco
similarity index 100%
rename from SysBuild/xsys/libcroco
rename to SysBuild/tools/libcroco
diff --git a/SysBuild/xsys/liboil b/SysBuild/tools/liboil
similarity index 100%
rename from SysBuild/xsys/liboil
rename to SysBuild/tools/liboil