From e5164ae1dd0571fe39c9716dcd03df8be7bb8286 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Sun, 17 Apr 2016 12:34:12 +0600
Subject: [PATCH] Refactored structure

---
 .gitignore                                    |  14 +-
 B8Framework/b8/Cache/ApcCache.php             | 115 --------------
 B8Framework/b8/Registry.php                   |  87 ----------
 B8Framework/tests/DatabaseTest.php            |  54 -------
 B8Framework/tests/RegistryTest.php            |  82 ----------
 Tests/temp/.gitignore                         |   2 -
 .../models/ignore.file => app/.gitkeep        |   0
 bootstrap.php                                 |   4 +-
 composer.json                                 |   8 +-
 composer.lock                                 |   2 +-
 phpunit.xml                                   |  34 ++--
 runtime/builds/.gitkeep                       |   0
 .../b8 => src/B8Framework}/Application.php    |   0
 {B8Framework/b8 => src/B8Framework}/Cache.php |   0
 src/B8Framework/Cache/ApcCache.php            | 149 ++++++++++++++++++
 .../B8Framework}/Cache/RequestCache.php       |   0
 .../b8 => src/B8Framework}/Config.php         |   0
 .../b8 => src/B8Framework}/Controller.php     |   0
 .../Controller/RestController.php             |   0
 .../b8 => src/B8Framework}/Database.php       |   0
 .../B8Framework}/Database/CodeGenerator.php   |   0
 .../CodeGenerator/BaseControllerTemplate.html |   0
 .../CodeGenerator/BaseModelTemplate.html      |   0
 .../CodeGenerator/BaseStoreTemplate.html      |   0
 .../CodeGenerator/ControllerTemplate.html     |   0
 .../Database/CodeGenerator/ModelTemplate.html |   0
 .../Database/CodeGenerator/StoreTemplate.html |   0
 .../B8Framework}/Database/Generator.php       |   0
 .../b8 => src/B8Framework}/Database/Map.php   |   0
 .../B8Framework}/Exception/HttpException.php  |   0
 .../HttpException/BadRequestException.php     |   0
 .../HttpException/ForbiddenException.php      |   0
 .../HttpException/NotAuthorizedException.php  |   0
 .../HttpException/NotFoundException.php       |   0
 .../HttpException/ServerErrorException.php    |   0
 .../HttpException/ValidationException.php     |   0
 {B8Framework/b8 => src/B8Framework}/Form.php  |   0
 .../B8Framework}/Form/ControlGroup.php        |   0
 .../b8 => src/B8Framework}/Form/Element.php   |   0
 .../B8Framework}/Form/Element/Button.php      |   0
 .../B8Framework}/Form/Element/Checkbox.php    |   0
 .../Form/Element/CheckboxGroup.php            |   0
 .../B8Framework}/Form/Element/Csrf.php        |   0
 .../B8Framework}/Form/Element/Email.php       |   0
 .../B8Framework}/Form/Element/Hidden.php      |   0
 .../B8Framework}/Form/Element/Password.php    |   0
 .../B8Framework}/Form/Element/Radio.php       |   0
 .../B8Framework}/Form/Element/Select.php      |   0
 .../B8Framework}/Form/Element/Submit.php      |   0
 .../B8Framework}/Form/Element/Text.php        |   0
 .../B8Framework}/Form/Element/TextArea.php    |   0
 .../B8Framework}/Form/Element/Url.php         |   0
 .../b8 => src/B8Framework}/Form/FieldSet.php  |   0
 .../b8 => src/B8Framework}/Form/Input.php     |   0
 .../B8Framework}/Form/View/Button.phtml       |   0
 .../B8Framework}/Form/View/Checkbox.phtml     |   0
 .../Form/View/CheckboxGroup.phtml             |   0
 .../B8Framework}/Form/View/ControlGroup.phtml |   0
 .../B8Framework}/Form/View/Csrf.phtml         |   0
 .../B8Framework}/Form/View/FieldSet.phtml     |   0
 .../B8Framework}/Form/View/Form.phtml         |   0
 .../B8Framework}/Form/View/Hidden.phtml       |   0
 .../B8Framework}/Form/View/Radio.phtml        |   0
 .../B8Framework}/Form/View/Select.phtml       |   0
 .../B8Framework}/Form/View/Text.phtml         |   0
 .../B8Framework}/Form/View/TextArea.phtml     |   0
 .../b8 => src/B8Framework}/Http/Request.php   |   0
 .../b8 => src/B8Framework}/Http/Response.php  |   0
 .../Http/Response/JsonResponse.php            |   0
 .../Http/Response/RedirectResponse.php        |   0
 .../b8 => src/B8Framework}/Http/Router.php    |   0
 .../b8 => src/B8Framework}/HttpClient.php     |   0
 {B8Framework/b8 => src/B8Framework}/Image.php |   0
 {B8Framework/b8 => src/B8Framework}/Model.php |   0
 {B8Framework/b8 => src/B8Framework}/Store.php |   0
 .../b8 => src/B8Framework}/Store/Factory.php  |   0
 .../b8 => src/B8Framework}/Type/Cache.php     |   0
 .../b8 => src/B8Framework}/Type/RestUser.php  |   0
 {B8Framework/b8 => src/B8Framework}/View.php  |   0
 .../B8Framework}/View/Helper/Format.php       |   0
 .../b8 => src/B8Framework}/View/Template.php  |   0
 .../b8 => src/B8Framework}/View/UserView.php  |   0
 {PHPCI => src/PHPCI}/Application.php          |   0
 {PHPCI => src/PHPCI}/BuildFactory.php         |   0
 {PHPCI => src/PHPCI}/Builder.php              |   0
 .../PHPCI}/Command/CreateAdminCommand.php     |   0
 .../PHPCI}/Command/CreateBuildCommand.php     |   0
 .../PHPCI}/Command/DaemonCommand.php          |   0
 .../PHPCI}/Command/DaemoniseCommand.php       |   0
 .../PHPCI}/Command/GenerateCommand.php        |   0
 .../PHPCI}/Command/InstallCommand.php         |   0
 {PHPCI => src/PHPCI}/Command/PollCommand.php  |   0
 .../PHPCI}/Command/RebuildCommand.php         |   0
 .../PHPCI}/Command/RebuildQueueCommand.php    |   0
 {PHPCI => src/PHPCI}/Command/RunCommand.php   |   0
 .../PHPCI}/Command/UpdateCommand.php          |   0
 .../PHPCI}/Command/WorkerCommand.php          |   0
 {PHPCI => src/PHPCI}/Controller.php           |   0
 .../PHPCI}/Controller/BuildController.php     |   0
 .../Controller/BuildStatusController.php      |   0
 .../PHPCI}/Controller/GroupController.php     |   0
 .../PHPCI}/Controller/HomeController.php      |   0
 .../PHPCI}/Controller/PluginController.php    |   0
 .../PHPCI}/Controller/ProjectController.php   |   0
 .../PHPCI}/Controller/SessionController.php   |   0
 .../PHPCI}/Controller/SettingsController.php  |   0
 .../PHPCI}/Controller/UserController.php      |   0
 .../PHPCI}/Controller/WebhookController.php   |   0
 {PHPCI => src/PHPCI}/ErrorHandler.php         |   0
 {PHPCI => src/PHPCI}/Helper/AnsiConverter.php |   0
 .../PHPCI}/Helper/BaseCommandExecutor.php     |   0
 {PHPCI => src/PHPCI}/Helper/Build.php         |   0
 .../PHPCI}/Helper/BuildInterpolator.php       |   0
 .../PHPCI}/Helper/CommandExecutor.php         |   0
 {PHPCI => src/PHPCI}/Helper/Diff.php          |   0
 {PHPCI => src/PHPCI}/Helper/Email.php         |   0
 {PHPCI => src/PHPCI}/Helper/Github.php        |   0
 {PHPCI => src/PHPCI}/Helper/Lang.php          |   6 +-
 .../PHPCI}/Helper/LoginIsDisabled.php         |   0
 {PHPCI => src/PHPCI}/Helper/MailerFactory.php |   0
 {PHPCI => src/PHPCI}/Helper/SshKey.php        |   0
 .../PHPCI}/Helper/UnixCommandExecutor.php     |   0
 {PHPCI => src/PHPCI}/Helper/User.php          |   0
 .../PHPCI}/Helper/WindowsCommandExecutor.php  |   0
 {PHPCI => src/PHPCI}/Languages/lang.da.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.de.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.el.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.en.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.es.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.fr.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.it.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.nl.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.pl.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.ru.php    |   0
 {PHPCI => src/PHPCI}/Languages/lang.uk.php    |   0
 .../PHPCI}/Logging/BuildDBLogHandler.php      |   0
 {PHPCI => src/PHPCI}/Logging/BuildLogger.php  |   0
 {PHPCI => src/PHPCI}/Logging/Handler.php      |   0
 .../Logging/LoggedBuildContextTidier.php      |   0
 {PHPCI => src/PHPCI}/Logging/LoggerConfig.php |   0
 .../PHPCI}/Logging/OutputLogHandler.php       |   0
 .../20140513143726_initial_migration.php      |   0
 ...0513153133_change_build_keys_migration.php |   0
 .../20140611170618_choose_branch.php          |   0
 .../20140730143702_fix_database_columns.php   |   0
 .../20150131075425_archive_project.php        |   0
 .../20150203105015_fix_column_types.php       |   0
 ...4958_unique_email_and_name_user_fields.php |   0
 .../20151008140800_add_project_groups.php     |   0
 ...0151009100610_remove_unique_name_index.php |   0
 .../20151014091859_errors_table.php           |   0
 .../20151015124825_convert_errors.php         |   0
 {PHPCI => src/PHPCI}/Model.php                |   0
 {PHPCI => src/PHPCI}/Model/Base/BuildBase.php |   0
 .../PHPCI}/Model/Base/BuildErrorBase.php      |   0
 .../PHPCI}/Model/Base/BuildMetaBase.php       |   0
 .../PHPCI}/Model/Base/ProjectBase.php         |   0
 .../PHPCI}/Model/Base/ProjectGroupBase.php    |   0
 {PHPCI => src/PHPCI}/Model/Base/UserBase.php  |   0
 {PHPCI => src/PHPCI}/Model/Build.php          |   0
 .../PHPCI}/Model/Build/BitbucketBuild.php     |   0
 .../PHPCI}/Model/Build/GithubBuild.php        |   0
 .../PHPCI}/Model/Build/GitlabBuild.php        |   0
 .../PHPCI}/Model/Build/LocalBuild.php         |   0
 .../PHPCI}/Model/Build/MercurialBuild.php     |   0
 .../PHPCI}/Model/Build/RemoteGitBuild.php     |   0
 .../PHPCI}/Model/Build/SubversionBuild.php    |   0
 {PHPCI => src/PHPCI}/Model/BuildError.php     |   0
 {PHPCI => src/PHPCI}/Model/BuildMeta.php      |   0
 {PHPCI => src/PHPCI}/Model/Project.php        |   0
 {PHPCI => src/PHPCI}/Model/ProjectGroup.php   |   0
 {PHPCI => src/PHPCI}/Model/User.php           |   0
 {PHPCI => src/PHPCI}/Plugin.php               |   0
 {PHPCI => src/PHPCI}/Plugin/Atoum.php         |   0
 {PHPCI => src/PHPCI}/Plugin/Behat.php         |   0
 {PHPCI => src/PHPCI}/Plugin/Campfire.php      |   0
 {PHPCI => src/PHPCI}/Plugin/CleanBuild.php    |   0
 {PHPCI => src/PHPCI}/Plugin/Codeception.php   |   0
 {PHPCI => src/PHPCI}/Plugin/Composer.php      |   0
 {PHPCI => src/PHPCI}/Plugin/CopyBuild.php     |   0
 {PHPCI => src/PHPCI}/Plugin/Deployer.php      |   0
 {PHPCI => src/PHPCI}/Plugin/Email.php         |   0
 {PHPCI => src/PHPCI}/Plugin/Env.php           |   0
 .../PHPCI}/Plugin/FlowdockNotify.php          |   0
 {PHPCI => src/PHPCI}/Plugin/Git.php           |   0
 {PHPCI => src/PHPCI}/Plugin/Grunt.php         |   0
 {PHPCI => src/PHPCI}/Plugin/Gulp.php          |   0
 {PHPCI => src/PHPCI}/Plugin/HipchatNotify.php |   0
 {PHPCI => src/PHPCI}/Plugin/Irc.php           |   0
 {PHPCI => src/PHPCI}/Plugin/Lint.php          |   0
 {PHPCI => src/PHPCI}/Plugin/Mysql.php         |   0
 {PHPCI => src/PHPCI}/Plugin/PackageBuild.php  |   0
 {PHPCI => src/PHPCI}/Plugin/Pdepend.php       |   0
 {PHPCI => src/PHPCI}/Plugin/Pgsql.php         |   0
 {PHPCI => src/PHPCI}/Plugin/Phar.php          |   0
 {PHPCI => src/PHPCI}/Plugin/Phing.php         |   0
 .../PHPCI}/Plugin/PhpCodeSniffer.php          |   0
 {PHPCI => src/PHPCI}/Plugin/PhpCpd.php        |   0
 {PHPCI => src/PHPCI}/Plugin/PhpCsFixer.php    |   0
 .../PHPCI}/Plugin/PhpDocblockChecker.php      |   0
 {PHPCI => src/PHPCI}/Plugin/PhpLoc.php        |   0
 .../PHPCI}/Plugin/PhpMessDetector.php         |   0
 .../PHPCI}/Plugin/PhpParallelLint.php         |   0
 {PHPCI => src/PHPCI}/Plugin/PhpSpec.php       |   0
 {PHPCI => src/PHPCI}/Plugin/PhpTalLint.php    |   0
 {PHPCI => src/PHPCI}/Plugin/PhpUnit.php       |   0
 {PHPCI => src/PHPCI}/Plugin/Shell.php         |   0
 {PHPCI => src/PHPCI}/Plugin/SlackNotify.php   |   0
 {PHPCI => src/PHPCI}/Plugin/Sqlite.php        |   0
 {PHPCI => src/PHPCI}/Plugin/TechnicalDebt.php |   0
 .../Plugin/Util/ComposerPluginInformation.php |   0
 {PHPCI => src/PHPCI}/Plugin/Util/Executor.php |   0
 {PHPCI => src/PHPCI}/Plugin/Util/Factory.php  |   0
 .../Plugin/Util/FilesPluginInformation.php    |   0
 .../Util/InstalledPluginInformation.php       |   0
 .../Util/PluginInformationCollection.php      |   0
 .../PHPCI}/Plugin/Util/TapParser.php          |   0
 .../Util/TestResultParsers/Codeception.php    |   0
 .../TestResultParsers/ParserInterface.php     |   0
 {PHPCI => src/PHPCI}/Plugin/Wipe.php          |   0
 {PHPCI => src/PHPCI}/Plugin/Xmpp.php          |   0
 .../PHPCI}/ProcessControl/Factory.php         |   0
 .../ProcessControl/PosixProcessControl.php    |   0
 .../ProcessControlInterface.php               |   0
 .../ProcessControl/UnixProcessControl.php     |   0
 .../ProcessControl/WindowsProcessControl.php  |   0
 {PHPCI => src/PHPCI}/Service/BuildService.php |   0
 .../PHPCI}/Service/BuildStatusService.php     |   0
 .../PHPCI}/Service/ProjectService.php         |   0
 {PHPCI => src/PHPCI}/Service/UserService.php  |   0
 {PHPCI => src/PHPCI}/Store.php                |   0
 .../PHPCI}/Store/Base/BuildErrorStoreBase.php |   0
 .../PHPCI}/Store/Base/BuildMetaStoreBase.php  |   0
 .../PHPCI}/Store/Base/BuildStoreBase.php      |   0
 .../Store/Base/ProjectGroupStoreBase.php      |   0
 .../PHPCI}/Store/Base/ProjectStoreBase.php    |   0
 .../PHPCI}/Store/Base/UserStoreBase.php       |   0
 .../PHPCI}/Store/BuildErrorStore.php          |   0
 {PHPCI => src/PHPCI}/Store/BuildMetaStore.php |   0
 {PHPCI => src/PHPCI}/Store/BuildStore.php     |   0
 .../PHPCI}/Store/ProjectGroupStore.php        |   0
 {PHPCI => src/PHPCI}/Store/ProjectStore.php   |   0
 {PHPCI => src/PHPCI}/Store/UserStore.php      |   0
 {PHPCI => src/PHPCI}/View/Build/errors.phtml  |   0
 .../PHPCI}/View/Build/header-row.phtml        |   0
 {PHPCI => src/PHPCI}/View/Build/view.phtml    |   0
 .../PHPCI}/View/BuildStatus/view.phtml        |   0
 {PHPCI => src/PHPCI}/View/BuildsTable.phtml   |   0
 {PHPCI => src/PHPCI}/View/Email/layout.phtml  |   0
 {PHPCI => src/PHPCI}/View/Email/long.phtml    |   0
 {PHPCI => src/PHPCI}/View/Email/short.phtml   |   0
 {PHPCI => src/PHPCI}/View/Group/edit.phtml    |   0
 {PHPCI => src/PHPCI}/View/Group/index.phtml   |   0
 {PHPCI => src/PHPCI}/View/Home/index.phtml    |   0
 {PHPCI => src/PHPCI}/View/Plugin/index.phtml  |   0
 {PHPCI => src/PHPCI}/View/Project/view.phtml  |   0
 {PHPCI => src/PHPCI}/View/ProjectForm.phtml   |   0
 {PHPCI => src/PHPCI}/View/Session.phtml       |   0
 .../PHPCI}/View/Session/forgotPassword.phtml  |   0
 {PHPCI => src/PHPCI}/View/Session/login.phtml |   0
 .../PHPCI}/View/Session/resetPassword.phtml   |   0
 .../PHPCI}/View/Settings/index.phtml          |   0
 {PHPCI => src/PHPCI}/View/SummaryTable.phtml  |   0
 {PHPCI => src/PHPCI}/View/User/index.phtml    |   0
 {PHPCI => src/PHPCI}/View/User/profile.phtml  |   0
 {PHPCI => src/PHPCI}/View/UserForm.phtml      |   0
 {PHPCI => src/PHPCI}/View/exception.phtml     |   0
 {PHPCI => src/PHPCI}/View/layout.phtml        |   0
 {PHPCI => src/PHPCI}/Worker/BuildWorker.php   |   0
 {PHPCI => src/PHPCI}/ZeroConfigPlugin.php     |   0
 .../tests => tests/B8Framework}/CacheTest.php |  10 +-
 .../B8Framework}/CodeGenerationTest.php       |  26 +--
 .../B8Framework}/DatabaseGenerationTest.php   |  15 +-
 tests/B8Framework/DatabaseTest.php            |  55 +++++++
 .../tests => tests/B8Framework}/FormTest.php  |  28 +---
 .../B8Framework}/HttpClientTest.php           |   6 +-
 .../B8Framework}/HttpExceptionTest.php        |  12 +-
 .../tests => tests/B8Framework}/ViewTest.php  |  17 +-
 .../data/generation/ArrayPropertyModel.php    |   0
 .../B8Framework}/data/generation/TestUser.php |   0
 .../data/generation/models/BadModel.php       |   0
 .../data/generation/models/Dos.php            |   0
 .../data/generation/models/Tres.php           |   0
 .../data/generation/models/Uno.php            |   0
 .../data/generation/models/ignore.file        |   0
 .../data/generation/update_models/Dos.php     |   0
 .../data/generation/update_models/Tres.php    |   0
 .../data/generation/update_models/Uno.php     |   0
 .../B8Framework}/data/view/Form/form.phtml    |   0
 .../B8Framework}/data/view/format.phtml       |   0
 .../B8Framework}/data/view/simple.phtml       |   0
 .../B8Framework}/data/view/vars.phtml         |   0
 .../PHPCI/Command/CreateAdminCommandTest.php  |   0
 .../PHPCI/Command/CreateBuildCommandTest.php  |   0
 .../PHPCI/Command/InstallCommandTest.php      |   0
 .../Controller/WebhookControllerTest.php      |   0
 .../PHPCI/Helper/AnsiConverterTest.php        |   0
 .../PHPCI/Helper/BuildInterpolatorTest.php    |   0
 .../PHPCI/Helper/CommandExecutorTest.php      |   4 +-
 {Tests => tests}/PHPCI/Helper/LangTest.php    |   0
 .../PHPCI/Helper/MailerFactoryTest.php        |   0
 .../PHPCI/Logging/BuildLoggerTest.php         |   0
 .../PHPCI/Logging/LoggerConfigTest.php        |   0
 {Tests => tests}/PHPCI/Model/BuildTest.php    |   0
 {Tests => tests}/PHPCI/Model/ProjectTest.php  |   0
 {Tests => tests}/PHPCI/Plugin/EmailTest.php   |   0
 {Tests => tests}/PHPCI/Plugin/PharTest.php    |   0
 .../Util/ComposerPluginInformationTest.php    |   0
 .../PHPCI/Plugin/Util/ExamplePluginConfig.php |   0
 .../PHPCI/Plugin/Util/ExecutorTest.php        |   0
 .../PHPCI/Plugin/Util/FactoryTest.php         |   0
 .../Plugin/Util/Fake/ExamplePluginFull.php    |   0
 .../ExamplePluginWithNoConstructorArgs.php    |   0
 .../ExamplePluginWithSingleOptionalArg.php    |   0
 .../ExamplePluginWithSingleRequiredArg.php    |   0
 ...xamplePluginWithSingleTypedRequiredArg.php |   0
 .../Util/FilesPluginInformationTest.php       |   0
 .../PHPCI/Plugin/Util/TapParserTest.php       |   0
 .../PosixProcessControlTest.php               |   0
 .../ProcessControl/ProcessControlTest.php     |   0
 .../ProcessControl/UnixProcessControlTest.php |   0
 .../WindowsProcessControlTest.php             |   0
 .../PHPCI/Service/BuildServiceTest.php        |   0
 .../PHPCI/Service/BuiltStatusServiceTest.php  |   0
 .../PHPCI/Service/ProjectServiceTest.php      |   0
 .../PHPCI/Service/UserServiceTest.php         |   0
 {Tests => tests}/bootstrap.php                |   0
 {PHPCI/build => tests/temp}/.gitignore        |   0
 vars.php                                      |   2 +-
 329 files changed, 276 insertions(+), 456 deletions(-)
 delete mode 100755 B8Framework/b8/Cache/ApcCache.php
 delete mode 100755 B8Framework/b8/Registry.php
 delete mode 100755 B8Framework/tests/DatabaseTest.php
 delete mode 100755 B8Framework/tests/RegistryTest.php
 delete mode 100644 Tests/temp/.gitignore
 rename B8Framework/tests/data/generation/models/ignore.file => app/.gitkeep (100%)
 mode change 100755 => 100644
 create mode 100644 runtime/builds/.gitkeep
 rename {B8Framework/b8 => src/B8Framework}/Application.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Cache.php (100%)
 create mode 100755 src/B8Framework/Cache/ApcCache.php
 rename {B8Framework/b8 => src/B8Framework}/Cache/RequestCache.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Config.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Controller.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Controller/RestController.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/CodeGenerator.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/CodeGenerator/BaseControllerTemplate.html (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/CodeGenerator/BaseModelTemplate.html (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/CodeGenerator/BaseStoreTemplate.html (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/CodeGenerator/ControllerTemplate.html (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/CodeGenerator/ModelTemplate.html (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/CodeGenerator/StoreTemplate.html (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/Generator.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Database/Map.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Exception/HttpException.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Exception/HttpException/BadRequestException.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Exception/HttpException/ForbiddenException.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Exception/HttpException/NotAuthorizedException.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Exception/HttpException/NotFoundException.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Exception/HttpException/ServerErrorException.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Exception/HttpException/ValidationException.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/ControlGroup.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Button.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Checkbox.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/CheckboxGroup.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Csrf.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Email.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Hidden.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Password.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Radio.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Select.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Submit.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Text.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/TextArea.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Element/Url.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/FieldSet.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/Input.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Button.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Checkbox.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/CheckboxGroup.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/ControlGroup.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Csrf.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/FieldSet.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Form.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Hidden.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Radio.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Select.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/Text.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Form/View/TextArea.phtml (100%)
 rename {B8Framework/b8 => src/B8Framework}/Http/Request.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Http/Response.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Http/Response/JsonResponse.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Http/Response/RedirectResponse.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Http/Router.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/HttpClient.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Image.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Model.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Store.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Store/Factory.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Type/Cache.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/Type/RestUser.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/View.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/View/Helper/Format.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/View/Template.php (100%)
 rename {B8Framework/b8 => src/B8Framework}/View/UserView.php (100%)
 rename {PHPCI => src/PHPCI}/Application.php (100%)
 rename {PHPCI => src/PHPCI}/BuildFactory.php (100%)
 rename {PHPCI => src/PHPCI}/Builder.php (100%)
 rename {PHPCI => src/PHPCI}/Command/CreateAdminCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/CreateBuildCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/DaemonCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/DaemoniseCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/GenerateCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/InstallCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/PollCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/RebuildCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/RebuildQueueCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/RunCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/UpdateCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Command/WorkerCommand.php (100%)
 rename {PHPCI => src/PHPCI}/Controller.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/BuildController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/BuildStatusController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/GroupController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/HomeController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/PluginController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/ProjectController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/SessionController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/SettingsController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/UserController.php (100%)
 rename {PHPCI => src/PHPCI}/Controller/WebhookController.php (100%)
 rename {PHPCI => src/PHPCI}/ErrorHandler.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/AnsiConverter.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/BaseCommandExecutor.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/Build.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/BuildInterpolator.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/CommandExecutor.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/Diff.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/Email.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/Github.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/Lang.php (95%)
 rename {PHPCI => src/PHPCI}/Helper/LoginIsDisabled.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/MailerFactory.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/SshKey.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/UnixCommandExecutor.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/User.php (100%)
 rename {PHPCI => src/PHPCI}/Helper/WindowsCommandExecutor.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.da.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.de.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.el.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.en.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.es.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.fr.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.it.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.nl.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.pl.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.ru.php (100%)
 rename {PHPCI => src/PHPCI}/Languages/lang.uk.php (100%)
 rename {PHPCI => src/PHPCI}/Logging/BuildDBLogHandler.php (100%)
 rename {PHPCI => src/PHPCI}/Logging/BuildLogger.php (100%)
 rename {PHPCI => src/PHPCI}/Logging/Handler.php (100%)
 rename {PHPCI => src/PHPCI}/Logging/LoggedBuildContextTidier.php (100%)
 rename {PHPCI => src/PHPCI}/Logging/LoggerConfig.php (100%)
 rename {PHPCI => src/PHPCI}/Logging/OutputLogHandler.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20140513143726_initial_migration.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20140513153133_change_build_keys_migration.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20140611170618_choose_branch.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20140730143702_fix_database_columns.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20150131075425_archive_project.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20150203105015_fix_column_types.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20150324174958_unique_email_and_name_user_fields.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20151008140800_add_project_groups.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20151009100610_remove_unique_name_index.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20151014091859_errors_table.php (100%)
 rename {PHPCI => src/PHPCI}/Migrations/20151015124825_convert_errors.php (100%)
 rename {PHPCI => src/PHPCI}/Model.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Base/BuildBase.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Base/BuildErrorBase.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Base/BuildMetaBase.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Base/ProjectBase.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Base/ProjectGroupBase.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Base/UserBase.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build/BitbucketBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build/GithubBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build/GitlabBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build/LocalBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build/MercurialBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build/RemoteGitBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Build/SubversionBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Model/BuildError.php (100%)
 rename {PHPCI => src/PHPCI}/Model/BuildMeta.php (100%)
 rename {PHPCI => src/PHPCI}/Model/Project.php (100%)
 rename {PHPCI => src/PHPCI}/Model/ProjectGroup.php (100%)
 rename {PHPCI => src/PHPCI}/Model/User.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Atoum.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Behat.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Campfire.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/CleanBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Codeception.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Composer.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/CopyBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Deployer.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Email.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Env.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/FlowdockNotify.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Git.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Grunt.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Gulp.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/HipchatNotify.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Irc.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Lint.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Mysql.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PackageBuild.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Pdepend.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Pgsql.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Phar.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Phing.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpCodeSniffer.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpCpd.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpCsFixer.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpDocblockChecker.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpLoc.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpMessDetector.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpParallelLint.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpSpec.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpTalLint.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/PhpUnit.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Shell.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/SlackNotify.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Sqlite.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/TechnicalDebt.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/ComposerPluginInformation.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/Executor.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/Factory.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/FilesPluginInformation.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/InstalledPluginInformation.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/PluginInformationCollection.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/TapParser.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/TestResultParsers/Codeception.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Util/TestResultParsers/ParserInterface.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Wipe.php (100%)
 rename {PHPCI => src/PHPCI}/Plugin/Xmpp.php (100%)
 rename {PHPCI => src/PHPCI}/ProcessControl/Factory.php (100%)
 rename {PHPCI => src/PHPCI}/ProcessControl/PosixProcessControl.php (100%)
 rename {PHPCI => src/PHPCI}/ProcessControl/ProcessControlInterface.php (100%)
 rename {PHPCI => src/PHPCI}/ProcessControl/UnixProcessControl.php (100%)
 rename {PHPCI => src/PHPCI}/ProcessControl/WindowsProcessControl.php (100%)
 rename {PHPCI => src/PHPCI}/Service/BuildService.php (100%)
 rename {PHPCI => src/PHPCI}/Service/BuildStatusService.php (100%)
 rename {PHPCI => src/PHPCI}/Service/ProjectService.php (100%)
 rename {PHPCI => src/PHPCI}/Service/UserService.php (100%)
 rename {PHPCI => src/PHPCI}/Store.php (100%)
 rename {PHPCI => src/PHPCI}/Store/Base/BuildErrorStoreBase.php (100%)
 rename {PHPCI => src/PHPCI}/Store/Base/BuildMetaStoreBase.php (100%)
 rename {PHPCI => src/PHPCI}/Store/Base/BuildStoreBase.php (100%)
 rename {PHPCI => src/PHPCI}/Store/Base/ProjectGroupStoreBase.php (100%)
 rename {PHPCI => src/PHPCI}/Store/Base/ProjectStoreBase.php (100%)
 rename {PHPCI => src/PHPCI}/Store/Base/UserStoreBase.php (100%)
 rename {PHPCI => src/PHPCI}/Store/BuildErrorStore.php (100%)
 rename {PHPCI => src/PHPCI}/Store/BuildMetaStore.php (100%)
 rename {PHPCI => src/PHPCI}/Store/BuildStore.php (100%)
 rename {PHPCI => src/PHPCI}/Store/ProjectGroupStore.php (100%)
 rename {PHPCI => src/PHPCI}/Store/ProjectStore.php (100%)
 rename {PHPCI => src/PHPCI}/Store/UserStore.php (100%)
 rename {PHPCI => src/PHPCI}/View/Build/errors.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Build/header-row.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Build/view.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/BuildStatus/view.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/BuildsTable.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Email/layout.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Email/long.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Email/short.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Group/edit.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Group/index.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Home/index.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Plugin/index.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Project/view.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/ProjectForm.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Session.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Session/forgotPassword.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Session/login.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Session/resetPassword.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/Settings/index.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/SummaryTable.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/User/index.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/User/profile.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/UserForm.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/exception.phtml (100%)
 rename {PHPCI => src/PHPCI}/View/layout.phtml (100%)
 rename {PHPCI => src/PHPCI}/Worker/BuildWorker.php (100%)
 rename {PHPCI => src/PHPCI}/ZeroConfigPlugin.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/CacheTest.php (74%)
 rename {B8Framework/tests => tests/B8Framework}/CodeGenerationTest.php (93%)
 mode change 100755 => 100644
 rename {B8Framework/tests => tests/B8Framework}/DatabaseGenerationTest.php (82%)
 mode change 100755 => 100644
 create mode 100755 tests/B8Framework/DatabaseTest.php
 rename {B8Framework/tests => tests/B8Framework}/FormTest.php (77%)
 rename {B8Framework/tests => tests/B8Framework}/HttpClientTest.php (90%)
 rename {B8Framework/tests => tests/B8Framework}/HttpExceptionTest.php (74%)
 rename {B8Framework/tests => tests/B8Framework}/ViewTest.php (84%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/ArrayPropertyModel.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/TestUser.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/models/BadModel.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/models/Dos.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/models/Tres.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/models/Uno.php (100%)
 create mode 100755 tests/B8Framework/data/generation/models/ignore.file
 rename {B8Framework/tests => tests/B8Framework}/data/generation/update_models/Dos.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/update_models/Tres.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/generation/update_models/Uno.php (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/view/Form/form.phtml (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/view/format.phtml (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/view/simple.phtml (100%)
 rename {B8Framework/tests => tests/B8Framework}/data/view/vars.phtml (100%)
 rename {Tests => tests}/PHPCI/Command/CreateAdminCommandTest.php (100%)
 rename {Tests => tests}/PHPCI/Command/CreateBuildCommandTest.php (100%)
 rename {Tests => tests}/PHPCI/Command/InstallCommandTest.php (100%)
 rename {Tests => tests}/PHPCI/Controller/WebhookControllerTest.php (100%)
 rename {Tests => tests}/PHPCI/Helper/AnsiConverterTest.php (100%)
 rename {Tests => tests}/PHPCI/Helper/BuildInterpolatorTest.php (100%)
 rename {Tests => tests}/PHPCI/Helper/CommandExecutorTest.php (94%)
 rename {Tests => tests}/PHPCI/Helper/LangTest.php (100%)
 rename {Tests => tests}/PHPCI/Helper/MailerFactoryTest.php (100%)
 rename {Tests => tests}/PHPCI/Logging/BuildLoggerTest.php (100%)
 rename {Tests => tests}/PHPCI/Logging/LoggerConfigTest.php (100%)
 rename {Tests => tests}/PHPCI/Model/BuildTest.php (100%)
 rename {Tests => tests}/PHPCI/Model/ProjectTest.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/EmailTest.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/PharTest.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/ComposerPluginInformationTest.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/ExamplePluginConfig.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/ExecutorTest.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/FactoryTest.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/FilesPluginInformationTest.php (100%)
 rename {Tests => tests}/PHPCI/Plugin/Util/TapParserTest.php (100%)
 rename {Tests => tests}/PHPCI/ProcessControl/PosixProcessControlTest.php (100%)
 rename {Tests => tests}/PHPCI/ProcessControl/ProcessControlTest.php (100%)
 rename {Tests => tests}/PHPCI/ProcessControl/UnixProcessControlTest.php (100%)
 rename {Tests => tests}/PHPCI/ProcessControl/WindowsProcessControlTest.php (100%)
 rename {Tests => tests}/PHPCI/Service/BuildServiceTest.php (100%)
 rename {Tests => tests}/PHPCI/Service/BuiltStatusServiceTest.php (100%)
 rename {Tests => tests}/PHPCI/Service/ProjectServiceTest.php (100%)
 rename {Tests => tests}/PHPCI/Service/UserServiceTest.php (100%)
 rename {Tests => tests}/bootstrap.php (100%)
 rename {PHPCI/build => tests/temp}/.gitignore (100%)

diff --git a/.gitignore b/.gitignore
index 63e81c5b..a140e92f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,17 @@
 .idea
 vendor/
 composer.phar
-config.php
 .DS_Store
 .settings/
 .project
 .buildpath
-.htaccess
-PHPCI/config.yml
+app/config.yml
 cache
 /loggerconfig.php
 /pluginconfig.php
-PHPCI/Model/Migration.php
-PHPCI/Model/Base/MigrationBase.php
-PHPCI/Store/MigrationStore.php
-PHPCI/Store/Base/MigrationStoreBase.php
+src/PHPCI/Model/Migration.php
+src/PHPCI/Model/Base/MigrationBase.php
+src/PHPCI/Store/MigrationStore.php
+src/PHPCI/Store/Base/MigrationStoreBase.php
 local_vars.php
-Tests/PHPCI/config.yml
+tests/PHPCI/config.yml
diff --git a/B8Framework/b8/Cache/ApcCache.php b/B8Framework/b8/Cache/ApcCache.php
deleted file mode 100755
index 8dcb91a1..00000000
--- a/B8Framework/b8/Cache/ApcCache.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-namespace b8\Cache;
-
-use b8\Type;
-
-class ApcCache implements Type\Cache
-{
-	/**
-	 * Check if caching is enabled.
-	 */
-	public function isEnabled()
-	{
-		$rtn = false;
-
-		$apcCli = ini_get('apc.enable_cli');
-
-		if( function_exists('apc_fetch') &&
-			(php_sapi_name() != 'cli' || in_array($apcCli, array('1', 1, true, 'On'))))
-		{
-			$rtn = true;
-		}
-
-		return $rtn;
-	}
-
-	/**
-	 * Get item from the cache:
-	 */
-	public function get($key, $default = null)
-	{
-		if (!$this->isEnabled()) {
-			return $default;
-		}
-
-		$success = false;
-		$rtn     = apc_fetch($key, $success);
-
-		if (!$success) {
-			$rtn = $default;
-		}
-
-		return $rtn;
-	}
-
-	/**
-	 * Add an item to the cache:
-	 */
-	public function set($key, $value = null, $ttl = 0)
-	{
-		if (!$this->isEnabled()) {
-			return false;
-		}
-
-		return apc_store($key, $value, $ttl);
-	}
-
-	/**
-	 * Remove an item from the cache:
-	 */
-	public function delete($key)
-	{
-		if (!$this->isEnabled()) {
-			return false;
-		}
-
-		return apc_delete($key);
-	}
-
-	/**
-	 * Check if an item is in the cache:
-	 */
-	public function contains($key)
-	{
-		if (!$this->isEnabled()) {
-			return false;
-		}
-
-		return apc_exists($key);
-	}
-
-	/**
-    * Short-hand syntax for get()
-    * @see Config::get()
-    */
-    public function __get($key)
-    {
-        return $this->get($key, null);
-    }
-
-    /**
-    * Short-hand syntax for set()
-    * @see Config::set()
-    */
-    public function __set($key, $value = null)
-    {
-        return $this->set($key, $value);
-    }
-
-    /**
-    * Is set
-    */
-    public function __isset($key)
-    {
-        return $this->contains($key);
-    }
-
-    /**
-    * Unset
-    */
-    public function __unset($key)
-    {
-        $this->delete($key);
-    }
-}
\ No newline at end of file
diff --git a/B8Framework/b8/Registry.php b/B8Framework/b8/Registry.php
deleted file mode 100755
index 812c8eb7..00000000
--- a/B8Framework/b8/Registry.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace b8;
-
-use b8\Config;
-use b8\Http\Request;
-
-if (!defined('B8_PATH')) {
-	define('B8_PATH', dirname(__FILE__) . '/');
-}
-
-/**
-* b8\Registry is now deprecated in favour of using the following classes:
-* @see b8\Http\Request
-* @see b8\Http\Response
-* @see b8\Config
-*/
-class Registry
-{
-	/**
-	 * @var Registry
-	 */
-	protected static $instance;
-	protected $_data    = array();
-	protected $_params  = null;
-
-	/**
-	* @var Config
-	*/
-	protected $config;
-
-	/**
-	* @var Request
-	*/
-	protected $request;
-
-	/**
-	 * @return Registry
-	 */
-	public static function getInstance()
-	{
-		return self::$instance;
-	}
-
-	public function __construct(Config $config, Request $request)
-	{
-		$this->config = $config;
-		$this->request = $request;
-
-		self::$instance = $this;
-	}
-
-	public function get($key, $default = null)
-	{
-		return $this->config->get($key, $default);
-	}
-
-	public function set($key, $value)
-	{
-		return $this->config->set($key, $value);
-	}
-
-	public function setArray($array)
-	{
-		return $this->config->set($array);
-	}
-
-	public function getParams()
-	{
-		return $this->request->getParams();
-	}
-
-	public function getParam($key, $default)
-	{
-		return $this->request->getParam($key, $default);
-	}
-
-	public function setParam($key, $value)
-	{
-		return $this->request->setParam($key, $value);
-	}
-
-	public function unsetParam($key)
-	{
-		return $this->request->unsetParam($key);
-	}
-}
\ No newline at end of file
diff --git a/B8Framework/tests/DatabaseTest.php b/B8Framework/tests/DatabaseTest.php
deleted file mode 100755
index e60e815b..00000000
--- a/B8Framework/tests/DatabaseTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/Database.php');
-
-class DatabaseTest extends \PHPUnit_Framework_TestCase
-{
-	protected $_host = 'localhost';
-	protected $_user = 'b8_test';
-	protected $_pass = 'b8_test';
-	protected $_name = 'b8_test';
-
-	public function testGetReadConnection()
-	{
-		\b8\Database::setDetails($this->_name, $this->_user, $this->_pass);
-		\b8\Database::setReadServers(array($this->_host));
-
-		$connection = \b8\Database::getConnection('read');
-
-		$this->assertInstanceOf('\b8\Database', $connection);
-	}
-
-	public function testGetWriteConnection()
-	{
-		\b8\Database::setDetails($this->_name, $this->_user, $this->_pass);
-		\b8\Database::setWriteServers(array($this->_host));
-
-		$connection = \b8\Database::getConnection('write');
-
-		$this->assertInstanceOf('\b8\Database', $connection);
-	}
-
-	public function testGetDetails()
-	{
-		\b8\Database::setDetails($this->_name, $this->_user, $this->_pass);
-		\b8\Database::setReadServers(array('localhost'));
-
-		$details = \b8\Database::getConnection('read')->getDetails();
-		$this->assertTrue(is_array($details));
-		$this->assertTrue(($details['db'] == $this->_name));
-		$this->assertTrue(($details['user'] == $this->_user));
-		$this->assertTrue(($details['pass'] == $this->_pass));
-	}
-
-	/**
-	 * @expectedException \Exception
-	 */
-	public function testConnectionFailure()
-	{
-		\b8\Database::setDetails('non_existant', 'invalid_user', 'incorrect_password');
-		\b8\Database::setReadServers(array('localhost'));
-		\b8\Database::getConnection('read');
-	}
-}
\ No newline at end of file
diff --git a/B8Framework/tests/RegistryTest.php b/B8Framework/tests/RegistryTest.php
deleted file mode 100755
index 97abecea..00000000
--- a/B8Framework/tests/RegistryTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-use b8\Registry;
-
-class RegistryTest extends \PHPUnit_Framework_TestCase
-{
-	public function testSingleton()
-	{
-		Registry::forceReset();
-		$instance   = Registry::getInstance();
-		$instance->set('test', true);
-
-		$instance2  = Registry::getInstance();
-		$this->assertTrue($instance2->get('test', false));
-	}
-
-	public function testStoreAndRetrieve()
-	{
-		Registry::forceReset();
-		$r = Registry::getInstance();
-		$r->set('test', 'cat');
-
-		$this->assertTrue($r->get('test', 'dog') == 'cat');
-	}
-
-	public function testSetArray()
-	{
-		Registry::forceReset();
-		$r = Registry::getInstance();
-		$r->set('one', 'two');
-		$r->setArray(array('test' => 'cat'));
-
-		$this->assertTrue($r->get('test', 'dog') == 'cat');
-		$this->assertTrue($r->get('one', 'three') == 'two');
-	}
-
-	public function testGetNonExistent()
-	{
-		Registry::forceReset();
-		$r = Registry::getInstance();
-		$this->assertTrue(!$r->get('cat', false));
-	}
-
-	public function testGetParams()
-	{
-		Registry::forceReset();
-
-		$_REQUEST                   = array();
-		$_REQUEST['cat']            = 'dog';
-		$_SERVER['REQUEST_METHOD']  = 'GET';
-
-		$r      = Registry::getInstance();
-		$params = $r->getParams();
-		$this->assertTrue(is_array($params));
-		$this->assertArrayHasKey('cat', $params);
-		$this->assertArrayNotHasKey('dog', $params);
-	}
-
-	public function testEmptyInput()
-	{
-		Registry::forceReset();
-		$r      = Registry::getInstance();
-		$params = $r->getParams();
-
-		$this->assertTrue(is_array($params));
-		$this->assertTrue(!count($params));
-	}
-
-	public function testGetSetUnsetParam()
-	{
-		Registry::forceReset();
-		$r = Registry::getInstance();
-		$this->assertTrue($r->getParam('cat', false) == false);
-		$r->setParam('cat', 'dog');
-
-		$this->assertTrue($r->getParam('cat', false) == 'dog');
-
-		$r->unsetParam('cat');
-		$this->assertTrue($r->getParam('cat', false) == false);
-	}
-}
\ No newline at end of file
diff --git a/Tests/temp/.gitignore b/Tests/temp/.gitignore
deleted file mode 100644
index d6b7ef32..00000000
--- a/Tests/temp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/B8Framework/tests/data/generation/models/ignore.file b/app/.gitkeep
old mode 100755
new mode 100644
similarity index 100%
rename from B8Framework/tests/data/generation/models/ignore.file
rename to app/.gitkeep
diff --git a/bootstrap.php b/bootstrap.php
index ebecad81..5fe9c8ed 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -15,7 +15,7 @@ if (empty($timezone)) {
     date_default_timezone_set('UTC');
 }
 
-$configFile = dirname(__FILE__) . '/PHPCI/config.yml';
+$configFile = dirname(__FILE__) . '/app/config.yml';
 $configEnv = getenv('phpci_config_file');
 $usingCustomConfigFile = false;
 
@@ -54,7 +54,7 @@ if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
 $conf = array();
 $conf['b8']['app']['namespace'] = 'PHPCI';
 $conf['b8']['app']['default_controller'] = 'Home';
-$conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
+$conf['b8']['view']['path'] = dirname(__FILE__) . '/src/PHPCI/View/';
 $conf['using_custom_file'] = $usingCustomConfigFile;
 
 $config = new b8\Config($conf);
diff --git a/composer.json b/composer.json
index 202d2791..f6a4ec0c 100644
--- a/composer.json
+++ b/composer.json
@@ -21,14 +21,14 @@
     },
     "autoload": {
         "psr-4": {
-            "PHPCI\\": "PHPCI/",
-            "b8\\":    "B8Framework/b8/"
+            "PHPCI\\": "src/PHPCI/",
+            "b8\\":    "src/B8Framework/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\PHPCI\\": "Tests/PHPCI/",
-            "Tests\\b8\\":    "B8Framework/tests/"
+            "Tests\\PHPCI\\": "tests/PHPCI/",
+            "Tests\\b8\\":    "tests/B8Framework/"
         }
     },
     "require": {
diff --git a/composer.lock b/composer.lock
index bfd54e19..0de2d78d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8284c7c2c1947ad6dab0eaa67bc2d268",
+    "hash": "1a7e6ffa53784a02d845d40fc34455f1",
     "content-hash": "aea45980fd51944fe67aeb4a0677ec88",
     "packages": [
         {
diff --git a/phpunit.xml b/phpunit.xml
index fdddf34d..2edaadd8 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,33 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./Tests/bootstrap.php"
+<phpunit
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    syntaxCheck="false"
+    bootstrap="./Tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="PHPCI Command Test Suite">
             <directory suffix="Test.php">./Tests/PHPCI/Command</directory>
         </testsuite>
+        <testsuite name="PHPCI Controller Test Suite">
+            <directory suffix="Test.php">./Tests/PHPCI/Controller</directory>
+        </testsuite>
         <testsuite name="PHPCI Helper Test Suite">
             <directory suffix="Test.php">./Tests/PHPCI/Helper</directory>
         </testsuite>
         <testsuite name="PHPCI Logging Test Suite">
             <directory suffix="Test.php">./Tests/PHPCI/Logging</directory>
         </testsuite>
-        <testsuite name="PHPCI Plugin Test Suite">
-            <directory suffix="Test.php">./Tests/PHPCI/Plugin</directory>
-        </testsuite>
         <testsuite name="PHPCI Model Test Suite">
             <directory suffix="Test.php">./Tests/PHPCI/Model</directory>
         </testsuite>
+        <testsuite name="PHPCI Plugin Test Suite">
+            <directory suffix="Test.php">./Tests/PHPCI/Plugin</directory>
+        </testsuite>
+        <!--<testsuite name="PHPCI ProcessControl Test Suite">
+            <directory suffix="Test.php">./Tests/PHPCI/ProcessControl</directory>
+        </testsuite>-->
         <testsuite name="PHPCI Service Test Suite">
             <directory suffix="Test.php">./Tests/PHPCI/Service</directory>
         </testsuite>
+        <!--<testsuite name="B8Framework Test Suite">
+            <directory suffix="Test.php">./B8Framework/tests</directory>
+        </testsuite>-->
     </testsuites>
 </phpunit>
diff --git a/runtime/builds/.gitkeep b/runtime/builds/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/B8Framework/b8/Application.php b/src/B8Framework/Application.php
similarity index 100%
rename from B8Framework/b8/Application.php
rename to src/B8Framework/Application.php
diff --git a/B8Framework/b8/Cache.php b/src/B8Framework/Cache.php
similarity index 100%
rename from B8Framework/b8/Cache.php
rename to src/B8Framework/Cache.php
diff --git a/src/B8Framework/Cache/ApcCache.php b/src/B8Framework/Cache/ApcCache.php
new file mode 100755
index 00000000..2c175252
--- /dev/null
+++ b/src/B8Framework/Cache/ApcCache.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace b8\Cache;
+
+use b8\Type;
+
+class ApcCache implements Type\Cache
+{
+    /**
+     * Check if caching is enabled.
+     *
+     * @return boolean
+     */
+    public function isEnabled()
+    {
+        $rtn    = false;
+        $apcCli = ini_get('apc.enable_cli');
+
+        if (function_exists('apc_fetch') && (php_sapi_name() != 'cli' || in_array($apcCli, array('1', 1, true, 'On')))) {
+            $rtn = true;
+        }
+
+        return $rtn;
+    }
+
+    /**
+     * Get item from the cache:
+     *
+     * @param string $key
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function get($key, $default = null)
+    {
+        if (!$this->isEnabled()) {
+            return $default;
+        }
+
+        $success = false;
+        $rtn     = apc_fetch($key, $success);
+        if (!$success) {
+            $rtn = $default;
+        }
+
+        return $rtn;
+    }
+
+    /**
+     * Add an item to the cache:
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param integer $ttl
+     *
+     * @return array|bool
+     */
+    public function set($key, $value = null, $ttl = 0)
+    {
+        if (!$this->isEnabled()) {
+            return false;
+        }
+
+        return apc_store($key, $value, $ttl);
+    }
+
+    /**
+     * Remove an item from the cache:
+     *
+     * @param string $key
+     *
+     * @return bool|string[]
+     */
+    public function delete($key)
+    {
+        if (!$this->isEnabled()) {
+            return false;
+        }
+
+        return apc_delete($key);
+    }
+
+    /**
+     * Check if an item is in the cache:
+     *
+     * @param string $key
+     *
+     * @return bool|string[]
+     */
+    public function contains($key)
+    {
+        if (!$this->isEnabled()) {
+            return false;
+        }
+
+        return apc_exists($key);
+    }
+
+    /**
+     * Short-hand syntax for get()
+     *
+     * @see Config::get()
+     *
+     * @param string $key
+     *
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        return $this->get($key, null);
+    }
+
+    /**
+     * Short-hand syntax for set()
+     *
+     * @see Config::set()
+     *
+     * @param string $key
+     * @param mixed $value
+     *
+     * @return array|bool
+     */
+    public function __set($key, $value = null)
+    {
+        return $this->set($key, $value);
+    }
+
+    /**
+     * Is set
+     *
+     * @param string $key
+     *
+     * @return bool|string[]
+     */
+    public function __isset($key)
+    {
+        return $this->contains($key);
+    }
+
+    /**
+     * Unset
+     *
+     * @param string $key
+     */
+    public function __unset($key)
+    {
+        $this->delete($key);
+    }
+}
diff --git a/B8Framework/b8/Cache/RequestCache.php b/src/B8Framework/Cache/RequestCache.php
similarity index 100%
rename from B8Framework/b8/Cache/RequestCache.php
rename to src/B8Framework/Cache/RequestCache.php
diff --git a/B8Framework/b8/Config.php b/src/B8Framework/Config.php
similarity index 100%
rename from B8Framework/b8/Config.php
rename to src/B8Framework/Config.php
diff --git a/B8Framework/b8/Controller.php b/src/B8Framework/Controller.php
similarity index 100%
rename from B8Framework/b8/Controller.php
rename to src/B8Framework/Controller.php
diff --git a/B8Framework/b8/Controller/RestController.php b/src/B8Framework/Controller/RestController.php
similarity index 100%
rename from B8Framework/b8/Controller/RestController.php
rename to src/B8Framework/Controller/RestController.php
diff --git a/B8Framework/b8/Database.php b/src/B8Framework/Database.php
similarity index 100%
rename from B8Framework/b8/Database.php
rename to src/B8Framework/Database.php
diff --git a/B8Framework/b8/Database/CodeGenerator.php b/src/B8Framework/Database/CodeGenerator.php
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator.php
rename to src/B8Framework/Database/CodeGenerator.php
diff --git a/B8Framework/b8/Database/CodeGenerator/BaseControllerTemplate.html b/src/B8Framework/Database/CodeGenerator/BaseControllerTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/BaseControllerTemplate.html
rename to src/B8Framework/Database/CodeGenerator/BaseControllerTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/BaseModelTemplate.html b/src/B8Framework/Database/CodeGenerator/BaseModelTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/BaseModelTemplate.html
rename to src/B8Framework/Database/CodeGenerator/BaseModelTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/BaseStoreTemplate.html b/src/B8Framework/Database/CodeGenerator/BaseStoreTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/BaseStoreTemplate.html
rename to src/B8Framework/Database/CodeGenerator/BaseStoreTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/ControllerTemplate.html b/src/B8Framework/Database/CodeGenerator/ControllerTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/ControllerTemplate.html
rename to src/B8Framework/Database/CodeGenerator/ControllerTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/ModelTemplate.html b/src/B8Framework/Database/CodeGenerator/ModelTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/ModelTemplate.html
rename to src/B8Framework/Database/CodeGenerator/ModelTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/StoreTemplate.html b/src/B8Framework/Database/CodeGenerator/StoreTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/StoreTemplate.html
rename to src/B8Framework/Database/CodeGenerator/StoreTemplate.html
diff --git a/B8Framework/b8/Database/Generator.php b/src/B8Framework/Database/Generator.php
similarity index 100%
rename from B8Framework/b8/Database/Generator.php
rename to src/B8Framework/Database/Generator.php
diff --git a/B8Framework/b8/Database/Map.php b/src/B8Framework/Database/Map.php
similarity index 100%
rename from B8Framework/b8/Database/Map.php
rename to src/B8Framework/Database/Map.php
diff --git a/B8Framework/b8/Exception/HttpException.php b/src/B8Framework/Exception/HttpException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException.php
rename to src/B8Framework/Exception/HttpException.php
diff --git a/B8Framework/b8/Exception/HttpException/BadRequestException.php b/src/B8Framework/Exception/HttpException/BadRequestException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/BadRequestException.php
rename to src/B8Framework/Exception/HttpException/BadRequestException.php
diff --git a/B8Framework/b8/Exception/HttpException/ForbiddenException.php b/src/B8Framework/Exception/HttpException/ForbiddenException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/ForbiddenException.php
rename to src/B8Framework/Exception/HttpException/ForbiddenException.php
diff --git a/B8Framework/b8/Exception/HttpException/NotAuthorizedException.php b/src/B8Framework/Exception/HttpException/NotAuthorizedException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/NotAuthorizedException.php
rename to src/B8Framework/Exception/HttpException/NotAuthorizedException.php
diff --git a/B8Framework/b8/Exception/HttpException/NotFoundException.php b/src/B8Framework/Exception/HttpException/NotFoundException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/NotFoundException.php
rename to src/B8Framework/Exception/HttpException/NotFoundException.php
diff --git a/B8Framework/b8/Exception/HttpException/ServerErrorException.php b/src/B8Framework/Exception/HttpException/ServerErrorException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/ServerErrorException.php
rename to src/B8Framework/Exception/HttpException/ServerErrorException.php
diff --git a/B8Framework/b8/Exception/HttpException/ValidationException.php b/src/B8Framework/Exception/HttpException/ValidationException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/ValidationException.php
rename to src/B8Framework/Exception/HttpException/ValidationException.php
diff --git a/B8Framework/b8/Form.php b/src/B8Framework/Form.php
similarity index 100%
rename from B8Framework/b8/Form.php
rename to src/B8Framework/Form.php
diff --git a/B8Framework/b8/Form/ControlGroup.php b/src/B8Framework/Form/ControlGroup.php
similarity index 100%
rename from B8Framework/b8/Form/ControlGroup.php
rename to src/B8Framework/Form/ControlGroup.php
diff --git a/B8Framework/b8/Form/Element.php b/src/B8Framework/Form/Element.php
similarity index 100%
rename from B8Framework/b8/Form/Element.php
rename to src/B8Framework/Form/Element.php
diff --git a/B8Framework/b8/Form/Element/Button.php b/src/B8Framework/Form/Element/Button.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Button.php
rename to src/B8Framework/Form/Element/Button.php
diff --git a/B8Framework/b8/Form/Element/Checkbox.php b/src/B8Framework/Form/Element/Checkbox.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Checkbox.php
rename to src/B8Framework/Form/Element/Checkbox.php
diff --git a/B8Framework/b8/Form/Element/CheckboxGroup.php b/src/B8Framework/Form/Element/CheckboxGroup.php
similarity index 100%
rename from B8Framework/b8/Form/Element/CheckboxGroup.php
rename to src/B8Framework/Form/Element/CheckboxGroup.php
diff --git a/B8Framework/b8/Form/Element/Csrf.php b/src/B8Framework/Form/Element/Csrf.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Csrf.php
rename to src/B8Framework/Form/Element/Csrf.php
diff --git a/B8Framework/b8/Form/Element/Email.php b/src/B8Framework/Form/Element/Email.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Email.php
rename to src/B8Framework/Form/Element/Email.php
diff --git a/B8Framework/b8/Form/Element/Hidden.php b/src/B8Framework/Form/Element/Hidden.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Hidden.php
rename to src/B8Framework/Form/Element/Hidden.php
diff --git a/B8Framework/b8/Form/Element/Password.php b/src/B8Framework/Form/Element/Password.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Password.php
rename to src/B8Framework/Form/Element/Password.php
diff --git a/B8Framework/b8/Form/Element/Radio.php b/src/B8Framework/Form/Element/Radio.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Radio.php
rename to src/B8Framework/Form/Element/Radio.php
diff --git a/B8Framework/b8/Form/Element/Select.php b/src/B8Framework/Form/Element/Select.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Select.php
rename to src/B8Framework/Form/Element/Select.php
diff --git a/B8Framework/b8/Form/Element/Submit.php b/src/B8Framework/Form/Element/Submit.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Submit.php
rename to src/B8Framework/Form/Element/Submit.php
diff --git a/B8Framework/b8/Form/Element/Text.php b/src/B8Framework/Form/Element/Text.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Text.php
rename to src/B8Framework/Form/Element/Text.php
diff --git a/B8Framework/b8/Form/Element/TextArea.php b/src/B8Framework/Form/Element/TextArea.php
similarity index 100%
rename from B8Framework/b8/Form/Element/TextArea.php
rename to src/B8Framework/Form/Element/TextArea.php
diff --git a/B8Framework/b8/Form/Element/Url.php b/src/B8Framework/Form/Element/Url.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Url.php
rename to src/B8Framework/Form/Element/Url.php
diff --git a/B8Framework/b8/Form/FieldSet.php b/src/B8Framework/Form/FieldSet.php
similarity index 100%
rename from B8Framework/b8/Form/FieldSet.php
rename to src/B8Framework/Form/FieldSet.php
diff --git a/B8Framework/b8/Form/Input.php b/src/B8Framework/Form/Input.php
similarity index 100%
rename from B8Framework/b8/Form/Input.php
rename to src/B8Framework/Form/Input.php
diff --git a/B8Framework/b8/Form/View/Button.phtml b/src/B8Framework/Form/View/Button.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Button.phtml
rename to src/B8Framework/Form/View/Button.phtml
diff --git a/B8Framework/b8/Form/View/Checkbox.phtml b/src/B8Framework/Form/View/Checkbox.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Checkbox.phtml
rename to src/B8Framework/Form/View/Checkbox.phtml
diff --git a/B8Framework/b8/Form/View/CheckboxGroup.phtml b/src/B8Framework/Form/View/CheckboxGroup.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/CheckboxGroup.phtml
rename to src/B8Framework/Form/View/CheckboxGroup.phtml
diff --git a/B8Framework/b8/Form/View/ControlGroup.phtml b/src/B8Framework/Form/View/ControlGroup.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/ControlGroup.phtml
rename to src/B8Framework/Form/View/ControlGroup.phtml
diff --git a/B8Framework/b8/Form/View/Csrf.phtml b/src/B8Framework/Form/View/Csrf.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Csrf.phtml
rename to src/B8Framework/Form/View/Csrf.phtml
diff --git a/B8Framework/b8/Form/View/FieldSet.phtml b/src/B8Framework/Form/View/FieldSet.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/FieldSet.phtml
rename to src/B8Framework/Form/View/FieldSet.phtml
diff --git a/B8Framework/b8/Form/View/Form.phtml b/src/B8Framework/Form/View/Form.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Form.phtml
rename to src/B8Framework/Form/View/Form.phtml
diff --git a/B8Framework/b8/Form/View/Hidden.phtml b/src/B8Framework/Form/View/Hidden.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Hidden.phtml
rename to src/B8Framework/Form/View/Hidden.phtml
diff --git a/B8Framework/b8/Form/View/Radio.phtml b/src/B8Framework/Form/View/Radio.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Radio.phtml
rename to src/B8Framework/Form/View/Radio.phtml
diff --git a/B8Framework/b8/Form/View/Select.phtml b/src/B8Framework/Form/View/Select.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Select.phtml
rename to src/B8Framework/Form/View/Select.phtml
diff --git a/B8Framework/b8/Form/View/Text.phtml b/src/B8Framework/Form/View/Text.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Text.phtml
rename to src/B8Framework/Form/View/Text.phtml
diff --git a/B8Framework/b8/Form/View/TextArea.phtml b/src/B8Framework/Form/View/TextArea.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/TextArea.phtml
rename to src/B8Framework/Form/View/TextArea.phtml
diff --git a/B8Framework/b8/Http/Request.php b/src/B8Framework/Http/Request.php
similarity index 100%
rename from B8Framework/b8/Http/Request.php
rename to src/B8Framework/Http/Request.php
diff --git a/B8Framework/b8/Http/Response.php b/src/B8Framework/Http/Response.php
similarity index 100%
rename from B8Framework/b8/Http/Response.php
rename to src/B8Framework/Http/Response.php
diff --git a/B8Framework/b8/Http/Response/JsonResponse.php b/src/B8Framework/Http/Response/JsonResponse.php
similarity index 100%
rename from B8Framework/b8/Http/Response/JsonResponse.php
rename to src/B8Framework/Http/Response/JsonResponse.php
diff --git a/B8Framework/b8/Http/Response/RedirectResponse.php b/src/B8Framework/Http/Response/RedirectResponse.php
similarity index 100%
rename from B8Framework/b8/Http/Response/RedirectResponse.php
rename to src/B8Framework/Http/Response/RedirectResponse.php
diff --git a/B8Framework/b8/Http/Router.php b/src/B8Framework/Http/Router.php
similarity index 100%
rename from B8Framework/b8/Http/Router.php
rename to src/B8Framework/Http/Router.php
diff --git a/B8Framework/b8/HttpClient.php b/src/B8Framework/HttpClient.php
similarity index 100%
rename from B8Framework/b8/HttpClient.php
rename to src/B8Framework/HttpClient.php
diff --git a/B8Framework/b8/Image.php b/src/B8Framework/Image.php
similarity index 100%
rename from B8Framework/b8/Image.php
rename to src/B8Framework/Image.php
diff --git a/B8Framework/b8/Model.php b/src/B8Framework/Model.php
similarity index 100%
rename from B8Framework/b8/Model.php
rename to src/B8Framework/Model.php
diff --git a/B8Framework/b8/Store.php b/src/B8Framework/Store.php
similarity index 100%
rename from B8Framework/b8/Store.php
rename to src/B8Framework/Store.php
diff --git a/B8Framework/b8/Store/Factory.php b/src/B8Framework/Store/Factory.php
similarity index 100%
rename from B8Framework/b8/Store/Factory.php
rename to src/B8Framework/Store/Factory.php
diff --git a/B8Framework/b8/Type/Cache.php b/src/B8Framework/Type/Cache.php
similarity index 100%
rename from B8Framework/b8/Type/Cache.php
rename to src/B8Framework/Type/Cache.php
diff --git a/B8Framework/b8/Type/RestUser.php b/src/B8Framework/Type/RestUser.php
similarity index 100%
rename from B8Framework/b8/Type/RestUser.php
rename to src/B8Framework/Type/RestUser.php
diff --git a/B8Framework/b8/View.php b/src/B8Framework/View.php
similarity index 100%
rename from B8Framework/b8/View.php
rename to src/B8Framework/View.php
diff --git a/B8Framework/b8/View/Helper/Format.php b/src/B8Framework/View/Helper/Format.php
similarity index 100%
rename from B8Framework/b8/View/Helper/Format.php
rename to src/B8Framework/View/Helper/Format.php
diff --git a/B8Framework/b8/View/Template.php b/src/B8Framework/View/Template.php
similarity index 100%
rename from B8Framework/b8/View/Template.php
rename to src/B8Framework/View/Template.php
diff --git a/B8Framework/b8/View/UserView.php b/src/B8Framework/View/UserView.php
similarity index 100%
rename from B8Framework/b8/View/UserView.php
rename to src/B8Framework/View/UserView.php
diff --git a/PHPCI/Application.php b/src/PHPCI/Application.php
similarity index 100%
rename from PHPCI/Application.php
rename to src/PHPCI/Application.php
diff --git a/PHPCI/BuildFactory.php b/src/PHPCI/BuildFactory.php
similarity index 100%
rename from PHPCI/BuildFactory.php
rename to src/PHPCI/BuildFactory.php
diff --git a/PHPCI/Builder.php b/src/PHPCI/Builder.php
similarity index 100%
rename from PHPCI/Builder.php
rename to src/PHPCI/Builder.php
diff --git a/PHPCI/Command/CreateAdminCommand.php b/src/PHPCI/Command/CreateAdminCommand.php
similarity index 100%
rename from PHPCI/Command/CreateAdminCommand.php
rename to src/PHPCI/Command/CreateAdminCommand.php
diff --git a/PHPCI/Command/CreateBuildCommand.php b/src/PHPCI/Command/CreateBuildCommand.php
similarity index 100%
rename from PHPCI/Command/CreateBuildCommand.php
rename to src/PHPCI/Command/CreateBuildCommand.php
diff --git a/PHPCI/Command/DaemonCommand.php b/src/PHPCI/Command/DaemonCommand.php
similarity index 100%
rename from PHPCI/Command/DaemonCommand.php
rename to src/PHPCI/Command/DaemonCommand.php
diff --git a/PHPCI/Command/DaemoniseCommand.php b/src/PHPCI/Command/DaemoniseCommand.php
similarity index 100%
rename from PHPCI/Command/DaemoniseCommand.php
rename to src/PHPCI/Command/DaemoniseCommand.php
diff --git a/PHPCI/Command/GenerateCommand.php b/src/PHPCI/Command/GenerateCommand.php
similarity index 100%
rename from PHPCI/Command/GenerateCommand.php
rename to src/PHPCI/Command/GenerateCommand.php
diff --git a/PHPCI/Command/InstallCommand.php b/src/PHPCI/Command/InstallCommand.php
similarity index 100%
rename from PHPCI/Command/InstallCommand.php
rename to src/PHPCI/Command/InstallCommand.php
diff --git a/PHPCI/Command/PollCommand.php b/src/PHPCI/Command/PollCommand.php
similarity index 100%
rename from PHPCI/Command/PollCommand.php
rename to src/PHPCI/Command/PollCommand.php
diff --git a/PHPCI/Command/RebuildCommand.php b/src/PHPCI/Command/RebuildCommand.php
similarity index 100%
rename from PHPCI/Command/RebuildCommand.php
rename to src/PHPCI/Command/RebuildCommand.php
diff --git a/PHPCI/Command/RebuildQueueCommand.php b/src/PHPCI/Command/RebuildQueueCommand.php
similarity index 100%
rename from PHPCI/Command/RebuildQueueCommand.php
rename to src/PHPCI/Command/RebuildQueueCommand.php
diff --git a/PHPCI/Command/RunCommand.php b/src/PHPCI/Command/RunCommand.php
similarity index 100%
rename from PHPCI/Command/RunCommand.php
rename to src/PHPCI/Command/RunCommand.php
diff --git a/PHPCI/Command/UpdateCommand.php b/src/PHPCI/Command/UpdateCommand.php
similarity index 100%
rename from PHPCI/Command/UpdateCommand.php
rename to src/PHPCI/Command/UpdateCommand.php
diff --git a/PHPCI/Command/WorkerCommand.php b/src/PHPCI/Command/WorkerCommand.php
similarity index 100%
rename from PHPCI/Command/WorkerCommand.php
rename to src/PHPCI/Command/WorkerCommand.php
diff --git a/PHPCI/Controller.php b/src/PHPCI/Controller.php
similarity index 100%
rename from PHPCI/Controller.php
rename to src/PHPCI/Controller.php
diff --git a/PHPCI/Controller/BuildController.php b/src/PHPCI/Controller/BuildController.php
similarity index 100%
rename from PHPCI/Controller/BuildController.php
rename to src/PHPCI/Controller/BuildController.php
diff --git a/PHPCI/Controller/BuildStatusController.php b/src/PHPCI/Controller/BuildStatusController.php
similarity index 100%
rename from PHPCI/Controller/BuildStatusController.php
rename to src/PHPCI/Controller/BuildStatusController.php
diff --git a/PHPCI/Controller/GroupController.php b/src/PHPCI/Controller/GroupController.php
similarity index 100%
rename from PHPCI/Controller/GroupController.php
rename to src/PHPCI/Controller/GroupController.php
diff --git a/PHPCI/Controller/HomeController.php b/src/PHPCI/Controller/HomeController.php
similarity index 100%
rename from PHPCI/Controller/HomeController.php
rename to src/PHPCI/Controller/HomeController.php
diff --git a/PHPCI/Controller/PluginController.php b/src/PHPCI/Controller/PluginController.php
similarity index 100%
rename from PHPCI/Controller/PluginController.php
rename to src/PHPCI/Controller/PluginController.php
diff --git a/PHPCI/Controller/ProjectController.php b/src/PHPCI/Controller/ProjectController.php
similarity index 100%
rename from PHPCI/Controller/ProjectController.php
rename to src/PHPCI/Controller/ProjectController.php
diff --git a/PHPCI/Controller/SessionController.php b/src/PHPCI/Controller/SessionController.php
similarity index 100%
rename from PHPCI/Controller/SessionController.php
rename to src/PHPCI/Controller/SessionController.php
diff --git a/PHPCI/Controller/SettingsController.php b/src/PHPCI/Controller/SettingsController.php
similarity index 100%
rename from PHPCI/Controller/SettingsController.php
rename to src/PHPCI/Controller/SettingsController.php
diff --git a/PHPCI/Controller/UserController.php b/src/PHPCI/Controller/UserController.php
similarity index 100%
rename from PHPCI/Controller/UserController.php
rename to src/PHPCI/Controller/UserController.php
diff --git a/PHPCI/Controller/WebhookController.php b/src/PHPCI/Controller/WebhookController.php
similarity index 100%
rename from PHPCI/Controller/WebhookController.php
rename to src/PHPCI/Controller/WebhookController.php
diff --git a/PHPCI/ErrorHandler.php b/src/PHPCI/ErrorHandler.php
similarity index 100%
rename from PHPCI/ErrorHandler.php
rename to src/PHPCI/ErrorHandler.php
diff --git a/PHPCI/Helper/AnsiConverter.php b/src/PHPCI/Helper/AnsiConverter.php
similarity index 100%
rename from PHPCI/Helper/AnsiConverter.php
rename to src/PHPCI/Helper/AnsiConverter.php
diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/src/PHPCI/Helper/BaseCommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/BaseCommandExecutor.php
rename to src/PHPCI/Helper/BaseCommandExecutor.php
diff --git a/PHPCI/Helper/Build.php b/src/PHPCI/Helper/Build.php
similarity index 100%
rename from PHPCI/Helper/Build.php
rename to src/PHPCI/Helper/Build.php
diff --git a/PHPCI/Helper/BuildInterpolator.php b/src/PHPCI/Helper/BuildInterpolator.php
similarity index 100%
rename from PHPCI/Helper/BuildInterpolator.php
rename to src/PHPCI/Helper/BuildInterpolator.php
diff --git a/PHPCI/Helper/CommandExecutor.php b/src/PHPCI/Helper/CommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/CommandExecutor.php
rename to src/PHPCI/Helper/CommandExecutor.php
diff --git a/PHPCI/Helper/Diff.php b/src/PHPCI/Helper/Diff.php
similarity index 100%
rename from PHPCI/Helper/Diff.php
rename to src/PHPCI/Helper/Diff.php
diff --git a/PHPCI/Helper/Email.php b/src/PHPCI/Helper/Email.php
similarity index 100%
rename from PHPCI/Helper/Email.php
rename to src/PHPCI/Helper/Email.php
diff --git a/PHPCI/Helper/Github.php b/src/PHPCI/Helper/Github.php
similarity index 100%
rename from PHPCI/Helper/Github.php
rename to src/PHPCI/Helper/Github.php
diff --git a/PHPCI/Helper/Lang.php b/src/PHPCI/Helper/Lang.php
similarity index 95%
rename from PHPCI/Helper/Lang.php
rename to src/PHPCI/Helper/Lang.php
index a998312b..0cc1b5c1 100644
--- a/PHPCI/Helper/Lang.php
+++ b/src/PHPCI/Helper/Lang.php
@@ -106,7 +106,7 @@ class Lang
 
         foreach (self::$languages as $language) {
             $strings = array();
-            require(PHPCI_DIR . 'PHPCI/Languages/lang.' . $language . '.php');
+            require(PHPCI_DIR . 'src/PHPCI/Languages/lang.' . $language . '.php');
             $languages[$language] = $strings['language_name'];
         }
 
@@ -175,7 +175,7 @@ class Lang
         $language = $language
             ? $language
             : self::$language;
-        $langFile = PHPCI_DIR . 'PHPCI/Languages/lang.' . $language . '.php';
+        $langFile = PHPCI_DIR . 'src/PHPCI/Languages/lang.' . $language . '.php';
 
         if (!file_exists($langFile)) {
             return null;
@@ -196,7 +196,7 @@ class Lang
     protected static function loadAvailableLanguages()
     {
         $matches = array();
-        foreach (glob(PHPCI_DIR . 'PHPCI/Languages/lang.*.php') as $file) {
+        foreach (glob(PHPCI_DIR . 'src/PHPCI/Languages/lang.*.php') as $file) {
             if (preg_match('/lang\.([a-z]{2}\-?[a-z]*)\.php/', $file, $matches)) {
                 self::$languages[] = $matches[1];
             }
diff --git a/PHPCI/Helper/LoginIsDisabled.php b/src/PHPCI/Helper/LoginIsDisabled.php
similarity index 100%
rename from PHPCI/Helper/LoginIsDisabled.php
rename to src/PHPCI/Helper/LoginIsDisabled.php
diff --git a/PHPCI/Helper/MailerFactory.php b/src/PHPCI/Helper/MailerFactory.php
similarity index 100%
rename from PHPCI/Helper/MailerFactory.php
rename to src/PHPCI/Helper/MailerFactory.php
diff --git a/PHPCI/Helper/SshKey.php b/src/PHPCI/Helper/SshKey.php
similarity index 100%
rename from PHPCI/Helper/SshKey.php
rename to src/PHPCI/Helper/SshKey.php
diff --git a/PHPCI/Helper/UnixCommandExecutor.php b/src/PHPCI/Helper/UnixCommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/UnixCommandExecutor.php
rename to src/PHPCI/Helper/UnixCommandExecutor.php
diff --git a/PHPCI/Helper/User.php b/src/PHPCI/Helper/User.php
similarity index 100%
rename from PHPCI/Helper/User.php
rename to src/PHPCI/Helper/User.php
diff --git a/PHPCI/Helper/WindowsCommandExecutor.php b/src/PHPCI/Helper/WindowsCommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/WindowsCommandExecutor.php
rename to src/PHPCI/Helper/WindowsCommandExecutor.php
diff --git a/PHPCI/Languages/lang.da.php b/src/PHPCI/Languages/lang.da.php
similarity index 100%
rename from PHPCI/Languages/lang.da.php
rename to src/PHPCI/Languages/lang.da.php
diff --git a/PHPCI/Languages/lang.de.php b/src/PHPCI/Languages/lang.de.php
similarity index 100%
rename from PHPCI/Languages/lang.de.php
rename to src/PHPCI/Languages/lang.de.php
diff --git a/PHPCI/Languages/lang.el.php b/src/PHPCI/Languages/lang.el.php
similarity index 100%
rename from PHPCI/Languages/lang.el.php
rename to src/PHPCI/Languages/lang.el.php
diff --git a/PHPCI/Languages/lang.en.php b/src/PHPCI/Languages/lang.en.php
similarity index 100%
rename from PHPCI/Languages/lang.en.php
rename to src/PHPCI/Languages/lang.en.php
diff --git a/PHPCI/Languages/lang.es.php b/src/PHPCI/Languages/lang.es.php
similarity index 100%
rename from PHPCI/Languages/lang.es.php
rename to src/PHPCI/Languages/lang.es.php
diff --git a/PHPCI/Languages/lang.fr.php b/src/PHPCI/Languages/lang.fr.php
similarity index 100%
rename from PHPCI/Languages/lang.fr.php
rename to src/PHPCI/Languages/lang.fr.php
diff --git a/PHPCI/Languages/lang.it.php b/src/PHPCI/Languages/lang.it.php
similarity index 100%
rename from PHPCI/Languages/lang.it.php
rename to src/PHPCI/Languages/lang.it.php
diff --git a/PHPCI/Languages/lang.nl.php b/src/PHPCI/Languages/lang.nl.php
similarity index 100%
rename from PHPCI/Languages/lang.nl.php
rename to src/PHPCI/Languages/lang.nl.php
diff --git a/PHPCI/Languages/lang.pl.php b/src/PHPCI/Languages/lang.pl.php
similarity index 100%
rename from PHPCI/Languages/lang.pl.php
rename to src/PHPCI/Languages/lang.pl.php
diff --git a/PHPCI/Languages/lang.ru.php b/src/PHPCI/Languages/lang.ru.php
similarity index 100%
rename from PHPCI/Languages/lang.ru.php
rename to src/PHPCI/Languages/lang.ru.php
diff --git a/PHPCI/Languages/lang.uk.php b/src/PHPCI/Languages/lang.uk.php
similarity index 100%
rename from PHPCI/Languages/lang.uk.php
rename to src/PHPCI/Languages/lang.uk.php
diff --git a/PHPCI/Logging/BuildDBLogHandler.php b/src/PHPCI/Logging/BuildDBLogHandler.php
similarity index 100%
rename from PHPCI/Logging/BuildDBLogHandler.php
rename to src/PHPCI/Logging/BuildDBLogHandler.php
diff --git a/PHPCI/Logging/BuildLogger.php b/src/PHPCI/Logging/BuildLogger.php
similarity index 100%
rename from PHPCI/Logging/BuildLogger.php
rename to src/PHPCI/Logging/BuildLogger.php
diff --git a/PHPCI/Logging/Handler.php b/src/PHPCI/Logging/Handler.php
similarity index 100%
rename from PHPCI/Logging/Handler.php
rename to src/PHPCI/Logging/Handler.php
diff --git a/PHPCI/Logging/LoggedBuildContextTidier.php b/src/PHPCI/Logging/LoggedBuildContextTidier.php
similarity index 100%
rename from PHPCI/Logging/LoggedBuildContextTidier.php
rename to src/PHPCI/Logging/LoggedBuildContextTidier.php
diff --git a/PHPCI/Logging/LoggerConfig.php b/src/PHPCI/Logging/LoggerConfig.php
similarity index 100%
rename from PHPCI/Logging/LoggerConfig.php
rename to src/PHPCI/Logging/LoggerConfig.php
diff --git a/PHPCI/Logging/OutputLogHandler.php b/src/PHPCI/Logging/OutputLogHandler.php
similarity index 100%
rename from PHPCI/Logging/OutputLogHandler.php
rename to src/PHPCI/Logging/OutputLogHandler.php
diff --git a/PHPCI/Migrations/20140513143726_initial_migration.php b/src/PHPCI/Migrations/20140513143726_initial_migration.php
similarity index 100%
rename from PHPCI/Migrations/20140513143726_initial_migration.php
rename to src/PHPCI/Migrations/20140513143726_initial_migration.php
diff --git a/PHPCI/Migrations/20140513153133_change_build_keys_migration.php b/src/PHPCI/Migrations/20140513153133_change_build_keys_migration.php
similarity index 100%
rename from PHPCI/Migrations/20140513153133_change_build_keys_migration.php
rename to src/PHPCI/Migrations/20140513153133_change_build_keys_migration.php
diff --git a/PHPCI/Migrations/20140611170618_choose_branch.php b/src/PHPCI/Migrations/20140611170618_choose_branch.php
similarity index 100%
rename from PHPCI/Migrations/20140611170618_choose_branch.php
rename to src/PHPCI/Migrations/20140611170618_choose_branch.php
diff --git a/PHPCI/Migrations/20140730143702_fix_database_columns.php b/src/PHPCI/Migrations/20140730143702_fix_database_columns.php
similarity index 100%
rename from PHPCI/Migrations/20140730143702_fix_database_columns.php
rename to src/PHPCI/Migrations/20140730143702_fix_database_columns.php
diff --git a/PHPCI/Migrations/20150131075425_archive_project.php b/src/PHPCI/Migrations/20150131075425_archive_project.php
similarity index 100%
rename from PHPCI/Migrations/20150131075425_archive_project.php
rename to src/PHPCI/Migrations/20150131075425_archive_project.php
diff --git a/PHPCI/Migrations/20150203105015_fix_column_types.php b/src/PHPCI/Migrations/20150203105015_fix_column_types.php
similarity index 100%
rename from PHPCI/Migrations/20150203105015_fix_column_types.php
rename to src/PHPCI/Migrations/20150203105015_fix_column_types.php
diff --git a/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php b/src/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
similarity index 100%
rename from PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
rename to src/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
diff --git a/PHPCI/Migrations/20151008140800_add_project_groups.php b/src/PHPCI/Migrations/20151008140800_add_project_groups.php
similarity index 100%
rename from PHPCI/Migrations/20151008140800_add_project_groups.php
rename to src/PHPCI/Migrations/20151008140800_add_project_groups.php
diff --git a/PHPCI/Migrations/20151009100610_remove_unique_name_index.php b/src/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
similarity index 100%
rename from PHPCI/Migrations/20151009100610_remove_unique_name_index.php
rename to src/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
diff --git a/PHPCI/Migrations/20151014091859_errors_table.php b/src/PHPCI/Migrations/20151014091859_errors_table.php
similarity index 100%
rename from PHPCI/Migrations/20151014091859_errors_table.php
rename to src/PHPCI/Migrations/20151014091859_errors_table.php
diff --git a/PHPCI/Migrations/20151015124825_convert_errors.php b/src/PHPCI/Migrations/20151015124825_convert_errors.php
similarity index 100%
rename from PHPCI/Migrations/20151015124825_convert_errors.php
rename to src/PHPCI/Migrations/20151015124825_convert_errors.php
diff --git a/PHPCI/Model.php b/src/PHPCI/Model.php
similarity index 100%
rename from PHPCI/Model.php
rename to src/PHPCI/Model.php
diff --git a/PHPCI/Model/Base/BuildBase.php b/src/PHPCI/Model/Base/BuildBase.php
similarity index 100%
rename from PHPCI/Model/Base/BuildBase.php
rename to src/PHPCI/Model/Base/BuildBase.php
diff --git a/PHPCI/Model/Base/BuildErrorBase.php b/src/PHPCI/Model/Base/BuildErrorBase.php
similarity index 100%
rename from PHPCI/Model/Base/BuildErrorBase.php
rename to src/PHPCI/Model/Base/BuildErrorBase.php
diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/src/PHPCI/Model/Base/BuildMetaBase.php
similarity index 100%
rename from PHPCI/Model/Base/BuildMetaBase.php
rename to src/PHPCI/Model/Base/BuildMetaBase.php
diff --git a/PHPCI/Model/Base/ProjectBase.php b/src/PHPCI/Model/Base/ProjectBase.php
similarity index 100%
rename from PHPCI/Model/Base/ProjectBase.php
rename to src/PHPCI/Model/Base/ProjectBase.php
diff --git a/PHPCI/Model/Base/ProjectGroupBase.php b/src/PHPCI/Model/Base/ProjectGroupBase.php
similarity index 100%
rename from PHPCI/Model/Base/ProjectGroupBase.php
rename to src/PHPCI/Model/Base/ProjectGroupBase.php
diff --git a/PHPCI/Model/Base/UserBase.php b/src/PHPCI/Model/Base/UserBase.php
similarity index 100%
rename from PHPCI/Model/Base/UserBase.php
rename to src/PHPCI/Model/Base/UserBase.php
diff --git a/PHPCI/Model/Build.php b/src/PHPCI/Model/Build.php
similarity index 100%
rename from PHPCI/Model/Build.php
rename to src/PHPCI/Model/Build.php
diff --git a/PHPCI/Model/Build/BitbucketBuild.php b/src/PHPCI/Model/Build/BitbucketBuild.php
similarity index 100%
rename from PHPCI/Model/Build/BitbucketBuild.php
rename to src/PHPCI/Model/Build/BitbucketBuild.php
diff --git a/PHPCI/Model/Build/GithubBuild.php b/src/PHPCI/Model/Build/GithubBuild.php
similarity index 100%
rename from PHPCI/Model/Build/GithubBuild.php
rename to src/PHPCI/Model/Build/GithubBuild.php
diff --git a/PHPCI/Model/Build/GitlabBuild.php b/src/PHPCI/Model/Build/GitlabBuild.php
similarity index 100%
rename from PHPCI/Model/Build/GitlabBuild.php
rename to src/PHPCI/Model/Build/GitlabBuild.php
diff --git a/PHPCI/Model/Build/LocalBuild.php b/src/PHPCI/Model/Build/LocalBuild.php
similarity index 100%
rename from PHPCI/Model/Build/LocalBuild.php
rename to src/PHPCI/Model/Build/LocalBuild.php
diff --git a/PHPCI/Model/Build/MercurialBuild.php b/src/PHPCI/Model/Build/MercurialBuild.php
similarity index 100%
rename from PHPCI/Model/Build/MercurialBuild.php
rename to src/PHPCI/Model/Build/MercurialBuild.php
diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/src/PHPCI/Model/Build/RemoteGitBuild.php
similarity index 100%
rename from PHPCI/Model/Build/RemoteGitBuild.php
rename to src/PHPCI/Model/Build/RemoteGitBuild.php
diff --git a/PHPCI/Model/Build/SubversionBuild.php b/src/PHPCI/Model/Build/SubversionBuild.php
similarity index 100%
rename from PHPCI/Model/Build/SubversionBuild.php
rename to src/PHPCI/Model/Build/SubversionBuild.php
diff --git a/PHPCI/Model/BuildError.php b/src/PHPCI/Model/BuildError.php
similarity index 100%
rename from PHPCI/Model/BuildError.php
rename to src/PHPCI/Model/BuildError.php
diff --git a/PHPCI/Model/BuildMeta.php b/src/PHPCI/Model/BuildMeta.php
similarity index 100%
rename from PHPCI/Model/BuildMeta.php
rename to src/PHPCI/Model/BuildMeta.php
diff --git a/PHPCI/Model/Project.php b/src/PHPCI/Model/Project.php
similarity index 100%
rename from PHPCI/Model/Project.php
rename to src/PHPCI/Model/Project.php
diff --git a/PHPCI/Model/ProjectGroup.php b/src/PHPCI/Model/ProjectGroup.php
similarity index 100%
rename from PHPCI/Model/ProjectGroup.php
rename to src/PHPCI/Model/ProjectGroup.php
diff --git a/PHPCI/Model/User.php b/src/PHPCI/Model/User.php
similarity index 100%
rename from PHPCI/Model/User.php
rename to src/PHPCI/Model/User.php
diff --git a/PHPCI/Plugin.php b/src/PHPCI/Plugin.php
similarity index 100%
rename from PHPCI/Plugin.php
rename to src/PHPCI/Plugin.php
diff --git a/PHPCI/Plugin/Atoum.php b/src/PHPCI/Plugin/Atoum.php
similarity index 100%
rename from PHPCI/Plugin/Atoum.php
rename to src/PHPCI/Plugin/Atoum.php
diff --git a/PHPCI/Plugin/Behat.php b/src/PHPCI/Plugin/Behat.php
similarity index 100%
rename from PHPCI/Plugin/Behat.php
rename to src/PHPCI/Plugin/Behat.php
diff --git a/PHPCI/Plugin/Campfire.php b/src/PHPCI/Plugin/Campfire.php
similarity index 100%
rename from PHPCI/Plugin/Campfire.php
rename to src/PHPCI/Plugin/Campfire.php
diff --git a/PHPCI/Plugin/CleanBuild.php b/src/PHPCI/Plugin/CleanBuild.php
similarity index 100%
rename from PHPCI/Plugin/CleanBuild.php
rename to src/PHPCI/Plugin/CleanBuild.php
diff --git a/PHPCI/Plugin/Codeception.php b/src/PHPCI/Plugin/Codeception.php
similarity index 100%
rename from PHPCI/Plugin/Codeception.php
rename to src/PHPCI/Plugin/Codeception.php
diff --git a/PHPCI/Plugin/Composer.php b/src/PHPCI/Plugin/Composer.php
similarity index 100%
rename from PHPCI/Plugin/Composer.php
rename to src/PHPCI/Plugin/Composer.php
diff --git a/PHPCI/Plugin/CopyBuild.php b/src/PHPCI/Plugin/CopyBuild.php
similarity index 100%
rename from PHPCI/Plugin/CopyBuild.php
rename to src/PHPCI/Plugin/CopyBuild.php
diff --git a/PHPCI/Plugin/Deployer.php b/src/PHPCI/Plugin/Deployer.php
similarity index 100%
rename from PHPCI/Plugin/Deployer.php
rename to src/PHPCI/Plugin/Deployer.php
diff --git a/PHPCI/Plugin/Email.php b/src/PHPCI/Plugin/Email.php
similarity index 100%
rename from PHPCI/Plugin/Email.php
rename to src/PHPCI/Plugin/Email.php
diff --git a/PHPCI/Plugin/Env.php b/src/PHPCI/Plugin/Env.php
similarity index 100%
rename from PHPCI/Plugin/Env.php
rename to src/PHPCI/Plugin/Env.php
diff --git a/PHPCI/Plugin/FlowdockNotify.php b/src/PHPCI/Plugin/FlowdockNotify.php
similarity index 100%
rename from PHPCI/Plugin/FlowdockNotify.php
rename to src/PHPCI/Plugin/FlowdockNotify.php
diff --git a/PHPCI/Plugin/Git.php b/src/PHPCI/Plugin/Git.php
similarity index 100%
rename from PHPCI/Plugin/Git.php
rename to src/PHPCI/Plugin/Git.php
diff --git a/PHPCI/Plugin/Grunt.php b/src/PHPCI/Plugin/Grunt.php
similarity index 100%
rename from PHPCI/Plugin/Grunt.php
rename to src/PHPCI/Plugin/Grunt.php
diff --git a/PHPCI/Plugin/Gulp.php b/src/PHPCI/Plugin/Gulp.php
similarity index 100%
rename from PHPCI/Plugin/Gulp.php
rename to src/PHPCI/Plugin/Gulp.php
diff --git a/PHPCI/Plugin/HipchatNotify.php b/src/PHPCI/Plugin/HipchatNotify.php
similarity index 100%
rename from PHPCI/Plugin/HipchatNotify.php
rename to src/PHPCI/Plugin/HipchatNotify.php
diff --git a/PHPCI/Plugin/Irc.php b/src/PHPCI/Plugin/Irc.php
similarity index 100%
rename from PHPCI/Plugin/Irc.php
rename to src/PHPCI/Plugin/Irc.php
diff --git a/PHPCI/Plugin/Lint.php b/src/PHPCI/Plugin/Lint.php
similarity index 100%
rename from PHPCI/Plugin/Lint.php
rename to src/PHPCI/Plugin/Lint.php
diff --git a/PHPCI/Plugin/Mysql.php b/src/PHPCI/Plugin/Mysql.php
similarity index 100%
rename from PHPCI/Plugin/Mysql.php
rename to src/PHPCI/Plugin/Mysql.php
diff --git a/PHPCI/Plugin/PackageBuild.php b/src/PHPCI/Plugin/PackageBuild.php
similarity index 100%
rename from PHPCI/Plugin/PackageBuild.php
rename to src/PHPCI/Plugin/PackageBuild.php
diff --git a/PHPCI/Plugin/Pdepend.php b/src/PHPCI/Plugin/Pdepend.php
similarity index 100%
rename from PHPCI/Plugin/Pdepend.php
rename to src/PHPCI/Plugin/Pdepend.php
diff --git a/PHPCI/Plugin/Pgsql.php b/src/PHPCI/Plugin/Pgsql.php
similarity index 100%
rename from PHPCI/Plugin/Pgsql.php
rename to src/PHPCI/Plugin/Pgsql.php
diff --git a/PHPCI/Plugin/Phar.php b/src/PHPCI/Plugin/Phar.php
similarity index 100%
rename from PHPCI/Plugin/Phar.php
rename to src/PHPCI/Plugin/Phar.php
diff --git a/PHPCI/Plugin/Phing.php b/src/PHPCI/Plugin/Phing.php
similarity index 100%
rename from PHPCI/Plugin/Phing.php
rename to src/PHPCI/Plugin/Phing.php
diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/src/PHPCI/Plugin/PhpCodeSniffer.php
similarity index 100%
rename from PHPCI/Plugin/PhpCodeSniffer.php
rename to src/PHPCI/Plugin/PhpCodeSniffer.php
diff --git a/PHPCI/Plugin/PhpCpd.php b/src/PHPCI/Plugin/PhpCpd.php
similarity index 100%
rename from PHPCI/Plugin/PhpCpd.php
rename to src/PHPCI/Plugin/PhpCpd.php
diff --git a/PHPCI/Plugin/PhpCsFixer.php b/src/PHPCI/Plugin/PhpCsFixer.php
similarity index 100%
rename from PHPCI/Plugin/PhpCsFixer.php
rename to src/PHPCI/Plugin/PhpCsFixer.php
diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/src/PHPCI/Plugin/PhpDocblockChecker.php
similarity index 100%
rename from PHPCI/Plugin/PhpDocblockChecker.php
rename to src/PHPCI/Plugin/PhpDocblockChecker.php
diff --git a/PHPCI/Plugin/PhpLoc.php b/src/PHPCI/Plugin/PhpLoc.php
similarity index 100%
rename from PHPCI/Plugin/PhpLoc.php
rename to src/PHPCI/Plugin/PhpLoc.php
diff --git a/PHPCI/Plugin/PhpMessDetector.php b/src/PHPCI/Plugin/PhpMessDetector.php
similarity index 100%
rename from PHPCI/Plugin/PhpMessDetector.php
rename to src/PHPCI/Plugin/PhpMessDetector.php
diff --git a/PHPCI/Plugin/PhpParallelLint.php b/src/PHPCI/Plugin/PhpParallelLint.php
similarity index 100%
rename from PHPCI/Plugin/PhpParallelLint.php
rename to src/PHPCI/Plugin/PhpParallelLint.php
diff --git a/PHPCI/Plugin/PhpSpec.php b/src/PHPCI/Plugin/PhpSpec.php
similarity index 100%
rename from PHPCI/Plugin/PhpSpec.php
rename to src/PHPCI/Plugin/PhpSpec.php
diff --git a/PHPCI/Plugin/PhpTalLint.php b/src/PHPCI/Plugin/PhpTalLint.php
similarity index 100%
rename from PHPCI/Plugin/PhpTalLint.php
rename to src/PHPCI/Plugin/PhpTalLint.php
diff --git a/PHPCI/Plugin/PhpUnit.php b/src/PHPCI/Plugin/PhpUnit.php
similarity index 100%
rename from PHPCI/Plugin/PhpUnit.php
rename to src/PHPCI/Plugin/PhpUnit.php
diff --git a/PHPCI/Plugin/Shell.php b/src/PHPCI/Plugin/Shell.php
similarity index 100%
rename from PHPCI/Plugin/Shell.php
rename to src/PHPCI/Plugin/Shell.php
diff --git a/PHPCI/Plugin/SlackNotify.php b/src/PHPCI/Plugin/SlackNotify.php
similarity index 100%
rename from PHPCI/Plugin/SlackNotify.php
rename to src/PHPCI/Plugin/SlackNotify.php
diff --git a/PHPCI/Plugin/Sqlite.php b/src/PHPCI/Plugin/Sqlite.php
similarity index 100%
rename from PHPCI/Plugin/Sqlite.php
rename to src/PHPCI/Plugin/Sqlite.php
diff --git a/PHPCI/Plugin/TechnicalDebt.php b/src/PHPCI/Plugin/TechnicalDebt.php
similarity index 100%
rename from PHPCI/Plugin/TechnicalDebt.php
rename to src/PHPCI/Plugin/TechnicalDebt.php
diff --git a/PHPCI/Plugin/Util/ComposerPluginInformation.php b/src/PHPCI/Plugin/Util/ComposerPluginInformation.php
similarity index 100%
rename from PHPCI/Plugin/Util/ComposerPluginInformation.php
rename to src/PHPCI/Plugin/Util/ComposerPluginInformation.php
diff --git a/PHPCI/Plugin/Util/Executor.php b/src/PHPCI/Plugin/Util/Executor.php
similarity index 100%
rename from PHPCI/Plugin/Util/Executor.php
rename to src/PHPCI/Plugin/Util/Executor.php
diff --git a/PHPCI/Plugin/Util/Factory.php b/src/PHPCI/Plugin/Util/Factory.php
similarity index 100%
rename from PHPCI/Plugin/Util/Factory.php
rename to src/PHPCI/Plugin/Util/Factory.php
diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/src/PHPCI/Plugin/Util/FilesPluginInformation.php
similarity index 100%
rename from PHPCI/Plugin/Util/FilesPluginInformation.php
rename to src/PHPCI/Plugin/Util/FilesPluginInformation.php
diff --git a/PHPCI/Plugin/Util/InstalledPluginInformation.php b/src/PHPCI/Plugin/Util/InstalledPluginInformation.php
similarity index 100%
rename from PHPCI/Plugin/Util/InstalledPluginInformation.php
rename to src/PHPCI/Plugin/Util/InstalledPluginInformation.php
diff --git a/PHPCI/Plugin/Util/PluginInformationCollection.php b/src/PHPCI/Plugin/Util/PluginInformationCollection.php
similarity index 100%
rename from PHPCI/Plugin/Util/PluginInformationCollection.php
rename to src/PHPCI/Plugin/Util/PluginInformationCollection.php
diff --git a/PHPCI/Plugin/Util/TapParser.php b/src/PHPCI/Plugin/Util/TapParser.php
similarity index 100%
rename from PHPCI/Plugin/Util/TapParser.php
rename to src/PHPCI/Plugin/Util/TapParser.php
diff --git a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php b/src/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
similarity index 100%
rename from PHPCI/Plugin/Util/TestResultParsers/Codeception.php
rename to src/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
diff --git a/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php b/src/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
similarity index 100%
rename from PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
rename to src/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
diff --git a/PHPCI/Plugin/Wipe.php b/src/PHPCI/Plugin/Wipe.php
similarity index 100%
rename from PHPCI/Plugin/Wipe.php
rename to src/PHPCI/Plugin/Wipe.php
diff --git a/PHPCI/Plugin/Xmpp.php b/src/PHPCI/Plugin/Xmpp.php
similarity index 100%
rename from PHPCI/Plugin/Xmpp.php
rename to src/PHPCI/Plugin/Xmpp.php
diff --git a/PHPCI/ProcessControl/Factory.php b/src/PHPCI/ProcessControl/Factory.php
similarity index 100%
rename from PHPCI/ProcessControl/Factory.php
rename to src/PHPCI/ProcessControl/Factory.php
diff --git a/PHPCI/ProcessControl/PosixProcessControl.php b/src/PHPCI/ProcessControl/PosixProcessControl.php
similarity index 100%
rename from PHPCI/ProcessControl/PosixProcessControl.php
rename to src/PHPCI/ProcessControl/PosixProcessControl.php
diff --git a/PHPCI/ProcessControl/ProcessControlInterface.php b/src/PHPCI/ProcessControl/ProcessControlInterface.php
similarity index 100%
rename from PHPCI/ProcessControl/ProcessControlInterface.php
rename to src/PHPCI/ProcessControl/ProcessControlInterface.php
diff --git a/PHPCI/ProcessControl/UnixProcessControl.php b/src/PHPCI/ProcessControl/UnixProcessControl.php
similarity index 100%
rename from PHPCI/ProcessControl/UnixProcessControl.php
rename to src/PHPCI/ProcessControl/UnixProcessControl.php
diff --git a/PHPCI/ProcessControl/WindowsProcessControl.php b/src/PHPCI/ProcessControl/WindowsProcessControl.php
similarity index 100%
rename from PHPCI/ProcessControl/WindowsProcessControl.php
rename to src/PHPCI/ProcessControl/WindowsProcessControl.php
diff --git a/PHPCI/Service/BuildService.php b/src/PHPCI/Service/BuildService.php
similarity index 100%
rename from PHPCI/Service/BuildService.php
rename to src/PHPCI/Service/BuildService.php
diff --git a/PHPCI/Service/BuildStatusService.php b/src/PHPCI/Service/BuildStatusService.php
similarity index 100%
rename from PHPCI/Service/BuildStatusService.php
rename to src/PHPCI/Service/BuildStatusService.php
diff --git a/PHPCI/Service/ProjectService.php b/src/PHPCI/Service/ProjectService.php
similarity index 100%
rename from PHPCI/Service/ProjectService.php
rename to src/PHPCI/Service/ProjectService.php
diff --git a/PHPCI/Service/UserService.php b/src/PHPCI/Service/UserService.php
similarity index 100%
rename from PHPCI/Service/UserService.php
rename to src/PHPCI/Service/UserService.php
diff --git a/PHPCI/Store.php b/src/PHPCI/Store.php
similarity index 100%
rename from PHPCI/Store.php
rename to src/PHPCI/Store.php
diff --git a/PHPCI/Store/Base/BuildErrorStoreBase.php b/src/PHPCI/Store/Base/BuildErrorStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/BuildErrorStoreBase.php
rename to src/PHPCI/Store/Base/BuildErrorStoreBase.php
diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/src/PHPCI/Store/Base/BuildMetaStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/BuildMetaStoreBase.php
rename to src/PHPCI/Store/Base/BuildMetaStoreBase.php
diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/src/PHPCI/Store/Base/BuildStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/BuildStoreBase.php
rename to src/PHPCI/Store/Base/BuildStoreBase.php
diff --git a/PHPCI/Store/Base/ProjectGroupStoreBase.php b/src/PHPCI/Store/Base/ProjectGroupStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/ProjectGroupStoreBase.php
rename to src/PHPCI/Store/Base/ProjectGroupStoreBase.php
diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/src/PHPCI/Store/Base/ProjectStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/ProjectStoreBase.php
rename to src/PHPCI/Store/Base/ProjectStoreBase.php
diff --git a/PHPCI/Store/Base/UserStoreBase.php b/src/PHPCI/Store/Base/UserStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/UserStoreBase.php
rename to src/PHPCI/Store/Base/UserStoreBase.php
diff --git a/PHPCI/Store/BuildErrorStore.php b/src/PHPCI/Store/BuildErrorStore.php
similarity index 100%
rename from PHPCI/Store/BuildErrorStore.php
rename to src/PHPCI/Store/BuildErrorStore.php
diff --git a/PHPCI/Store/BuildMetaStore.php b/src/PHPCI/Store/BuildMetaStore.php
similarity index 100%
rename from PHPCI/Store/BuildMetaStore.php
rename to src/PHPCI/Store/BuildMetaStore.php
diff --git a/PHPCI/Store/BuildStore.php b/src/PHPCI/Store/BuildStore.php
similarity index 100%
rename from PHPCI/Store/BuildStore.php
rename to src/PHPCI/Store/BuildStore.php
diff --git a/PHPCI/Store/ProjectGroupStore.php b/src/PHPCI/Store/ProjectGroupStore.php
similarity index 100%
rename from PHPCI/Store/ProjectGroupStore.php
rename to src/PHPCI/Store/ProjectGroupStore.php
diff --git a/PHPCI/Store/ProjectStore.php b/src/PHPCI/Store/ProjectStore.php
similarity index 100%
rename from PHPCI/Store/ProjectStore.php
rename to src/PHPCI/Store/ProjectStore.php
diff --git a/PHPCI/Store/UserStore.php b/src/PHPCI/Store/UserStore.php
similarity index 100%
rename from PHPCI/Store/UserStore.php
rename to src/PHPCI/Store/UserStore.php
diff --git a/PHPCI/View/Build/errors.phtml b/src/PHPCI/View/Build/errors.phtml
similarity index 100%
rename from PHPCI/View/Build/errors.phtml
rename to src/PHPCI/View/Build/errors.phtml
diff --git a/PHPCI/View/Build/header-row.phtml b/src/PHPCI/View/Build/header-row.phtml
similarity index 100%
rename from PHPCI/View/Build/header-row.phtml
rename to src/PHPCI/View/Build/header-row.phtml
diff --git a/PHPCI/View/Build/view.phtml b/src/PHPCI/View/Build/view.phtml
similarity index 100%
rename from PHPCI/View/Build/view.phtml
rename to src/PHPCI/View/Build/view.phtml
diff --git a/PHPCI/View/BuildStatus/view.phtml b/src/PHPCI/View/BuildStatus/view.phtml
similarity index 100%
rename from PHPCI/View/BuildStatus/view.phtml
rename to src/PHPCI/View/BuildStatus/view.phtml
diff --git a/PHPCI/View/BuildsTable.phtml b/src/PHPCI/View/BuildsTable.phtml
similarity index 100%
rename from PHPCI/View/BuildsTable.phtml
rename to src/PHPCI/View/BuildsTable.phtml
diff --git a/PHPCI/View/Email/layout.phtml b/src/PHPCI/View/Email/layout.phtml
similarity index 100%
rename from PHPCI/View/Email/layout.phtml
rename to src/PHPCI/View/Email/layout.phtml
diff --git a/PHPCI/View/Email/long.phtml b/src/PHPCI/View/Email/long.phtml
similarity index 100%
rename from PHPCI/View/Email/long.phtml
rename to src/PHPCI/View/Email/long.phtml
diff --git a/PHPCI/View/Email/short.phtml b/src/PHPCI/View/Email/short.phtml
similarity index 100%
rename from PHPCI/View/Email/short.phtml
rename to src/PHPCI/View/Email/short.phtml
diff --git a/PHPCI/View/Group/edit.phtml b/src/PHPCI/View/Group/edit.phtml
similarity index 100%
rename from PHPCI/View/Group/edit.phtml
rename to src/PHPCI/View/Group/edit.phtml
diff --git a/PHPCI/View/Group/index.phtml b/src/PHPCI/View/Group/index.phtml
similarity index 100%
rename from PHPCI/View/Group/index.phtml
rename to src/PHPCI/View/Group/index.phtml
diff --git a/PHPCI/View/Home/index.phtml b/src/PHPCI/View/Home/index.phtml
similarity index 100%
rename from PHPCI/View/Home/index.phtml
rename to src/PHPCI/View/Home/index.phtml
diff --git a/PHPCI/View/Plugin/index.phtml b/src/PHPCI/View/Plugin/index.phtml
similarity index 100%
rename from PHPCI/View/Plugin/index.phtml
rename to src/PHPCI/View/Plugin/index.phtml
diff --git a/PHPCI/View/Project/view.phtml b/src/PHPCI/View/Project/view.phtml
similarity index 100%
rename from PHPCI/View/Project/view.phtml
rename to src/PHPCI/View/Project/view.phtml
diff --git a/PHPCI/View/ProjectForm.phtml b/src/PHPCI/View/ProjectForm.phtml
similarity index 100%
rename from PHPCI/View/ProjectForm.phtml
rename to src/PHPCI/View/ProjectForm.phtml
diff --git a/PHPCI/View/Session.phtml b/src/PHPCI/View/Session.phtml
similarity index 100%
rename from PHPCI/View/Session.phtml
rename to src/PHPCI/View/Session.phtml
diff --git a/PHPCI/View/Session/forgotPassword.phtml b/src/PHPCI/View/Session/forgotPassword.phtml
similarity index 100%
rename from PHPCI/View/Session/forgotPassword.phtml
rename to src/PHPCI/View/Session/forgotPassword.phtml
diff --git a/PHPCI/View/Session/login.phtml b/src/PHPCI/View/Session/login.phtml
similarity index 100%
rename from PHPCI/View/Session/login.phtml
rename to src/PHPCI/View/Session/login.phtml
diff --git a/PHPCI/View/Session/resetPassword.phtml b/src/PHPCI/View/Session/resetPassword.phtml
similarity index 100%
rename from PHPCI/View/Session/resetPassword.phtml
rename to src/PHPCI/View/Session/resetPassword.phtml
diff --git a/PHPCI/View/Settings/index.phtml b/src/PHPCI/View/Settings/index.phtml
similarity index 100%
rename from PHPCI/View/Settings/index.phtml
rename to src/PHPCI/View/Settings/index.phtml
diff --git a/PHPCI/View/SummaryTable.phtml b/src/PHPCI/View/SummaryTable.phtml
similarity index 100%
rename from PHPCI/View/SummaryTable.phtml
rename to src/PHPCI/View/SummaryTable.phtml
diff --git a/PHPCI/View/User/index.phtml b/src/PHPCI/View/User/index.phtml
similarity index 100%
rename from PHPCI/View/User/index.phtml
rename to src/PHPCI/View/User/index.phtml
diff --git a/PHPCI/View/User/profile.phtml b/src/PHPCI/View/User/profile.phtml
similarity index 100%
rename from PHPCI/View/User/profile.phtml
rename to src/PHPCI/View/User/profile.phtml
diff --git a/PHPCI/View/UserForm.phtml b/src/PHPCI/View/UserForm.phtml
similarity index 100%
rename from PHPCI/View/UserForm.phtml
rename to src/PHPCI/View/UserForm.phtml
diff --git a/PHPCI/View/exception.phtml b/src/PHPCI/View/exception.phtml
similarity index 100%
rename from PHPCI/View/exception.phtml
rename to src/PHPCI/View/exception.phtml
diff --git a/PHPCI/View/layout.phtml b/src/PHPCI/View/layout.phtml
similarity index 100%
rename from PHPCI/View/layout.phtml
rename to src/PHPCI/View/layout.phtml
diff --git a/PHPCI/Worker/BuildWorker.php b/src/PHPCI/Worker/BuildWorker.php
similarity index 100%
rename from PHPCI/Worker/BuildWorker.php
rename to src/PHPCI/Worker/BuildWorker.php
diff --git a/PHPCI/ZeroConfigPlugin.php b/src/PHPCI/ZeroConfigPlugin.php
similarity index 100%
rename from PHPCI/ZeroConfigPlugin.php
rename to src/PHPCI/ZeroConfigPlugin.php
diff --git a/B8Framework/tests/CacheTest.php b/tests/B8Framework/CacheTest.php
similarity index 74%
rename from B8Framework/tests/CacheTest.php
rename to tests/B8Framework/CacheTest.php
index c9e46836..cffccd50 100755
--- a/B8Framework/tests/CacheTest.php
+++ b/tests/B8Framework/CacheTest.php
@@ -1,9 +1,8 @@
 <?php
 
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/Cache.php');
+namespace Tests\b8;
 
-use b8\Registry, b8\Cache;
+use b8\Config, b8\Cache;
 
 class CacheTest extends PHPUnit_Framework_TestCase
 {
@@ -15,14 +14,15 @@ class CacheTest extends PHPUnit_Framework_TestCase
 
 	public function testDisableCaching()
 	{
-		Registry::getInstance()->set('DisableCaching', true);
+		$config = new Config();
+		Config::getInstance()->set('DisableCaching', true);
 
 		$cache = Cache::getCache(Cache::TYPE_APC);
 		$this->assertFalse($cache->isEnabled());
 		$this->assertFalse($cache->set('anything', 10));
 		$this->assertTrue(is_null($cache->get('anything')));
 
-		Registry::getInstance()->set('DisableCaching', false);
+		Config::getInstance()->set('DisableCaching', false);
 	}
 
 	public function testCaching()
diff --git a/B8Framework/tests/CodeGenerationTest.php b/tests/B8Framework/CodeGenerationTest.php
old mode 100755
new mode 100644
similarity index 93%
rename from B8Framework/tests/CodeGenerationTest.php
rename to tests/B8Framework/CodeGenerationTest.php
index d5121da4..e15afab4
--- a/B8Framework/tests/CodeGenerationTest.php
+++ b/tests/B8Framework/CodeGenerationTest.php
@@ -1,26 +1,11 @@
 <?php
 
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/Model.php');
-require_once(dirname(__FILE__) . '/../b8/Controller.php');
-require_once(dirname(__FILE__) . '/../b8/Controller/RestController.php');
-require_once(dirname(__FILE__) . '/../b8/Store.php');
-require_once(dirname(__FILE__) . '/../b8/Store/Factory.php');
-require_once(dirname(__FILE__) . '/../b8/Database.php');
-require_once(dirname(__FILE__) . '/../b8/View.php');
-require_once(dirname(__FILE__) . '/../b8/View/UserView.php');
-require_once(dirname(__FILE__) . '/../b8/Database/Map.php');
-require_once(dirname(__FILE__) . '/../b8/Database/Generator.php');
-require_once(dirname(__FILE__) . '/../b8/Database/CodeGenerator.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/ValidationException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/BadRequestException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/ForbiddenException.php');
+namespace Tests\b8;
 
 use b8\Database\Generator,
 	b8\Database\CodeGenerator,
 	b8\Database,
-	b8\Registry;
+	b8\Config;
 
 class CodeGenerationTest extends \PHPUnit_Framework_TestCase
 {
@@ -33,7 +18,8 @@ class CodeGenerationTest extends \PHPUnit_Framework_TestCase
 		Database::setWriteServers(array('localhost'));
 		Database::setReadServers(array('localhost'));
 
-		Registry::getInstance()->set('b8.app.namespace', 'Generation');
+		$config = new Config();
+		Config::getInstance()->set('b8.app.namespace', 'Generation');
 
 		self::$_db = Database::getConnection('write');
 
@@ -504,8 +490,9 @@ class CodeGenerationTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($dos instanceof Generation\Controller\Base\DosControllerBase);
 		$this->assertTrue($tres instanceof Generation\Controller\Base\TresControllerBase);
 
+		$config = new Config();
+		Config::getInstance()->set('hello', 'world');
 
-		Registry::getInstance()->setParam('hello', 'world');
 		$this->assertTrue($uno->getParam('hello', 'dave') == 'world');
 
 		$uno->setParam('hello', 'dave');
@@ -630,7 +617,6 @@ class CodeGenerationTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue(is_array($list));
 		$this->assertTrue(count($list['items']) != 0);
 
-		Registry::getInstance()->forceReset();
 		$uno->setParam('where', array('id' => 1000));
 		$uno->setParam('fuzzy', 'id');
 		$list = $uno->index();
diff --git a/B8Framework/tests/DatabaseGenerationTest.php b/tests/B8Framework/DatabaseGenerationTest.php
old mode 100755
new mode 100644
similarity index 82%
rename from B8Framework/tests/DatabaseGenerationTest.php
rename to tests/B8Framework/DatabaseGenerationTest.php
index 00674f7e..13865ff2
--- a/B8Framework/tests/DatabaseGenerationTest.php
+++ b/tests/B8Framework/DatabaseGenerationTest.php
@@ -1,13 +1,8 @@
 <?php
 
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/Model.php');
-require_once(dirname(__FILE__) . '/../b8/Database.php');
-require_once(dirname(__FILE__) . '/../b8/Database/Map.php');
-require_once(dirname(__FILE__) . '/../b8/Database/Generator.php');
+namespace Tests\b8;
 
-use b8\Database\Generator,
-	b8\Database\Map;
+use b8\Database\Generator, b8\Database\Map, b8\Database;
 
 class DatabaseGenerationTest extends \PHPUnit_Framework_TestCase
 {
@@ -19,10 +14,10 @@ class DatabaseGenerationTest extends \PHPUnit_Framework_TestCase
 
 	public function setUp()
 	{
-		\b8\Database::setDetails($this->_name, $this->_user, $this->_pass);
-		\b8\Database::setWriteServers(array($this->_host));
+		Database::setDetails($this->_name, $this->_user, $this->_pass);
+		Database::setWriteServers(array($this->_host));
 
-		$this->_db = \b8\Database::getConnection('write');
+		$this->_db = Database::getConnection('write');
 
 		$this->_db->query('DROP TABLE IF EXISTS tres');
 		$this->_db->query('DROP TABLE IF EXISTS dos');
diff --git a/tests/B8Framework/DatabaseTest.php b/tests/B8Framework/DatabaseTest.php
new file mode 100755
index 00000000..575b313a
--- /dev/null
+++ b/tests/B8Framework/DatabaseTest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Tests\b8;
+
+use b8\Database;
+
+class DatabaseTest extends \PHPUnit_Framework_TestCase
+{
+	protected $_host = 'localhost';
+	protected $_user = 'b8_test';
+	protected $_pass = 'b8_test';
+	protected $_name = 'b8_test';
+
+	public function testGetReadConnection()
+	{
+		Database::setDetails($this->_name, $this->_user, $this->_pass);
+		Database::setReadServers(array($this->_host));
+
+		$connection = Database::getConnection('read');
+
+		$this->assertInstanceOf('\b8\Database', $connection);
+	}
+
+	public function testGetWriteConnection()
+	{
+		Database::setDetails($this->_name, $this->_user, $this->_pass);
+		Database::setWriteServers(array($this->_host));
+
+		$connection = Database::getConnection('write');
+
+		$this->assertInstanceOf('\b8\Database', $connection);
+	}
+
+	public function testGetDetails()
+	{
+		Database::setDetails($this->_name, $this->_user, $this->_pass);
+		Database::setReadServers(array('localhost'));
+
+		$details = Database::getConnection('read')->getDetails();
+		$this->assertTrue(is_array($details));
+		$this->assertTrue(($details['db'] == $this->_name));
+		$this->assertTrue(($details['user'] == $this->_user));
+		$this->assertTrue(($details['pass'] == $this->_pass));
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testConnectionFailure()
+	{
+		Database::setDetails('non_existant', 'invalid_user', 'incorrect_password');
+		Database::setReadServers(array('localhost'));
+		Database::getConnection('read');
+	}
+}
\ No newline at end of file
diff --git a/B8Framework/tests/FormTest.php b/tests/B8Framework/FormTest.php
similarity index 77%
rename from B8Framework/tests/FormTest.php
rename to tests/B8Framework/FormTest.php
index e8973d9d..d113cfe7 100755
--- a/B8Framework/tests/FormTest.php
+++ b/tests/B8Framework/FormTest.php
@@ -1,27 +1,8 @@
 <?php
 
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/View.php');
-require_once(dirname(__FILE__) . '/../b8/View/UserView.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Input.php');
-require_once(dirname(__FILE__) . '/../b8/Form/FieldSet.php');
-require_once(dirname(__FILE__) . '/../b8/Form.php');
-require_once(dirname(__FILE__) . '/../b8/Form/ControlGroup.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Text.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Button.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Checkbox.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/CheckboxGroup.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Email.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Hidden.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Select.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Radio.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Submit.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/TextArea.php');
-require_once(dirname(__FILE__) . '/../b8/Form/Element/Url.php');
+namespace Tests\b8;
 
-use b8\Form,
-	b8\Registry;
+use b8\Form, b8\Config;
 
 class FormTest extends \PHPUnit_Framework_TestCase
 {
@@ -34,11 +15,12 @@ class FormTest extends \PHPUnit_Framework_TestCase
 		$this->assertTrue($f->getAction() == '/');
 		$this->assertTrue($f->getMethod() == 'POST');
 
-		Registry::getInstance()->set('ViewPath', dirname(__FILE__) . '/data/view/');
+		$config = new Config();
+		Config::getInstance()->set('ViewPath', dirname(__FILE__) . '/data/view/');
 
 		$this->assertTrue($f->render('form') == '/POST');
 
-		Registry::getInstance()->set('ViewPath', '');
+		Config::getInstance()->set('ViewPath', '');
 		$this->assertTrue(strpos((string)$f, '<form') !== false);
 	}
 
diff --git a/B8Framework/tests/HttpClientTest.php b/tests/B8Framework/HttpClientTest.php
similarity index 90%
rename from B8Framework/tests/HttpClientTest.php
rename to tests/B8Framework/HttpClientTest.php
index 51288e0e..9918d1c3 100755
--- a/B8Framework/tests/HttpClientTest.php
+++ b/tests/B8Framework/HttpClientTest.php
@@ -1,10 +1,8 @@
 <?php
 
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/HttpClient.php');
+namespace Tests\b8;
 
-use b8\Registry,
-	b8\HttpClient;
+use b8\HttpClient;
 
 class HttpClientTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/B8Framework/tests/HttpExceptionTest.php b/tests/B8Framework/HttpExceptionTest.php
similarity index 74%
rename from B8Framework/tests/HttpExceptionTest.php
rename to tests/B8Framework/HttpExceptionTest.php
index 6d0895dc..648fee90 100755
--- a/B8Framework/tests/HttpExceptionTest.php
+++ b/tests/B8Framework/HttpExceptionTest.php
@@ -1,16 +1,8 @@
 <?php
 
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/BadRequestException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/ForbiddenException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/NotAuthorizedException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/NotFoundException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/ServerErrorException.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException/ValidationException.php');
+namespace Tests\b8;
 
-use b8\Exception\HttpException,
-	b8\Exception\HttpException\BadRequestException;
+use b8\Exception\HttpException;
 
 class HttpExceptionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/B8Framework/tests/ViewTest.php b/tests/B8Framework/ViewTest.php
similarity index 84%
rename from B8Framework/tests/ViewTest.php
rename to tests/B8Framework/ViewTest.php
index 96ee362b..e09c8a80 100755
--- a/B8Framework/tests/ViewTest.php
+++ b/tests/B8Framework/ViewTest.php
@@ -1,19 +1,14 @@
 <?php
 
-require_once(dirname(__FILE__) . '/../b8/Registry.php');
-require_once(dirname(__FILE__) . '/../b8/View.php');
-require_once(dirname(__FILE__) . '/../b8/View/UserView.php');
-require_once(dirname(__FILE__) . '/../b8/View/Helper/Format.php');
-require_once(dirname(__FILE__) . '/../b8/Exception/HttpException.php');
+namespace Tests\b8;
 
-use b8\View,
-	b8\View\UserView;
+use b8\View, b8\View\UserView;
 
 class ViewTest extends \PHPUnit_Framework_TestCase
 {
 	public function testSimpleView()
 	{
-		$view = new b8\View('simple', dirname(__FILE__) . '/data/view/');
+		$view = new View('simple', dirname(__FILE__) . '/data/view/');
 		$this->assertTrue($view->render() == 'Hello');
 	}
 
@@ -22,12 +17,12 @@ class ViewTest extends \PHPUnit_Framework_TestCase
 	 */
 	public function testInvalidView()
 	{
-		new b8\View('dogs', dirname(__FILE__) . '/data/view/');
+		new View('dogs', dirname(__FILE__) . '/data/view/');
 	}
 
 	public function testViewVars()
 	{
-		$view = new b8\View('vars', dirname(__FILE__) . '/data/view/');
+		$view = new View('vars', dirname(__FILE__) . '/data/view/');
 		$view->who = 'World';
 
 		$this->assertTrue(isset($view->who));
@@ -37,7 +32,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
 
 	public function testFormatViewHelper()
 	{
-		$view = new b8\View('format', dirname(__FILE__) . '/data/view/');
+		$view = new View('format', dirname(__FILE__) . '/data/view/');
 		$view->number = 1000000.25;
 		$view->symbol = true;
 
diff --git a/B8Framework/tests/data/generation/ArrayPropertyModel.php b/tests/B8Framework/data/generation/ArrayPropertyModel.php
similarity index 100%
rename from B8Framework/tests/data/generation/ArrayPropertyModel.php
rename to tests/B8Framework/data/generation/ArrayPropertyModel.php
diff --git a/B8Framework/tests/data/generation/TestUser.php b/tests/B8Framework/data/generation/TestUser.php
similarity index 100%
rename from B8Framework/tests/data/generation/TestUser.php
rename to tests/B8Framework/data/generation/TestUser.php
diff --git a/B8Framework/tests/data/generation/models/BadModel.php b/tests/B8Framework/data/generation/models/BadModel.php
similarity index 100%
rename from B8Framework/tests/data/generation/models/BadModel.php
rename to tests/B8Framework/data/generation/models/BadModel.php
diff --git a/B8Framework/tests/data/generation/models/Dos.php b/tests/B8Framework/data/generation/models/Dos.php
similarity index 100%
rename from B8Framework/tests/data/generation/models/Dos.php
rename to tests/B8Framework/data/generation/models/Dos.php
diff --git a/B8Framework/tests/data/generation/models/Tres.php b/tests/B8Framework/data/generation/models/Tres.php
similarity index 100%
rename from B8Framework/tests/data/generation/models/Tres.php
rename to tests/B8Framework/data/generation/models/Tres.php
diff --git a/B8Framework/tests/data/generation/models/Uno.php b/tests/B8Framework/data/generation/models/Uno.php
similarity index 100%
rename from B8Framework/tests/data/generation/models/Uno.php
rename to tests/B8Framework/data/generation/models/Uno.php
diff --git a/tests/B8Framework/data/generation/models/ignore.file b/tests/B8Framework/data/generation/models/ignore.file
new file mode 100755
index 00000000..e69de29b
diff --git a/B8Framework/tests/data/generation/update_models/Dos.php b/tests/B8Framework/data/generation/update_models/Dos.php
similarity index 100%
rename from B8Framework/tests/data/generation/update_models/Dos.php
rename to tests/B8Framework/data/generation/update_models/Dos.php
diff --git a/B8Framework/tests/data/generation/update_models/Tres.php b/tests/B8Framework/data/generation/update_models/Tres.php
similarity index 100%
rename from B8Framework/tests/data/generation/update_models/Tres.php
rename to tests/B8Framework/data/generation/update_models/Tres.php
diff --git a/B8Framework/tests/data/generation/update_models/Uno.php b/tests/B8Framework/data/generation/update_models/Uno.php
similarity index 100%
rename from B8Framework/tests/data/generation/update_models/Uno.php
rename to tests/B8Framework/data/generation/update_models/Uno.php
diff --git a/B8Framework/tests/data/view/Form/form.phtml b/tests/B8Framework/data/view/Form/form.phtml
similarity index 100%
rename from B8Framework/tests/data/view/Form/form.phtml
rename to tests/B8Framework/data/view/Form/form.phtml
diff --git a/B8Framework/tests/data/view/format.phtml b/tests/B8Framework/data/view/format.phtml
similarity index 100%
rename from B8Framework/tests/data/view/format.phtml
rename to tests/B8Framework/data/view/format.phtml
diff --git a/B8Framework/tests/data/view/simple.phtml b/tests/B8Framework/data/view/simple.phtml
similarity index 100%
rename from B8Framework/tests/data/view/simple.phtml
rename to tests/B8Framework/data/view/simple.phtml
diff --git a/B8Framework/tests/data/view/vars.phtml b/tests/B8Framework/data/view/vars.phtml
similarity index 100%
rename from B8Framework/tests/data/view/vars.phtml
rename to tests/B8Framework/data/view/vars.phtml
diff --git a/Tests/PHPCI/Command/CreateAdminCommandTest.php b/tests/PHPCI/Command/CreateAdminCommandTest.php
similarity index 100%
rename from Tests/PHPCI/Command/CreateAdminCommandTest.php
rename to tests/PHPCI/Command/CreateAdminCommandTest.php
diff --git a/Tests/PHPCI/Command/CreateBuildCommandTest.php b/tests/PHPCI/Command/CreateBuildCommandTest.php
similarity index 100%
rename from Tests/PHPCI/Command/CreateBuildCommandTest.php
rename to tests/PHPCI/Command/CreateBuildCommandTest.php
diff --git a/Tests/PHPCI/Command/InstallCommandTest.php b/tests/PHPCI/Command/InstallCommandTest.php
similarity index 100%
rename from Tests/PHPCI/Command/InstallCommandTest.php
rename to tests/PHPCI/Command/InstallCommandTest.php
diff --git a/Tests/PHPCI/Controller/WebhookControllerTest.php b/tests/PHPCI/Controller/WebhookControllerTest.php
similarity index 100%
rename from Tests/PHPCI/Controller/WebhookControllerTest.php
rename to tests/PHPCI/Controller/WebhookControllerTest.php
diff --git a/Tests/PHPCI/Helper/AnsiConverterTest.php b/tests/PHPCI/Helper/AnsiConverterTest.php
similarity index 100%
rename from Tests/PHPCI/Helper/AnsiConverterTest.php
rename to tests/PHPCI/Helper/AnsiConverterTest.php
diff --git a/Tests/PHPCI/Helper/BuildInterpolatorTest.php b/tests/PHPCI/Helper/BuildInterpolatorTest.php
similarity index 100%
rename from Tests/PHPCI/Helper/BuildInterpolatorTest.php
rename to tests/PHPCI/Helper/BuildInterpolatorTest.php
diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/tests/PHPCI/Helper/CommandExecutorTest.php
similarity index 94%
rename from Tests/PHPCI/Helper/CommandExecutorTest.php
rename to tests/PHPCI/Helper/CommandExecutorTest.php
index 5d5dc08b..2fca707a 100644
--- a/Tests/PHPCI/Helper/CommandExecutorTest.php
+++ b/tests/PHPCI/Helper/CommandExecutorTest.php
@@ -28,7 +28,7 @@ class CommandExecutorTest extends \PHPUnit_Framework_TestCase
         parent::setUp();
         $mockBuildLogger = $this->prophesize('PHPCI\Logging\BuildLogger');
         $class = IS_WIN ? 'PHPCI\Helper\WindowsCommandExecutor' : 'PHPCI\Helper\UnixCommandExecutor';
-        $this->testedExecutor = new $class($mockBuildLogger->reveal(), __DIR__ . "/");
+        $this->testedExecutor = new $class($mockBuildLogger->reveal(), __DIR__ . "CommandExecutorTest.php/");
     }
 
     public function testGetLastOutput_ReturnsOutputOfCommand()
@@ -62,7 +62,7 @@ class CommandExecutorTest extends \PHPUnit_Framework_TestCase
     {
         $thisFileName = "CommandExecutorTest.php";
         $returnValue = $this->testedExecutor->findBinary($thisFileName);
-        $this->assertEquals(__DIR__ . "/" . $thisFileName, $returnValue);
+        $this->assertEquals(__DIR__ . "CommandExecutorTest.php/" . $thisFileName, $returnValue);
     }
 
     /**
diff --git a/Tests/PHPCI/Helper/LangTest.php b/tests/PHPCI/Helper/LangTest.php
similarity index 100%
rename from Tests/PHPCI/Helper/LangTest.php
rename to tests/PHPCI/Helper/LangTest.php
diff --git a/Tests/PHPCI/Helper/MailerFactoryTest.php b/tests/PHPCI/Helper/MailerFactoryTest.php
similarity index 100%
rename from Tests/PHPCI/Helper/MailerFactoryTest.php
rename to tests/PHPCI/Helper/MailerFactoryTest.php
diff --git a/Tests/PHPCI/Logging/BuildLoggerTest.php b/tests/PHPCI/Logging/BuildLoggerTest.php
similarity index 100%
rename from Tests/PHPCI/Logging/BuildLoggerTest.php
rename to tests/PHPCI/Logging/BuildLoggerTest.php
diff --git a/Tests/PHPCI/Logging/LoggerConfigTest.php b/tests/PHPCI/Logging/LoggerConfigTest.php
similarity index 100%
rename from Tests/PHPCI/Logging/LoggerConfigTest.php
rename to tests/PHPCI/Logging/LoggerConfigTest.php
diff --git a/Tests/PHPCI/Model/BuildTest.php b/tests/PHPCI/Model/BuildTest.php
similarity index 100%
rename from Tests/PHPCI/Model/BuildTest.php
rename to tests/PHPCI/Model/BuildTest.php
diff --git a/Tests/PHPCI/Model/ProjectTest.php b/tests/PHPCI/Model/ProjectTest.php
similarity index 100%
rename from Tests/PHPCI/Model/ProjectTest.php
rename to tests/PHPCI/Model/ProjectTest.php
diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/tests/PHPCI/Plugin/EmailTest.php
similarity index 100%
rename from Tests/PHPCI/Plugin/EmailTest.php
rename to tests/PHPCI/Plugin/EmailTest.php
diff --git a/Tests/PHPCI/Plugin/PharTest.php b/tests/PHPCI/Plugin/PharTest.php
similarity index 100%
rename from Tests/PHPCI/Plugin/PharTest.php
rename to tests/PHPCI/Plugin/PharTest.php
diff --git a/Tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php b/tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
rename to tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
diff --git a/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php b/tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
rename to tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
diff --git a/Tests/PHPCI/Plugin/Util/ExecutorTest.php b/tests/PHPCI/Plugin/Util/ExecutorTest.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/ExecutorTest.php
rename to tests/PHPCI/Plugin/Util/ExecutorTest.php
diff --git a/Tests/PHPCI/Plugin/Util/FactoryTest.php b/tests/PHPCI/Plugin/Util/FactoryTest.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/FactoryTest.php
rename to tests/PHPCI/Plugin/Util/FactoryTest.php
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php b/tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
rename to tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php b/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
rename to tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php b/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
rename to tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php b/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
rename to tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php b/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
rename to tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
diff --git a/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php b/tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
rename to tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
diff --git a/Tests/PHPCI/Plugin/Util/TapParserTest.php b/tests/PHPCI/Plugin/Util/TapParserTest.php
similarity index 100%
rename from Tests/PHPCI/Plugin/Util/TapParserTest.php
rename to tests/PHPCI/Plugin/Util/TapParserTest.php
diff --git a/Tests/PHPCI/ProcessControl/PosixProcessControlTest.php b/tests/PHPCI/ProcessControl/PosixProcessControlTest.php
similarity index 100%
rename from Tests/PHPCI/ProcessControl/PosixProcessControlTest.php
rename to tests/PHPCI/ProcessControl/PosixProcessControlTest.php
diff --git a/Tests/PHPCI/ProcessControl/ProcessControlTest.php b/tests/PHPCI/ProcessControl/ProcessControlTest.php
similarity index 100%
rename from Tests/PHPCI/ProcessControl/ProcessControlTest.php
rename to tests/PHPCI/ProcessControl/ProcessControlTest.php
diff --git a/Tests/PHPCI/ProcessControl/UnixProcessControlTest.php b/tests/PHPCI/ProcessControl/UnixProcessControlTest.php
similarity index 100%
rename from Tests/PHPCI/ProcessControl/UnixProcessControlTest.php
rename to tests/PHPCI/ProcessControl/UnixProcessControlTest.php
diff --git a/Tests/PHPCI/ProcessControl/WindowsProcessControlTest.php b/tests/PHPCI/ProcessControl/WindowsProcessControlTest.php
similarity index 100%
rename from Tests/PHPCI/ProcessControl/WindowsProcessControlTest.php
rename to tests/PHPCI/ProcessControl/WindowsProcessControlTest.php
diff --git a/Tests/PHPCI/Service/BuildServiceTest.php b/tests/PHPCI/Service/BuildServiceTest.php
similarity index 100%
rename from Tests/PHPCI/Service/BuildServiceTest.php
rename to tests/PHPCI/Service/BuildServiceTest.php
diff --git a/Tests/PHPCI/Service/BuiltStatusServiceTest.php b/tests/PHPCI/Service/BuiltStatusServiceTest.php
similarity index 100%
rename from Tests/PHPCI/Service/BuiltStatusServiceTest.php
rename to tests/PHPCI/Service/BuiltStatusServiceTest.php
diff --git a/Tests/PHPCI/Service/ProjectServiceTest.php b/tests/PHPCI/Service/ProjectServiceTest.php
similarity index 100%
rename from Tests/PHPCI/Service/ProjectServiceTest.php
rename to tests/PHPCI/Service/ProjectServiceTest.php
diff --git a/Tests/PHPCI/Service/UserServiceTest.php b/tests/PHPCI/Service/UserServiceTest.php
similarity index 100%
rename from Tests/PHPCI/Service/UserServiceTest.php
rename to tests/PHPCI/Service/UserServiceTest.php
diff --git a/Tests/bootstrap.php b/tests/bootstrap.php
similarity index 100%
rename from Tests/bootstrap.php
rename to tests/bootstrap.php
diff --git a/PHPCI/build/.gitignore b/tests/temp/.gitignore
similarity index 100%
rename from PHPCI/build/.gitignore
rename to tests/temp/.gitignore
diff --git a/vars.php b/vars.php
index 98c07377..41811582 100644
--- a/vars.php
+++ b/vars.php
@@ -18,7 +18,7 @@ if (!defined('PHPCI_BIN_DIR')) {
 
 // Define PHPCI_BUILD_ROOT_DIR
 if (!defined('PHPCI_BUILD_ROOT_DIR')) {
-    define('PHPCI_BUILD_ROOT_DIR', PHPCI_DIR . 'PHPCI/build/');
+    define('PHPCI_BUILD_ROOT_DIR', PHPCI_DIR . 'runtime/builds/');
 }
 
 // Should PHPCI run the Shell plugin?