diff --git a/src/modules/getid3/bin/autogen.sh b/3rd_party/getid3/bin/autogen.sh
similarity index 100%
rename from src/modules/getid3/bin/autogen.sh
rename to 3rd_party/getid3/bin/autogen.sh
diff --git a/src/modules/getid3/configure b/3rd_party/getid3/configure
similarity index 100%
rename from src/modules/getid3/configure
rename to 3rd_party/getid3/configure
diff --git a/src/modules/getid3/etc/Makefile.in b/3rd_party/getid3/etc/Makefile.in
similarity index 100%
rename from src/modules/getid3/etc/Makefile.in
rename to 3rd_party/getid3/etc/Makefile.in
diff --git a/src/modules/getid3/etc/configure.ac b/3rd_party/getid3/etc/configure.ac
similarity index 100%
rename from src/modules/getid3/etc/configure.ac
rename to 3rd_party/getid3/etc/configure.ac
diff --git a/src/modules/getid3/etc/doxygen.config b/3rd_party/getid3/etc/doxygen.config
similarity index 100%
rename from src/modules/getid3/etc/doxygen.config
rename to 3rd_party/getid3/etc/doxygen.config
diff --git a/src/modules/getid3/tmp/.keepme b/3rd_party/getid3/tmp/.keepme
similarity index 100%
rename from src/modules/getid3/tmp/.keepme
rename to 3rd_party/getid3/tmp/.keepme
diff --git a/src/modules/getid3/var/extension.cache.dbm.php b/3rd_party/getid3/var/extension.cache.dbm.php
similarity index 100%
rename from src/modules/getid3/var/extension.cache.dbm.php
rename to 3rd_party/getid3/var/extension.cache.dbm.php
diff --git a/src/modules/getid3/var/extension.cache.mysql.php b/3rd_party/getid3/var/extension.cache.mysql.php
similarity index 100%
rename from src/modules/getid3/var/extension.cache.mysql.php
rename to 3rd_party/getid3/var/extension.cache.mysql.php
diff --git a/src/modules/getid3/var/getid3.lib.php b/3rd_party/getid3/var/getid3.lib.php
similarity index 100%
rename from src/modules/getid3/var/getid3.lib.php
rename to 3rd_party/getid3/var/getid3.lib.php
diff --git a/src/modules/getid3/var/getid3.php b/3rd_party/getid3/var/getid3.php
similarity index 100%
rename from src/modules/getid3/var/getid3.php
rename to 3rd_party/getid3/var/getid3.php
diff --git a/src/modules/getid3/var/module.archive.gzip.php b/3rd_party/getid3/var/module.archive.gzip.php
similarity index 100%
rename from src/modules/getid3/var/module.archive.gzip.php
rename to 3rd_party/getid3/var/module.archive.gzip.php
diff --git a/src/modules/getid3/var/module.archive.rar.php b/3rd_party/getid3/var/module.archive.rar.php
similarity index 100%
rename from src/modules/getid3/var/module.archive.rar.php
rename to 3rd_party/getid3/var/module.archive.rar.php
diff --git a/src/modules/getid3/var/module.archive.szip.php b/3rd_party/getid3/var/module.archive.szip.php
similarity index 100%
rename from src/modules/getid3/var/module.archive.szip.php
rename to 3rd_party/getid3/var/module.archive.szip.php
diff --git a/src/modules/getid3/var/module.archive.tar.php b/3rd_party/getid3/var/module.archive.tar.php
similarity index 100%
rename from src/modules/getid3/var/module.archive.tar.php
rename to 3rd_party/getid3/var/module.archive.tar.php
diff --git a/src/modules/getid3/var/module.archive.zip.php b/3rd_party/getid3/var/module.archive.zip.php
similarity index 100%
rename from src/modules/getid3/var/module.archive.zip.php
rename to 3rd_party/getid3/var/module.archive.zip.php
diff --git a/src/modules/getid3/var/module.audio-video.asf.php b/3rd_party/getid3/var/module.audio-video.asf.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.asf.php
rename to 3rd_party/getid3/var/module.audio-video.asf.php
diff --git a/src/modules/getid3/var/module.audio-video.bink.php b/3rd_party/getid3/var/module.audio-video.bink.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.bink.php
rename to 3rd_party/getid3/var/module.audio-video.bink.php
diff --git a/src/modules/getid3/var/module.audio-video.flv.php b/3rd_party/getid3/var/module.audio-video.flv.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.flv.php
rename to 3rd_party/getid3/var/module.audio-video.flv.php
diff --git a/src/modules/getid3/var/module.audio-video.matroska.php b/3rd_party/getid3/var/module.audio-video.matroska.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.matroska.php
rename to 3rd_party/getid3/var/module.audio-video.matroska.php
diff --git a/src/modules/getid3/var/module.audio-video.mpeg.php b/3rd_party/getid3/var/module.audio-video.mpeg.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.mpeg.php
rename to 3rd_party/getid3/var/module.audio-video.mpeg.php
diff --git a/src/modules/getid3/var/module.audio-video.nsv.php b/3rd_party/getid3/var/module.audio-video.nsv.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.nsv.php
rename to 3rd_party/getid3/var/module.audio-video.nsv.php
diff --git a/src/modules/getid3/var/module.audio-video.quicktime.php b/3rd_party/getid3/var/module.audio-video.quicktime.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.quicktime.php
rename to 3rd_party/getid3/var/module.audio-video.quicktime.php
diff --git a/src/modules/getid3/var/module.audio-video.real.php b/3rd_party/getid3/var/module.audio-video.real.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.real.php
rename to 3rd_party/getid3/var/module.audio-video.real.php
diff --git a/src/modules/getid3/var/module.audio-video.riff.php b/3rd_party/getid3/var/module.audio-video.riff.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.riff.php
rename to 3rd_party/getid3/var/module.audio-video.riff.php
diff --git a/src/modules/getid3/var/module.audio-video.swf.php b/3rd_party/getid3/var/module.audio-video.swf.php
similarity index 100%
rename from src/modules/getid3/var/module.audio-video.swf.php
rename to 3rd_party/getid3/var/module.audio-video.swf.php
diff --git a/src/modules/getid3/var/module.audio.aac.php b/3rd_party/getid3/var/module.audio.aac.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.aac.php
rename to 3rd_party/getid3/var/module.audio.aac.php
diff --git a/src/modules/getid3/var/module.audio.ac3.php b/3rd_party/getid3/var/module.audio.ac3.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.ac3.php
rename to 3rd_party/getid3/var/module.audio.ac3.php
diff --git a/src/modules/getid3/var/module.audio.au.php b/3rd_party/getid3/var/module.audio.au.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.au.php
rename to 3rd_party/getid3/var/module.audio.au.php
diff --git a/src/modules/getid3/var/module.audio.avr.php b/3rd_party/getid3/var/module.audio.avr.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.avr.php
rename to 3rd_party/getid3/var/module.audio.avr.php
diff --git a/src/modules/getid3/var/module.audio.bonk.php b/3rd_party/getid3/var/module.audio.bonk.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.bonk.php
rename to 3rd_party/getid3/var/module.audio.bonk.php
diff --git a/src/modules/getid3/var/module.audio.dss.php b/3rd_party/getid3/var/module.audio.dss.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.dss.php
rename to 3rd_party/getid3/var/module.audio.dss.php
diff --git a/src/modules/getid3/var/module.audio.dts.php b/3rd_party/getid3/var/module.audio.dts.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.dts.php
rename to 3rd_party/getid3/var/module.audio.dts.php
diff --git a/src/modules/getid3/var/module.audio.flac.php b/3rd_party/getid3/var/module.audio.flac.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.flac.php
rename to 3rd_party/getid3/var/module.audio.flac.php
diff --git a/src/modules/getid3/var/module.audio.la.php b/3rd_party/getid3/var/module.audio.la.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.la.php
rename to 3rd_party/getid3/var/module.audio.la.php
diff --git a/src/modules/getid3/var/module.audio.lpac.php b/3rd_party/getid3/var/module.audio.lpac.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.lpac.php
rename to 3rd_party/getid3/var/module.audio.lpac.php
diff --git a/src/modules/getid3/var/module.audio.midi.php b/3rd_party/getid3/var/module.audio.midi.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.midi.php
rename to 3rd_party/getid3/var/module.audio.midi.php
diff --git a/src/modules/getid3/var/module.audio.mod.php b/3rd_party/getid3/var/module.audio.mod.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.mod.php
rename to 3rd_party/getid3/var/module.audio.mod.php
diff --git a/src/modules/getid3/var/module.audio.monkey.php b/3rd_party/getid3/var/module.audio.monkey.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.monkey.php
rename to 3rd_party/getid3/var/module.audio.monkey.php
diff --git a/src/modules/getid3/var/module.audio.mp3.php b/3rd_party/getid3/var/module.audio.mp3.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.mp3.php
rename to 3rd_party/getid3/var/module.audio.mp3.php
diff --git a/src/modules/getid3/var/module.audio.mpc.php b/3rd_party/getid3/var/module.audio.mpc.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.mpc.php
rename to 3rd_party/getid3/var/module.audio.mpc.php
diff --git a/src/modules/getid3/var/module.audio.ogg.php b/3rd_party/getid3/var/module.audio.ogg.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.ogg.php
rename to 3rd_party/getid3/var/module.audio.ogg.php
diff --git a/src/modules/getid3/var/module.audio.optimfrog.php b/3rd_party/getid3/var/module.audio.optimfrog.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.optimfrog.php
rename to 3rd_party/getid3/var/module.audio.optimfrog.php
diff --git a/src/modules/getid3/var/module.audio.rkau.php b/3rd_party/getid3/var/module.audio.rkau.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.rkau.php
rename to 3rd_party/getid3/var/module.audio.rkau.php
diff --git a/src/modules/getid3/var/module.audio.shorten.php b/3rd_party/getid3/var/module.audio.shorten.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.shorten.php
rename to 3rd_party/getid3/var/module.audio.shorten.php
diff --git a/src/modules/getid3/var/module.audio.tta.php b/3rd_party/getid3/var/module.audio.tta.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.tta.php
rename to 3rd_party/getid3/var/module.audio.tta.php
diff --git a/src/modules/getid3/var/module.audio.voc.php b/3rd_party/getid3/var/module.audio.voc.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.voc.php
rename to 3rd_party/getid3/var/module.audio.voc.php
diff --git a/src/modules/getid3/var/module.audio.vqf.php b/3rd_party/getid3/var/module.audio.vqf.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.vqf.php
rename to 3rd_party/getid3/var/module.audio.vqf.php
diff --git a/src/modules/getid3/var/module.audio.wavpack.php b/3rd_party/getid3/var/module.audio.wavpack.php
similarity index 100%
rename from src/modules/getid3/var/module.audio.wavpack.php
rename to 3rd_party/getid3/var/module.audio.wavpack.php
diff --git a/src/modules/getid3/var/module.graphic.bmp.php b/3rd_party/getid3/var/module.graphic.bmp.php
similarity index 100%
rename from src/modules/getid3/var/module.graphic.bmp.php
rename to 3rd_party/getid3/var/module.graphic.bmp.php
diff --git a/src/modules/getid3/var/module.graphic.gif.php b/3rd_party/getid3/var/module.graphic.gif.php
similarity index 100%
rename from src/modules/getid3/var/module.graphic.gif.php
rename to 3rd_party/getid3/var/module.graphic.gif.php
diff --git a/src/modules/getid3/var/module.graphic.jpg.php b/3rd_party/getid3/var/module.graphic.jpg.php
similarity index 100%
rename from src/modules/getid3/var/module.graphic.jpg.php
rename to 3rd_party/getid3/var/module.graphic.jpg.php
diff --git a/src/modules/getid3/var/module.graphic.pcd.php b/3rd_party/getid3/var/module.graphic.pcd.php
similarity index 100%
rename from src/modules/getid3/var/module.graphic.pcd.php
rename to 3rd_party/getid3/var/module.graphic.pcd.php
diff --git a/src/modules/getid3/var/module.graphic.png.php b/3rd_party/getid3/var/module.graphic.png.php
similarity index 100%
rename from src/modules/getid3/var/module.graphic.png.php
rename to 3rd_party/getid3/var/module.graphic.png.php
diff --git a/src/modules/getid3/var/module.graphic.svg.php b/3rd_party/getid3/var/module.graphic.svg.php
similarity index 100%
rename from src/modules/getid3/var/module.graphic.svg.php
rename to 3rd_party/getid3/var/module.graphic.svg.php
diff --git a/src/modules/getid3/var/module.graphic.tiff.php b/3rd_party/getid3/var/module.graphic.tiff.php
similarity index 100%
rename from src/modules/getid3/var/module.graphic.tiff.php
rename to 3rd_party/getid3/var/module.graphic.tiff.php
diff --git a/src/modules/getid3/var/module.misc.doc.php b/3rd_party/getid3/var/module.misc.doc.php
similarity index 100%
rename from src/modules/getid3/var/module.misc.doc.php
rename to 3rd_party/getid3/var/module.misc.doc.php
diff --git a/src/modules/getid3/var/module.misc.exe.php b/3rd_party/getid3/var/module.misc.exe.php
similarity index 100%
rename from src/modules/getid3/var/module.misc.exe.php
rename to 3rd_party/getid3/var/module.misc.exe.php
diff --git a/src/modules/getid3/var/module.misc.iso.php b/3rd_party/getid3/var/module.misc.iso.php
similarity index 100%
rename from src/modules/getid3/var/module.misc.iso.php
rename to 3rd_party/getid3/var/module.misc.iso.php
diff --git a/src/modules/getid3/var/module.misc.msoffice.php b/3rd_party/getid3/var/module.misc.msoffice.php
similarity index 100%
rename from src/modules/getid3/var/module.misc.msoffice.php
rename to 3rd_party/getid3/var/module.misc.msoffice.php
diff --git a/src/modules/getid3/var/module.misc.par2.php b/3rd_party/getid3/var/module.misc.par2.php
similarity index 100%
rename from src/modules/getid3/var/module.misc.par2.php
rename to 3rd_party/getid3/var/module.misc.par2.php
diff --git a/src/modules/getid3/var/module.misc.pdf.php b/3rd_party/getid3/var/module.misc.pdf.php
similarity index 100%
rename from src/modules/getid3/var/module.misc.pdf.php
rename to 3rd_party/getid3/var/module.misc.pdf.php
diff --git a/src/modules/getid3/var/module.tag.apetag.php b/3rd_party/getid3/var/module.tag.apetag.php
similarity index 100%
rename from src/modules/getid3/var/module.tag.apetag.php
rename to 3rd_party/getid3/var/module.tag.apetag.php
diff --git a/src/modules/getid3/var/module.tag.id3v1.php b/3rd_party/getid3/var/module.tag.id3v1.php
similarity index 100%
rename from src/modules/getid3/var/module.tag.id3v1.php
rename to 3rd_party/getid3/var/module.tag.id3v1.php
diff --git a/src/modules/getid3/var/module.tag.id3v2.php b/3rd_party/getid3/var/module.tag.id3v2.php
similarity index 100%
rename from src/modules/getid3/var/module.tag.id3v2.php
rename to 3rd_party/getid3/var/module.tag.id3v2.php
diff --git a/src/modules/getid3/var/module.tag.lyrics3.php b/3rd_party/getid3/var/module.tag.lyrics3.php
similarity index 100%
rename from src/modules/getid3/var/module.tag.lyrics3.php
rename to 3rd_party/getid3/var/module.tag.lyrics3.php
diff --git a/src/modules/getid3/var/write.apetag.php b/3rd_party/getid3/var/write.apetag.php
similarity index 100%
rename from src/modules/getid3/var/write.apetag.php
rename to 3rd_party/getid3/var/write.apetag.php
diff --git a/src/modules/getid3/var/write.id3v1.php b/3rd_party/getid3/var/write.id3v1.php
similarity index 100%
rename from src/modules/getid3/var/write.id3v1.php
rename to 3rd_party/getid3/var/write.id3v1.php
diff --git a/src/modules/getid3/var/write.id3v2.php b/3rd_party/getid3/var/write.id3v2.php
similarity index 100%
rename from src/modules/getid3/var/write.id3v2.php
rename to 3rd_party/getid3/var/write.id3v2.php
diff --git a/src/modules/getid3/var/write.lyrics3.php b/3rd_party/getid3/var/write.lyrics3.php
similarity index 100%
rename from src/modules/getid3/var/write.lyrics3.php
rename to 3rd_party/getid3/var/write.lyrics3.php
diff --git a/src/modules/getid3/var/write.metaflac.php b/3rd_party/getid3/var/write.metaflac.php
similarity index 100%
rename from src/modules/getid3/var/write.metaflac.php
rename to 3rd_party/getid3/var/write.metaflac.php
diff --git a/src/modules/getid3/var/write.php b/3rd_party/getid3/var/write.php
similarity index 100%
rename from src/modules/getid3/var/write.php
rename to 3rd_party/getid3/var/write.php
diff --git a/src/modules/getid3/var/write.real.php b/3rd_party/getid3/var/write.real.php
similarity index 100%
rename from src/modules/getid3/var/write.real.php
rename to 3rd_party/getid3/var/write.real.php
diff --git a/src/modules/getid3/var/write.vorbiscomment.php b/3rd_party/getid3/var/write.vorbiscomment.php
similarity index 100%
rename from src/modules/getid3/var/write.vorbiscomment.php
rename to 3rd_party/getid3/var/write.vorbiscomment.php
diff --git a/src/tools/pear/bin/autogen.sh b/3rd_party/php/pear/bin/autogen.sh
similarity index 100%
rename from src/tools/pear/bin/autogen.sh
rename to 3rd_party/php/pear/bin/autogen.sh
diff --git a/src/tools/pear/bin/install.sh b/3rd_party/php/pear/bin/install.sh
similarity index 100%
rename from src/tools/pear/bin/install.sh
rename to 3rd_party/php/pear/bin/install.sh
diff --git a/src/modules/storageServer/configure b/3rd_party/php/pear/configure
similarity index 100%
rename from src/modules/storageServer/configure
rename to 3rd_party/php/pear/configure
diff --git a/src/tools/pear/etc/Makefile.in b/3rd_party/php/pear/etc/Makefile.in
similarity index 100%
rename from src/tools/pear/etc/Makefile.in
rename to 3rd_party/php/pear/etc/Makefile.in
diff --git a/src/tools/pear/etc/configure.ac b/3rd_party/php/pear/etc/configure.ac
similarity index 100%
rename from src/tools/pear/etc/configure.ac
rename to 3rd_party/php/pear/etc/configure.ac
diff --git a/src/tools/pear/etc/pear.conf.template b/3rd_party/php/pear/etc/pear.conf.template
similarity index 100%
rename from src/tools/pear/etc/pear.conf.template
rename to 3rd_party/php/pear/etc/pear.conf.template
diff --git a/src/tools/pear/src/Archive/Tar.php b/3rd_party/php/pear/src/Archive/Tar.php
similarity index 100%
rename from src/tools/pear/src/Archive/Tar.php
rename to 3rd_party/php/pear/src/Archive/Tar.php
diff --git a/src/tools/pear/src/Calendar/Calendar.php b/3rd_party/php/pear/src/Calendar/Calendar.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Calendar.php
rename to 3rd_party/php/pear/src/Calendar/Calendar.php
diff --git a/src/tools/pear/src/Calendar/Day.php b/3rd_party/php/pear/src/Calendar/Day.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Day.php
rename to 3rd_party/php/pear/src/Calendar/Day.php
diff --git a/src/tools/pear/src/Calendar/Decorator.php b/3rd_party/php/pear/src/Calendar/Decorator.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Decorator.php
rename to 3rd_party/php/pear/src/Calendar/Decorator.php
diff --git a/src/tools/pear/src/Calendar/Decorator/Textual.php b/3rd_party/php/pear/src/Calendar/Decorator/Textual.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Decorator/Textual.php
rename to 3rd_party/php/pear/src/Calendar/Decorator/Textual.php
diff --git a/src/tools/pear/src/Calendar/Decorator/Uri.php b/3rd_party/php/pear/src/Calendar/Decorator/Uri.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Decorator/Uri.php
rename to 3rd_party/php/pear/src/Calendar/Decorator/Uri.php
diff --git a/src/tools/pear/src/Calendar/Decorator/Weekday.php b/3rd_party/php/pear/src/Calendar/Decorator/Weekday.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Decorator/Weekday.php
rename to 3rd_party/php/pear/src/Calendar/Decorator/Weekday.php
diff --git a/src/tools/pear/src/Calendar/Decorator/Wrapper.php b/3rd_party/php/pear/src/Calendar/Decorator/Wrapper.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Decorator/Wrapper.php
rename to 3rd_party/php/pear/src/Calendar/Decorator/Wrapper.php
diff --git a/src/tools/pear/src/Calendar/Engine/Interface.php b/3rd_party/php/pear/src/Calendar/Engine/Interface.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Engine/Interface.php
rename to 3rd_party/php/pear/src/Calendar/Engine/Interface.php
diff --git a/src/tools/pear/src/Calendar/Engine/PearDate.php b/3rd_party/php/pear/src/Calendar/Engine/PearDate.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Engine/PearDate.php
rename to 3rd_party/php/pear/src/Calendar/Engine/PearDate.php
diff --git a/src/tools/pear/src/Calendar/Engine/UnixTS.php b/3rd_party/php/pear/src/Calendar/Engine/UnixTS.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Engine/UnixTS.php
rename to 3rd_party/php/pear/src/Calendar/Engine/UnixTS.php
diff --git a/src/tools/pear/src/Calendar/Factory.php b/3rd_party/php/pear/src/Calendar/Factory.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Factory.php
rename to 3rd_party/php/pear/src/Calendar/Factory.php
diff --git a/src/tools/pear/src/Calendar/Hour.php b/3rd_party/php/pear/src/Calendar/Hour.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Hour.php
rename to 3rd_party/php/pear/src/Calendar/Hour.php
diff --git a/src/tools/pear/src/Calendar/Minute.php b/3rd_party/php/pear/src/Calendar/Minute.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Minute.php
rename to 3rd_party/php/pear/src/Calendar/Minute.php
diff --git a/src/tools/pear/src/Calendar/Month.php b/3rd_party/php/pear/src/Calendar/Month.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Month.php
rename to 3rd_party/php/pear/src/Calendar/Month.php
diff --git a/src/tools/pear/src/Calendar/Month/Weekdays.php b/3rd_party/php/pear/src/Calendar/Month/Weekdays.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Month/Weekdays.php
rename to 3rd_party/php/pear/src/Calendar/Month/Weekdays.php
diff --git a/src/tools/pear/src/Calendar/Month/Weeks.php b/3rd_party/php/pear/src/Calendar/Month/Weeks.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Month/Weeks.php
rename to 3rd_party/php/pear/src/Calendar/Month/Weeks.php
diff --git a/src/tools/pear/src/Calendar/Second.php b/3rd_party/php/pear/src/Calendar/Second.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Second.php
rename to 3rd_party/php/pear/src/Calendar/Second.php
diff --git a/src/tools/pear/src/Calendar/Table/Helper.php b/3rd_party/php/pear/src/Calendar/Table/Helper.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Table/Helper.php
rename to 3rd_party/php/pear/src/Calendar/Table/Helper.php
diff --git a/src/tools/pear/src/Calendar/Util/Textual.php b/3rd_party/php/pear/src/Calendar/Util/Textual.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Util/Textual.php
rename to 3rd_party/php/pear/src/Calendar/Util/Textual.php
diff --git a/src/tools/pear/src/Calendar/Util/Uri.php b/3rd_party/php/pear/src/Calendar/Util/Uri.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Util/Uri.php
rename to 3rd_party/php/pear/src/Calendar/Util/Uri.php
diff --git a/src/tools/pear/src/Calendar/Validator.php b/3rd_party/php/pear/src/Calendar/Validator.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Validator.php
rename to 3rd_party/php/pear/src/Calendar/Validator.php
diff --git a/src/tools/pear/src/Calendar/Week.php b/3rd_party/php/pear/src/Calendar/Week.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Week.php
rename to 3rd_party/php/pear/src/Calendar/Week.php
diff --git a/src/tools/pear/src/Calendar/Year.php b/3rd_party/php/pear/src/Calendar/Year.php
similarity index 100%
rename from src/tools/pear/src/Calendar/Year.php
rename to 3rd_party/php/pear/src/Calendar/Year.php
diff --git a/src/tools/pear/src/Calendar/docs/Readme b/3rd_party/php/pear/src/Calendar/docs/Readme
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/Readme
rename to 3rd_party/php/pear/src/Calendar/docs/Readme
diff --git a/src/tools/pear/src/Calendar/docs/examples/1.php b/3rd_party/php/pear/src/Calendar/docs/examples/1.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/1.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/1.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/1.phps b/3rd_party/php/pear/src/Calendar/docs/examples/1.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/1.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/1.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/10.php b/3rd_party/php/pear/src/Calendar/docs/examples/10.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/10.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/10.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/10.phps b/3rd_party/php/pear/src/Calendar/docs/examples/10.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/10.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/10.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/11.php b/3rd_party/php/pear/src/Calendar/docs/examples/11.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/11.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/11.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/11.phps b/3rd_party/php/pear/src/Calendar/docs/examples/11.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/11.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/11.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/12.php b/3rd_party/php/pear/src/Calendar/docs/examples/12.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/12.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/12.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/12.phps b/3rd_party/php/pear/src/Calendar/docs/examples/12.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/12.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/12.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/13.php b/3rd_party/php/pear/src/Calendar/docs/examples/13.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/13.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/13.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/13.phps b/3rd_party/php/pear/src/Calendar/docs/examples/13.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/13.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/13.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/14.php b/3rd_party/php/pear/src/Calendar/docs/examples/14.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/14.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/14.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/14.phps b/3rd_party/php/pear/src/Calendar/docs/examples/14.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/14.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/14.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/15.php b/3rd_party/php/pear/src/Calendar/docs/examples/15.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/15.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/15.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/15.phps b/3rd_party/php/pear/src/Calendar/docs/examples/15.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/15.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/15.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/16.php b/3rd_party/php/pear/src/Calendar/docs/examples/16.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/16.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/16.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/16.phps b/3rd_party/php/pear/src/Calendar/docs/examples/16.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/16.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/16.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/17.php b/3rd_party/php/pear/src/Calendar/docs/examples/17.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/17.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/17.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/17.phps b/3rd_party/php/pear/src/Calendar/docs/examples/17.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/17.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/17.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/18.php b/3rd_party/php/pear/src/Calendar/docs/examples/18.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/18.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/18.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/18.phps b/3rd_party/php/pear/src/Calendar/docs/examples/18.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/18.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/18.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/19.php b/3rd_party/php/pear/src/Calendar/docs/examples/19.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/19.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/19.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/19.phps b/3rd_party/php/pear/src/Calendar/docs/examples/19.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/19.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/19.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/2.php b/3rd_party/php/pear/src/Calendar/docs/examples/2.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/2.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/2.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/2.phps b/3rd_party/php/pear/src/Calendar/docs/examples/2.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/2.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/2.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/20.php b/3rd_party/php/pear/src/Calendar/docs/examples/20.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/20.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/20.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/20.phps b/3rd_party/php/pear/src/Calendar/docs/examples/20.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/20.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/20.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/21.php b/3rd_party/php/pear/src/Calendar/docs/examples/21.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/21.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/21.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/21.phps b/3rd_party/php/pear/src/Calendar/docs/examples/21.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/21.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/21.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/22.php b/3rd_party/php/pear/src/Calendar/docs/examples/22.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/22.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/22.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/22.phps b/3rd_party/php/pear/src/Calendar/docs/examples/22.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/22.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/22.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/23.php b/3rd_party/php/pear/src/Calendar/docs/examples/23.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/23.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/23.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/23.phps b/3rd_party/php/pear/src/Calendar/docs/examples/23.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/23.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/23.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/3.php b/3rd_party/php/pear/src/Calendar/docs/examples/3.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/3.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/3.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/3.phps b/3rd_party/php/pear/src/Calendar/docs/examples/3.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/3.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/3.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/4.php b/3rd_party/php/pear/src/Calendar/docs/examples/4.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/4.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/4.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/4.phps b/3rd_party/php/pear/src/Calendar/docs/examples/4.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/4.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/4.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/5.php b/3rd_party/php/pear/src/Calendar/docs/examples/5.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/5.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/5.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/5.phps b/3rd_party/php/pear/src/Calendar/docs/examples/5.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/5.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/5.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/6.php b/3rd_party/php/pear/src/Calendar/docs/examples/6.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/6.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/6.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/6.phps b/3rd_party/php/pear/src/Calendar/docs/examples/6.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/6.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/6.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/7.php b/3rd_party/php/pear/src/Calendar/docs/examples/7.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/7.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/7.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/7.phps b/3rd_party/php/pear/src/Calendar/docs/examples/7.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/7.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/7.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/8.php b/3rd_party/php/pear/src/Calendar/docs/examples/8.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/8.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/8.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/8.phps b/3rd_party/php/pear/src/Calendar/docs/examples/8.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/8.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/8.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/9.php b/3rd_party/php/pear/src/Calendar/docs/examples/9.php
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/9.php
rename to 3rd_party/php/pear/src/Calendar/docs/examples/9.php
diff --git a/src/tools/pear/src/Calendar/docs/examples/9.phps b/3rd_party/php/pear/src/Calendar/docs/examples/9.phps
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/9.phps
rename to 3rd_party/php/pear/src/Calendar/docs/examples/9.phps
diff --git a/src/tools/pear/src/Calendar/docs/examples/index.html b/3rd_party/php/pear/src/Calendar/docs/examples/index.html
similarity index 100%
rename from src/tools/pear/src/Calendar/docs/examples/index.html
rename to 3rd_party/php/pear/src/Calendar/docs/examples/index.html
diff --git a/src/tools/pear/src/Calendar/tests/README b/3rd_party/php/pear/src/Calendar/tests/README
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/README
rename to 3rd_party/php/pear/src/Calendar/tests/README
diff --git a/src/tools/pear/src/Calendar/tests/all_tests.php b/3rd_party/php/pear/src/Calendar/tests/all_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/all_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/all_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/calendar_engine_tests.php b/3rd_party/php/pear/src/Calendar/tests/calendar_engine_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/calendar_engine_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/calendar_engine_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/calendar_include.php b/3rd_party/php/pear/src/Calendar/tests/calendar_include.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/calendar_include.php
rename to 3rd_party/php/pear/src/Calendar/tests/calendar_include.php
diff --git a/src/tools/pear/src/Calendar/tests/calendar_tabular_tests.php b/3rd_party/php/pear/src/Calendar/tests/calendar_tabular_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/calendar_tabular_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/calendar_tabular_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/calendar_test.php b/3rd_party/php/pear/src/Calendar/tests/calendar_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/calendar_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/calendar_test.php
diff --git a/src/tools/pear/src/Calendar/tests/calendar_tests.php b/3rd_party/php/pear/src/Calendar/tests/calendar_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/calendar_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/calendar_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/day_test.php b/3rd_party/php/pear/src/Calendar/tests/day_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/day_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/day_test.php
diff --git a/src/tools/pear/src/Calendar/tests/decorator_test.php b/3rd_party/php/pear/src/Calendar/tests/decorator_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/decorator_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/decorator_test.php
diff --git a/src/tools/pear/src/Calendar/tests/decorator_tests.php b/3rd_party/php/pear/src/Calendar/tests/decorator_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/decorator_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/decorator_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/decorator_textual_test.php b/3rd_party/php/pear/src/Calendar/tests/decorator_textual_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/decorator_textual_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/decorator_textual_test.php
diff --git a/src/tools/pear/src/Calendar/tests/decorator_uri_test.php b/3rd_party/php/pear/src/Calendar/tests/decorator_uri_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/decorator_uri_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/decorator_uri_test.php
diff --git a/src/tools/pear/src/Calendar/tests/helper_test.php b/3rd_party/php/pear/src/Calendar/tests/helper_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/helper_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/helper_test.php
diff --git a/src/tools/pear/src/Calendar/tests/hour_test.php b/3rd_party/php/pear/src/Calendar/tests/hour_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/hour_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/hour_test.php
diff --git a/src/tools/pear/src/Calendar/tests/minute_test.php b/3rd_party/php/pear/src/Calendar/tests/minute_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/minute_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/minute_test.php
diff --git a/src/tools/pear/src/Calendar/tests/month_test.php b/3rd_party/php/pear/src/Calendar/tests/month_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/month_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/month_test.php
diff --git a/src/tools/pear/src/Calendar/tests/month_weekdays_test.php b/3rd_party/php/pear/src/Calendar/tests/month_weekdays_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/month_weekdays_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/month_weekdays_test.php
diff --git a/src/tools/pear/src/Calendar/tests/month_weeks_test.php b/3rd_party/php/pear/src/Calendar/tests/month_weeks_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/month_weeks_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/month_weeks_test.php
diff --git a/src/tools/pear/src/Calendar/tests/peardate_engine_test.php b/3rd_party/php/pear/src/Calendar/tests/peardate_engine_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/peardate_engine_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/peardate_engine_test.php
diff --git a/src/tools/pear/src/Calendar/tests/second_test.php b/3rd_party/php/pear/src/Calendar/tests/second_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/second_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/second_test.php
diff --git a/src/tools/pear/src/Calendar/tests/simple_include.php b/3rd_party/php/pear/src/Calendar/tests/simple_include.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/simple_include.php
rename to 3rd_party/php/pear/src/Calendar/tests/simple_include.php
diff --git a/src/tools/pear/src/Calendar/tests/table_helper_tests.php b/3rd_party/php/pear/src/Calendar/tests/table_helper_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/table_helper_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/table_helper_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/unixts_engine_test.php b/3rd_party/php/pear/src/Calendar/tests/unixts_engine_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/unixts_engine_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/unixts_engine_test.php
diff --git a/src/tools/pear/src/Calendar/tests/util_tests.php b/3rd_party/php/pear/src/Calendar/tests/util_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/util_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/util_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/util_textual_test.php b/3rd_party/php/pear/src/Calendar/tests/util_textual_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/util_textual_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/util_textual_test.php
diff --git a/src/tools/pear/src/Calendar/tests/util_uri_test.php b/3rd_party/php/pear/src/Calendar/tests/util_uri_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/util_uri_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/util_uri_test.php
diff --git a/src/tools/pear/src/Calendar/tests/validator_error_test.php b/3rd_party/php/pear/src/Calendar/tests/validator_error_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/validator_error_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/validator_error_test.php
diff --git a/src/tools/pear/src/Calendar/tests/validator_tests.php b/3rd_party/php/pear/src/Calendar/tests/validator_tests.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/validator_tests.php
rename to 3rd_party/php/pear/src/Calendar/tests/validator_tests.php
diff --git a/src/tools/pear/src/Calendar/tests/validator_unit_test.php b/3rd_party/php/pear/src/Calendar/tests/validator_unit_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/validator_unit_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/validator_unit_test.php
diff --git a/src/tools/pear/src/Calendar/tests/week_firstday_0_test.php b/3rd_party/php/pear/src/Calendar/tests/week_firstday_0_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/week_firstday_0_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/week_firstday_0_test.php
diff --git a/src/tools/pear/src/Calendar/tests/week_test.php b/3rd_party/php/pear/src/Calendar/tests/week_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/week_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/week_test.php
diff --git a/src/tools/pear/src/Calendar/tests/year_test.php b/3rd_party/php/pear/src/Calendar/tests/year_test.php
similarity index 100%
rename from src/tools/pear/src/Calendar/tests/year_test.php
rename to 3rd_party/php/pear/src/Calendar/tests/year_test.php
diff --git a/src/tools/pear/src/Console/Getopt.php b/3rd_party/php/pear/src/Console/Getopt.php
similarity index 100%
rename from src/tools/pear/src/Console/Getopt.php
rename to 3rd_party/php/pear/src/Console/Getopt.php
diff --git a/src/tools/pear/src/DB.php b/3rd_party/php/pear/src/DB.php
similarity index 100%
rename from src/tools/pear/src/DB.php
rename to 3rd_party/php/pear/src/DB.php
diff --git a/src/tools/pear/src/DB/common.php b/3rd_party/php/pear/src/DB/common.php
similarity index 100%
rename from src/tools/pear/src/DB/common.php
rename to 3rd_party/php/pear/src/DB/common.php
diff --git a/src/tools/pear/src/DB/dbase.php b/3rd_party/php/pear/src/DB/dbase.php
similarity index 100%
rename from src/tools/pear/src/DB/dbase.php
rename to 3rd_party/php/pear/src/DB/dbase.php
diff --git a/src/tools/pear/src/DB/fbsql.php b/3rd_party/php/pear/src/DB/fbsql.php
similarity index 100%
rename from src/tools/pear/src/DB/fbsql.php
rename to 3rd_party/php/pear/src/DB/fbsql.php
diff --git a/src/tools/pear/src/DB/ibase.php b/3rd_party/php/pear/src/DB/ibase.php
similarity index 100%
rename from src/tools/pear/src/DB/ibase.php
rename to 3rd_party/php/pear/src/DB/ibase.php
diff --git a/src/tools/pear/src/DB/ifx.php b/3rd_party/php/pear/src/DB/ifx.php
similarity index 100%
rename from src/tools/pear/src/DB/ifx.php
rename to 3rd_party/php/pear/src/DB/ifx.php
diff --git a/src/tools/pear/src/DB/msql.php b/3rd_party/php/pear/src/DB/msql.php
similarity index 100%
rename from src/tools/pear/src/DB/msql.php
rename to 3rd_party/php/pear/src/DB/msql.php
diff --git a/src/tools/pear/src/DB/mssql.php b/3rd_party/php/pear/src/DB/mssql.php
similarity index 100%
rename from src/tools/pear/src/DB/mssql.php
rename to 3rd_party/php/pear/src/DB/mssql.php
diff --git a/src/tools/pear/src/DB/mysql.php b/3rd_party/php/pear/src/DB/mysql.php
similarity index 100%
rename from src/tools/pear/src/DB/mysql.php
rename to 3rd_party/php/pear/src/DB/mysql.php
diff --git a/src/tools/pear/src/DB/mysqli.php b/3rd_party/php/pear/src/DB/mysqli.php
similarity index 100%
rename from src/tools/pear/src/DB/mysqli.php
rename to 3rd_party/php/pear/src/DB/mysqli.php
diff --git a/src/tools/pear/src/DB/oci8.php b/3rd_party/php/pear/src/DB/oci8.php
similarity index 100%
rename from src/tools/pear/src/DB/oci8.php
rename to 3rd_party/php/pear/src/DB/oci8.php
diff --git a/src/tools/pear/src/DB/odbc.php b/3rd_party/php/pear/src/DB/odbc.php
similarity index 100%
rename from src/tools/pear/src/DB/odbc.php
rename to 3rd_party/php/pear/src/DB/odbc.php
diff --git a/src/tools/pear/src/DB/pgsql.php b/3rd_party/php/pear/src/DB/pgsql.php
similarity index 100%
rename from src/tools/pear/src/DB/pgsql.php
rename to 3rd_party/php/pear/src/DB/pgsql.php
diff --git a/src/tools/pear/src/DB/sqlite.php b/3rd_party/php/pear/src/DB/sqlite.php
similarity index 100%
rename from src/tools/pear/src/DB/sqlite.php
rename to 3rd_party/php/pear/src/DB/sqlite.php
diff --git a/src/tools/pear/src/DB/storage.php b/3rd_party/php/pear/src/DB/storage.php
similarity index 100%
rename from src/tools/pear/src/DB/storage.php
rename to 3rd_party/php/pear/src/DB/storage.php
diff --git a/src/tools/pear/src/DB/sybase.php b/3rd_party/php/pear/src/DB/sybase.php
similarity index 100%
rename from src/tools/pear/src/DB/sybase.php
rename to 3rd_party/php/pear/src/DB/sybase.php
diff --git a/src/tools/pear/src/File.php b/3rd_party/php/pear/src/File.php
similarity index 100%
rename from src/tools/pear/src/File.php
rename to 3rd_party/php/pear/src/File.php
diff --git a/src/tools/pear/src/File/CSV.php b/3rd_party/php/pear/src/File/CSV.php
similarity index 100%
rename from src/tools/pear/src/File/CSV.php
rename to 3rd_party/php/pear/src/File/CSV.php
diff --git a/src/tools/pear/src/File/Find.php b/3rd_party/php/pear/src/File/Find.php
similarity index 100%
rename from src/tools/pear/src/File/Find.php
rename to 3rd_party/php/pear/src/File/Find.php
diff --git a/src/tools/pear/src/File/Util.php b/3rd_party/php/pear/src/File/Util.php
similarity index 100%
rename from src/tools/pear/src/File/Util.php
rename to 3rd_party/php/pear/src/File/Util.php
diff --git a/src/tools/pear/src/HTML/Common.php b/3rd_party/php/pear/src/HTML/Common.php
similarity index 100%
rename from src/tools/pear/src/HTML/Common.php
rename to 3rd_party/php/pear/src/HTML/Common.php
diff --git a/src/tools/pear/src/HTML/QuickForm.php b/3rd_party/php/pear/src/HTML/QuickForm.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm.php
rename to 3rd_party/php/pear/src/HTML/QuickForm.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/Array.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/Array.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/Array.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/Array.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/ArraySmarty.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ArraySmarty.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/ArraySmarty.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ArraySmarty.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/Default.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/Default.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/Default.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/Default.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/ITDynamic.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITDynamic.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/ITDynamic.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITDynamic.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/ITStatic.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITStatic.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/ITStatic.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITStatic.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/Object.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/Object.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/Object.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/Object.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/ObjectFlexy.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ObjectFlexy.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/ObjectFlexy.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ObjectFlexy.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Renderer/QuickHtml.php b/3rd_party/php/pear/src/HTML/QuickForm/Renderer/QuickHtml.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Renderer/QuickHtml.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Renderer/QuickHtml.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Rule.php b/3rd_party/php/pear/src/HTML/QuickForm/Rule.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Rule.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Rule.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Rule/Callback.php b/3rd_party/php/pear/src/HTML/QuickForm/Rule/Callback.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Rule/Callback.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Rule/Callback.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Rule/Compare.php b/3rd_party/php/pear/src/HTML/QuickForm/Rule/Compare.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Rule/Compare.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Rule/Compare.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Rule/Email.php b/3rd_party/php/pear/src/HTML/QuickForm/Rule/Email.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Rule/Email.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Rule/Email.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Rule/Range.php b/3rd_party/php/pear/src/HTML/QuickForm/Rule/Range.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Rule/Range.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Rule/Range.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Rule/Regex.php b/3rd_party/php/pear/src/HTML/QuickForm/Rule/Regex.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Rule/Regex.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Rule/Regex.php
diff --git a/src/tools/pear/src/HTML/QuickForm/Rule/Required.php b/3rd_party/php/pear/src/HTML/QuickForm/Rule/Required.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/Rule/Required.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/Rule/Required.php
diff --git a/src/tools/pear/src/HTML/QuickForm/RuleRegistry.php b/3rd_party/php/pear/src/HTML/QuickForm/RuleRegistry.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/RuleRegistry.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/RuleRegistry.php
diff --git a/src/tools/pear/src/HTML/QuickForm/advcheckbox.php b/3rd_party/php/pear/src/HTML/QuickForm/advcheckbox.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/advcheckbox.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/advcheckbox.php
diff --git a/src/tools/pear/src/HTML/QuickForm/autocomplete.php b/3rd_party/php/pear/src/HTML/QuickForm/autocomplete.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/autocomplete.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/autocomplete.php
diff --git a/src/tools/pear/src/HTML/QuickForm/button.php b/3rd_party/php/pear/src/HTML/QuickForm/button.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/button.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/button.php
diff --git a/src/tools/pear/src/HTML/QuickForm/checkbox.php b/3rd_party/php/pear/src/HTML/QuickForm/checkbox.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/checkbox.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/checkbox.php
diff --git a/src/tools/pear/src/HTML/QuickForm/date.php b/3rd_party/php/pear/src/HTML/QuickForm/date.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/date.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/date.php
diff --git a/src/tools/pear/src/HTML/QuickForm/element.php b/3rd_party/php/pear/src/HTML/QuickForm/element.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/element.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/element.php
diff --git a/src/tools/pear/src/HTML/QuickForm/file.php b/3rd_party/php/pear/src/HTML/QuickForm/file.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/file.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/file.php
diff --git a/src/tools/pear/src/HTML/QuickForm/group.php b/3rd_party/php/pear/src/HTML/QuickForm/group.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/group.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/group.php
diff --git a/src/tools/pear/src/HTML/QuickForm/header.php b/3rd_party/php/pear/src/HTML/QuickForm/header.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/header.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/header.php
diff --git a/src/tools/pear/src/HTML/QuickForm/hidden.php b/3rd_party/php/pear/src/HTML/QuickForm/hidden.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/hidden.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/hidden.php
diff --git a/src/tools/pear/src/HTML/QuickForm/hiddenselect.php b/3rd_party/php/pear/src/HTML/QuickForm/hiddenselect.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/hiddenselect.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/hiddenselect.php
diff --git a/src/tools/pear/src/HTML/QuickForm/hierselect.php b/3rd_party/php/pear/src/HTML/QuickForm/hierselect.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/hierselect.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/hierselect.php
diff --git a/src/tools/pear/src/HTML/QuickForm/html.php b/3rd_party/php/pear/src/HTML/QuickForm/html.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/html.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/html.php
diff --git a/src/tools/pear/src/HTML/QuickForm/image.php b/3rd_party/php/pear/src/HTML/QuickForm/image.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/image.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/image.php
diff --git a/src/tools/pear/src/HTML/QuickForm/input.php b/3rd_party/php/pear/src/HTML/QuickForm/input.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/input.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/input.php
diff --git a/src/tools/pear/src/HTML/QuickForm/link.php b/3rd_party/php/pear/src/HTML/QuickForm/link.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/link.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/link.php
diff --git a/src/tools/pear/src/HTML/QuickForm/password.php b/3rd_party/php/pear/src/HTML/QuickForm/password.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/password.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/password.php
diff --git a/src/tools/pear/src/HTML/QuickForm/radio.php b/3rd_party/php/pear/src/HTML/QuickForm/radio.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/radio.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/radio.php
diff --git a/src/tools/pear/src/HTML/QuickForm/reset.php b/3rd_party/php/pear/src/HTML/QuickForm/reset.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/reset.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/reset.php
diff --git a/src/tools/pear/src/HTML/QuickForm/select.php b/3rd_party/php/pear/src/HTML/QuickForm/select.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/select.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/select.php
diff --git a/src/tools/pear/src/HTML/QuickForm/static.php b/3rd_party/php/pear/src/HTML/QuickForm/static.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/static.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/static.php
diff --git a/src/tools/pear/src/HTML/QuickForm/submit.php b/3rd_party/php/pear/src/HTML/QuickForm/submit.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/submit.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/submit.php
diff --git a/src/tools/pear/src/HTML/QuickForm/text.php b/3rd_party/php/pear/src/HTML/QuickForm/text.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/text.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/text.php
diff --git a/src/tools/pear/src/HTML/QuickForm/textarea.php b/3rd_party/php/pear/src/HTML/QuickForm/textarea.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/textarea.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/textarea.php
diff --git a/src/tools/pear/src/HTML/QuickForm/xbutton.php b/3rd_party/php/pear/src/HTML/QuickForm/xbutton.php
similarity index 100%
rename from src/tools/pear/src/HTML/QuickForm/xbutton.php
rename to 3rd_party/php/pear/src/HTML/QuickForm/xbutton.php
diff --git a/src/tools/pear/src/OS/Guess.php b/3rd_party/php/pear/src/OS/Guess.php
similarity index 100%
rename from src/tools/pear/src/OS/Guess.php
rename to 3rd_party/php/pear/src/OS/Guess.php
diff --git a/src/tools/pear/src/PEAR.php b/3rd_party/php/pear/src/PEAR.php
similarity index 100%
rename from src/tools/pear/src/PEAR.php
rename to 3rd_party/php/pear/src/PEAR.php
diff --git a/src/tools/pear/src/PEAR/Autoloader.php b/3rd_party/php/pear/src/PEAR/Autoloader.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Autoloader.php
rename to 3rd_party/php/pear/src/PEAR/Autoloader.php
diff --git a/src/tools/pear/src/PEAR/Builder.php b/3rd_party/php/pear/src/PEAR/Builder.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Builder.php
rename to 3rd_party/php/pear/src/PEAR/Builder.php
diff --git a/src/tools/pear/src/PEAR/ChannelFile.php b/3rd_party/php/pear/src/PEAR/ChannelFile.php
similarity index 100%
rename from src/tools/pear/src/PEAR/ChannelFile.php
rename to 3rd_party/php/pear/src/PEAR/ChannelFile.php
diff --git a/src/tools/pear/src/PEAR/ChannelFile/Parser.php b/3rd_party/php/pear/src/PEAR/ChannelFile/Parser.php
similarity index 100%
rename from src/tools/pear/src/PEAR/ChannelFile/Parser.php
rename to 3rd_party/php/pear/src/PEAR/ChannelFile/Parser.php
diff --git a/src/tools/pear/src/PEAR/Command.php b/3rd_party/php/pear/src/PEAR/Command.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command.php
rename to 3rd_party/php/pear/src/PEAR/Command.php
diff --git a/src/tools/pear/src/PEAR/Command/Auth.php b/3rd_party/php/pear/src/PEAR/Command/Auth.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Auth.php
rename to 3rd_party/php/pear/src/PEAR/Command/Auth.php
diff --git a/src/tools/pear/src/PEAR/Command/Auth.xml b/3rd_party/php/pear/src/PEAR/Command/Auth.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Auth.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Auth.xml
diff --git a/src/tools/pear/src/PEAR/Command/Build.php b/3rd_party/php/pear/src/PEAR/Command/Build.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Build.php
rename to 3rd_party/php/pear/src/PEAR/Command/Build.php
diff --git a/src/tools/pear/src/PEAR/Command/Build.xml b/3rd_party/php/pear/src/PEAR/Command/Build.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Build.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Build.xml
diff --git a/src/tools/pear/src/PEAR/Command/Channels.php b/3rd_party/php/pear/src/PEAR/Command/Channels.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Channels.php
rename to 3rd_party/php/pear/src/PEAR/Command/Channels.php
diff --git a/src/tools/pear/src/PEAR/Command/Channels.xml b/3rd_party/php/pear/src/PEAR/Command/Channels.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Channels.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Channels.xml
diff --git a/src/tools/pear/src/PEAR/Command/Common.php b/3rd_party/php/pear/src/PEAR/Command/Common.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Common.php
rename to 3rd_party/php/pear/src/PEAR/Command/Common.php
diff --git a/src/tools/pear/src/PEAR/Command/Config.php b/3rd_party/php/pear/src/PEAR/Command/Config.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Config.php
rename to 3rd_party/php/pear/src/PEAR/Command/Config.php
diff --git a/src/tools/pear/src/PEAR/Command/Config.xml b/3rd_party/php/pear/src/PEAR/Command/Config.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Config.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Config.xml
diff --git a/src/tools/pear/src/PEAR/Command/Install.php b/3rd_party/php/pear/src/PEAR/Command/Install.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Install.php
rename to 3rd_party/php/pear/src/PEAR/Command/Install.php
diff --git a/src/tools/pear/src/PEAR/Command/Install.xml b/3rd_party/php/pear/src/PEAR/Command/Install.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Install.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Install.xml
diff --git a/src/tools/pear/src/PEAR/Command/Mirror.php b/3rd_party/php/pear/src/PEAR/Command/Mirror.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Mirror.php
rename to 3rd_party/php/pear/src/PEAR/Command/Mirror.php
diff --git a/src/tools/pear/src/PEAR/Command/Mirror.xml b/3rd_party/php/pear/src/PEAR/Command/Mirror.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Mirror.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Mirror.xml
diff --git a/src/tools/pear/src/PEAR/Command/Package.php b/3rd_party/php/pear/src/PEAR/Command/Package.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Package.php
rename to 3rd_party/php/pear/src/PEAR/Command/Package.php
diff --git a/src/tools/pear/src/PEAR/Command/Package.xml b/3rd_party/php/pear/src/PEAR/Command/Package.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Package.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Package.xml
diff --git a/src/tools/pear/src/PEAR/Command/Pickle.php b/3rd_party/php/pear/src/PEAR/Command/Pickle.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Pickle.php
rename to 3rd_party/php/pear/src/PEAR/Command/Pickle.php
diff --git a/src/tools/pear/src/PEAR/Command/Pickle.xml b/3rd_party/php/pear/src/PEAR/Command/Pickle.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Pickle.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Pickle.xml
diff --git a/src/tools/pear/src/PEAR/Command/Registry.php b/3rd_party/php/pear/src/PEAR/Command/Registry.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Registry.php
rename to 3rd_party/php/pear/src/PEAR/Command/Registry.php
diff --git a/src/tools/pear/src/PEAR/Command/Registry.xml b/3rd_party/php/pear/src/PEAR/Command/Registry.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Registry.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Registry.xml
diff --git a/src/tools/pear/src/PEAR/Command/Remote.php b/3rd_party/php/pear/src/PEAR/Command/Remote.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Remote.php
rename to 3rd_party/php/pear/src/PEAR/Command/Remote.php
diff --git a/src/tools/pear/src/PEAR/Command/Remote.xml b/3rd_party/php/pear/src/PEAR/Command/Remote.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Remote.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Remote.xml
diff --git a/src/tools/pear/src/PEAR/Command/Test.php b/3rd_party/php/pear/src/PEAR/Command/Test.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Test.php
rename to 3rd_party/php/pear/src/PEAR/Command/Test.php
diff --git a/src/tools/pear/src/PEAR/Command/Test.xml b/3rd_party/php/pear/src/PEAR/Command/Test.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Command/Test.xml
rename to 3rd_party/php/pear/src/PEAR/Command/Test.xml
diff --git a/src/tools/pear/src/PEAR/Common.php b/3rd_party/php/pear/src/PEAR/Common.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Common.php
rename to 3rd_party/php/pear/src/PEAR/Common.php
diff --git a/src/tools/pear/src/PEAR/Config.php b/3rd_party/php/pear/src/PEAR/Config.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Config.php
rename to 3rd_party/php/pear/src/PEAR/Config.php
diff --git a/src/tools/pear/src/PEAR/Dependency2.php b/3rd_party/php/pear/src/PEAR/Dependency2.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Dependency2.php
rename to 3rd_party/php/pear/src/PEAR/Dependency2.php
diff --git a/src/tools/pear/src/PEAR/DependencyDB.php b/3rd_party/php/pear/src/PEAR/DependencyDB.php
similarity index 100%
rename from src/tools/pear/src/PEAR/DependencyDB.php
rename to 3rd_party/php/pear/src/PEAR/DependencyDB.php
diff --git a/src/tools/pear/src/PEAR/Downloader.php b/3rd_party/php/pear/src/PEAR/Downloader.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Downloader.php
rename to 3rd_party/php/pear/src/PEAR/Downloader.php
diff --git a/src/tools/pear/src/PEAR/Downloader/Package.php b/3rd_party/php/pear/src/PEAR/Downloader/Package.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Downloader/Package.php
rename to 3rd_party/php/pear/src/PEAR/Downloader/Package.php
diff --git a/src/tools/pear/src/PEAR/ErrorStack.php b/3rd_party/php/pear/src/PEAR/ErrorStack.php
similarity index 100%
rename from src/tools/pear/src/PEAR/ErrorStack.php
rename to 3rd_party/php/pear/src/PEAR/ErrorStack.php
diff --git a/src/tools/pear/src/PEAR/Exception.php b/3rd_party/php/pear/src/PEAR/Exception.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Exception.php
rename to 3rd_party/php/pear/src/PEAR/Exception.php
diff --git a/src/tools/pear/src/PEAR/FixPHP5PEARWarnings.php b/3rd_party/php/pear/src/PEAR/FixPHP5PEARWarnings.php
similarity index 100%
rename from src/tools/pear/src/PEAR/FixPHP5PEARWarnings.php
rename to 3rd_party/php/pear/src/PEAR/FixPHP5PEARWarnings.php
diff --git a/src/tools/pear/src/PEAR/Frontend.php b/3rd_party/php/pear/src/PEAR/Frontend.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Frontend.php
rename to 3rd_party/php/pear/src/PEAR/Frontend.php
diff --git a/src/tools/pear/src/PEAR/Frontend/CLI.php b/3rd_party/php/pear/src/PEAR/Frontend/CLI.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Frontend/CLI.php
rename to 3rd_party/php/pear/src/PEAR/Frontend/CLI.php
diff --git a/src/tools/pear/src/PEAR/Installer.php b/3rd_party/php/pear/src/PEAR/Installer.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer.php
rename to 3rd_party/php/pear/src/PEAR/Installer.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role.php b/3rd_party/php/pear/src/PEAR/Installer/Role.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Cfg.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Cfg.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Cfg.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Cfg.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Common.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Common.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Common.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Common.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Data.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Data.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Data.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Data.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Data.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Data.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Data.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Data.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Doc.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Doc.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Doc.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Doc.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Doc.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Doc.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Doc.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Doc.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Ext.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Ext.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Ext.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Ext.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Ext.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Ext.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Ext.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Ext.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Php.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Php.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Php.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Php.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Php.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Php.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Php.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Php.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Script.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Script.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Script.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Script.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Script.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Script.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Script.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Script.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Src.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Src.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Src.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Src.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Src.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Src.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Src.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Src.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Test.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Test.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Test.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Test.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Test.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Test.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Test.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Test.xml
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Www.php b/3rd_party/php/pear/src/PEAR/Installer/Role/Www.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Www.php
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Www.php
diff --git a/src/tools/pear/src/PEAR/Installer/Role/Www.xml b/3rd_party/php/pear/src/PEAR/Installer/Role/Www.xml
similarity index 100%
rename from src/tools/pear/src/PEAR/Installer/Role/Www.xml
rename to 3rd_party/php/pear/src/PEAR/Installer/Role/Www.xml
diff --git a/src/tools/pear/src/PEAR/PackageFile.php b/3rd_party/php/pear/src/PEAR/PackageFile.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/Generator/v1.php b/3rd_party/php/pear/src/PEAR/PackageFile/Generator/v1.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/Generator/v1.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/Generator/v1.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/Generator/v2.php b/3rd_party/php/pear/src/PEAR/PackageFile/Generator/v2.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/Generator/v2.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/Generator/v2.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/Parser/v1.php b/3rd_party/php/pear/src/PEAR/PackageFile/Parser/v1.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/Parser/v1.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/Parser/v1.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/Parser/v2.php b/3rd_party/php/pear/src/PEAR/PackageFile/Parser/v2.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/Parser/v2.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/Parser/v2.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/v1.php b/3rd_party/php/pear/src/PEAR/PackageFile/v1.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/v1.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/v1.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/v2.php b/3rd_party/php/pear/src/PEAR/PackageFile/v2.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/v2.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/v2.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/v2/Validator.php b/3rd_party/php/pear/src/PEAR/PackageFile/v2/Validator.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/v2/Validator.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/v2/Validator.php
diff --git a/src/tools/pear/src/PEAR/PackageFile/v2/rw.php b/3rd_party/php/pear/src/PEAR/PackageFile/v2/rw.php
similarity index 100%
rename from src/tools/pear/src/PEAR/PackageFile/v2/rw.php
rename to 3rd_party/php/pear/src/PEAR/PackageFile/v2/rw.php
diff --git a/src/tools/pear/src/PEAR/Packager.php b/3rd_party/php/pear/src/PEAR/Packager.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Packager.php
rename to 3rd_party/php/pear/src/PEAR/Packager.php
diff --git a/src/tools/pear/src/PEAR/REST.php b/3rd_party/php/pear/src/PEAR/REST.php
similarity index 100%
rename from src/tools/pear/src/PEAR/REST.php
rename to 3rd_party/php/pear/src/PEAR/REST.php
diff --git a/src/tools/pear/src/PEAR/REST/10.php b/3rd_party/php/pear/src/PEAR/REST/10.php
similarity index 100%
rename from src/tools/pear/src/PEAR/REST/10.php
rename to 3rd_party/php/pear/src/PEAR/REST/10.php
diff --git a/src/tools/pear/src/PEAR/REST/11.php b/3rd_party/php/pear/src/PEAR/REST/11.php
similarity index 100%
rename from src/tools/pear/src/PEAR/REST/11.php
rename to 3rd_party/php/pear/src/PEAR/REST/11.php
diff --git a/src/tools/pear/src/PEAR/REST/13.php b/3rd_party/php/pear/src/PEAR/REST/13.php
similarity index 100%
rename from src/tools/pear/src/PEAR/REST/13.php
rename to 3rd_party/php/pear/src/PEAR/REST/13.php
diff --git a/src/tools/pear/src/PEAR/Registry.php b/3rd_party/php/pear/src/PEAR/Registry.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Registry.php
rename to 3rd_party/php/pear/src/PEAR/Registry.php
diff --git a/src/tools/pear/src/PEAR/RunTest.php b/3rd_party/php/pear/src/PEAR/RunTest.php
similarity index 100%
rename from src/tools/pear/src/PEAR/RunTest.php
rename to 3rd_party/php/pear/src/PEAR/RunTest.php
diff --git a/src/tools/pear/src/PEAR/Task/Common.php b/3rd_party/php/pear/src/PEAR/Task/Common.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Common.php
rename to 3rd_party/php/pear/src/PEAR/Task/Common.php
diff --git a/src/tools/pear/src/PEAR/Task/Postinstallscript.php b/3rd_party/php/pear/src/PEAR/Task/Postinstallscript.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Postinstallscript.php
rename to 3rd_party/php/pear/src/PEAR/Task/Postinstallscript.php
diff --git a/src/tools/pear/src/PEAR/Task/Postinstallscript/rw.php b/3rd_party/php/pear/src/PEAR/Task/Postinstallscript/rw.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Postinstallscript/rw.php
rename to 3rd_party/php/pear/src/PEAR/Task/Postinstallscript/rw.php
diff --git a/src/tools/pear/src/PEAR/Task/Replace.php b/3rd_party/php/pear/src/PEAR/Task/Replace.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Replace.php
rename to 3rd_party/php/pear/src/PEAR/Task/Replace.php
diff --git a/src/tools/pear/src/PEAR/Task/Replace/rw.php b/3rd_party/php/pear/src/PEAR/Task/Replace/rw.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Replace/rw.php
rename to 3rd_party/php/pear/src/PEAR/Task/Replace/rw.php
diff --git a/src/tools/pear/src/PEAR/Task/Unixeol.php b/3rd_party/php/pear/src/PEAR/Task/Unixeol.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Unixeol.php
rename to 3rd_party/php/pear/src/PEAR/Task/Unixeol.php
diff --git a/src/tools/pear/src/PEAR/Task/Unixeol/rw.php b/3rd_party/php/pear/src/PEAR/Task/Unixeol/rw.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Unixeol/rw.php
rename to 3rd_party/php/pear/src/PEAR/Task/Unixeol/rw.php
diff --git a/src/tools/pear/src/PEAR/Task/Windowseol.php b/3rd_party/php/pear/src/PEAR/Task/Windowseol.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Windowseol.php
rename to 3rd_party/php/pear/src/PEAR/Task/Windowseol.php
diff --git a/src/tools/pear/src/PEAR/Task/Windowseol/rw.php b/3rd_party/php/pear/src/PEAR/Task/Windowseol/rw.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Task/Windowseol/rw.php
rename to 3rd_party/php/pear/src/PEAR/Task/Windowseol/rw.php
diff --git a/src/tools/pear/src/PEAR/Validate.php b/3rd_party/php/pear/src/PEAR/Validate.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Validate.php
rename to 3rd_party/php/pear/src/PEAR/Validate.php
diff --git a/src/tools/pear/src/PEAR/Validator/PECL.php b/3rd_party/php/pear/src/PEAR/Validator/PECL.php
similarity index 100%
rename from src/tools/pear/src/PEAR/Validator/PECL.php
rename to 3rd_party/php/pear/src/PEAR/Validator/PECL.php
diff --git a/src/tools/pear/src/PEAR/XMLParser.php b/3rd_party/php/pear/src/PEAR/XMLParser.php
similarity index 100%
rename from src/tools/pear/src/PEAR/XMLParser.php
rename to 3rd_party/php/pear/src/PEAR/XMLParser.php
diff --git a/src/tools/pear/src/PEAR5.php b/3rd_party/php/pear/src/PEAR5.php
similarity index 100%
rename from src/tools/pear/src/PEAR5.php
rename to 3rd_party/php/pear/src/PEAR5.php
diff --git a/src/tools/pear/src/PHPUnit.php b/3rd_party/php/pear/src/PHPUnit.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit.php
rename to 3rd_party/php/pear/src/PHPUnit.php
diff --git a/src/tools/pear/src/PHPUnit/Assert.php b/3rd_party/php/pear/src/PHPUnit/Assert.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/Assert.php
rename to 3rd_party/php/pear/src/PHPUnit/Assert.php
diff --git a/src/tools/pear/src/PHPUnit/GUI/Gtk.php b/3rd_party/php/pear/src/PHPUnit/GUI/Gtk.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/GUI/Gtk.php
rename to 3rd_party/php/pear/src/PHPUnit/GUI/Gtk.php
diff --git a/src/tools/pear/src/PHPUnit/GUI/HTML.php b/3rd_party/php/pear/src/PHPUnit/GUI/HTML.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/GUI/HTML.php
rename to 3rd_party/php/pear/src/PHPUnit/GUI/HTML.php
diff --git a/src/tools/pear/src/PHPUnit/GUI/HTML.tpl b/3rd_party/php/pear/src/PHPUnit/GUI/HTML.tpl
similarity index 100%
rename from src/tools/pear/src/PHPUnit/GUI/HTML.tpl
rename to 3rd_party/php/pear/src/PHPUnit/GUI/HTML.tpl
diff --git a/src/tools/pear/src/PHPUnit/GUI/SetupDecorator.php b/3rd_party/php/pear/src/PHPUnit/GUI/SetupDecorator.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/GUI/SetupDecorator.php
rename to 3rd_party/php/pear/src/PHPUnit/GUI/SetupDecorator.php
diff --git a/src/tools/pear/src/PHPUnit/RepeatedTest.php b/3rd_party/php/pear/src/PHPUnit/RepeatedTest.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/RepeatedTest.php
rename to 3rd_party/php/pear/src/PHPUnit/RepeatedTest.php
diff --git a/src/tools/pear/src/PHPUnit/Skeleton.php b/3rd_party/php/pear/src/PHPUnit/Skeleton.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/Skeleton.php
rename to 3rd_party/php/pear/src/PHPUnit/Skeleton.php
diff --git a/src/tools/pear/src/PHPUnit/TestCase.php b/3rd_party/php/pear/src/PHPUnit/TestCase.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/TestCase.php
rename to 3rd_party/php/pear/src/PHPUnit/TestCase.php
diff --git a/src/tools/pear/src/PHPUnit/TestDecorator.php b/3rd_party/php/pear/src/PHPUnit/TestDecorator.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/TestDecorator.php
rename to 3rd_party/php/pear/src/PHPUnit/TestDecorator.php
diff --git a/src/tools/pear/src/PHPUnit/TestFailure.php b/3rd_party/php/pear/src/PHPUnit/TestFailure.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/TestFailure.php
rename to 3rd_party/php/pear/src/PHPUnit/TestFailure.php
diff --git a/src/tools/pear/src/PHPUnit/TestListener.php b/3rd_party/php/pear/src/PHPUnit/TestListener.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/TestListener.php
rename to 3rd_party/php/pear/src/PHPUnit/TestListener.php
diff --git a/src/tools/pear/src/PHPUnit/TestResult.php b/3rd_party/php/pear/src/PHPUnit/TestResult.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/TestResult.php
rename to 3rd_party/php/pear/src/PHPUnit/TestResult.php
diff --git a/src/tools/pear/src/PHPUnit/TestSuite.php b/3rd_party/php/pear/src/PHPUnit/TestSuite.php
similarity index 100%
rename from src/tools/pear/src/PHPUnit/TestSuite.php
rename to 3rd_party/php/pear/src/PHPUnit/TestSuite.php
diff --git a/src/tools/pear/src/System.php b/3rd_party/php/pear/src/System.php
similarity index 100%
rename from src/tools/pear/src/System.php
rename to 3rd_party/php/pear/src/System.php
diff --git a/src/tools/pear/src/VERSIONS.txt b/3rd_party/php/pear/src/VERSIONS.txt
similarity index 100%
rename from src/tools/pear/src/VERSIONS.txt
rename to 3rd_party/php/pear/src/VERSIONS.txt
diff --git a/src/tools/pear/src/XML/Beautifier.php b/3rd_party/php/pear/src/XML/Beautifier.php
similarity index 100%
rename from src/tools/pear/src/XML/Beautifier.php
rename to 3rd_party/php/pear/src/XML/Beautifier.php
diff --git a/src/tools/pear/src/XML/Beautifier/Renderer.php b/3rd_party/php/pear/src/XML/Beautifier/Renderer.php
similarity index 100%
rename from src/tools/pear/src/XML/Beautifier/Renderer.php
rename to 3rd_party/php/pear/src/XML/Beautifier/Renderer.php
diff --git a/src/tools/pear/src/XML/Beautifier/Renderer/Plain.php b/3rd_party/php/pear/src/XML/Beautifier/Renderer/Plain.php
similarity index 100%
rename from src/tools/pear/src/XML/Beautifier/Renderer/Plain.php
rename to 3rd_party/php/pear/src/XML/Beautifier/Renderer/Plain.php
diff --git a/src/tools/pear/src/XML/Beautifier/Tokenizer.php b/3rd_party/php/pear/src/XML/Beautifier/Tokenizer.php
similarity index 100%
rename from src/tools/pear/src/XML/Beautifier/Tokenizer.php
rename to 3rd_party/php/pear/src/XML/Beautifier/Tokenizer.php
diff --git a/src/tools/pear/src/XML/Parser.php b/3rd_party/php/pear/src/XML/Parser.php
similarity index 100%
rename from src/tools/pear/src/XML/Parser.php
rename to 3rd_party/php/pear/src/XML/Parser.php
diff --git a/src/tools/pear/src/XML/Parser/Simple.php b/3rd_party/php/pear/src/XML/Parser/Simple.php
similarity index 100%
rename from src/tools/pear/src/XML/Parser/Simple.php
rename to 3rd_party/php/pear/src/XML/Parser/Simple.php
diff --git a/src/tools/pear/src/XML/RPC.php b/3rd_party/php/pear/src/XML/RPC.php
similarity index 100%
rename from src/tools/pear/src/XML/RPC.php
rename to 3rd_party/php/pear/src/XML/RPC.php
diff --git a/src/tools/pear/src/XML/RPC/Dump.php b/3rd_party/php/pear/src/XML/RPC/Dump.php
similarity index 100%
rename from src/tools/pear/src/XML/RPC/Dump.php
rename to 3rd_party/php/pear/src/XML/RPC/Dump.php
diff --git a/src/tools/pear/src/XML/RPC/Server.php b/3rd_party/php/pear/src/XML/RPC/Server.php
similarity index 100%
rename from src/tools/pear/src/XML/RPC/Server.php
rename to 3rd_party/php/pear/src/XML/RPC/Server.php
diff --git a/src/tools/pear/src/XML/Serializer.php b/3rd_party/php/pear/src/XML/Serializer.php
similarity index 100%
rename from src/tools/pear/src/XML/Serializer.php
rename to 3rd_party/php/pear/src/XML/Serializer.php
diff --git a/src/tools/pear/src/XML/Unserializer.php b/3rd_party/php/pear/src/XML/Unserializer.php
similarity index 100%
rename from src/tools/pear/src/XML/Unserializer.php
rename to 3rd_party/php/pear/src/XML/Unserializer.php
diff --git a/src/tools/pear/src/XML/Util.php b/3rd_party/php/pear/src/XML/Util.php
similarity index 100%
rename from src/tools/pear/src/XML/Util.php
rename to 3rd_party/php/pear/src/XML/Util.php
diff --git a/src/modules/storageServer/tmp/.keepme b/3rd_party/php/pear/tmp/.keepme
similarity index 100%
rename from src/modules/storageServer/tmp/.keepme
rename to 3rd_party/php/pear/tmp/.keepme
diff --git a/src/modules/storageServer/.htaccess b/3rd_party/storageServer/.htaccess
similarity index 100%
rename from src/modules/storageServer/.htaccess
rename to 3rd_party/storageServer/.htaccess
diff --git a/src/modules/storageServer/bin/autogen.sh b/3rd_party/storageServer/bin/autogen.sh
similarity index 100%
rename from src/modules/storageServer/bin/autogen.sh
rename to 3rd_party/storageServer/bin/autogen.sh
diff --git a/src/modules/storageServer/bin/runPhpTest.sh b/3rd_party/storageServer/bin/runPhpTest.sh
similarity index 100%
rename from src/modules/storageServer/bin/runPhpTest.sh
rename to 3rd_party/storageServer/bin/runPhpTest.sh
diff --git a/src/modules/storageServer/bin/xrCli.sh b/3rd_party/storageServer/bin/xrCli.sh
similarity index 100%
rename from src/modules/storageServer/bin/xrCli.sh
rename to 3rd_party/storageServer/bin/xrCli.sh
diff --git a/src/tools/pear/configure b/3rd_party/storageServer/configure
similarity index 100%
rename from src/tools/pear/configure
rename to 3rd_party/storageServer/configure
diff --git a/src/modules/storageServer/doc/index.html b/3rd_party/storageServer/doc/index.html
similarity index 100%
rename from src/modules/storageServer/doc/index.html
rename to 3rd_party/storageServer/doc/index.html
diff --git a/src/modules/storageServer/etc/Makefile.in b/3rd_party/storageServer/etc/Makefile.in
similarity index 100%
rename from src/modules/storageServer/etc/Makefile.in
rename to 3rd_party/storageServer/etc/Makefile.in
diff --git a/src/modules/storageServer/etc/configure.ac b/3rd_party/storageServer/etc/configure.ac
similarity index 100%
rename from src/modules/storageServer/etc/configure.ac
rename to 3rd_party/storageServer/etc/configure.ac
diff --git a/src/modules/storageServer/etc/doxygen.config b/3rd_party/storageServer/etc/doxygen.config
similarity index 100%
rename from src/modules/storageServer/etc/doxygen.config
rename to 3rd_party/storageServer/etc/doxygen.config
diff --git a/src/tools/pear/tmp/.keepme b/3rd_party/storageServer/tmp/.keepme
similarity index 100%
rename from src/tools/pear/tmp/.keepme
rename to 3rd_party/storageServer/tmp/.keepme
diff --git a/src/modules/storageServer/var/.htaccess b/3rd_party/storageServer/var/.htaccess
similarity index 100%
rename from src/modules/storageServer/var/.htaccess
rename to 3rd_party/storageServer/var/.htaccess
diff --git a/src/modules/storageServer/var/AccessRecur.php b/3rd_party/storageServer/var/AccessRecur.php
similarity index 100%
rename from src/modules/storageServer/var/AccessRecur.php
rename to 3rd_party/storageServer/var/AccessRecur.php
diff --git a/src/modules/storageServer/var/Alib.php b/3rd_party/storageServer/var/Alib.php
similarity index 100%
rename from src/modules/storageServer/var/Alib.php
rename to 3rd_party/storageServer/var/Alib.php
diff --git a/src/modules/storageServer/var/Backup.php b/3rd_party/storageServer/var/Backup.php
similarity index 100%
rename from src/modules/storageServer/var/Backup.php
rename to 3rd_party/storageServer/var/Backup.php
diff --git a/src/modules/storageServer/var/BasicStor.php b/3rd_party/storageServer/var/BasicStor.php
similarity index 100%
rename from src/modules/storageServer/var/BasicStor.php
rename to 3rd_party/storageServer/var/BasicStor.php
diff --git a/src/modules/storageServer/var/CleanStor.php b/3rd_party/storageServer/var/CleanStor.php
similarity index 100%
rename from src/modules/storageServer/var/CleanStor.php
rename to 3rd_party/storageServer/var/CleanStor.php
diff --git a/src/modules/storageServer/var/GreenBox.php b/3rd_party/storageServer/var/GreenBox.php
similarity index 100%
rename from src/modules/storageServer/var/GreenBox.php
rename to 3rd_party/storageServer/var/GreenBox.php
diff --git a/src/modules/storageServer/var/LocStor.php b/3rd_party/storageServer/var/LocStor.php
similarity index 100%
rename from src/modules/storageServer/var/LocStor.php
rename to 3rd_party/storageServer/var/LocStor.php
diff --git a/src/modules/storageServer/var/M3uPlaylist.php b/3rd_party/storageServer/var/M3uPlaylist.php
similarity index 100%
rename from src/modules/storageServer/var/M3uPlaylist.php
rename to 3rd_party/storageServer/var/M3uPlaylist.php
diff --git a/src/modules/storageServer/var/Playlist.php b/3rd_party/storageServer/var/Playlist.php
similarity index 100%
rename from src/modules/storageServer/var/Playlist.php
rename to 3rd_party/storageServer/var/Playlist.php
diff --git a/src/modules/storageServer/var/Prefs.php b/3rd_party/storageServer/var/Prefs.php
similarity index 100%
rename from src/modules/storageServer/var/Prefs.php
rename to 3rd_party/storageServer/var/Prefs.php
diff --git a/src/modules/storageServer/var/Renderer.php b/3rd_party/storageServer/var/Renderer.php
similarity index 100%
rename from src/modules/storageServer/var/Renderer.php
rename to 3rd_party/storageServer/var/Renderer.php
diff --git a/src/modules/storageServer/var/Restore.php b/3rd_party/storageServer/var/Restore.php
similarity index 100%
rename from src/modules/storageServer/var/Restore.php
rename to 3rd_party/storageServer/var/Restore.php
diff --git a/src/modules/storageServer/var/Schedule.php b/3rd_party/storageServer/var/Schedule.php
similarity index 100%
rename from src/modules/storageServer/var/Schedule.php
rename to 3rd_party/storageServer/var/Schedule.php
diff --git a/src/modules/storageServer/var/SmilPlaylist.php b/3rd_party/storageServer/var/SmilPlaylist.php
similarity index 100%
rename from src/modules/storageServer/var/SmilPlaylist.php
rename to 3rd_party/storageServer/var/SmilPlaylist.php
diff --git a/src/modules/storageServer/var/StoredFile.php b/3rd_party/storageServer/var/StoredFile.php
similarity index 100%
rename from src/modules/storageServer/var/StoredFile.php
rename to 3rd_party/storageServer/var/StoredFile.php
diff --git a/src/modules/storageServer/var/Subjects.php b/3rd_party/storageServer/var/Subjects.php
similarity index 100%
rename from src/modules/storageServer/var/Subjects.php
rename to 3rd_party/storageServer/var/Subjects.php
diff --git a/src/modules/storageServer/var/Transport.php b/3rd_party/storageServer/var/Transport.php
similarity index 100%
rename from src/modules/storageServer/var/Transport.php
rename to 3rd_party/storageServer/var/Transport.php
diff --git a/src/modules/storageServer/var/TransportRecord.php b/3rd_party/storageServer/var/TransportRecord.php
similarity index 100%
rename from src/modules/storageServer/var/TransportRecord.php
rename to 3rd_party/storageServer/var/TransportRecord.php
diff --git a/src/modules/storageServer/var/Validator.php b/3rd_party/storageServer/var/Validator.php
similarity index 100%
rename from src/modules/storageServer/var/Validator.php
rename to 3rd_party/storageServer/var/Validator.php
diff --git a/src/modules/storageServer/var/XmlParser.php b/3rd_party/storageServer/var/XmlParser.php
similarity index 100%
rename from src/modules/storageServer/var/XmlParser.php
rename to 3rd_party/storageServer/var/XmlParser.php
diff --git a/src/modules/storageServer/var/audioClipFormat.php b/3rd_party/storageServer/var/audioClipFormat.php
similarity index 100%
rename from src/modules/storageServer/var/audioClipFormat.php
rename to 3rd_party/storageServer/var/audioClipFormat.php
diff --git a/src/modules/storageServer/var/campcaster_version.php b/3rd_party/storageServer/var/campcaster_version.php
similarity index 100%
rename from src/modules/storageServer/var/campcaster_version.php
rename to 3rd_party/storageServer/var/campcaster_version.php
diff --git a/src/modules/storageServer/var/conf.php b/3rd_party/storageServer/var/conf.php
similarity index 100%
rename from src/modules/storageServer/var/conf.php
rename to 3rd_party/storageServer/var/conf.php
diff --git a/src/modules/storageServer/var/conf.php.template b/3rd_party/storageServer/var/conf.php.template
similarity index 100%
rename from src/modules/storageServer/var/conf.php.template
rename to 3rd_party/storageServer/var/conf.php.template
diff --git a/src/modules/storageServer/var/conf_only.php.template b/3rd_party/storageServer/var/conf_only.php.template
similarity index 100%
rename from src/modules/storageServer/var/conf_only.php.template
rename to 3rd_party/storageServer/var/conf_only.php.template
diff --git a/src/modules/storageServer/var/cron/Cron.php b/3rd_party/storageServer/var/cron/Cron.php
similarity index 100%
rename from src/modules/storageServer/var/cron/Cron.php
rename to 3rd_party/storageServer/var/cron/Cron.php
diff --git a/src/modules/storageServer/var/cron/CronJob.php b/3rd_party/storageServer/var/cron/CronJob.php
similarity index 100%
rename from src/modules/storageServer/var/cron/CronJob.php
rename to 3rd_party/storageServer/var/cron/CronJob.php
diff --git a/src/modules/storageServer/var/cron/Crontab.php b/3rd_party/storageServer/var/cron/Crontab.php
similarity index 100%
rename from src/modules/storageServer/var/cron/Crontab.php
rename to 3rd_party/storageServer/var/cron/Crontab.php
diff --git a/src/modules/storageServer/var/cron/croncall.php b/3rd_party/storageServer/var/cron/croncall.php
similarity index 100%
rename from src/modules/storageServer/var/cron/croncall.php
rename to 3rd_party/storageServer/var/cron/croncall.php
diff --git a/src/modules/storageServer/var/cron/transportCron.php b/3rd_party/storageServer/var/cron/transportCron.php
similarity index 100%
rename from src/modules/storageServer/var/cron/transportCron.php
rename to 3rd_party/storageServer/var/cron/transportCron.php
diff --git a/src/modules/storageServer/var/cron/transportCronJob.php b/3rd_party/storageServer/var/cron/transportCronJob.php
similarity index 100%
rename from src/modules/storageServer/var/cron/transportCronJob.php
rename to 3rd_party/storageServer/var/cron/transportCronJob.php
diff --git a/src/modules/storageServer/var/emptyMdata.xml b/3rd_party/storageServer/var/emptyMdata.xml
similarity index 100%
rename from src/modules/storageServer/var/emptyMdata.xml
rename to 3rd_party/storageServer/var/emptyMdata.xml
diff --git a/src/modules/storageServer/var/emptyPlaylist.xml b/3rd_party/storageServer/var/emptyPlaylist.xml
similarity index 100%
rename from src/modules/storageServer/var/emptyPlaylist.xml
rename to 3rd_party/storageServer/var/emptyPlaylist.xml
diff --git a/src/modules/storageServer/var/emptyWebstream.xml b/3rd_party/storageServer/var/emptyWebstream.xml
similarity index 100%
rename from src/modules/storageServer/var/emptyWebstream.xml
rename to 3rd_party/storageServer/var/emptyWebstream.xml
diff --git a/src/modules/storageServer/var/genres.xml b/3rd_party/storageServer/var/genres.xml
similarity index 100%
rename from src/modules/storageServer/var/genres.xml
rename to 3rd_party/storageServer/var/genres.xml
diff --git a/src/modules/storageServer/var/index.php b/3rd_party/storageServer/var/index.php
similarity index 100%
rename from src/modules/storageServer/var/index.php
rename to 3rd_party/storageServer/var/index.php
diff --git a/src/modules/storageServer/var/install/campcaster-user.php b/3rd_party/storageServer/var/install/campcaster-user.php
similarity index 100%
rename from src/modules/storageServer/var/install/campcaster-user.php
rename to 3rd_party/storageServer/var/install/campcaster-user.php
diff --git a/src/modules/storageServer/var/install/getGname.php b/3rd_party/storageServer/var/install/getGname.php
similarity index 100%
rename from src/modules/storageServer/var/install/getGname.php
rename to 3rd_party/storageServer/var/install/getGname.php
diff --git a/src/modules/storageServer/var/install/getPwd.php b/3rd_party/storageServer/var/install/getPwd.php
similarity index 100%
rename from src/modules/storageServer/var/install/getPwd.php
rename to 3rd_party/storageServer/var/install/getPwd.php
diff --git a/src/modules/storageServer/var/install/getWwwRoot.php b/3rd_party/storageServer/var/install/getWwwRoot.php
similarity index 100%
rename from src/modules/storageServer/var/install/getWwwRoot.php
rename to 3rd_party/storageServer/var/install/getWwwRoot.php
diff --git a/src/modules/storageServer/var/install/getXrUrl.php b/3rd_party/storageServer/var/install/getXrUrl.php
similarity index 100%
rename from src/modules/storageServer/var/install/getXrUrl.php
rename to 3rd_party/storageServer/var/install/getXrUrl.php
diff --git a/src/modules/storageServer/var/install/index.php b/3rd_party/storageServer/var/install/index.php
similarity index 100%
rename from src/modules/storageServer/var/install/index.php
rename to 3rd_party/storageServer/var/install/index.php
diff --git a/src/modules/storageServer/var/install/install.php b/3rd_party/storageServer/var/install/install.php
similarity index 100%
rename from src/modules/storageServer/var/install/install.php
rename to 3rd_party/storageServer/var/install/install.php
diff --git a/src/modules/storageServer/var/install/installInit.php b/3rd_party/storageServer/var/install/installInit.php
similarity index 100%
rename from src/modules/storageServer/var/install/installInit.php
rename to 3rd_party/storageServer/var/install/installInit.php
diff --git a/src/modules/storageServer/var/install/uninstall.php b/3rd_party/storageServer/var/install/uninstall.php
similarity index 100%
rename from src/modules/storageServer/var/install/uninstall.php
rename to 3rd_party/storageServer/var/install/uninstall.php
diff --git a/src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php b/3rd_party/storageServer/var/install/upgrade/upgrade-to-1.2.0.php
similarity index 100%
rename from src/modules/storageServer/var/install/upgrade/upgrade-to-1.2.0.php
rename to 3rd_party/storageServer/var/install/upgrade/upgrade-to-1.2.0.php
diff --git a/src/modules/storageServer/var/install/upgrade/upgrade.php b/3rd_party/storageServer/var/install/upgrade/upgrade.php
similarity index 100%
rename from src/modules/storageServer/var/install/upgrade/upgrade.php
rename to 3rd_party/storageServer/var/install/upgrade/upgrade.php
diff --git a/src/modules/storageServer/var/playlistFormat.php b/3rd_party/storageServer/var/playlistFormat.php
similarity index 100%
rename from src/modules/storageServer/var/playlistFormat.php
rename to 3rd_party/storageServer/var/playlistFormat.php
diff --git a/src/modules/storageServer/var/tests/0000000000010001 b/3rd_party/storageServer/var/tests/0000000000010001
similarity index 100%
rename from src/modules/storageServer/var/tests/0000000000010001
rename to 3rd_party/storageServer/var/tests/0000000000010001
diff --git a/src/modules/storageServer/var/tests/0000000000010002 b/3rd_party/storageServer/var/tests/0000000000010002
similarity index 100%
rename from src/modules/storageServer/var/tests/0000000000010002
rename to 3rd_party/storageServer/var/tests/0000000000010002
diff --git a/src/modules/storageServer/var/tests/AllTests.php b/3rd_party/storageServer/var/tests/AllTests.php
similarity index 100%
rename from src/modules/storageServer/var/tests/AllTests.php
rename to 3rd_party/storageServer/var/tests/AllTests.php
diff --git a/src/modules/storageServer/var/tests/BasicStorTests.php b/3rd_party/storageServer/var/tests/BasicStorTests.php
similarity index 100%
rename from src/modules/storageServer/var/tests/BasicStorTests.php
rename to 3rd_party/storageServer/var/tests/BasicStorTests.php
diff --git a/src/modules/storageServer/var/tests/PlayListTests.php b/3rd_party/storageServer/var/tests/PlayListTests.php
similarity index 100%
rename from src/modules/storageServer/var/tests/PlayListTests.php
rename to 3rd_party/storageServer/var/tests/PlayListTests.php
diff --git a/src/modules/storageServer/var/tests/SchedulerExportTests.php b/3rd_party/storageServer/var/tests/SchedulerExportTests.php
similarity index 100%
rename from src/modules/storageServer/var/tests/SchedulerExportTests.php
rename to 3rd_party/storageServer/var/tests/SchedulerExportTests.php
diff --git a/src/modules/storageServer/var/tests/SchedulerTests.php b/3rd_party/storageServer/var/tests/SchedulerTests.php
similarity index 100%
rename from src/modules/storageServer/var/tests/SchedulerTests.php
rename to 3rd_party/storageServer/var/tests/SchedulerTests.php
diff --git a/src/modules/storageServer/var/tests/analyze.php b/3rd_party/storageServer/var/tests/analyze.php
similarity index 100%
rename from src/modules/storageServer/var/tests/analyze.php
rename to 3rd_party/storageServer/var/tests/analyze.php
diff --git a/src/modules/storageServer/var/tests/ex1.mp3 b/3rd_party/storageServer/var/tests/ex1.mp3
similarity index 100%
rename from src/modules/storageServer/var/tests/ex1.mp3
rename to 3rd_party/storageServer/var/tests/ex1.mp3
diff --git a/src/modules/storageServer/var/tests/ex2.ogg b/3rd_party/storageServer/var/tests/ex2.ogg
similarity index 100%
rename from src/modules/storageServer/var/tests/ex2.ogg
rename to 3rd_party/storageServer/var/tests/ex2.ogg
diff --git a/src/modules/storageServer/var/tests/ex2.wav b/3rd_party/storageServer/var/tests/ex2.wav
similarity index 100%
rename from src/modules/storageServer/var/tests/ex2.wav
rename to 3rd_party/storageServer/var/tests/ex2.wav
diff --git a/src/modules/storageServer/var/tests/ex3.wav b/3rd_party/storageServer/var/tests/ex3.wav
similarity index 100%
rename from src/modules/storageServer/var/tests/ex3.wav
rename to 3rd_party/storageServer/var/tests/ex3.wav
diff --git a/src/modules/storageServer/var/tests/exportedPl_lspl.tar b/3rd_party/storageServer/var/tests/exportedPl_lspl.tar
similarity index 100%
rename from src/modules/storageServer/var/tests/exportedPl_lspl.tar
rename to 3rd_party/storageServer/var/tests/exportedPl_lspl.tar
diff --git a/src/modules/storageServer/var/tests/index.php b/3rd_party/storageServer/var/tests/index.php
similarity index 100%
rename from src/modules/storageServer/var/tests/index.php
rename to 3rd_party/storageServer/var/tests/index.php
diff --git a/src/modules/storageServer/var/tests/plistEmbedded.xml b/3rd_party/storageServer/var/tests/plistEmbedded.xml
similarity index 100%
rename from src/modules/storageServer/var/tests/plistEmbedded.xml
rename to 3rd_party/storageServer/var/tests/plistEmbedded.xml
diff --git a/src/modules/storageServer/var/tests/question.wav b/3rd_party/storageServer/var/tests/question.wav
similarity index 100%
rename from src/modules/storageServer/var/tests/question.wav
rename to 3rd_party/storageServer/var/tests/question.wav
diff --git a/src/modules/storageServer/var/tests/test10001.mp3 b/3rd_party/storageServer/var/tests/test10001.mp3
similarity index 100%
rename from src/modules/storageServer/var/tests/test10001.mp3
rename to 3rd_party/storageServer/var/tests/test10001.mp3
diff --git a/src/modules/storageServer/var/tests/test10002.mp3 b/3rd_party/storageServer/var/tests/test10002.mp3
similarity index 100%
rename from src/modules/storageServer/var/tests/test10002.mp3
rename to 3rd_party/storageServer/var/tests/test10002.mp3
diff --git a/src/modules/storageServer/var/tests/test10003.mp3 b/3rd_party/storageServer/var/tests/test10003.mp3
similarity index 100%
rename from src/modules/storageServer/var/tests/test10003.mp3
rename to 3rd_party/storageServer/var/tests/test10003.mp3
diff --git a/src/modules/storageServer/var/tests/transTest.php b/3rd_party/storageServer/var/tests/transTest.php
similarity index 100%
rename from src/modules/storageServer/var/tests/transTest.php
rename to 3rd_party/storageServer/var/tests/transTest.php
diff --git a/src/modules/storageServer/var/tests/webstreamTest.php b/3rd_party/storageServer/var/tests/webstreamTest.php
similarity index 100%
rename from src/modules/storageServer/var/tests/webstreamTest.php
rename to 3rd_party/storageServer/var/tests/webstreamTest.php
diff --git a/src/modules/storageServer/var/tests/wstream1.xml b/3rd_party/storageServer/var/tests/wstream1.xml
similarity index 100%
rename from src/modules/storageServer/var/tests/wstream1.xml
rename to 3rd_party/storageServer/var/tests/wstream1.xml
diff --git a/src/modules/storageServer/var/webstreamFormat.php b/3rd_party/storageServer/var/webstreamFormat.php
similarity index 100%
rename from src/modules/storageServer/var/webstreamFormat.php
rename to 3rd_party/storageServer/var/webstreamFormat.php
diff --git a/src/modules/storageServer/var/xmlrpc/XR_LocStor.php b/3rd_party/storageServer/var/xmlrpc/XR_LocStor.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/XR_LocStor.php
rename to 3rd_party/storageServer/var/xmlrpc/XR_LocStor.php
diff --git a/src/modules/storageServer/var/xmlrpc/index.php b/3rd_party/storageServer/var/xmlrpc/index.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/index.php
rename to 3rd_party/storageServer/var/xmlrpc/index.php
diff --git a/src/modules/storageServer/var/xmlrpc/put.php b/3rd_party/storageServer/var/xmlrpc/put.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/put.php
rename to 3rd_party/storageServer/var/xmlrpc/put.php
diff --git a/src/modules/storageServer/var/xmlrpc/schedulerPhpClient.php b/3rd_party/storageServer/var/xmlrpc/schedulerPhpClient.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/schedulerPhpClient.php
rename to 3rd_party/storageServer/var/xmlrpc/schedulerPhpClient.php
diff --git a/src/modules/storageServer/var/xmlrpc/simpleGet.php b/3rd_party/storageServer/var/xmlrpc/simpleGet.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/simpleGet.php
rename to 3rd_party/storageServer/var/xmlrpc/simpleGet.php
diff --git a/src/modules/storageServer/var/xmlrpc/testRunner.sh b/3rd_party/storageServer/var/xmlrpc/testRunner.sh
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/testRunner.sh
rename to 3rd_party/storageServer/var/xmlrpc/testRunner.sh
diff --git a/src/modules/storageServer/var/xmlrpc/urldecode b/3rd_party/storageServer/var/xmlrpc/urldecode
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/urldecode
rename to 3rd_party/storageServer/var/xmlrpc/urldecode
diff --git a/src/modules/storageServer/var/xmlrpc/xrLocStor.php b/3rd_party/storageServer/var/xmlrpc/xrLocStor.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/xrLocStor.php
rename to 3rd_party/storageServer/var/xmlrpc/xrLocStor.php
diff --git a/src/modules/storageServer/var/xmlrpc/xr_cli_test.php b/3rd_party/storageServer/var/xmlrpc/xr_cli_test.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/xr_cli_test.php
rename to 3rd_party/storageServer/var/xmlrpc/xr_cli_test.php
diff --git a/src/modules/storageServer/var/xmlrpc/xr_web_test.php b/3rd_party/storageServer/var/xmlrpc/xr_web_test.php
similarity index 100%
rename from src/modules/storageServer/var/xmlrpc/xr_web_test.php
rename to 3rd_party/storageServer/var/xmlrpc/xr_web_test.php
diff --git a/utils/restore2.php b/utils/restore2.php
new file mode 100755
index 000000000..f5390b3cc
--- /dev/null
+++ b/utils/restore2.php
@@ -0,0 +1,41 @@
+#!/usr/bin/php
+
+<?php
+    /**
+     * Do database restore in background. - command line php application
+     *
+     * required command line parameters:
+     * @param 1. backup file
+     * @param 2. status file
+     * @param 3. token
+     * @param 4. sessid
+     *
+     */
+
+    require_once(dirname(__FILE__).'/../var/conf.php');
+    require_once(dirname(__FILE__).'/../var/GreenBox.php');
+    require_once(dirname(__FILE__).'/../var/Restore.php');
+    include_once('DB.php');
+
+    PEAR::setErrorHandling(PEAR_ERROR_RETURN);
+    $CC_DBC = DB::connect($CC_CONFIG['dsn'], TRUE);
+    if (DB::isError($CC_DBC)) {
+        die($CC_DBC->getMessage());
+    }
+    $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
+
+    $gb = new GreenBox();
+    $rs = new Restore($gb);
+
+    if ($rs->loglevel=='debug') {
+	    $rs->addLogItem('argv:'.print_r($argv,true));
+    }
+
+#    sleep(2);
+
+    $backupfile = $argv[1];
+    $token      = $argv[3];
+    $sessid     = $argv[4];
+    $rs->startRestore($backupfile,$token,$sessid);
+
+?>
\ No newline at end of file
diff --git a/utils/serbianLatinToCyrillicConverter.py b/utils/serbianLatinToCyrillicConverter.py
new file mode 100755
index 000000000..e68118995
--- /dev/null
+++ b/utils/serbianLatinToCyrillicConverter.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#-------------------------------------------------------------------------------
+#   Copyright (c) 2010 Sourcefabric O.P.S.
+#
+#   This file is part of the Campcaster project.
+#   http://campcaster.sourcefabric.org/
+#   To report bugs, send an e-mail to bugs@campware.org
+#
+#   Campcaster is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   Campcaster 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 General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Campcaster; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#
+#   Author   : $Author$
+#   Version  : $Revision$
+#   Location : $URL$
+#-------------------------------------------------------------------------------
+
+#-------------------------------------------------------------------------------
+#   This script converts an ICU localization file from Serbian Latin
+#   to Serbian Cyrillic.
+#-------------------------------------------------------------------------------
+
+import sys, re, codecs
+
+usageString = 'Usage: serbianLatinToCyrillicConverter.py' \
+              ' inputfile outputfile'
+
+if len(sys.argv) >= 3:
+    fileNameIn  = sys.argv[1]
+    fileNameOut = sys.argv[2]
+else:
+    print usageString
+    sys.exit(1)
+
+oldLines = codecs.open(fileNameIn, 'r', 'utf-8').readlines()
+newLines = [ ]
+
+def cyrillize(word):
+    if re.match(r'#.*#\Z', word):
+        return word
+    
+    compound = { u'lj' : u'љ', u'Lj' : u'Љ',
+                 u'nj' : u'њ', u'Nj' : u'Њ',
+                 u'dž' : u'џ', u'Dž' : u'Џ' }
+    simple = dict(zip(u'abvgdđežzijklmnoprstćufhcčšw',
+                      u'абвгдђежзијклмнопрстћуфхцчшв'))
+    simple.update(dict(zip(u'ABVGDĐEŽZIJKLMNOPRSTĆUFHCČŠW',
+                           u'АБВГДЂЕЖЗИЈКЛМНОПРСТЋУФХЦЧШВ')))
+    exceptions = { ur'\н'       :   ur'\n',
+                   u'Фаде ин'   :   u'Фејд ин',
+                   u'Фаде оут'  :   u'Фејд аут',
+                   u'фаде ин'   :   u'фејд ин',
+                   u'фаде оут'  :   u'фејд аут',
+                   u'есцапе'    :   u'ескејп',
+                   u'Плаy'      :   u'Плеј',
+                   u'Паусе'     :   u'Поуз',
+                   u'трацк'     :   u'трак',
+                   u'УРИ'       :   u'URI',
+                   u'РДС'       :   u'RDS',
+                   u'БПМ'       :   u'BPM',
+                   u'ИСРЦ'      :   u'ISRC' }
+    
+    for latin, cyrillic in compound.iteritems():
+        word = word.replace(latin, cyrillic)
+    for latin, cyrillic in simple.iteritems():
+        word = word.replace(latin, cyrillic)
+    for bad, good in exceptions.iteritems():
+        word = word.replace(bad, good)
+    
+    return word
+
+for line in oldLines:
+    m = re.match(r'(.*)"(.*)"(.*)\n', line)
+    if m:
+        line = m.groups()[0] + '"' \
+             + cyrillize(m.groups()[1]) + '"' \
+             + m.groups()[2] + '\n'
+    
+    elif line == 'sr_CS:table\n':
+        line = 'sr_CS_CYRILLIC:table\n'
+    
+    newLines += [line]
+
+codecs.open(fileNameOut, 'w', 'utf-8').writelines(newLines)
diff --git a/var/jingles/B92 - Brian Eno.ogg b/var/jingles/B92 - Brian Eno.ogg
deleted file mode 100644
index e525aab42..000000000
Binary files a/var/jingles/B92 - Brian Eno.ogg and /dev/null differ
diff --git a/var/jingles/B92 - MC Killer-stereo.ogg b/var/jingles/B92 - MC Killer-stereo.ogg
deleted file mode 100644
index b76a7fe71..000000000
Binary files a/var/jingles/B92 - MC Killer-stereo.ogg and /dev/null differ
diff --git a/var/jingles/B92 - Prodigy.ogg b/var/jingles/B92 - Prodigy.ogg
deleted file mode 100644
index 9eb820f09..000000000
Binary files a/var/jingles/B92 - Prodigy.ogg and /dev/null differ
diff --git a/var/jingles/LS Breaking news vocal only.ogg b/var/jingles/LS Breaking news vocal only.ogg
deleted file mode 100644
index 22813c48f..000000000
Binary files a/var/jingles/LS Breaking news vocal only.ogg and /dev/null differ
diff --git a/var/jingles/LS Breaking news.ogg b/var/jingles/LS Breaking news.ogg
deleted file mode 100644
index 6ed8cb9f9..000000000
Binary files a/var/jingles/LS Breaking news.ogg and /dev/null differ
diff --git a/var/jingles/LS Creative solo vocal FX.ogg b/var/jingles/LS Creative solo vocal FX.ogg
deleted file mode 100644
index 06b855b46..000000000
Binary files a/var/jingles/LS Creative solo vocal FX.ogg and /dev/null differ
diff --git a/var/jingles/LS Creative.ogg b/var/jingles/LS Creative.ogg
deleted file mode 100644
index f509726c7..000000000
Binary files a/var/jingles/LS Creative.ogg and /dev/null differ
diff --git a/var/jingles/LS Live FEED.ogg b/var/jingles/LS Live FEED.ogg
deleted file mode 100644
index 39f1f7c93..000000000
Binary files a/var/jingles/LS Live FEED.ogg and /dev/null differ
diff --git a/var/jingles/LS RadioShow solo vocal.ogg b/var/jingles/LS RadioShow solo vocal.ogg
deleted file mode 100644
index 50d05f166..000000000
Binary files a/var/jingles/LS RadioShow solo vocal.ogg and /dev/null differ
diff --git a/var/jingles/LS RadioShow.ogg b/var/jingles/LS RadioShow.ogg
deleted file mode 100644
index 322ed386c..000000000
Binary files a/var/jingles/LS RadioShow.ogg and /dev/null differ
diff --git a/var/jingles/LS free more than source.ogg b/var/jingles/LS free more than source.ogg
deleted file mode 100644
index 4b58a5789..000000000
Binary files a/var/jingles/LS free more than source.ogg and /dev/null differ
diff --git a/var/jingles/LS more than source phono.ogg b/var/jingles/LS more than source phono.ogg
deleted file mode 100644
index c2e5f8da7..000000000
Binary files a/var/jingles/LS more than source phono.ogg and /dev/null differ
diff --git a/var/jingles/LS more than source.ogg b/var/jingles/LS more than source.ogg
deleted file mode 100644
index aa4998f5e..000000000
Binary files a/var/jingles/LS more than source.ogg and /dev/null differ
diff --git a/var/rbot/campcaster.rb b/var/rbot/campcaster.rb
deleted file mode 100644
index 8a4cb52ba..000000000
--- a/var/rbot/campcaster.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# Plugin for the Ruby IRC bot (http://linuxbrit.co.uk/rbot/)
-#
-# Looks up information for Trac tickets for Campcaster.
-#
-# (c) 2006 Mark Kretschmann <markey@web.de>
-# Licensed under GPL V2.
-
-require 'cgi'
-begin
-  require 'rubyful_soup'
-rescue
-  warning "could not load rubyful_soup, urban dictionary disabled"
-  warning "please get it from http://www.crummy.com/software/RubyfulSoup/"
-  warning "or install it via gem"
-  return
-end
-require 'uri/common'
-
-
-class CampcasterPlugin < Plugin
-
-  def help( plugin, topic="")
-    "cc <number> => Look up information for the Campcaster ticket <number>."
-  end
-
-  def handle_ticket( m, params )
-    ticket = params[:ticket]
-    if ticket.to_i > 0
-      url = "http://trac.campware.org/campcaster/ticket/#{ticket}"
-      uri = URI.parse( url )
-    else
-      m.reply "Usage: #{help nil}"
-      return
-    end
-
-    soup = BeautifulSoup.new( @bot.httputil.get_cached( uri ) )
-    if summary = soup.find( 'h2', :attrs => { 'class' => 'summary' } )
-      status = soup.find( 'h3', :attrs => { 'class' => 'status' } ).strong
-      m.reply "TICKET: #{ticket} | SUMMARY: #{summary.contents} | STATUS: #{status.contents} | URL: #{url}"
-    else
-      m.reply "Ticket #{ticket} not found."
-    end
-  end
-
-  def handle_ls( m, params )
-    m.reply help( nil, nil )
-  end
-
-end
-
-
-plugin = CampcasterPlugin.new
-plugin.register( "cc" )
-
-plugin.map 'cc :ticket', :action => 'handle_ticket'
-plugin.map 'ls :ticket', :action => 'handle_ls'
-