From 2ece374513fdfec37a7d43f1f36f0f5de9039423 Mon Sep 17 00:00:00 2001
From: "paul.baranowski" <paul.baranowski@sourcefabric.org>
Date: Thu, 30 Sep 2010 16:59:38 -0400
Subject: [PATCH] CC-1695  	 Remove Campcaster Studio and make install
 easier Fixed references to files for new directory structure for the backend
 stuff.

---
 3rd_party/php/pear/{src => }/Archive/Tar.php  |  0
 .../php/pear/{src => }/Calendar/Calendar.php  |  0
 3rd_party/php/pear/{src => }/Calendar/Day.php |  0
 .../php/pear/{src => }/Calendar/Decorator.php |  0
 .../{src => }/Calendar/Decorator/Textual.php  |  0
 .../pear/{src => }/Calendar/Decorator/Uri.php |  0
 .../{src => }/Calendar/Decorator/Weekday.php  |  0
 .../{src => }/Calendar/Decorator/Wrapper.php  |  0
 .../{src => }/Calendar/Engine/Interface.php   |  0
 .../{src => }/Calendar/Engine/PearDate.php    |  0
 .../pear/{src => }/Calendar/Engine/UnixTS.php |  0
 .../php/pear/{src => }/Calendar/Factory.php   |  0
 .../php/pear/{src => }/Calendar/Hour.php      |  0
 .../php/pear/{src => }/Calendar/Minute.php    |  0
 .../php/pear/{src => }/Calendar/Month.php     |  0
 .../{src => }/Calendar/Month/Weekdays.php     |  0
 .../pear/{src => }/Calendar/Month/Weeks.php   |  0
 .../php/pear/{src => }/Calendar/Second.php    |  0
 .../pear/{src => }/Calendar/Table/Helper.php  |  0
 .../pear/{src => }/Calendar/Util/Textual.php  |  0
 .../php/pear/{src => }/Calendar/Util/Uri.php  |  0
 .../php/pear/{src => }/Calendar/Validator.php |  0
 .../php/pear/{src => }/Calendar/Week.php      |  0
 .../php/pear/{src => }/Calendar/Year.php      |  0
 .../php/pear/{src => }/Calendar/docs/Readme   |  0
 .../{src => }/Calendar/docs/examples/1.php    |  0
 .../{src => }/Calendar/docs/examples/1.phps   |  0
 .../{src => }/Calendar/docs/examples/10.php   |  0
 .../{src => }/Calendar/docs/examples/10.phps  |  0
 .../{src => }/Calendar/docs/examples/11.php   |  0
 .../{src => }/Calendar/docs/examples/11.phps  |  0
 .../{src => }/Calendar/docs/examples/12.php   |  0
 .../{src => }/Calendar/docs/examples/12.phps  |  0
 .../{src => }/Calendar/docs/examples/13.php   |  0
 .../{src => }/Calendar/docs/examples/13.phps  |  0
 .../{src => }/Calendar/docs/examples/14.php   |  0
 .../{src => }/Calendar/docs/examples/14.phps  |  0
 .../{src => }/Calendar/docs/examples/15.php   |  0
 .../{src => }/Calendar/docs/examples/15.phps  |  0
 .../{src => }/Calendar/docs/examples/16.php   |  0
 .../{src => }/Calendar/docs/examples/16.phps  |  0
 .../{src => }/Calendar/docs/examples/17.php   |  0
 .../{src => }/Calendar/docs/examples/17.phps  |  0
 .../{src => }/Calendar/docs/examples/18.php   |  0
 .../{src => }/Calendar/docs/examples/18.phps  |  0
 .../{src => }/Calendar/docs/examples/19.php   |  0
 .../{src => }/Calendar/docs/examples/19.phps  |  0
 .../{src => }/Calendar/docs/examples/2.php    |  0
 .../{src => }/Calendar/docs/examples/2.phps   |  0
 .../{src => }/Calendar/docs/examples/20.php   |  0
 .../{src => }/Calendar/docs/examples/20.phps  |  0
 .../{src => }/Calendar/docs/examples/21.php   |  0
 .../{src => }/Calendar/docs/examples/21.phps  |  0
 .../{src => }/Calendar/docs/examples/22.php   |  0
 .../{src => }/Calendar/docs/examples/22.phps  |  0
 .../{src => }/Calendar/docs/examples/23.php   |  0
 .../{src => }/Calendar/docs/examples/23.phps  |  0
 .../{src => }/Calendar/docs/examples/3.php    |  0
 .../{src => }/Calendar/docs/examples/3.phps   |  0
 .../{src => }/Calendar/docs/examples/4.php    |  0
 .../{src => }/Calendar/docs/examples/4.phps   |  0
 .../{src => }/Calendar/docs/examples/5.php    |  0
 .../{src => }/Calendar/docs/examples/5.phps   |  0
 .../{src => }/Calendar/docs/examples/6.php    |  0
 .../{src => }/Calendar/docs/examples/6.phps   |  0
 .../{src => }/Calendar/docs/examples/7.php    |  0
 .../{src => }/Calendar/docs/examples/7.phps   |  0
 .../{src => }/Calendar/docs/examples/8.php    |  0
 .../{src => }/Calendar/docs/examples/8.phps   |  0
 .../{src => }/Calendar/docs/examples/9.php    |  0
 .../{src => }/Calendar/docs/examples/9.phps   |  0
 .../Calendar/docs/examples/index.html         |  0
 .../php/pear/{src => }/Calendar/tests/README  |  0
 .../{src => }/Calendar/tests/all_tests.php    |  0
 .../Calendar/tests/calendar_engine_tests.php  |  0
 .../Calendar/tests/calendar_include.php       |  0
 .../Calendar/tests/calendar_tabular_tests.php |  0
 .../Calendar/tests/calendar_test.php          |  0
 .../Calendar/tests/calendar_tests.php         |  0
 .../{src => }/Calendar/tests/day_test.php     |  0
 .../Calendar/tests/decorator_test.php         |  0
 .../Calendar/tests/decorator_tests.php        |  0
 .../Calendar/tests/decorator_textual_test.php |  0
 .../Calendar/tests/decorator_uri_test.php     |  0
 .../{src => }/Calendar/tests/helper_test.php  |  0
 .../{src => }/Calendar/tests/hour_test.php    |  0
 .../{src => }/Calendar/tests/minute_test.php  |  0
 .../{src => }/Calendar/tests/month_test.php   |  0
 .../Calendar/tests/month_weekdays_test.php    |  0
 .../Calendar/tests/month_weeks_test.php       |  0
 .../Calendar/tests/peardate_engine_test.php   |  0
 .../{src => }/Calendar/tests/second_test.php  |  0
 .../Calendar/tests/simple_include.php         |  0
 .../Calendar/tests/table_helper_tests.php     |  0
 .../Calendar/tests/unixts_engine_test.php     |  0
 .../{src => }/Calendar/tests/util_tests.php   |  0
 .../Calendar/tests/util_textual_test.php      |  0
 .../Calendar/tests/util_uri_test.php          |  0
 .../Calendar/tests/validator_error_test.php   |  0
 .../Calendar/tests/validator_tests.php        |  0
 .../Calendar/tests/validator_unit_test.php    |  0
 .../Calendar/tests/week_firstday_0_test.php   |  0
 .../{src => }/Calendar/tests/week_test.php    |  0
 .../{src => }/Calendar/tests/year_test.php    |  0
 .../php/pear/{src => }/Console/Getopt.php     |  0
 3rd_party/php/pear/{src => }/DB.php           |  0
 3rd_party/php/pear/{src => }/DB/common.php    |  0
 3rd_party/php/pear/{src => }/DB/dbase.php     |  0
 3rd_party/php/pear/{src => }/DB/fbsql.php     |  0
 3rd_party/php/pear/{src => }/DB/ibase.php     |  0
 3rd_party/php/pear/{src => }/DB/ifx.php       |  0
 3rd_party/php/pear/{src => }/DB/msql.php      |  0
 3rd_party/php/pear/{src => }/DB/mssql.php     |  0
 3rd_party/php/pear/{src => }/DB/mysql.php     |  0
 3rd_party/php/pear/{src => }/DB/mysqli.php    |  0
 3rd_party/php/pear/{src => }/DB/oci8.php      |  0
 3rd_party/php/pear/{src => }/DB/odbc.php      |  0
 3rd_party/php/pear/{src => }/DB/pgsql.php     |  0
 3rd_party/php/pear/{src => }/DB/sqlite.php    |  0
 3rd_party/php/pear/{src => }/DB/storage.php   |  0
 3rd_party/php/pear/{src => }/DB/sybase.php    |  0
 3rd_party/php/pear/{src => }/File.php         |  0
 3rd_party/php/pear/{src => }/File/CSV.php     |  0
 3rd_party/php/pear/{src => }/File/Find.php    |  0
 3rd_party/php/pear/{src => }/File/Util.php    |  0
 3rd_party/php/pear/{src => }/HTML/Common.php  |  0
 .../php/pear/{src => }/HTML/QuickForm.php     |  0
 .../{src => }/HTML/QuickForm/Renderer.php     |  0
 .../HTML/QuickForm/Renderer/Array.php         |  0
 .../HTML/QuickForm/Renderer/ArraySmarty.php   |  0
 .../HTML/QuickForm/Renderer/Default.php       |  0
 .../HTML/QuickForm/Renderer/ITDynamic.php     |  0
 .../HTML/QuickForm/Renderer/ITStatic.php      |  0
 .../HTML/QuickForm/Renderer/Object.php        |  0
 .../HTML/QuickForm/Renderer/ObjectFlexy.php   |  0
 .../HTML/QuickForm/Renderer/QuickHtml.php     |  0
 .../pear/{src => }/HTML/QuickForm/Rule.php    |  0
 .../HTML/QuickForm/Rule/Callback.php          |  0
 .../{src => }/HTML/QuickForm/Rule/Compare.php |  0
 .../{src => }/HTML/QuickForm/Rule/Email.php   |  0
 .../{src => }/HTML/QuickForm/Rule/Range.php   |  0
 .../{src => }/HTML/QuickForm/Rule/Regex.php   |  0
 .../HTML/QuickForm/Rule/Required.php          |  0
 .../{src => }/HTML/QuickForm/RuleRegistry.php |  0
 .../{src => }/HTML/QuickForm/advcheckbox.php  |  0
 .../{src => }/HTML/QuickForm/autocomplete.php |  0
 .../pear/{src => }/HTML/QuickForm/button.php  |  0
 .../{src => }/HTML/QuickForm/checkbox.php     |  0
 .../pear/{src => }/HTML/QuickForm/date.php    |  0
 .../pear/{src => }/HTML/QuickForm/element.php |  0
 .../pear/{src => }/HTML/QuickForm/file.php    |  0
 .../pear/{src => }/HTML/QuickForm/group.php   |  0
 .../pear/{src => }/HTML/QuickForm/header.php  |  0
 .../pear/{src => }/HTML/QuickForm/hidden.php  |  0
 .../{src => }/HTML/QuickForm/hiddenselect.php |  0
 .../{src => }/HTML/QuickForm/hierselect.php   |  0
 .../pear/{src => }/HTML/QuickForm/html.php    |  0
 .../pear/{src => }/HTML/QuickForm/image.php   |  0
 .../pear/{src => }/HTML/QuickForm/input.php   |  0
 .../pear/{src => }/HTML/QuickForm/link.php    |  0
 .../{src => }/HTML/QuickForm/password.php     |  0
 .../pear/{src => }/HTML/QuickForm/radio.php   |  0
 .../pear/{src => }/HTML/QuickForm/reset.php   |  0
 .../pear/{src => }/HTML/QuickForm/select.php  |  0
 .../pear/{src => }/HTML/QuickForm/static.php  |  0
 .../pear/{src => }/HTML/QuickForm/submit.php  |  0
 .../pear/{src => }/HTML/QuickForm/text.php    |  0
 .../{src => }/HTML/QuickForm/textarea.php     |  0
 .../pear/{src => }/HTML/QuickForm/xbutton.php |  0
 3rd_party/php/pear/{src => }/OS/Guess.php     |  0
 3rd_party/php/pear/{src => }/PEAR.php         |  0
 .../php/pear/{src => }/PEAR/Autoloader.php    |  0
 3rd_party/php/pear/{src => }/PEAR/Builder.php |  0
 .../php/pear/{src => }/PEAR/ChannelFile.php   |  0
 .../{src => }/PEAR/ChannelFile/Parser.php     |  0
 3rd_party/php/pear/{src => }/PEAR/Command.php |  0
 .../php/pear/{src => }/PEAR/Command/Auth.php  |  0
 .../php/pear/{src => }/PEAR/Command/Auth.xml  |  0
 .../php/pear/{src => }/PEAR/Command/Build.php |  0
 .../php/pear/{src => }/PEAR/Command/Build.xml |  0
 .../pear/{src => }/PEAR/Command/Channels.php  |  0
 .../pear/{src => }/PEAR/Command/Channels.xml  |  0
 .../pear/{src => }/PEAR/Command/Common.php    |  0
 .../pear/{src => }/PEAR/Command/Config.php    |  0
 .../pear/{src => }/PEAR/Command/Config.xml    |  0
 .../pear/{src => }/PEAR/Command/Install.php   |  0
 .../pear/{src => }/PEAR/Command/Install.xml   |  0
 .../pear/{src => }/PEAR/Command/Mirror.php    |  0
 .../pear/{src => }/PEAR/Command/Mirror.xml    |  0
 .../pear/{src => }/PEAR/Command/Package.php   |  0
 .../pear/{src => }/PEAR/Command/Package.xml   |  0
 .../pear/{src => }/PEAR/Command/Pickle.php    |  0
 .../pear/{src => }/PEAR/Command/Pickle.xml    |  0
 .../pear/{src => }/PEAR/Command/Registry.php  |  0
 .../pear/{src => }/PEAR/Command/Registry.xml  |  0
 .../pear/{src => }/PEAR/Command/Remote.php    |  0
 .../pear/{src => }/PEAR/Command/Remote.xml    |  0
 .../php/pear/{src => }/PEAR/Command/Test.php  |  0
 .../php/pear/{src => }/PEAR/Command/Test.xml  |  0
 3rd_party/php/pear/{src => }/PEAR/Common.php  |  0
 3rd_party/php/pear/{src => }/PEAR/Config.php  |  0
 .../php/pear/{src => }/PEAR/Dependency2.php   |  0
 .../php/pear/{src => }/PEAR/DependencyDB.php  |  0
 .../php/pear/{src => }/PEAR/Downloader.php    |  0
 .../{src => }/PEAR/Downloader/Package.php     |  0
 .../php/pear/{src => }/PEAR/ErrorStack.php    |  0
 .../php/pear/{src => }/PEAR/Exception.php     |  0
 .../{src => }/PEAR/FixPHP5PEARWarnings.php    |  0
 .../php/pear/{src => }/PEAR/Frontend.php      |  0
 .../php/pear/{src => }/PEAR/Frontend/CLI.php  |  0
 .../php/pear/{src => }/PEAR/Installer.php     |  0
 .../pear/{src => }/PEAR/Installer/Role.php    |  0
 .../{src => }/PEAR/Installer/Role/Cfg.php     |  0
 .../{src => }/PEAR/Installer/Role/Cfg.xml     |  0
 .../{src => }/PEAR/Installer/Role/Common.php  |  0
 .../{src => }/PEAR/Installer/Role/Data.php    |  0
 .../{src => }/PEAR/Installer/Role/Data.xml    |  0
 .../{src => }/PEAR/Installer/Role/Doc.php     |  0
 .../{src => }/PEAR/Installer/Role/Doc.xml     |  0
 .../{src => }/PEAR/Installer/Role/Ext.php     |  0
 .../{src => }/PEAR/Installer/Role/Ext.xml     |  0
 .../{src => }/PEAR/Installer/Role/Php.php     |  0
 .../{src => }/PEAR/Installer/Role/Php.xml     |  0
 .../{src => }/PEAR/Installer/Role/Script.php  |  0
 .../{src => }/PEAR/Installer/Role/Script.xml  |  0
 .../{src => }/PEAR/Installer/Role/Src.php     |  0
 .../{src => }/PEAR/Installer/Role/Src.xml     |  0
 .../{src => }/PEAR/Installer/Role/Test.php    |  0
 .../{src => }/PEAR/Installer/Role/Test.xml    |  0
 .../{src => }/PEAR/Installer/Role/Www.php     |  0
 .../{src => }/PEAR/Installer/Role/Www.xml     |  0
 .../php/pear/{src => }/PEAR/PackageFile.php   |  0
 .../PEAR/PackageFile/Generator/v1.php         |  0
 .../PEAR/PackageFile/Generator/v2.php         |  0
 .../{src => }/PEAR/PackageFile/Parser/v1.php  |  0
 .../{src => }/PEAR/PackageFile/Parser/v2.php  |  0
 .../pear/{src => }/PEAR/PackageFile/v1.php    |  0
 .../pear/{src => }/PEAR/PackageFile/v2.php    |  0
 .../PEAR/PackageFile/v2/Validator.php         |  0
 .../pear/{src => }/PEAR/PackageFile/v2/rw.php |  0
 .../php/pear/{src => }/PEAR/Packager.php      |  0
 3rd_party/php/pear/{src => }/PEAR/REST.php    |  0
 3rd_party/php/pear/{src => }/PEAR/REST/10.php |  0
 3rd_party/php/pear/{src => }/PEAR/REST/11.php |  0
 3rd_party/php/pear/{src => }/PEAR/REST/13.php |  0
 .../php/pear/{src => }/PEAR/Registry.php      |  0
 3rd_party/php/pear/{src => }/PEAR/RunTest.php |  0
 .../php/pear/{src => }/PEAR/Task/Common.php   |  0
 .../{src => }/PEAR/Task/Postinstallscript.php |  0
 .../PEAR/Task/Postinstallscript/rw.php        |  0
 .../php/pear/{src => }/PEAR/Task/Replace.php  |  0
 .../pear/{src => }/PEAR/Task/Replace/rw.php   |  0
 .../php/pear/{src => }/PEAR/Task/Unixeol.php  |  0
 .../pear/{src => }/PEAR/Task/Unixeol/rw.php   |  0
 .../pear/{src => }/PEAR/Task/Windowseol.php   |  0
 .../{src => }/PEAR/Task/Windowseol/rw.php     |  0
 .../php/pear/{src => }/PEAR/Validate.php      |  0
 .../pear/{src => }/PEAR/Validator/PECL.php    |  0
 .../php/pear/{src => }/PEAR/XMLParser.php     |  0
 3rd_party/php/pear/{src => }/PEAR5.php        |  0
 3rd_party/php/pear/{src => }/PHPUnit.php      |  0
 .../php/pear/{src => }/PHPUnit/Assert.php     |  0
 .../php/pear/{src => }/PHPUnit/GUI/Gtk.php    |  0
 .../php/pear/{src => }/PHPUnit/GUI/HTML.php   |  0
 .../php/pear/{src => }/PHPUnit/GUI/HTML.tpl   |  0
 .../{src => }/PHPUnit/GUI/SetupDecorator.php  |  0
 .../pear/{src => }/PHPUnit/RepeatedTest.php   |  0
 .../php/pear/{src => }/PHPUnit/Skeleton.php   |  0
 .../php/pear/{src => }/PHPUnit/TestCase.php   |  0
 .../pear/{src => }/PHPUnit/TestDecorator.php  |  0
 .../pear/{src => }/PHPUnit/TestFailure.php    |  0
 .../pear/{src => }/PHPUnit/TestListener.php   |  0
 .../php/pear/{src => }/PHPUnit/TestResult.php |  0
 .../php/pear/{src => }/PHPUnit/TestSuite.php  |  0
 3rd_party/php/pear/{src => }/System.php       |  0
 3rd_party/php/pear/{src => }/VERSIONS.txt     |  0
 .../php/pear/{src => }/XML/Beautifier.php     |  0
 .../{src => }/XML/Beautifier/Renderer.php     |  0
 .../XML/Beautifier/Renderer/Plain.php         |  0
 .../{src => }/XML/Beautifier/Tokenizer.php    |  0
 3rd_party/php/pear/{src => }/XML/Parser.php   |  0
 .../php/pear/{src => }/XML/Parser/Simple.php  |  0
 3rd_party/php/pear/{src => }/XML/RPC.php      |  0
 3rd_party/php/pear/{src => }/XML/RPC/Dump.php |  0
 .../php/pear/{src => }/XML/RPC/Server.php     |  0
 .../php/pear/{src => }/XML/Serializer.php     |  0
 .../php/pear/{src => }/XML/Unserializer.php   |  0
 3rd_party/php/pear/{src => }/XML/Util.php     |  0
 3rd_party/php/pear/bin/autogen.sh             | 81 -------------------
 3rd_party/php/pear/configure                  | 47 -----------
 3rd_party/php/pear/etc/Makefile.in            | 74 -----------------
 3rd_party/php/pear/etc/configure.ac           | 43 ----------
 3rd_party/php/pear/etc/pear.conf.template     |  2 -
 3rd_party/php/pear/tmp/.keepme                |  1 -
 backend/BasicStor.php                         | 61 +++++++-------
 backend/CleanStor.php                         |  4 +-
 backend/GreenBox.php                          | 31 ++-----
 backend/StoredFile.php                        |  3 +-
 backend/Subjects.php                          |  1 -
 backend/cron/transportCron.php                |  2 +-
 backend/tests/AllTests.php                    |  2 +-
 backend/tests/analyze.php                     |  2 +-
 backend/tests/transTest.php                   |  2 +-
 backend/tests/webstreamTest.php               |  2 +-
 backend/xmlrpc/put.php                        |  2 +-
 backend/xmlrpc/simpleGet.php                  |  2 +-
 backend/xmlrpc/xrLocStor.php                  |  2 +-
 backend/xmlrpc/xr_cli_test.php                |  2 +-
 backend/xmlrpc/xr_web_test.php                |  2 +-
 conf.php                                      | 18 ++---
 .../bin/install.sh => install/install-pear.sh |  0
 install/install.php                           | 12 +--
 utils/backup.php                              |  7 +-
 utils/campcaster-import.php                   |  5 +-
 utils/conf.php                                |  3 -
 utils/dumpDbSchema.php                        |  3 +-
 utils/getStorPath.php                         |  3 +-
 utils/restore.php                             |  7 +-
 utils/restore2.php                            |  6 +-
 319 files changed, 75 insertions(+), 357 deletions(-)
 rename 3rd_party/php/pear/{src => }/Archive/Tar.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Calendar.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Day.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Decorator.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Decorator/Textual.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Decorator/Uri.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Decorator/Weekday.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Decorator/Wrapper.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Engine/Interface.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Engine/PearDate.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Engine/UnixTS.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Factory.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Hour.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Minute.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Month.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Month/Weekdays.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Month/Weeks.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Second.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Table/Helper.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Util/Textual.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Util/Uri.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Validator.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Week.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/Year.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/Readme (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/1.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/1.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/10.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/10.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/11.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/11.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/12.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/12.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/13.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/13.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/14.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/14.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/15.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/15.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/16.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/16.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/17.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/17.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/18.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/18.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/19.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/19.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/2.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/2.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/20.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/20.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/21.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/21.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/22.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/22.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/23.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/23.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/3.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/3.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/4.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/4.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/5.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/5.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/6.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/6.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/7.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/7.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/8.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/8.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/9.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/9.phps (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/docs/examples/index.html (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/README (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/all_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/calendar_engine_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/calendar_include.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/calendar_tabular_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/calendar_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/calendar_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/day_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/decorator_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/decorator_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/decorator_textual_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/decorator_uri_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/helper_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/hour_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/minute_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/month_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/month_weekdays_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/month_weeks_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/peardate_engine_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/second_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/simple_include.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/table_helper_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/unixts_engine_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/util_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/util_textual_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/util_uri_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/validator_error_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/validator_tests.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/validator_unit_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/week_firstday_0_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/week_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Calendar/tests/year_test.php (100%)
 rename 3rd_party/php/pear/{src => }/Console/Getopt.php (100%)
 rename 3rd_party/php/pear/{src => }/DB.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/common.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/dbase.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/fbsql.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/ibase.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/ifx.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/msql.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/mssql.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/mysql.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/mysqli.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/oci8.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/odbc.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/pgsql.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/sqlite.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/storage.php (100%)
 rename 3rd_party/php/pear/{src => }/DB/sybase.php (100%)
 rename 3rd_party/php/pear/{src => }/File.php (100%)
 rename 3rd_party/php/pear/{src => }/File/CSV.php (100%)
 rename 3rd_party/php/pear/{src => }/File/Find.php (100%)
 rename 3rd_party/php/pear/{src => }/File/Util.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/Common.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/Array.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/ArraySmarty.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/Default.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/ITDynamic.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/ITStatic.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/Object.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/ObjectFlexy.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Renderer/QuickHtml.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Rule.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Rule/Callback.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Rule/Compare.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Rule/Email.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Rule/Range.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Rule/Regex.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/Rule/Required.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/RuleRegistry.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/advcheckbox.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/autocomplete.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/button.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/checkbox.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/date.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/element.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/file.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/group.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/header.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/hidden.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/hiddenselect.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/hierselect.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/html.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/image.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/input.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/link.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/password.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/radio.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/reset.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/select.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/static.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/submit.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/text.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/textarea.php (100%)
 rename 3rd_party/php/pear/{src => }/HTML/QuickForm/xbutton.php (100%)
 rename 3rd_party/php/pear/{src => }/OS/Guess.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Autoloader.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Builder.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/ChannelFile.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/ChannelFile/Parser.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Auth.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Auth.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Build.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Build.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Channels.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Channels.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Common.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Config.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Config.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Install.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Install.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Mirror.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Mirror.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Package.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Package.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Pickle.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Pickle.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Registry.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Registry.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Remote.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Remote.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Test.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Command/Test.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Common.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Config.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Dependency2.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/DependencyDB.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Downloader.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Downloader/Package.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/ErrorStack.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Exception.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/FixPHP5PEARWarnings.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Frontend.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Frontend/CLI.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Cfg.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Cfg.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Common.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Data.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Data.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Doc.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Doc.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Ext.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Ext.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Php.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Php.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Script.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Script.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Src.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Src.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Test.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Test.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Www.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Installer/Role/Www.xml (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/Generator/v1.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/Generator/v2.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/Parser/v1.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/Parser/v2.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/v1.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/v2.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/v2/Validator.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/PackageFile/v2/rw.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Packager.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/REST.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/REST/10.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/REST/11.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/REST/13.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Registry.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/RunTest.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Common.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Postinstallscript.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Postinstallscript/rw.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Replace.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Replace/rw.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Unixeol.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Unixeol/rw.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Windowseol.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Task/Windowseol/rw.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Validate.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/Validator/PECL.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR/XMLParser.php (100%)
 rename 3rd_party/php/pear/{src => }/PEAR5.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/Assert.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/GUI/Gtk.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/GUI/HTML.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/GUI/HTML.tpl (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/GUI/SetupDecorator.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/RepeatedTest.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/Skeleton.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/TestCase.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/TestDecorator.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/TestFailure.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/TestListener.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/TestResult.php (100%)
 rename 3rd_party/php/pear/{src => }/PHPUnit/TestSuite.php (100%)
 rename 3rd_party/php/pear/{src => }/System.php (100%)
 rename 3rd_party/php/pear/{src => }/VERSIONS.txt (100%)
 rename 3rd_party/php/pear/{src => }/XML/Beautifier.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Beautifier/Renderer.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Beautifier/Renderer/Plain.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Beautifier/Tokenizer.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Parser.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Parser/Simple.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/RPC.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/RPC/Dump.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/RPC/Server.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Serializer.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Unserializer.php (100%)
 rename 3rd_party/php/pear/{src => }/XML/Util.php (100%)
 delete mode 100755 3rd_party/php/pear/bin/autogen.sh
 delete mode 100755 3rd_party/php/pear/configure
 delete mode 100644 3rd_party/php/pear/etc/Makefile.in
 delete mode 100644 3rd_party/php/pear/etc/configure.ac
 delete mode 100644 3rd_party/php/pear/etc/pear.conf.template
 delete mode 100644 3rd_party/php/pear/tmp/.keepme
 rename 3rd_party/php/pear/bin/install.sh => install/install-pear.sh (100%)
 delete mode 100644 utils/conf.php

diff --git a/3rd_party/php/pear/src/Archive/Tar.php b/3rd_party/php/pear/Archive/Tar.php
similarity index 100%
rename from 3rd_party/php/pear/src/Archive/Tar.php
rename to 3rd_party/php/pear/Archive/Tar.php
diff --git a/3rd_party/php/pear/src/Calendar/Calendar.php b/3rd_party/php/pear/Calendar/Calendar.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Calendar.php
rename to 3rd_party/php/pear/Calendar/Calendar.php
diff --git a/3rd_party/php/pear/src/Calendar/Day.php b/3rd_party/php/pear/Calendar/Day.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Day.php
rename to 3rd_party/php/pear/Calendar/Day.php
diff --git a/3rd_party/php/pear/src/Calendar/Decorator.php b/3rd_party/php/pear/Calendar/Decorator.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Decorator.php
rename to 3rd_party/php/pear/Calendar/Decorator.php
diff --git a/3rd_party/php/pear/src/Calendar/Decorator/Textual.php b/3rd_party/php/pear/Calendar/Decorator/Textual.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Decorator/Textual.php
rename to 3rd_party/php/pear/Calendar/Decorator/Textual.php
diff --git a/3rd_party/php/pear/src/Calendar/Decorator/Uri.php b/3rd_party/php/pear/Calendar/Decorator/Uri.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Decorator/Uri.php
rename to 3rd_party/php/pear/Calendar/Decorator/Uri.php
diff --git a/3rd_party/php/pear/src/Calendar/Decorator/Weekday.php b/3rd_party/php/pear/Calendar/Decorator/Weekday.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Decorator/Weekday.php
rename to 3rd_party/php/pear/Calendar/Decorator/Weekday.php
diff --git a/3rd_party/php/pear/src/Calendar/Decorator/Wrapper.php b/3rd_party/php/pear/Calendar/Decorator/Wrapper.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Decorator/Wrapper.php
rename to 3rd_party/php/pear/Calendar/Decorator/Wrapper.php
diff --git a/3rd_party/php/pear/src/Calendar/Engine/Interface.php b/3rd_party/php/pear/Calendar/Engine/Interface.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Engine/Interface.php
rename to 3rd_party/php/pear/Calendar/Engine/Interface.php
diff --git a/3rd_party/php/pear/src/Calendar/Engine/PearDate.php b/3rd_party/php/pear/Calendar/Engine/PearDate.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Engine/PearDate.php
rename to 3rd_party/php/pear/Calendar/Engine/PearDate.php
diff --git a/3rd_party/php/pear/src/Calendar/Engine/UnixTS.php b/3rd_party/php/pear/Calendar/Engine/UnixTS.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Engine/UnixTS.php
rename to 3rd_party/php/pear/Calendar/Engine/UnixTS.php
diff --git a/3rd_party/php/pear/src/Calendar/Factory.php b/3rd_party/php/pear/Calendar/Factory.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Factory.php
rename to 3rd_party/php/pear/Calendar/Factory.php
diff --git a/3rd_party/php/pear/src/Calendar/Hour.php b/3rd_party/php/pear/Calendar/Hour.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Hour.php
rename to 3rd_party/php/pear/Calendar/Hour.php
diff --git a/3rd_party/php/pear/src/Calendar/Minute.php b/3rd_party/php/pear/Calendar/Minute.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Minute.php
rename to 3rd_party/php/pear/Calendar/Minute.php
diff --git a/3rd_party/php/pear/src/Calendar/Month.php b/3rd_party/php/pear/Calendar/Month.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Month.php
rename to 3rd_party/php/pear/Calendar/Month.php
diff --git a/3rd_party/php/pear/src/Calendar/Month/Weekdays.php b/3rd_party/php/pear/Calendar/Month/Weekdays.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Month/Weekdays.php
rename to 3rd_party/php/pear/Calendar/Month/Weekdays.php
diff --git a/3rd_party/php/pear/src/Calendar/Month/Weeks.php b/3rd_party/php/pear/Calendar/Month/Weeks.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Month/Weeks.php
rename to 3rd_party/php/pear/Calendar/Month/Weeks.php
diff --git a/3rd_party/php/pear/src/Calendar/Second.php b/3rd_party/php/pear/Calendar/Second.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Second.php
rename to 3rd_party/php/pear/Calendar/Second.php
diff --git a/3rd_party/php/pear/src/Calendar/Table/Helper.php b/3rd_party/php/pear/Calendar/Table/Helper.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Table/Helper.php
rename to 3rd_party/php/pear/Calendar/Table/Helper.php
diff --git a/3rd_party/php/pear/src/Calendar/Util/Textual.php b/3rd_party/php/pear/Calendar/Util/Textual.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Util/Textual.php
rename to 3rd_party/php/pear/Calendar/Util/Textual.php
diff --git a/3rd_party/php/pear/src/Calendar/Util/Uri.php b/3rd_party/php/pear/Calendar/Util/Uri.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Util/Uri.php
rename to 3rd_party/php/pear/Calendar/Util/Uri.php
diff --git a/3rd_party/php/pear/src/Calendar/Validator.php b/3rd_party/php/pear/Calendar/Validator.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Validator.php
rename to 3rd_party/php/pear/Calendar/Validator.php
diff --git a/3rd_party/php/pear/src/Calendar/Week.php b/3rd_party/php/pear/Calendar/Week.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Week.php
rename to 3rd_party/php/pear/Calendar/Week.php
diff --git a/3rd_party/php/pear/src/Calendar/Year.php b/3rd_party/php/pear/Calendar/Year.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/Year.php
rename to 3rd_party/php/pear/Calendar/Year.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/Readme b/3rd_party/php/pear/Calendar/docs/Readme
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/Readme
rename to 3rd_party/php/pear/Calendar/docs/Readme
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/1.php b/3rd_party/php/pear/Calendar/docs/examples/1.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/1.php
rename to 3rd_party/php/pear/Calendar/docs/examples/1.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/1.phps b/3rd_party/php/pear/Calendar/docs/examples/1.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/1.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/1.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/10.php b/3rd_party/php/pear/Calendar/docs/examples/10.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/10.php
rename to 3rd_party/php/pear/Calendar/docs/examples/10.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/10.phps b/3rd_party/php/pear/Calendar/docs/examples/10.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/10.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/10.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/11.php b/3rd_party/php/pear/Calendar/docs/examples/11.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/11.php
rename to 3rd_party/php/pear/Calendar/docs/examples/11.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/11.phps b/3rd_party/php/pear/Calendar/docs/examples/11.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/11.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/11.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/12.php b/3rd_party/php/pear/Calendar/docs/examples/12.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/12.php
rename to 3rd_party/php/pear/Calendar/docs/examples/12.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/12.phps b/3rd_party/php/pear/Calendar/docs/examples/12.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/12.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/12.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/13.php b/3rd_party/php/pear/Calendar/docs/examples/13.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/13.php
rename to 3rd_party/php/pear/Calendar/docs/examples/13.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/13.phps b/3rd_party/php/pear/Calendar/docs/examples/13.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/13.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/13.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/14.php b/3rd_party/php/pear/Calendar/docs/examples/14.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/14.php
rename to 3rd_party/php/pear/Calendar/docs/examples/14.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/14.phps b/3rd_party/php/pear/Calendar/docs/examples/14.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/14.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/14.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/15.php b/3rd_party/php/pear/Calendar/docs/examples/15.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/15.php
rename to 3rd_party/php/pear/Calendar/docs/examples/15.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/15.phps b/3rd_party/php/pear/Calendar/docs/examples/15.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/15.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/15.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/16.php b/3rd_party/php/pear/Calendar/docs/examples/16.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/16.php
rename to 3rd_party/php/pear/Calendar/docs/examples/16.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/16.phps b/3rd_party/php/pear/Calendar/docs/examples/16.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/16.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/16.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/17.php b/3rd_party/php/pear/Calendar/docs/examples/17.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/17.php
rename to 3rd_party/php/pear/Calendar/docs/examples/17.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/17.phps b/3rd_party/php/pear/Calendar/docs/examples/17.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/17.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/17.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/18.php b/3rd_party/php/pear/Calendar/docs/examples/18.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/18.php
rename to 3rd_party/php/pear/Calendar/docs/examples/18.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/18.phps b/3rd_party/php/pear/Calendar/docs/examples/18.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/18.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/18.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/19.php b/3rd_party/php/pear/Calendar/docs/examples/19.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/19.php
rename to 3rd_party/php/pear/Calendar/docs/examples/19.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/19.phps b/3rd_party/php/pear/Calendar/docs/examples/19.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/19.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/19.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/2.php b/3rd_party/php/pear/Calendar/docs/examples/2.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/2.php
rename to 3rd_party/php/pear/Calendar/docs/examples/2.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/2.phps b/3rd_party/php/pear/Calendar/docs/examples/2.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/2.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/2.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/20.php b/3rd_party/php/pear/Calendar/docs/examples/20.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/20.php
rename to 3rd_party/php/pear/Calendar/docs/examples/20.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/20.phps b/3rd_party/php/pear/Calendar/docs/examples/20.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/20.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/20.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/21.php b/3rd_party/php/pear/Calendar/docs/examples/21.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/21.php
rename to 3rd_party/php/pear/Calendar/docs/examples/21.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/21.phps b/3rd_party/php/pear/Calendar/docs/examples/21.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/21.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/21.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/22.php b/3rd_party/php/pear/Calendar/docs/examples/22.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/22.php
rename to 3rd_party/php/pear/Calendar/docs/examples/22.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/22.phps b/3rd_party/php/pear/Calendar/docs/examples/22.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/22.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/22.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/23.php b/3rd_party/php/pear/Calendar/docs/examples/23.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/23.php
rename to 3rd_party/php/pear/Calendar/docs/examples/23.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/23.phps b/3rd_party/php/pear/Calendar/docs/examples/23.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/23.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/23.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/3.php b/3rd_party/php/pear/Calendar/docs/examples/3.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/3.php
rename to 3rd_party/php/pear/Calendar/docs/examples/3.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/3.phps b/3rd_party/php/pear/Calendar/docs/examples/3.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/3.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/3.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/4.php b/3rd_party/php/pear/Calendar/docs/examples/4.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/4.php
rename to 3rd_party/php/pear/Calendar/docs/examples/4.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/4.phps b/3rd_party/php/pear/Calendar/docs/examples/4.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/4.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/4.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/5.php b/3rd_party/php/pear/Calendar/docs/examples/5.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/5.php
rename to 3rd_party/php/pear/Calendar/docs/examples/5.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/5.phps b/3rd_party/php/pear/Calendar/docs/examples/5.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/5.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/5.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/6.php b/3rd_party/php/pear/Calendar/docs/examples/6.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/6.php
rename to 3rd_party/php/pear/Calendar/docs/examples/6.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/6.phps b/3rd_party/php/pear/Calendar/docs/examples/6.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/6.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/6.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/7.php b/3rd_party/php/pear/Calendar/docs/examples/7.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/7.php
rename to 3rd_party/php/pear/Calendar/docs/examples/7.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/7.phps b/3rd_party/php/pear/Calendar/docs/examples/7.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/7.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/7.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/8.php b/3rd_party/php/pear/Calendar/docs/examples/8.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/8.php
rename to 3rd_party/php/pear/Calendar/docs/examples/8.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/8.phps b/3rd_party/php/pear/Calendar/docs/examples/8.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/8.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/8.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/9.php b/3rd_party/php/pear/Calendar/docs/examples/9.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/9.php
rename to 3rd_party/php/pear/Calendar/docs/examples/9.php
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/9.phps b/3rd_party/php/pear/Calendar/docs/examples/9.phps
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/9.phps
rename to 3rd_party/php/pear/Calendar/docs/examples/9.phps
diff --git a/3rd_party/php/pear/src/Calendar/docs/examples/index.html b/3rd_party/php/pear/Calendar/docs/examples/index.html
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/docs/examples/index.html
rename to 3rd_party/php/pear/Calendar/docs/examples/index.html
diff --git a/3rd_party/php/pear/src/Calendar/tests/README b/3rd_party/php/pear/Calendar/tests/README
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/README
rename to 3rd_party/php/pear/Calendar/tests/README
diff --git a/3rd_party/php/pear/src/Calendar/tests/all_tests.php b/3rd_party/php/pear/Calendar/tests/all_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/all_tests.php
rename to 3rd_party/php/pear/Calendar/tests/all_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/calendar_engine_tests.php b/3rd_party/php/pear/Calendar/tests/calendar_engine_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/calendar_engine_tests.php
rename to 3rd_party/php/pear/Calendar/tests/calendar_engine_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/calendar_include.php b/3rd_party/php/pear/Calendar/tests/calendar_include.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/calendar_include.php
rename to 3rd_party/php/pear/Calendar/tests/calendar_include.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/calendar_tabular_tests.php b/3rd_party/php/pear/Calendar/tests/calendar_tabular_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/calendar_tabular_tests.php
rename to 3rd_party/php/pear/Calendar/tests/calendar_tabular_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/calendar_test.php b/3rd_party/php/pear/Calendar/tests/calendar_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/calendar_test.php
rename to 3rd_party/php/pear/Calendar/tests/calendar_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/calendar_tests.php b/3rd_party/php/pear/Calendar/tests/calendar_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/calendar_tests.php
rename to 3rd_party/php/pear/Calendar/tests/calendar_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/day_test.php b/3rd_party/php/pear/Calendar/tests/day_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/day_test.php
rename to 3rd_party/php/pear/Calendar/tests/day_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/decorator_test.php b/3rd_party/php/pear/Calendar/tests/decorator_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/decorator_test.php
rename to 3rd_party/php/pear/Calendar/tests/decorator_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/decorator_tests.php b/3rd_party/php/pear/Calendar/tests/decorator_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/decorator_tests.php
rename to 3rd_party/php/pear/Calendar/tests/decorator_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/decorator_textual_test.php b/3rd_party/php/pear/Calendar/tests/decorator_textual_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/decorator_textual_test.php
rename to 3rd_party/php/pear/Calendar/tests/decorator_textual_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/decorator_uri_test.php b/3rd_party/php/pear/Calendar/tests/decorator_uri_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/decorator_uri_test.php
rename to 3rd_party/php/pear/Calendar/tests/decorator_uri_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/helper_test.php b/3rd_party/php/pear/Calendar/tests/helper_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/helper_test.php
rename to 3rd_party/php/pear/Calendar/tests/helper_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/hour_test.php b/3rd_party/php/pear/Calendar/tests/hour_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/hour_test.php
rename to 3rd_party/php/pear/Calendar/tests/hour_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/minute_test.php b/3rd_party/php/pear/Calendar/tests/minute_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/minute_test.php
rename to 3rd_party/php/pear/Calendar/tests/minute_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/month_test.php b/3rd_party/php/pear/Calendar/tests/month_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/month_test.php
rename to 3rd_party/php/pear/Calendar/tests/month_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/month_weekdays_test.php b/3rd_party/php/pear/Calendar/tests/month_weekdays_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/month_weekdays_test.php
rename to 3rd_party/php/pear/Calendar/tests/month_weekdays_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/month_weeks_test.php b/3rd_party/php/pear/Calendar/tests/month_weeks_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/month_weeks_test.php
rename to 3rd_party/php/pear/Calendar/tests/month_weeks_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/peardate_engine_test.php b/3rd_party/php/pear/Calendar/tests/peardate_engine_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/peardate_engine_test.php
rename to 3rd_party/php/pear/Calendar/tests/peardate_engine_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/second_test.php b/3rd_party/php/pear/Calendar/tests/second_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/second_test.php
rename to 3rd_party/php/pear/Calendar/tests/second_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/simple_include.php b/3rd_party/php/pear/Calendar/tests/simple_include.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/simple_include.php
rename to 3rd_party/php/pear/Calendar/tests/simple_include.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/table_helper_tests.php b/3rd_party/php/pear/Calendar/tests/table_helper_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/table_helper_tests.php
rename to 3rd_party/php/pear/Calendar/tests/table_helper_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/unixts_engine_test.php b/3rd_party/php/pear/Calendar/tests/unixts_engine_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/unixts_engine_test.php
rename to 3rd_party/php/pear/Calendar/tests/unixts_engine_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/util_tests.php b/3rd_party/php/pear/Calendar/tests/util_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/util_tests.php
rename to 3rd_party/php/pear/Calendar/tests/util_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/util_textual_test.php b/3rd_party/php/pear/Calendar/tests/util_textual_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/util_textual_test.php
rename to 3rd_party/php/pear/Calendar/tests/util_textual_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/util_uri_test.php b/3rd_party/php/pear/Calendar/tests/util_uri_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/util_uri_test.php
rename to 3rd_party/php/pear/Calendar/tests/util_uri_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/validator_error_test.php b/3rd_party/php/pear/Calendar/tests/validator_error_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/validator_error_test.php
rename to 3rd_party/php/pear/Calendar/tests/validator_error_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/validator_tests.php b/3rd_party/php/pear/Calendar/tests/validator_tests.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/validator_tests.php
rename to 3rd_party/php/pear/Calendar/tests/validator_tests.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/validator_unit_test.php b/3rd_party/php/pear/Calendar/tests/validator_unit_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/validator_unit_test.php
rename to 3rd_party/php/pear/Calendar/tests/validator_unit_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/week_firstday_0_test.php b/3rd_party/php/pear/Calendar/tests/week_firstday_0_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/week_firstday_0_test.php
rename to 3rd_party/php/pear/Calendar/tests/week_firstday_0_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/week_test.php b/3rd_party/php/pear/Calendar/tests/week_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/week_test.php
rename to 3rd_party/php/pear/Calendar/tests/week_test.php
diff --git a/3rd_party/php/pear/src/Calendar/tests/year_test.php b/3rd_party/php/pear/Calendar/tests/year_test.php
similarity index 100%
rename from 3rd_party/php/pear/src/Calendar/tests/year_test.php
rename to 3rd_party/php/pear/Calendar/tests/year_test.php
diff --git a/3rd_party/php/pear/src/Console/Getopt.php b/3rd_party/php/pear/Console/Getopt.php
similarity index 100%
rename from 3rd_party/php/pear/src/Console/Getopt.php
rename to 3rd_party/php/pear/Console/Getopt.php
diff --git a/3rd_party/php/pear/src/DB.php b/3rd_party/php/pear/DB.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB.php
rename to 3rd_party/php/pear/DB.php
diff --git a/3rd_party/php/pear/src/DB/common.php b/3rd_party/php/pear/DB/common.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/common.php
rename to 3rd_party/php/pear/DB/common.php
diff --git a/3rd_party/php/pear/src/DB/dbase.php b/3rd_party/php/pear/DB/dbase.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/dbase.php
rename to 3rd_party/php/pear/DB/dbase.php
diff --git a/3rd_party/php/pear/src/DB/fbsql.php b/3rd_party/php/pear/DB/fbsql.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/fbsql.php
rename to 3rd_party/php/pear/DB/fbsql.php
diff --git a/3rd_party/php/pear/src/DB/ibase.php b/3rd_party/php/pear/DB/ibase.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/ibase.php
rename to 3rd_party/php/pear/DB/ibase.php
diff --git a/3rd_party/php/pear/src/DB/ifx.php b/3rd_party/php/pear/DB/ifx.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/ifx.php
rename to 3rd_party/php/pear/DB/ifx.php
diff --git a/3rd_party/php/pear/src/DB/msql.php b/3rd_party/php/pear/DB/msql.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/msql.php
rename to 3rd_party/php/pear/DB/msql.php
diff --git a/3rd_party/php/pear/src/DB/mssql.php b/3rd_party/php/pear/DB/mssql.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/mssql.php
rename to 3rd_party/php/pear/DB/mssql.php
diff --git a/3rd_party/php/pear/src/DB/mysql.php b/3rd_party/php/pear/DB/mysql.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/mysql.php
rename to 3rd_party/php/pear/DB/mysql.php
diff --git a/3rd_party/php/pear/src/DB/mysqli.php b/3rd_party/php/pear/DB/mysqli.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/mysqli.php
rename to 3rd_party/php/pear/DB/mysqli.php
diff --git a/3rd_party/php/pear/src/DB/oci8.php b/3rd_party/php/pear/DB/oci8.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/oci8.php
rename to 3rd_party/php/pear/DB/oci8.php
diff --git a/3rd_party/php/pear/src/DB/odbc.php b/3rd_party/php/pear/DB/odbc.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/odbc.php
rename to 3rd_party/php/pear/DB/odbc.php
diff --git a/3rd_party/php/pear/src/DB/pgsql.php b/3rd_party/php/pear/DB/pgsql.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/pgsql.php
rename to 3rd_party/php/pear/DB/pgsql.php
diff --git a/3rd_party/php/pear/src/DB/sqlite.php b/3rd_party/php/pear/DB/sqlite.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/sqlite.php
rename to 3rd_party/php/pear/DB/sqlite.php
diff --git a/3rd_party/php/pear/src/DB/storage.php b/3rd_party/php/pear/DB/storage.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/storage.php
rename to 3rd_party/php/pear/DB/storage.php
diff --git a/3rd_party/php/pear/src/DB/sybase.php b/3rd_party/php/pear/DB/sybase.php
similarity index 100%
rename from 3rd_party/php/pear/src/DB/sybase.php
rename to 3rd_party/php/pear/DB/sybase.php
diff --git a/3rd_party/php/pear/src/File.php b/3rd_party/php/pear/File.php
similarity index 100%
rename from 3rd_party/php/pear/src/File.php
rename to 3rd_party/php/pear/File.php
diff --git a/3rd_party/php/pear/src/File/CSV.php b/3rd_party/php/pear/File/CSV.php
similarity index 100%
rename from 3rd_party/php/pear/src/File/CSV.php
rename to 3rd_party/php/pear/File/CSV.php
diff --git a/3rd_party/php/pear/src/File/Find.php b/3rd_party/php/pear/File/Find.php
similarity index 100%
rename from 3rd_party/php/pear/src/File/Find.php
rename to 3rd_party/php/pear/File/Find.php
diff --git a/3rd_party/php/pear/src/File/Util.php b/3rd_party/php/pear/File/Util.php
similarity index 100%
rename from 3rd_party/php/pear/src/File/Util.php
rename to 3rd_party/php/pear/File/Util.php
diff --git a/3rd_party/php/pear/src/HTML/Common.php b/3rd_party/php/pear/HTML/Common.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/Common.php
rename to 3rd_party/php/pear/HTML/Common.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm.php b/3rd_party/php/pear/HTML/QuickForm.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm.php
rename to 3rd_party/php/pear/HTML/QuickForm.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer.php b/3rd_party/php/pear/HTML/QuickForm/Renderer.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/Array.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/Array.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/Array.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/Array.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ArraySmarty.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/ArraySmarty.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ArraySmarty.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/ArraySmarty.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/Default.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/Default.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/Default.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/Default.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITDynamic.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/ITDynamic.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITDynamic.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/ITDynamic.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITStatic.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/ITStatic.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ITStatic.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/ITStatic.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/Object.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/Object.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/Object.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/Object.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/ObjectFlexy.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/ObjectFlexy.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/ObjectFlexy.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/ObjectFlexy.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Renderer/QuickHtml.php b/3rd_party/php/pear/HTML/QuickForm/Renderer/QuickHtml.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Renderer/QuickHtml.php
rename to 3rd_party/php/pear/HTML/QuickForm/Renderer/QuickHtml.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Rule.php b/3rd_party/php/pear/HTML/QuickForm/Rule.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Rule.php
rename to 3rd_party/php/pear/HTML/QuickForm/Rule.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Rule/Callback.php b/3rd_party/php/pear/HTML/QuickForm/Rule/Callback.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Rule/Callback.php
rename to 3rd_party/php/pear/HTML/QuickForm/Rule/Callback.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Rule/Compare.php b/3rd_party/php/pear/HTML/QuickForm/Rule/Compare.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Rule/Compare.php
rename to 3rd_party/php/pear/HTML/QuickForm/Rule/Compare.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Rule/Email.php b/3rd_party/php/pear/HTML/QuickForm/Rule/Email.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Rule/Email.php
rename to 3rd_party/php/pear/HTML/QuickForm/Rule/Email.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Rule/Range.php b/3rd_party/php/pear/HTML/QuickForm/Rule/Range.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Rule/Range.php
rename to 3rd_party/php/pear/HTML/QuickForm/Rule/Range.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Rule/Regex.php b/3rd_party/php/pear/HTML/QuickForm/Rule/Regex.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Rule/Regex.php
rename to 3rd_party/php/pear/HTML/QuickForm/Rule/Regex.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/Rule/Required.php b/3rd_party/php/pear/HTML/QuickForm/Rule/Required.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/Rule/Required.php
rename to 3rd_party/php/pear/HTML/QuickForm/Rule/Required.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/RuleRegistry.php b/3rd_party/php/pear/HTML/QuickForm/RuleRegistry.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/RuleRegistry.php
rename to 3rd_party/php/pear/HTML/QuickForm/RuleRegistry.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/advcheckbox.php b/3rd_party/php/pear/HTML/QuickForm/advcheckbox.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/advcheckbox.php
rename to 3rd_party/php/pear/HTML/QuickForm/advcheckbox.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/autocomplete.php b/3rd_party/php/pear/HTML/QuickForm/autocomplete.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/autocomplete.php
rename to 3rd_party/php/pear/HTML/QuickForm/autocomplete.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/button.php b/3rd_party/php/pear/HTML/QuickForm/button.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/button.php
rename to 3rd_party/php/pear/HTML/QuickForm/button.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/checkbox.php b/3rd_party/php/pear/HTML/QuickForm/checkbox.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/checkbox.php
rename to 3rd_party/php/pear/HTML/QuickForm/checkbox.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/date.php b/3rd_party/php/pear/HTML/QuickForm/date.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/date.php
rename to 3rd_party/php/pear/HTML/QuickForm/date.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/element.php b/3rd_party/php/pear/HTML/QuickForm/element.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/element.php
rename to 3rd_party/php/pear/HTML/QuickForm/element.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/file.php b/3rd_party/php/pear/HTML/QuickForm/file.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/file.php
rename to 3rd_party/php/pear/HTML/QuickForm/file.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/group.php b/3rd_party/php/pear/HTML/QuickForm/group.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/group.php
rename to 3rd_party/php/pear/HTML/QuickForm/group.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/header.php b/3rd_party/php/pear/HTML/QuickForm/header.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/header.php
rename to 3rd_party/php/pear/HTML/QuickForm/header.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/hidden.php b/3rd_party/php/pear/HTML/QuickForm/hidden.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/hidden.php
rename to 3rd_party/php/pear/HTML/QuickForm/hidden.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/hiddenselect.php b/3rd_party/php/pear/HTML/QuickForm/hiddenselect.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/hiddenselect.php
rename to 3rd_party/php/pear/HTML/QuickForm/hiddenselect.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/hierselect.php b/3rd_party/php/pear/HTML/QuickForm/hierselect.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/hierselect.php
rename to 3rd_party/php/pear/HTML/QuickForm/hierselect.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/html.php b/3rd_party/php/pear/HTML/QuickForm/html.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/html.php
rename to 3rd_party/php/pear/HTML/QuickForm/html.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/image.php b/3rd_party/php/pear/HTML/QuickForm/image.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/image.php
rename to 3rd_party/php/pear/HTML/QuickForm/image.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/input.php b/3rd_party/php/pear/HTML/QuickForm/input.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/input.php
rename to 3rd_party/php/pear/HTML/QuickForm/input.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/link.php b/3rd_party/php/pear/HTML/QuickForm/link.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/link.php
rename to 3rd_party/php/pear/HTML/QuickForm/link.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/password.php b/3rd_party/php/pear/HTML/QuickForm/password.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/password.php
rename to 3rd_party/php/pear/HTML/QuickForm/password.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/radio.php b/3rd_party/php/pear/HTML/QuickForm/radio.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/radio.php
rename to 3rd_party/php/pear/HTML/QuickForm/radio.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/reset.php b/3rd_party/php/pear/HTML/QuickForm/reset.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/reset.php
rename to 3rd_party/php/pear/HTML/QuickForm/reset.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/select.php b/3rd_party/php/pear/HTML/QuickForm/select.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/select.php
rename to 3rd_party/php/pear/HTML/QuickForm/select.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/static.php b/3rd_party/php/pear/HTML/QuickForm/static.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/static.php
rename to 3rd_party/php/pear/HTML/QuickForm/static.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/submit.php b/3rd_party/php/pear/HTML/QuickForm/submit.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/submit.php
rename to 3rd_party/php/pear/HTML/QuickForm/submit.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/text.php b/3rd_party/php/pear/HTML/QuickForm/text.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/text.php
rename to 3rd_party/php/pear/HTML/QuickForm/text.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/textarea.php b/3rd_party/php/pear/HTML/QuickForm/textarea.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/textarea.php
rename to 3rd_party/php/pear/HTML/QuickForm/textarea.php
diff --git a/3rd_party/php/pear/src/HTML/QuickForm/xbutton.php b/3rd_party/php/pear/HTML/QuickForm/xbutton.php
similarity index 100%
rename from 3rd_party/php/pear/src/HTML/QuickForm/xbutton.php
rename to 3rd_party/php/pear/HTML/QuickForm/xbutton.php
diff --git a/3rd_party/php/pear/src/OS/Guess.php b/3rd_party/php/pear/OS/Guess.php
similarity index 100%
rename from 3rd_party/php/pear/src/OS/Guess.php
rename to 3rd_party/php/pear/OS/Guess.php
diff --git a/3rd_party/php/pear/src/PEAR.php b/3rd_party/php/pear/PEAR.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR.php
rename to 3rd_party/php/pear/PEAR.php
diff --git a/3rd_party/php/pear/src/PEAR/Autoloader.php b/3rd_party/php/pear/PEAR/Autoloader.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Autoloader.php
rename to 3rd_party/php/pear/PEAR/Autoloader.php
diff --git a/3rd_party/php/pear/src/PEAR/Builder.php b/3rd_party/php/pear/PEAR/Builder.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Builder.php
rename to 3rd_party/php/pear/PEAR/Builder.php
diff --git a/3rd_party/php/pear/src/PEAR/ChannelFile.php b/3rd_party/php/pear/PEAR/ChannelFile.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/ChannelFile.php
rename to 3rd_party/php/pear/PEAR/ChannelFile.php
diff --git a/3rd_party/php/pear/src/PEAR/ChannelFile/Parser.php b/3rd_party/php/pear/PEAR/ChannelFile/Parser.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/ChannelFile/Parser.php
rename to 3rd_party/php/pear/PEAR/ChannelFile/Parser.php
diff --git a/3rd_party/php/pear/src/PEAR/Command.php b/3rd_party/php/pear/PEAR/Command.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command.php
rename to 3rd_party/php/pear/PEAR/Command.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Auth.php b/3rd_party/php/pear/PEAR/Command/Auth.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Auth.php
rename to 3rd_party/php/pear/PEAR/Command/Auth.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Auth.xml b/3rd_party/php/pear/PEAR/Command/Auth.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Auth.xml
rename to 3rd_party/php/pear/PEAR/Command/Auth.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Build.php b/3rd_party/php/pear/PEAR/Command/Build.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Build.php
rename to 3rd_party/php/pear/PEAR/Command/Build.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Build.xml b/3rd_party/php/pear/PEAR/Command/Build.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Build.xml
rename to 3rd_party/php/pear/PEAR/Command/Build.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Channels.php b/3rd_party/php/pear/PEAR/Command/Channels.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Channels.php
rename to 3rd_party/php/pear/PEAR/Command/Channels.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Channels.xml b/3rd_party/php/pear/PEAR/Command/Channels.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Channels.xml
rename to 3rd_party/php/pear/PEAR/Command/Channels.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Common.php b/3rd_party/php/pear/PEAR/Command/Common.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Common.php
rename to 3rd_party/php/pear/PEAR/Command/Common.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Config.php b/3rd_party/php/pear/PEAR/Command/Config.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Config.php
rename to 3rd_party/php/pear/PEAR/Command/Config.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Config.xml b/3rd_party/php/pear/PEAR/Command/Config.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Config.xml
rename to 3rd_party/php/pear/PEAR/Command/Config.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Install.php b/3rd_party/php/pear/PEAR/Command/Install.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Install.php
rename to 3rd_party/php/pear/PEAR/Command/Install.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Install.xml b/3rd_party/php/pear/PEAR/Command/Install.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Install.xml
rename to 3rd_party/php/pear/PEAR/Command/Install.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Mirror.php b/3rd_party/php/pear/PEAR/Command/Mirror.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Mirror.php
rename to 3rd_party/php/pear/PEAR/Command/Mirror.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Mirror.xml b/3rd_party/php/pear/PEAR/Command/Mirror.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Mirror.xml
rename to 3rd_party/php/pear/PEAR/Command/Mirror.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Package.php b/3rd_party/php/pear/PEAR/Command/Package.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Package.php
rename to 3rd_party/php/pear/PEAR/Command/Package.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Package.xml b/3rd_party/php/pear/PEAR/Command/Package.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Package.xml
rename to 3rd_party/php/pear/PEAR/Command/Package.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Pickle.php b/3rd_party/php/pear/PEAR/Command/Pickle.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Pickle.php
rename to 3rd_party/php/pear/PEAR/Command/Pickle.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Pickle.xml b/3rd_party/php/pear/PEAR/Command/Pickle.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Pickle.xml
rename to 3rd_party/php/pear/PEAR/Command/Pickle.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Registry.php b/3rd_party/php/pear/PEAR/Command/Registry.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Registry.php
rename to 3rd_party/php/pear/PEAR/Command/Registry.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Registry.xml b/3rd_party/php/pear/PEAR/Command/Registry.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Registry.xml
rename to 3rd_party/php/pear/PEAR/Command/Registry.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Remote.php b/3rd_party/php/pear/PEAR/Command/Remote.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Remote.php
rename to 3rd_party/php/pear/PEAR/Command/Remote.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Remote.xml b/3rd_party/php/pear/PEAR/Command/Remote.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Remote.xml
rename to 3rd_party/php/pear/PEAR/Command/Remote.xml
diff --git a/3rd_party/php/pear/src/PEAR/Command/Test.php b/3rd_party/php/pear/PEAR/Command/Test.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Test.php
rename to 3rd_party/php/pear/PEAR/Command/Test.php
diff --git a/3rd_party/php/pear/src/PEAR/Command/Test.xml b/3rd_party/php/pear/PEAR/Command/Test.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Command/Test.xml
rename to 3rd_party/php/pear/PEAR/Command/Test.xml
diff --git a/3rd_party/php/pear/src/PEAR/Common.php b/3rd_party/php/pear/PEAR/Common.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Common.php
rename to 3rd_party/php/pear/PEAR/Common.php
diff --git a/3rd_party/php/pear/src/PEAR/Config.php b/3rd_party/php/pear/PEAR/Config.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Config.php
rename to 3rd_party/php/pear/PEAR/Config.php
diff --git a/3rd_party/php/pear/src/PEAR/Dependency2.php b/3rd_party/php/pear/PEAR/Dependency2.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Dependency2.php
rename to 3rd_party/php/pear/PEAR/Dependency2.php
diff --git a/3rd_party/php/pear/src/PEAR/DependencyDB.php b/3rd_party/php/pear/PEAR/DependencyDB.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/DependencyDB.php
rename to 3rd_party/php/pear/PEAR/DependencyDB.php
diff --git a/3rd_party/php/pear/src/PEAR/Downloader.php b/3rd_party/php/pear/PEAR/Downloader.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Downloader.php
rename to 3rd_party/php/pear/PEAR/Downloader.php
diff --git a/3rd_party/php/pear/src/PEAR/Downloader/Package.php b/3rd_party/php/pear/PEAR/Downloader/Package.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Downloader/Package.php
rename to 3rd_party/php/pear/PEAR/Downloader/Package.php
diff --git a/3rd_party/php/pear/src/PEAR/ErrorStack.php b/3rd_party/php/pear/PEAR/ErrorStack.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/ErrorStack.php
rename to 3rd_party/php/pear/PEAR/ErrorStack.php
diff --git a/3rd_party/php/pear/src/PEAR/Exception.php b/3rd_party/php/pear/PEAR/Exception.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Exception.php
rename to 3rd_party/php/pear/PEAR/Exception.php
diff --git a/3rd_party/php/pear/src/PEAR/FixPHP5PEARWarnings.php b/3rd_party/php/pear/PEAR/FixPHP5PEARWarnings.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/FixPHP5PEARWarnings.php
rename to 3rd_party/php/pear/PEAR/FixPHP5PEARWarnings.php
diff --git a/3rd_party/php/pear/src/PEAR/Frontend.php b/3rd_party/php/pear/PEAR/Frontend.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Frontend.php
rename to 3rd_party/php/pear/PEAR/Frontend.php
diff --git a/3rd_party/php/pear/src/PEAR/Frontend/CLI.php b/3rd_party/php/pear/PEAR/Frontend/CLI.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Frontend/CLI.php
rename to 3rd_party/php/pear/PEAR/Frontend/CLI.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer.php b/3rd_party/php/pear/PEAR/Installer.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer.php
rename to 3rd_party/php/pear/PEAR/Installer.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role.php b/3rd_party/php/pear/PEAR/Installer/Role.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role.php
rename to 3rd_party/php/pear/PEAR/Installer/Role.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.php b/3rd_party/php/pear/PEAR/Installer/Role/Cfg.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Cfg.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.xml b/3rd_party/php/pear/PEAR/Installer/Role/Cfg.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Cfg.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Cfg.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Common.php b/3rd_party/php/pear/PEAR/Installer/Role/Common.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Common.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Common.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Data.php b/3rd_party/php/pear/PEAR/Installer/Role/Data.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Data.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Data.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Data.xml b/3rd_party/php/pear/PEAR/Installer/Role/Data.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Data.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Data.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Doc.php b/3rd_party/php/pear/PEAR/Installer/Role/Doc.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Doc.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Doc.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Doc.xml b/3rd_party/php/pear/PEAR/Installer/Role/Doc.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Doc.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Doc.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Ext.php b/3rd_party/php/pear/PEAR/Installer/Role/Ext.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Ext.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Ext.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Ext.xml b/3rd_party/php/pear/PEAR/Installer/Role/Ext.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Ext.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Ext.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Php.php b/3rd_party/php/pear/PEAR/Installer/Role/Php.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Php.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Php.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Php.xml b/3rd_party/php/pear/PEAR/Installer/Role/Php.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Php.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Php.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Script.php b/3rd_party/php/pear/PEAR/Installer/Role/Script.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Script.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Script.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Script.xml b/3rd_party/php/pear/PEAR/Installer/Role/Script.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Script.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Script.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Src.php b/3rd_party/php/pear/PEAR/Installer/Role/Src.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Src.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Src.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Src.xml b/3rd_party/php/pear/PEAR/Installer/Role/Src.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Src.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Src.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Test.php b/3rd_party/php/pear/PEAR/Installer/Role/Test.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Test.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Test.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Test.xml b/3rd_party/php/pear/PEAR/Installer/Role/Test.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Test.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Test.xml
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Www.php b/3rd_party/php/pear/PEAR/Installer/Role/Www.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Www.php
rename to 3rd_party/php/pear/PEAR/Installer/Role/Www.php
diff --git a/3rd_party/php/pear/src/PEAR/Installer/Role/Www.xml b/3rd_party/php/pear/PEAR/Installer/Role/Www.xml
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Installer/Role/Www.xml
rename to 3rd_party/php/pear/PEAR/Installer/Role/Www.xml
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile.php b/3rd_party/php/pear/PEAR/PackageFile.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile.php
rename to 3rd_party/php/pear/PEAR/PackageFile.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/Generator/v1.php b/3rd_party/php/pear/PEAR/PackageFile/Generator/v1.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/Generator/v1.php
rename to 3rd_party/php/pear/PEAR/PackageFile/Generator/v1.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/Generator/v2.php b/3rd_party/php/pear/PEAR/PackageFile/Generator/v2.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/Generator/v2.php
rename to 3rd_party/php/pear/PEAR/PackageFile/Generator/v2.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/Parser/v1.php b/3rd_party/php/pear/PEAR/PackageFile/Parser/v1.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/Parser/v1.php
rename to 3rd_party/php/pear/PEAR/PackageFile/Parser/v1.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/Parser/v2.php b/3rd_party/php/pear/PEAR/PackageFile/Parser/v2.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/Parser/v2.php
rename to 3rd_party/php/pear/PEAR/PackageFile/Parser/v2.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/v1.php b/3rd_party/php/pear/PEAR/PackageFile/v1.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/v1.php
rename to 3rd_party/php/pear/PEAR/PackageFile/v1.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/v2.php b/3rd_party/php/pear/PEAR/PackageFile/v2.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/v2.php
rename to 3rd_party/php/pear/PEAR/PackageFile/v2.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/v2/Validator.php b/3rd_party/php/pear/PEAR/PackageFile/v2/Validator.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/v2/Validator.php
rename to 3rd_party/php/pear/PEAR/PackageFile/v2/Validator.php
diff --git a/3rd_party/php/pear/src/PEAR/PackageFile/v2/rw.php b/3rd_party/php/pear/PEAR/PackageFile/v2/rw.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/PackageFile/v2/rw.php
rename to 3rd_party/php/pear/PEAR/PackageFile/v2/rw.php
diff --git a/3rd_party/php/pear/src/PEAR/Packager.php b/3rd_party/php/pear/PEAR/Packager.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Packager.php
rename to 3rd_party/php/pear/PEAR/Packager.php
diff --git a/3rd_party/php/pear/src/PEAR/REST.php b/3rd_party/php/pear/PEAR/REST.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/REST.php
rename to 3rd_party/php/pear/PEAR/REST.php
diff --git a/3rd_party/php/pear/src/PEAR/REST/10.php b/3rd_party/php/pear/PEAR/REST/10.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/REST/10.php
rename to 3rd_party/php/pear/PEAR/REST/10.php
diff --git a/3rd_party/php/pear/src/PEAR/REST/11.php b/3rd_party/php/pear/PEAR/REST/11.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/REST/11.php
rename to 3rd_party/php/pear/PEAR/REST/11.php
diff --git a/3rd_party/php/pear/src/PEAR/REST/13.php b/3rd_party/php/pear/PEAR/REST/13.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/REST/13.php
rename to 3rd_party/php/pear/PEAR/REST/13.php
diff --git a/3rd_party/php/pear/src/PEAR/Registry.php b/3rd_party/php/pear/PEAR/Registry.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Registry.php
rename to 3rd_party/php/pear/PEAR/Registry.php
diff --git a/3rd_party/php/pear/src/PEAR/RunTest.php b/3rd_party/php/pear/PEAR/RunTest.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/RunTest.php
rename to 3rd_party/php/pear/PEAR/RunTest.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Common.php b/3rd_party/php/pear/PEAR/Task/Common.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Common.php
rename to 3rd_party/php/pear/PEAR/Task/Common.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Postinstallscript.php b/3rd_party/php/pear/PEAR/Task/Postinstallscript.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Postinstallscript.php
rename to 3rd_party/php/pear/PEAR/Task/Postinstallscript.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Postinstallscript/rw.php b/3rd_party/php/pear/PEAR/Task/Postinstallscript/rw.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Postinstallscript/rw.php
rename to 3rd_party/php/pear/PEAR/Task/Postinstallscript/rw.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Replace.php b/3rd_party/php/pear/PEAR/Task/Replace.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Replace.php
rename to 3rd_party/php/pear/PEAR/Task/Replace.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Replace/rw.php b/3rd_party/php/pear/PEAR/Task/Replace/rw.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Replace/rw.php
rename to 3rd_party/php/pear/PEAR/Task/Replace/rw.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Unixeol.php b/3rd_party/php/pear/PEAR/Task/Unixeol.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Unixeol.php
rename to 3rd_party/php/pear/PEAR/Task/Unixeol.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Unixeol/rw.php b/3rd_party/php/pear/PEAR/Task/Unixeol/rw.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Unixeol/rw.php
rename to 3rd_party/php/pear/PEAR/Task/Unixeol/rw.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Windowseol.php b/3rd_party/php/pear/PEAR/Task/Windowseol.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Windowseol.php
rename to 3rd_party/php/pear/PEAR/Task/Windowseol.php
diff --git a/3rd_party/php/pear/src/PEAR/Task/Windowseol/rw.php b/3rd_party/php/pear/PEAR/Task/Windowseol/rw.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Task/Windowseol/rw.php
rename to 3rd_party/php/pear/PEAR/Task/Windowseol/rw.php
diff --git a/3rd_party/php/pear/src/PEAR/Validate.php b/3rd_party/php/pear/PEAR/Validate.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Validate.php
rename to 3rd_party/php/pear/PEAR/Validate.php
diff --git a/3rd_party/php/pear/src/PEAR/Validator/PECL.php b/3rd_party/php/pear/PEAR/Validator/PECL.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/Validator/PECL.php
rename to 3rd_party/php/pear/PEAR/Validator/PECL.php
diff --git a/3rd_party/php/pear/src/PEAR/XMLParser.php b/3rd_party/php/pear/PEAR/XMLParser.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR/XMLParser.php
rename to 3rd_party/php/pear/PEAR/XMLParser.php
diff --git a/3rd_party/php/pear/src/PEAR5.php b/3rd_party/php/pear/PEAR5.php
similarity index 100%
rename from 3rd_party/php/pear/src/PEAR5.php
rename to 3rd_party/php/pear/PEAR5.php
diff --git a/3rd_party/php/pear/src/PHPUnit.php b/3rd_party/php/pear/PHPUnit.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit.php
rename to 3rd_party/php/pear/PHPUnit.php
diff --git a/3rd_party/php/pear/src/PHPUnit/Assert.php b/3rd_party/php/pear/PHPUnit/Assert.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/Assert.php
rename to 3rd_party/php/pear/PHPUnit/Assert.php
diff --git a/3rd_party/php/pear/src/PHPUnit/GUI/Gtk.php b/3rd_party/php/pear/PHPUnit/GUI/Gtk.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/GUI/Gtk.php
rename to 3rd_party/php/pear/PHPUnit/GUI/Gtk.php
diff --git a/3rd_party/php/pear/src/PHPUnit/GUI/HTML.php b/3rd_party/php/pear/PHPUnit/GUI/HTML.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/GUI/HTML.php
rename to 3rd_party/php/pear/PHPUnit/GUI/HTML.php
diff --git a/3rd_party/php/pear/src/PHPUnit/GUI/HTML.tpl b/3rd_party/php/pear/PHPUnit/GUI/HTML.tpl
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/GUI/HTML.tpl
rename to 3rd_party/php/pear/PHPUnit/GUI/HTML.tpl
diff --git a/3rd_party/php/pear/src/PHPUnit/GUI/SetupDecorator.php b/3rd_party/php/pear/PHPUnit/GUI/SetupDecorator.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/GUI/SetupDecorator.php
rename to 3rd_party/php/pear/PHPUnit/GUI/SetupDecorator.php
diff --git a/3rd_party/php/pear/src/PHPUnit/RepeatedTest.php b/3rd_party/php/pear/PHPUnit/RepeatedTest.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/RepeatedTest.php
rename to 3rd_party/php/pear/PHPUnit/RepeatedTest.php
diff --git a/3rd_party/php/pear/src/PHPUnit/Skeleton.php b/3rd_party/php/pear/PHPUnit/Skeleton.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/Skeleton.php
rename to 3rd_party/php/pear/PHPUnit/Skeleton.php
diff --git a/3rd_party/php/pear/src/PHPUnit/TestCase.php b/3rd_party/php/pear/PHPUnit/TestCase.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/TestCase.php
rename to 3rd_party/php/pear/PHPUnit/TestCase.php
diff --git a/3rd_party/php/pear/src/PHPUnit/TestDecorator.php b/3rd_party/php/pear/PHPUnit/TestDecorator.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/TestDecorator.php
rename to 3rd_party/php/pear/PHPUnit/TestDecorator.php
diff --git a/3rd_party/php/pear/src/PHPUnit/TestFailure.php b/3rd_party/php/pear/PHPUnit/TestFailure.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/TestFailure.php
rename to 3rd_party/php/pear/PHPUnit/TestFailure.php
diff --git a/3rd_party/php/pear/src/PHPUnit/TestListener.php b/3rd_party/php/pear/PHPUnit/TestListener.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/TestListener.php
rename to 3rd_party/php/pear/PHPUnit/TestListener.php
diff --git a/3rd_party/php/pear/src/PHPUnit/TestResult.php b/3rd_party/php/pear/PHPUnit/TestResult.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/TestResult.php
rename to 3rd_party/php/pear/PHPUnit/TestResult.php
diff --git a/3rd_party/php/pear/src/PHPUnit/TestSuite.php b/3rd_party/php/pear/PHPUnit/TestSuite.php
similarity index 100%
rename from 3rd_party/php/pear/src/PHPUnit/TestSuite.php
rename to 3rd_party/php/pear/PHPUnit/TestSuite.php
diff --git a/3rd_party/php/pear/src/System.php b/3rd_party/php/pear/System.php
similarity index 100%
rename from 3rd_party/php/pear/src/System.php
rename to 3rd_party/php/pear/System.php
diff --git a/3rd_party/php/pear/src/VERSIONS.txt b/3rd_party/php/pear/VERSIONS.txt
similarity index 100%
rename from 3rd_party/php/pear/src/VERSIONS.txt
rename to 3rd_party/php/pear/VERSIONS.txt
diff --git a/3rd_party/php/pear/src/XML/Beautifier.php b/3rd_party/php/pear/XML/Beautifier.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Beautifier.php
rename to 3rd_party/php/pear/XML/Beautifier.php
diff --git a/3rd_party/php/pear/src/XML/Beautifier/Renderer.php b/3rd_party/php/pear/XML/Beautifier/Renderer.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Beautifier/Renderer.php
rename to 3rd_party/php/pear/XML/Beautifier/Renderer.php
diff --git a/3rd_party/php/pear/src/XML/Beautifier/Renderer/Plain.php b/3rd_party/php/pear/XML/Beautifier/Renderer/Plain.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Beautifier/Renderer/Plain.php
rename to 3rd_party/php/pear/XML/Beautifier/Renderer/Plain.php
diff --git a/3rd_party/php/pear/src/XML/Beautifier/Tokenizer.php b/3rd_party/php/pear/XML/Beautifier/Tokenizer.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Beautifier/Tokenizer.php
rename to 3rd_party/php/pear/XML/Beautifier/Tokenizer.php
diff --git a/3rd_party/php/pear/src/XML/Parser.php b/3rd_party/php/pear/XML/Parser.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Parser.php
rename to 3rd_party/php/pear/XML/Parser.php
diff --git a/3rd_party/php/pear/src/XML/Parser/Simple.php b/3rd_party/php/pear/XML/Parser/Simple.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Parser/Simple.php
rename to 3rd_party/php/pear/XML/Parser/Simple.php
diff --git a/3rd_party/php/pear/src/XML/RPC.php b/3rd_party/php/pear/XML/RPC.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/RPC.php
rename to 3rd_party/php/pear/XML/RPC.php
diff --git a/3rd_party/php/pear/src/XML/RPC/Dump.php b/3rd_party/php/pear/XML/RPC/Dump.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/RPC/Dump.php
rename to 3rd_party/php/pear/XML/RPC/Dump.php
diff --git a/3rd_party/php/pear/src/XML/RPC/Server.php b/3rd_party/php/pear/XML/RPC/Server.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/RPC/Server.php
rename to 3rd_party/php/pear/XML/RPC/Server.php
diff --git a/3rd_party/php/pear/src/XML/Serializer.php b/3rd_party/php/pear/XML/Serializer.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Serializer.php
rename to 3rd_party/php/pear/XML/Serializer.php
diff --git a/3rd_party/php/pear/src/XML/Unserializer.php b/3rd_party/php/pear/XML/Unserializer.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Unserializer.php
rename to 3rd_party/php/pear/XML/Unserializer.php
diff --git a/3rd_party/php/pear/src/XML/Util.php b/3rd_party/php/pear/XML/Util.php
similarity index 100%
rename from 3rd_party/php/pear/src/XML/Util.php
rename to 3rd_party/php/pear/XML/Util.php
diff --git a/3rd_party/php/pear/bin/autogen.sh b/3rd_party/php/pear/bin/autogen.sh
deleted file mode 100755
index 937777dd7..000000000
--- a/3rd_party/php/pear/bin/autogen.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-#-------------------------------------------------------------------------------
-#   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$
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Run this to set up the build system: configure, makefiles, etc.
-# (based on the version in enlightenment's cvs)
-#-------------------------------------------------------------------------------
-
-package="pear"
-
-# assume we're in $basedir/bin
-reldir=`dirname $0`/..
-basedir=`cd $reldir; pwd;`
-test -z "$basedir" && basedir=.
-usrdir=`cd $basedir/../../../usr; pwd;`
-
-bindir=$basedir/bin
-etcdir=$basedir/etc
-tmpdir=$basedir/tmp
-
-cd "$tmpdir"
-DIE=0
-
-(autoheader --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $package."
-    echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "You must have autoconf installed to compile $package."
-    echo "Download the appropriate package for your distribution,"
-    echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-}
-
-if test "$DIE" -eq 1; then
-    exit 1
-fi
-
-if test -z "$*"; then
-    echo "I am going to run ./configure with no arguments - if you wish "
-    echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-echo "Generating configuration files for $package, please wait...."
-
-configure_ac=${etcdir}/configure.ac
-configure=${tmpdir}/configure
-
-echo "  autoconf -I ${tmpdir} -o ${configure} ${configure_ac}"
-autoconf -I ${tmpdir} -o ${configure} ${configure_ac}
-
diff --git a/3rd_party/php/pear/configure b/3rd_party/php/pear/configure
deleted file mode 100755
index 26ccda218..000000000
--- a/3rd_party/php/pear/configure
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#-------------------------------------------------------------------------------
-#   Copyright (c) 2010 Sourcefabric O.P.S.
-#
-#   This file is part of the Campcaster project.
-#   http://campcaster.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
-#
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#   Run this script to configure the environment.
-#
-#   This script in effect calls the real automake / autoconf configure script
-#-------------------------------------------------------------------------------
-
-# assume we're in $basedir
-reldir=`dirname $0`
-basedir=`cd $reldir; pwd;`
-test -z "$basedir" && basedir=.
-
-bindir=$basedir/bin
-tmpdir=$basedir/tmp
-
-
-autogen=$bindir/autogen.sh
-configure=$tmpdir/configure
-
-if [ ! -x $configure ]; then
-    (cd $basedir && $autogen $*)
-fi
-
-(cd $tmpdir && $configure $*)
-
diff --git a/3rd_party/php/pear/etc/Makefile.in b/3rd_party/php/pear/etc/Makefile.in
deleted file mode 100644
index dad5dc843..000000000
--- a/3rd_party/php/pear/etc/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#-------------------------------------------------------------------------------
-#   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$
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-#   General command definitions
-#-------------------------------------------------------------------------------
-MKDIR      = mkdir -p
-RM         = rm -f
-RMDIR      = rm -rf
-DOXYGEN    = doxygen
-DOXYTAG    = doxytag
-XSLTPROC   = xsltproc
-ECHO       = @echo
-FLAWFINDER = flawfinder
-
-
-#-------------------------------------------------------------------------------
-#   Basic directory and file definitions
-#-------------------------------------------------------------------------------
-BASE_DIR     = .
-BIN_DIR      = ${BASE_DIR}/bin
-DOC_DIR      = ${BASE_DIR}/doc
-ETC_DIR      = ${BASE_DIR}/etc
-TMP_DIR      = ${BASE_DIR}/tmp
-
-INSTALL_DIR = @prefix@
-
-
-#-------------------------------------------------------------------------------
-#   Targets
-#-------------------------------------------------------------------------------
-.PHONY: all install clean distclean
-
-all:
-
-install:
-	# ##########################
-	# Install the PEAR libraries
-	# ##########################
-	${MKDIR} ${INSTALL_DIR}/lib/pear
-	# Copy the PEAR libraries without the SVN directories
-	cd src; tar -cf tmp-pear-libs.tar --exclude=*svn . 2>/dev/null; mv -f tmp-pear-libs.tar ${INSTALL_DIR}/lib/pear
-	tar xf ${INSTALL_DIR}/lib/pear/tmp-pear-libs.tar --directory ${INSTALL_DIR}/lib/pear
-	rm -f ${INSTALL_DIR}/lib/pear/tmp-pear-libs.tar
-
-clean:
-
-distclean:
-
-
diff --git a/3rd_party/php/pear/etc/configure.ac b/3rd_party/php/pear/etc/configure.ac
deleted file mode 100644
index addbc57a7..000000000
--- a/3rd_party/php/pear/etc/configure.ac
+++ /dev/null
@@ -1,43 +0,0 @@
-dnl-----------------------------------------------------------------------------
-dnl Copyright (c) 2010 Sourcefabric O.P.S.
-dnl
-dnl This file is part of the Campcaster project.
-dnl http://campcaster.sourcefabric.org/
-dnl To report bugs, send an e-mail to bugs@campware.org
-dnl
-dnl Campcaster is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl Campcaster is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with Campcaster; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-dnl
-dnl
-dnl Author   : $Author$
-dnl Version  : $Revision$
-dnl Location : $URL$
-dnl-----------------------------------------------------------------------------
-
-dnl-----------------------------------------------------------------------------
-dnl NOTE: Run all configure related scripts from the tmp directory of the
-dnl project.
-dnl This is due to the fact that configure spreads a lot of trash around,
-dnl like atom4te cache directories, config.* files, etc. into the directory
-dnl it is being run from. We clearly don't want these in our base directory.
-dnl-----------------------------------------------------------------------------
-AC_INIT(pear, 1.3.5, bugs@campware.org)
-AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2010 Sourcefabric O.P.S. under the GNU GPL])
-AC_REVISION($Revision$)
-
-AC_CONFIG_FILES(../Makefile:../etc/Makefile.in)
-
-AC_OUTPUT()
-
diff --git a/3rd_party/php/pear/etc/pear.conf.template b/3rd_party/php/pear/etc/pear.conf.template
deleted file mode 100644
index 17f1beb56..000000000
--- a/3rd_party/php/pear/etc/pear.conf.template
+++ /dev/null
@@ -1,2 +0,0 @@
-#PEAR_Config 0.9
-a:10:{s:15:"preferred_state";s:6:"stable";s:7:"bin_dir";s:25:"/tmp/campcaster/build/bin";s:7:"php_dir";s:30:"/tmp/campcaster/build/lib/pear";s:7:"doc_dir";s:35:"/tmp/campcaster/build/lib/pear/docs";s:8:"data_dir";s:35:"/tmp/campcaster/build/lib/pear/data";s:8:"test_dir";s:36:"/tmp/campcaster/build/lib/pear/tests";s:9:"cache_dir";s:36:"/tmp/campcaster/build/lib/pear/cache";s:9:"cache_ttl";i:300;s:7:"php_bin";s:0:"";s:10:"__channels";a:2:{s:12:"pecl.php.net";a:0:{}s:5:"__uri";a:0:{}}}
\ No newline at end of file
diff --git a/3rd_party/php/pear/tmp/.keepme b/3rd_party/php/pear/tmp/.keepme
deleted file mode 100644
index e0808fa16..000000000
--- a/3rd_party/php/pear/tmp/.keepme
+++ /dev/null
@@ -1 +0,0 @@
-keep me
diff --git a/backend/BasicStor.php b/backend/BasicStor.php
index cb69d9a36..b3738ef32 100644
--- a/backend/BasicStor.php
+++ b/backend/BasicStor.php
@@ -57,6 +57,7 @@ define('GBERR_NOTIMPL', 69);
 require_once(dirname(__FILE__)."/Alib.php");
 require_once(dirname(__FILE__)."/StoredFile.php");
 require_once(dirname(__FILE__)."/Transport.php");
+require_once(dirname(__FILE__)."/Playlist.php");
 
 $g_metadata_xml_to_db_mapping = array(
         "dc:format" => "format",
@@ -910,7 +911,6 @@ class BasicStor {
     private static function NormalizeExtent($v)
     {
         if (!preg_match("|^\d{2}:\d{2}:\d{2}.\d{6}$|", $v)) {
-            require_once("Playlist.php");
             $s = Playlist::playlistTimeToSeconds($v);
             $t = Playlist::secondsToPlaylistTime($s);
             return $t;
@@ -1138,12 +1138,12 @@ class BasicStor {
         }
 
         // Final query
-        
+
         //"dcterms:extent" => "length",
 		//"dc:title" => "track_title",
     	//"dc:creator" => "artist_name",
     	//dc:description
-        
+
         global $g_metadata_xml_to_db_mapping;
         $plSelect = "SELECT ";
         $fileSelect = "SELECT ";
@@ -1169,25 +1169,25 @@ class BasicStor {
             else {
                 $plSelect .= "NULL AS ".$val.", ";
                 $fileSelect .= $val.", ";
-            }       
+            }
         }
-        
-        $sql = "SELECT * FROM ((".$plSelect."PL.id, 'playlist' AS ftype 
+
+        $sql = "SELECT * FROM ((".$plSelect."PL.id, 'playlist' AS ftype
                 FROM ".$CC_CONFIG["playListTable"]." AS PL
-				LEFT JOIN ".$CC_CONFIG['playListTimeView']." PLT ON PL.id = PLT.id) 
-				          
-                UNION 
-                
+				LEFT JOIN ".$CC_CONFIG['playListTimeView']." PLT ON PL.id = PLT.id)
+
+                UNION
+
                 (".$fileSelect."id, ftype FROM ".$CC_CONFIG["filesTable"]." AS FILES)) AS RESULTS ";
-        
+
         $sql .= $whereClause;
-                 
+
         if ($orderby) {
            $sql .= " ORDER BY ".join(",", $orderBySql);
         }
 
         //$_SESSION["br"] = $sql;
-        
+
         $res = $CC_DBC->getAll($sql);
         if (PEAR::isError($res)) {
         	return $res;
@@ -1195,12 +1195,12 @@ class BasicStor {
         if (!is_array($res)) {
         	$res = array();
         }
-        
+
         $count = count($res);
         $_SESSION["br"] .= "  COUNT: ".$count;
-        
+
         $res = array_slice($res, $offset != 0 ? $offset : 0, $limit != 0 ? $limit : 10);
-        
+
         $eres = array();
         foreach ($res as $it) {
             $eres[] = array(
@@ -1236,14 +1236,14 @@ class BasicStor {
     public function bsBrowseCategory($category, $limit=0, $offset=0, $criteria=NULL)
     {
         global $CC_CONFIG, $CC_DBC;
-        
+
         $pl_cat = array(
             "dcterms:extent" => "length",
     		"dc:title" => "name",
         	"dc:creator" => "creator",
         	"dc:description" => "description"
         );
-        
+
         $category = strtolower($category);
         $columnName = BasicStor::xmlCategoryToDbColumn($category);
         if (is_null($columnName)) {
@@ -1266,15 +1266,15 @@ class BasicStor {
         if (!is_array($res)) {
         	$res = array();
         }
-        
+
         if (array_key_exists($category, $pl_cat) && $category !== "dcterms:extent") {
             $columnName = $pl_cat[$category];
-            
+
             $sql = "SELECT DISTINCT $columnName FROM ".$CC_CONFIG["playListTable"];
             $limitPart = ($limit != 0 ? " LIMIT $limit" : '' ).
                 ($offset != 0 ? " OFFSET $offset" : '' );
             $countRowsSql = "SELECT COUNT(DISTINCT $columnName) FROM ".$CC_CONFIG["playListTable"];
-    
+
             $pl_cnt = $CC_DBC->GetOne($countRowsSql);
             if (PEAR::isError($cnt)) {
             	return $cnt;
@@ -1285,7 +1285,7 @@ class BasicStor {
             }
             if (!is_array($pl_res)) {
             	$pl_res = array();
-            }  
+            }
 
             $res = array_merge($res, $pl_res);
             $res = array_slice($res, 0, $limit);
@@ -1293,14 +1293,14 @@ class BasicStor {
         }
         else if ($category === "dcterms:extent") {
                 $columnName = $pl_cat[$category];
-                
+
                 $limitPart = ($limit != 0 ? " LIMIT $limit" : '' ).
                     ($offset != 0 ? " OFFSET $offset" : '' );
-                
+
                 $sql = "SELECT DISTINCT length AS $columnName FROM ".$CC_CONFIG["playListTimeView"];
-                
+
                 $countRowsSql = "SELECT COUNT(DISTINCT length) FROM ".$CC_CONFIG["playListTimeView"];
-        
+
                 $pl_cnt = $CC_DBC->GetOne($countRowsSql);
                 if (PEAR::isError($cnt)) {
                 	return $cnt;
@@ -1311,13 +1311,13 @@ class BasicStor {
                 }
                 if (!is_array($pl_res)) {
                 	$pl_res = array();
-                }  
-    
+                }
+
                 $res = array_merge($res, $pl_res);
                 $res = array_slice($res, 0, $limit);
                 $cnt = $cnt + $pl_cnt;
             }
-        
+
         return array('results'=>$res, 'cnt'=>$cnt);
     }
 
@@ -1342,7 +1342,6 @@ class BasicStor {
     public function bsExportPlaylistOpen($plids, $type='lspl', $withContent=TRUE)
     {
         global $CC_CONFIG;
-        require_once("Playlist.php");
         if (!is_array($plids)) {
             $plids = array($plids);
         }
@@ -1388,7 +1387,6 @@ class BasicStor {
             if (file_exists($MDfname)) {
                 switch ($it['type']) {
 	                case "playlist":
-	                    require_once("Playlist.php");
 	                    $storedFile = $r = StoredFile::RecallByGunid($it['gunid']);
 	                    switch ($type) {
 	                        case "smil":
@@ -1616,7 +1614,6 @@ class BasicStor {
             }
         }
         // playlists:
-        require_once("Playlist.php");
         $d = @dir($tmpdp);
         if ($d !== false) {
             while ((!PEAR::isError($res)) && false !== ($entry = $d->read())) {
diff --git a/backend/CleanStor.php b/backend/CleanStor.php
index 9b9e3d772..7146a5642 100644
--- a/backend/CleanStor.php
+++ b/backend/CleanStor.php
@@ -9,9 +9,9 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
     exit(1);
 }
 
-require_once('conf.php');
+require_once('../conf.php');
 require_once('DB.php');
-require_once('install/installInit.php');
+require_once('../install/installInit.php');
 require_once ('StoredFile.php');
 
 function printUsage() {
diff --git a/backend/GreenBox.php b/backend/GreenBox.php
index 41c3451d0..83d5f6c7e 100644
--- a/backend/GreenBox.php
+++ b/backend/GreenBox.php
@@ -7,7 +7,12 @@ require_once("LocStor.php");
 if (isset($WHITE_SCREEN_OF_DEATH) && $WHITE_SCREEN_OF_DEATH) {
     echo __FILE__.':line '.__LINE__.": Loaded LocStor<br>";
 }
+require_once("Playlist.php");
+require_once("Renderer.php");
 require_once('Prefs.php');
+require_once("Backup.php");
+require_once('Restore.php');
+require_once("Transport.php");
 
 /**
  * GreenBox class
@@ -749,7 +754,6 @@ class GreenBox extends BasicStor {
     public function displayPlaylistClipAtOffset($sessid, $plid, $offset, $distance=0,
         $lang=NULL, $deflang=NULL)
     {
-        require_once("Playlist.php");
         $pl = StoredFile::RecallByGunid($plid);
         if (is_null($pl) || PEAR::isError($pl)) {
             return $pl;
@@ -924,7 +928,6 @@ class GreenBox extends BasicStor {
      */
       public function playlistTimeToSeconds($plt)
       {
-          require_once("Playlist.php");
           return Playlist::playlistTimeToSeconds($plt);
       }
 
@@ -939,7 +942,6 @@ class GreenBox extends BasicStor {
      */
       public static function secondsToPlaylistTime($s0)
       {
-          require_once("Playlist.php");
           return Playlist::secondsToPlaylistTime($s0);
       } // fn secondsToPlaylistTime
 
@@ -957,7 +959,6 @@ class GreenBox extends BasicStor {
      */
     public function renderPlaylistToFileOpen($sessid, $plid)
     {
-        require_once("Renderer.php");
         $r = Renderer::rnRender2FileOpen($this, $plid);
         if (PEAR::isError($r)) {
             return $r;
@@ -977,7 +978,6 @@ class GreenBox extends BasicStor {
      */
     public function renderPlaylistToFileCheck($token)
     {
-        require_once("Renderer.php");
         $r = Renderer::rnRender2FileCheck($this, $token);
         if (PEAR::isError($r)) {
             return $r;
@@ -998,7 +998,6 @@ class GreenBox extends BasicStor {
      */
     public function renderPlaylistToFileList($status='')
     {
-        require_once("Renderer.php");
         return Renderer::rnRender2FileList($this, $status);
     } // fn renderPlaylistToFileList
 
@@ -1013,7 +1012,6 @@ class GreenBox extends BasicStor {
      */
     public function renderPlaylistToFileClose($token)
     {
-        require_once("Renderer.php");
         $r = Renderer::rnRender2FileClose($this, $token);
         if (PEAR::isError($r)) {
             return $r;
@@ -1034,7 +1032,6 @@ class GreenBox extends BasicStor {
      */
     public function renderPlaylistToStorageOpen($sessid, $plid)
     {
-        require_once("Renderer.php");
         $owner = GreenBox::getSessUserId($sessid);
         if (PEAR::isError($owner)) {
             return $owner;
@@ -1058,7 +1055,6 @@ class GreenBox extends BasicStor {
      */
     public function renderPlaylistToStorageCheck($token)
     {
-        require_once("Renderer.php");
         $r = Renderer::rnRender2StorageCheck($this, $token);
         if (PEAR::isError($r)) {
             return $r;
@@ -1164,7 +1160,6 @@ class GreenBox extends BasicStor {
      */
     public function createBackupOpen($sessid, $criteria='')
     {
-        require_once("Backup.php");
         $bu = new Backup($this);
         if (PEAR::isError($bu)) {
             return $bu;
@@ -1186,7 +1181,6 @@ class GreenBox extends BasicStor {
      */
     public function createBackupCheck($token)
     {
-        require_once("Backup.php");
         $bu = new Backup($this);
         if (PEAR::isError($bu)) {
             return $bu;
@@ -1209,7 +1203,6 @@ class GreenBox extends BasicStor {
      */
     public function createBackupList($sessid, $stat='')
     {
-        require_once("Backup.php");
         $bu = new Backup($this);
         if (PEAR::isError($bu)) {
             return $bu;
@@ -1228,7 +1221,6 @@ class GreenBox extends BasicStor {
      */
     public function createBackupClose($token)
     {
-        require_once("Backup.php");
         $bu = new Backup($this);
         if (PEAR::isError($bu)) {
             return $bu;
@@ -1250,7 +1242,6 @@ class GreenBox extends BasicStor {
      */
     public function backupRestoreOpen($sessid, $filename)
     {
-        require_once('Restore.php');
         $rs = new Restore($this);
         if (PEAR::isError($rs)) {
             return $rs;
@@ -1272,7 +1263,6 @@ class GreenBox extends BasicStor {
      */
     public function backupRestoreCheck($token)
     {
-        require_once('Restore.php');
         $rs = new Restore($this);
         if (PEAR::isError($rs)) {
             return $rs;
@@ -1290,7 +1280,6 @@ class GreenBox extends BasicStor {
      *      is success
      */
     public function backupRestoreClose($token) {
-    	require_once('Restore.php');
     	$rs = new Restore($this);
     	if (PEAR::isError($rs)) {
     	    return $rs;
@@ -1433,7 +1422,6 @@ class GreenBox extends BasicStor {
      */
     public function getTransportInfo($trtok)
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         return $tr->getTransportInfo($trtok);
     } // fn getTransportInfo
@@ -1451,7 +1439,6 @@ class GreenBox extends BasicStor {
      */
     public function turnOnOffTransports($sessid, $onOff=NULL)
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         return $tr->turnOnOffTransports($sessid, $onOff);
     } // fn turnOnOffTransports
@@ -1469,7 +1456,6 @@ class GreenBox extends BasicStor {
      */
     public function doTransportAction($trtok, $action)
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         $res = $tr->doTransportAction($trtok, $action);
         return $res;
@@ -1488,7 +1474,6 @@ class GreenBox extends BasicStor {
      */
     public function uploadFile2Hub($filePath)
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         return $tr->uploadFile2Hub($filePath);
     } // fn uploadFile2Hub
@@ -1503,7 +1488,6 @@ class GreenBox extends BasicStor {
      */
     public function getHubInitiatedTransfers()
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         return $tr->getHubInitiatedTransfers();
     } // fn getHubInitiatedTransfers
@@ -1520,7 +1504,6 @@ class GreenBox extends BasicStor {
      */
     public function startHubInitiatedTransfer($trtok)
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         return $tr->startHubInitiatedTransfer($trtok);
     } // fn startHubInitiatedTransfer
@@ -1542,7 +1525,6 @@ class GreenBox extends BasicStor {
      */
     public function upload2Hub($gunid, $withContent=FALSE)
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         return $tr->upload2Hub($gunid, $withContent);
     } // fn upload2Hub
@@ -1566,7 +1548,6 @@ class GreenBox extends BasicStor {
         if (PEAR::isError($uid)) {
             return $uid;
         }
-        require_once("Transport.php");
         $tr = new Transport($this);
         return $tr->downloadFromHub($uid, $gunid, $withContent);
     } // fn downloadFromHub
@@ -1583,7 +1564,6 @@ class GreenBox extends BasicStor {
      */
     public function globalSearch($criteria)
     {
-        require_once("Transport.php");
         $tr = new Transport($this);
         //return $tr->globalSearch($criteria);
         return $tr->remoteSearch($criteria);
@@ -1602,7 +1582,6 @@ class GreenBox extends BasicStor {
      */
 //    public function getSearchResults($trtok, $andClose=TRUE)
 //    {
-//        require_once("Transport.php");
 //        $tr = new Transport($this);
 //        return $tr->getSearchResults($trtok, $andClose);
 //    } // fn getSearchResults
diff --git a/backend/StoredFile.php b/backend/StoredFile.php
index cb5c7dc59..975c9161c 100644
--- a/backend/StoredFile.php
+++ b/backend/StoredFile.php
@@ -1,7 +1,6 @@
 <?php
-//require_once("MetaData.php");
 require_once("Playlist.php");
-require_once(dirname(__FILE__)."/../../getid3/var/getid3.php");
+require_once(dirname(__FILE__)."/../3rd_party/getid3/var/getid3.php");
 
 /**
  * Track numbers in metadata tags can come in many formats:
diff --git a/backend/Subjects.php b/backend/Subjects.php
index e13169c29..f99cea1c6 100644
--- a/backend/Subjects.php
+++ b/backend/Subjects.php
@@ -1,5 +1,4 @@
 <?php
-//require_once("ObjClasses.php");
 define('ALIBERR_NOTGR', 20);
 define('ALIBERR_BADSMEMB', 21);
 
diff --git a/backend/cron/transportCron.php b/backend/cron/transportCron.php
index 67bccd675..63845ee9d 100755
--- a/backend/cron/transportCron.php
+++ b/backend/cron/transportCron.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-require_once(dirname(__FILE__).'/../conf.php');
+require_once(dirname(__FILE__).'/../../conf.php');
 require_once('DB.php');
 require_once(dirname(__FILE__).'/../LocStor.php');
 
diff --git a/backend/tests/AllTests.php b/backend/tests/AllTests.php
index 2d67e376f..3dc6c52d1 100644
--- a/backend/tests/AllTests.php
+++ b/backend/tests/AllTests.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__).'/../conf.php');
+require_once(dirname(__FILE__).'/../../conf.php');
 require_once('DB.php');
 require_once('PHPUnit.php');
 require_once 'BasicStorTests.php';
diff --git a/backend/tests/analyze.php b/backend/tests/analyze.php
index 1a19a2d7b..c1435b9c8 100755
--- a/backend/tests/analyze.php
+++ b/backend/tests/analyze.php
@@ -7,7 +7,7 @@ echo "TEST\n";
 $gunid = $argv[1];
 echo "GUNID: $gunid\n";
 
-require_once('../conf.php');
+require_once('../../conf.php');
 require_once('DB.php');
 require_once('../GreenBox.php');
 
diff --git a/backend/tests/transTest.php b/backend/tests/transTest.php
index 3c93252f3..3a48b1faa 100644
--- a/backend/tests/transTest.php
+++ b/backend/tests/transTest.php
@@ -2,7 +2,7 @@
 /*
 header("Content-type: text/plain");
 
-require_once('../conf.php');
+require_once('../../conf.php');
 require_once('DB.php');
 require_once('../GreenBox.php');
 require_once('../LocStor.php');
diff --git a/backend/tests/webstreamTest.php b/backend/tests/webstreamTest.php
index 2821ba927..d8393867c 100644
--- a/backend/tests/webstreamTest.php
+++ b/backend/tests/webstreamTest.php
@@ -3,7 +3,7 @@
 header("Content-type: text/plain");
 echo "\n#StorageServer storeWebstream  test:\n";
 
-require_once('../conf.php');
+require_once('../../conf.php');
 require_once('DB.php');
 require_once('../GreenBox.php');
 
diff --git a/backend/xmlrpc/put.php b/backend/xmlrpc/put.php
index ed5a6e9a9..650a5880a 100644
--- a/backend/xmlrpc/put.php
+++ b/backend/xmlrpc/put.php
@@ -29,7 +29,7 @@
 
 define('USE_FLOCK', TRUE);
 
-require_once(dirname(__FILE__).'/../conf.php');
+require_once(dirname(__FILE__).'/../../conf.php');
 require_once('DB.php');
 require_once(dirname(__FILE__).'/../LocStor.php');
 
diff --git a/backend/xmlrpc/simpleGet.php b/backend/xmlrpc/simpleGet.php
index 5611ce6ed..ebb0cf8dc 100644
--- a/backend/xmlrpc/simpleGet.php
+++ b/backend/xmlrpc/simpleGet.php
@@ -24,7 +24,7 @@
  *
  */
 
-require_once(dirname(__FILE__).'/../conf.php');
+require_once(dirname(__FILE__).'/../../conf.php');
 require_once('DB.php');
 require_once(dirname(__FILE__).'/../LocStor.php');
 require_once(dirname(__FILE__).'/../MetaData.php');
diff --git a/backend/xmlrpc/xrLocStor.php b/backend/xmlrpc/xrLocStor.php
index cffb85514..fb9acf702 100644
--- a/backend/xmlrpc/xrLocStor.php
+++ b/backend/xmlrpc/xrLocStor.php
@@ -23,7 +23,7 @@ ini_set("error_append_string", "</string></value>
 header("Content-type: text/xml");
 
 /* ================================================================= includes */
-require_once(dirname(__FILE__).'/../conf.php');
+require_once(dirname(__FILE__).'/../../conf.php');
 require_once('DB.php');
 require_once("XML/RPC/Server.php");
 require_once('XR_LocStor.php');
diff --git a/backend/xmlrpc/xr_cli_test.php b/backend/xmlrpc/xr_cli_test.php
index 4c8124a0f..c282be12b 100644
--- a/backend/xmlrpc/xr_cli_test.php
+++ b/backend/xmlrpc/xr_cli_test.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__).'/../conf.php');
+require_once(dirname(__FILE__).'/../../conf.php');
 include_once("XML/RPC.php");
 include_once("Console/Getopt.php");
 
diff --git a/backend/xmlrpc/xr_web_test.php b/backend/xmlrpc/xr_web_test.php
index 9f7516923..34537170c 100644
--- a/backend/xmlrpc/xr_web_test.php
+++ b/backend/xmlrpc/xr_web_test.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__).'/../conf.php');
+require_once(dirname(__FILE__).'/../../conf.php');
 include_once("XML/RPC.php");
 
 session_start();
diff --git a/conf.php b/conf.php
index 7194f95cb..ee4a0cc7f 100644
--- a/conf.php
+++ b/conf.php
@@ -50,24 +50,24 @@ $CC_CONFIG = array(
     'StationPrefsGr'=> 'StationPrefs',
     //'AllGr'         => 'All',
     'TrashName'     => 'trash_',
-    'storageDir'    =>  dirname(__FILE__).'/../../storageServer/var/stor',
-    'bufferDir'     =>  dirname(__FILE__).'/../../storageServer/var/stor/buffer',
-    'transDir'      =>  dirname(__FILE__).'/../../storageServer/var/trans',
-    'accessDir'     =>  dirname(__FILE__).'/../../storageServer/var/access',
-    'pearPath'      =>  dirname(__FILE__).'/../../../../usr/lib/pear',
+    'storageDir'    =>  dirname(__FILE__).'/stor',
+    'bufferDir'     =>  dirname(__FILE__).'/stor/buffer',
+    'transDir'      =>  dirname(__FILE__).'/trans',
+    'accessDir'     =>  dirname(__FILE__).'/access',
+    'pearPath'      =>  dirname(__FILE__).'/3rd_party/php/pear',
 //    'zendPath'      =>  dirname(__FILE__).'/../../../../usr/lib',
-    'cronDir'       =>  dirname(__FILE__).'/../../storageServer/var/cron',
+    'cronDir'       =>  dirname(__FILE__).'/backend/cron',
     'validate'      =>  TRUE,
     'useTrash'      =>  TRUE,
 
     /* ==================================================== URL configuration */
-    'storageUrlPath'        => '/campcasterStorageServer',
+    'storageUrlPath'        => '/campcaster/backend',
     'storageXMLRPC'         => 'xmlrpc/xrLocStor.php',
     'storageUrlHost'        => 'localhost',
     'storageUrlPort'        => 80,
 
     /* ================================================ archive configuration */
-    'archiveUrlPath'        => '/campcasterStorageServer',
+    'archiveUrlPath'        => '/campcaster/backend',
     'archiveXMLRPC'         => 'xmlrpc/xrLocStor.php',
     'archiveUrlHost'        => 'localhost',
 //    'archiveUrlHost'        => '192.168.30.166',
@@ -107,7 +107,7 @@ $CC_CONFIG = array(
     /* =================================================== cron configuration */
     'cronUserName'      => 'www-data',
 #    'lockfile'          => dirname(__FILE__).'/cron/cron.lock',
-    'lockfile'     =>  dirname(__FILE__).'/../../storageServer/var/stor/buffer/cron.lock',
+    'lockfile'     =>  dirname(__FILE__).'/stor/buffer/cron.lock',
     'cronfile'          => dirname(__FILE__).'/cron/croncall.php',
     'paramdir'          => dirname(__FILE__).'/cron/params',
     'systemPrefId' => "0", // ID for system prefs in prefs table
diff --git a/3rd_party/php/pear/bin/install.sh b/install/install-pear.sh
similarity index 100%
rename from 3rd_party/php/pear/bin/install.sh
rename to install/install-pear.sh
diff --git a/install/install.php b/install/install.php
index 6b67cc6c7..a627341c4 100644
--- a/install/install.php
+++ b/install/install.php
@@ -21,7 +21,7 @@ echo "* StorageServer Install *\n";
 echo "*************************\n";
 
 require_once(dirname(__FILE__).'/../conf.php');
-require_once(dirname(__FILE__).'/../GreenBox.php');
+require_once(dirname(__FILE__).'/../backend/GreenBox.php');
 require_once(dirname(__FILE__)."/installInit.php");
 campcaster_db_connect(true);
 
@@ -309,16 +309,16 @@ if (!camp_db_table_exists($CC_CONFIG['playListContentsTable'])) {
 
 	CREATE TRIGGER calculate_position AFTER INSERT OR DELETE ON ".$CC_CONFIG['playListContentsTable']."
     FOR EACH ROW EXECUTE PROCEDURE calculate_position();
-    
+
     CREATE OR REPLACE VIEW cc_playlisttimes AS (
     SELECT PL.id, COALESCE(T.length, '00:00:00') AS length
-    from ".$CC_CONFIG['playListTable']." AS PL LEFT JOIN 
-    (SELECT playlist_id AS id, text(SUM(cliplength)) AS length  
+    from ".$CC_CONFIG['playListTable']." AS PL LEFT JOIN
+    (SELECT playlist_id AS id, text(SUM(cliplength)) AS length
     FROM ".$CC_CONFIG['playListContentsTable']." GROUP BY playlist_id) AS T
-    
+
     ON PL.id = T.id
     );
-    
+
     ";
 
     camp_install_query($sql);
diff --git a/utils/backup.php b/utils/backup.php
index f49b4ff14..71c1cc89d 100644
--- a/utils/backup.php
+++ b/utils/backup.php
@@ -2,13 +2,12 @@
 define('NSPACE', 'lse');
 
 header("Content-type: text/plain");
-require_once('conf.php');
-require_once("$STORAGE_SERVER_PATH/var/conf.php");
 require_once('DB.php');
 require_once("XML/Util.php");
 require_once("XML/Beautifier.php");
-require_once("$STORAGE_SERVER_PATH/var/BasicStor.php");
-require_once("$STORAGE_SERVER_PATH/var/Prefs.php");
+require_once(dirname(__FILE__)."/../conf.php");
+require_once(dirname(__FILE__)."/../backend/BasicStor.php");
+require_once(dirname(__FILE__)."/../backend/Prefs.php");
 
 PEAR::setErrorHandling(PEAR_ERROR_RETURN);
 $CC_DBC = DB::connect($CC_CONFIG['dsn'], TRUE);
diff --git a/utils/campcaster-import.php b/utils/campcaster-import.php
index 6eb629980..a5f3e2746 100644
--- a/utils/campcaster-import.php
+++ b/utils/campcaster-import.php
@@ -12,11 +12,10 @@ set_time_limit(0);
 error_reporting(E_ALL);
 set_error_handler("camp_import_error_handler", E_ALL & !E_NOTICE);
 
-require_once('conf.php');
-require_once("$STORAGE_SERVER_PATH/var/conf.php");
 require_once('DB.php');
-require_once("$STORAGE_SERVER_PATH/var/GreenBox.php");
 require_once('Console/Getopt.php');
+require_once(dirname(__FILE__)."/../conf.php");
+require_once(dirname(__FILE__)."/../backend/GreenBox.php");
 
 function camp_import_error_handler()
 {
diff --git a/utils/conf.php b/utils/conf.php
deleted file mode 100644
index b11c0bc81..000000000
--- a/utils/conf.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$STORAGE_SERVER_PATH = dirname(__FILE__)."/../../storageServer";
-?>
\ No newline at end of file
diff --git a/utils/dumpDbSchema.php b/utils/dumpDbSchema.php
index 61f2871a4..2ca11f4be 100644
--- a/utils/dumpDbSchema.php
+++ b/utils/dumpDbSchema.php
@@ -1,6 +1,5 @@
 <?
-require_once('conf.php');
-require_once("$STORAGE_SERVER_PATH/var/conf.php");
+require_once(dirname(__FILE__)."/../conf.php");
 header("Conten-type: text/plain");
 $dbname = $CC_CONFIG['dsn']['database'];
 $dbuser = $CC_CONFIG['dsn']['username'];
diff --git a/utils/getStorPath.php b/utils/getStorPath.php
index 661ec539b..1f8cd5252 100644
--- a/utils/getStorPath.php
+++ b/utils/getStorPath.php
@@ -1,7 +1,6 @@
 <?php
 header("Content-type: text/plain");
-require_once('conf.php');
-require_once("$STORAGE_SERVER_PATH/var/conf.php");
+require_once("../conf.php");
 
 echo $CC_CONFIG['storageDir']."\n";
 ?>
\ No newline at end of file
diff --git a/utils/restore.php b/utils/restore.php
index 6fbf1da6c..c9e3cc9e1 100644
--- a/utils/restore.php
+++ b/utils/restore.php
@@ -4,13 +4,12 @@ define('VERBOSE', FALSE);
 #define('VERBOSE', TRUE);
 
 header("Content-type: text/plain");
-require_once 'conf.php';
-require_once "$STORAGE_SERVER_PATH/var/conf.php";
 require_once 'DB.php';
 require_once "XML/Util.php";
 require_once "XML/Beautifier.php";
-require_once "$STORAGE_SERVER_PATH/var/BasicStor.php";
-require_once "$STORAGE_SERVER_PATH/var/Prefs.php";
+require_once dirname(__FILE__)."/../conf.php";
+require_once dirname(__FILE__)."/../backend/BasicStor.php";
+require_once dirname(__FILE__)."/../backend/Prefs.php";
 
 /* =========================================================== misc functions */
 function ls_restore_processObject($el)
diff --git a/utils/restore2.php b/utils/restore2.php
index f5390b3cc..ef12224ae 100755
--- a/utils/restore2.php
+++ b/utils/restore2.php
@@ -12,9 +12,9 @@
      *
      */
 
-    require_once(dirname(__FILE__).'/../var/conf.php');
-    require_once(dirname(__FILE__).'/../var/GreenBox.php');
-    require_once(dirname(__FILE__).'/../var/Restore.php');
+    require_once(dirname(__FILE__).'/../conf.php');
+    require_once(dirname(__FILE__).'/../backend/GreenBox.php');
+    require_once(dirname(__FILE__).'/../backend/Restore.php');
     include_once('DB.php');
 
     PEAR::setErrorHandling(PEAR_ERROR_RETURN);