From 2069d40544fed19e02ebfe5cb975c47be7b519ed Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Fri, 18 Jan 2013 17:47:25 +0100
Subject: [PATCH] Use composer as application autoloader

---
 bin/console                                   |   2 +-
 bin/doctrine                                  |   2 +-
 bin/setup                                     |   2 +-
 builder.php                                   |  10 +-
 cleaner.php                                   |   6 +-
 composer.json                                 |  12 +-
 functionnal-tests/api/dailymotion.php         |  25 +--
 .../Controller/Utils/ConnectionTest.php       |   3 +-
 lib/Alchemy/Phrasea/Loader/ApcAutoloader.php  |  37 ----
 lib/Alchemy/Phrasea/Loader/Autoloader.php     | 104 ----------
 .../Phrasea/Loader/CacheAutoloader.php        | 128 ------------
 lib/Alchemy/Phrasea/Loader/LoaderStrategy.php |  27 ---
 .../Phrasea/Loader/XcacheAutoloader.php       |  37 ----
 lib/Doctrine/Entities/Basket.php              |   4 -
 lib/Doctrine/Entities/BasketElement.php       |   3 -
 lib/Doctrine/Entities/StoryWZ.php             |   6 -
 lib/bootstrap.php                             |  20 --
 lib/classes/{ACL.class.php => ACL.php}        |   0
 .../OAuth2/{Account.class.php => Account.php} |   0
 .../OAuth2/{Adapter.class.php => Adapter.php} |   0
 ...{Application.class.php => Application.php} |   0
 .../{Navigator.class.php => Navigator.php}    |   0
 .../{AuthCode.class.php => AuthCode.php}      |   0
 .../{Exception.class.php => Exception.php}    |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../{Redirect.class.php => Redirect.php}      |   0
 ...ccessDenied.class.php => AccessDenied.php} |   0
 ...alidClient.class.php => InvalidClient.php} |   0
 ...idRequest.class.php => InvalidRequest.php} |   0
 ...nvalidScope.class.php => InvalidScope.php} |   0
 ...{ServerError.class.php => ServerError.php} |   0
 ...ble.class.php => TemporaryUnavailable.php} |   0
 ...lient.class.php => UnauthorizedClient.php} |   0
 ....class.php => UnsupportedResponseType.php} |   0
 ...enticate.class.php => WWWAuthenticate.php} |   0
 ...alidClient.class.php => InvalidClient.php} |   0
 ...idRequest.class.php => InvalidRequest.php} |   0
 ...nvalidToken.class.php => InvalidToken.php} |   0
 .../{BadRequest.class.php => BadRequest.php}  |   0
 .../{Forbidden.class.php => Forbidden.php}    |   0
 ...AppDesktop.class.php => DevAppDesktop.php} |   0
 ...pInternet.class.php => DevAppInternet.php} |   0
 ...efreshToken.class.php => RefreshToken.php} |   0
 .../API/OAuth2/{Token.class.php => Token.php} |   0
 .../V1/{Abstract.class.php => Abstract.php}   |   0
 .../V1/{Interface.class.php => Interface.php} |   0
 lib/classes/API/V1/{Log.class.php => Log.php} |   0
 .../API/V1/{adapter.class.php => adapter.php} |   0
 .../{abstract.class.php => abstract.php}      |   0
 .../{badrequest.class.php => badrequest.php}  |   0
 .../{forbidden.class.php => forbidden.php}    |   0
 ...rror.class.php => internalservererror.php} |   0
 ...allowed.class.php => methodnotallowed.php} |   0
 .../{notfound.class.php => notfound.php}      |   0
 ...nauthorized.class.php => unauthorized.php} |   0
 .../API/V1/{result.class.php => result.php}   |   0
 .../Bridge/{Account.class.php => Account.php} |   0
 ...Settings.class.php => AccountSettings.php} |   0
 lib/classes/Bridge/{Api.class.php => Api.php} |   0
 .../Api/{Abstract.class.php => Abstract.php}  |   0
 ...ction.class.php => AbstractCollection.php} |   0
 .../Auth/{Abstract.class.php => Abstract.php} |   0
 .../Api/Auth/{Flickr.class.php => Flickr.php} |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../Api/Auth/{OAuth2.class.php => OAuth2.php} |   0
 .../Auth/{Youtube.class.php => Youtube.php}   |   0
 ...tion.class.php => ContainerCollection.php} |   0
 ...rface.class.php => ContainerInterface.php} |   0
 ...{Dailymotion.class.php => Dailymotion.php} |   0
 .../{Container.class.php => Container.php}    |   0
 .../{Element.class.php => Element.php}        |   0
 ...ection.class.php => ElementCollection.php} |   0
 ...terface.class.php => ElementInterface.php} |   0
 .../Api/{Flickr.class.php => Flickr.php}      |   0
 .../{Container.class.php => Container.php}    |   0
 .../Flickr/{Element.class.php => Element.php} |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../Api/{Youtube.class.php => Youtube.php}    |   0
 .../{Container.class.php => Container.php}    |   0
 .../{Element.class.php => Element.php}        |   0
 .../Bridge/{Element.class.php => Element.php} |   0
 .../{Exception.class.php => Exception.php}    |   0
 ...NotFound.class.php => AccountNotFound.php} |   0
 ....class.php => ActionAuthBadConnection.php} |   0
 ....class.php => ActionAuthNeedReconnect.php} |   0
 ...orbidden.class.php => ActionForbidden.php} |   0
 ...Id.class.php => ActionInvalidObjectId.php} |   0
 ...eld.class.php => ActionMandatoryField.php} |   0
 ....php => ApiConnectorAccessTokenFailed.php} |   0
 ...lass.php => ApiConnectorNotConfigured.php} |   0
 ...class.php => ApiConnectorNotConnected.php} |   0
 ...und.class.php => ApiConnectorNotFound.php} |   0
 ...lass.php => ApiConnectorRequestFailed.php} |   0
 ...{ApiDisabled.class.php => ApiDisabled.php} |   0
 ...{ApiNotFound.class.php => ApiNotFound.php} |   0
 ...Unknown.class.php => ContainerUnknown.php} |   0
 ...NotFound.class.php => ElementNotFound.php} |   0
 ...ntUnknown.class.php => ElementUnknown.php} |   0
 ...rdType.class.php => InvalidRecordType.php} |   0
 ...ectUnknown.class.php => ObjectUnknown.php} |   0
 ...enNotFound.class.php => TokenNotFound.php} |   0
 .../{Browser.class.php => Browser.php}        |   0
 .../{Abstract.class.php => Abstract.php}      |   0
 .../{BadRequest.class.php => BadRequest.php}  |   0
 ...Found.class.php => CollectionNotFound.php} |   0
 ...ldNotFound.class.php => FieldNotFound.php} |   0
 ...fNotFound.class.php => SubdefNotFound.php} |   0
 ...ss.php => metadataDescriptionNotFound.php} |   0
 ...NotFound.class.php => DataboxNotFound.php} |   0
 ...ryNotFound.class.php => EntryNotFound.php} |   0
 ...temNotFound.class.php => ItemNotFound.php} |   0
 ...tFound.class.php => PublisherNotFound.php} |   0
 ...eedNotFound.class.php => FeedNotFound.php} |   0
 .../{Forbidden.class.php => Forbidden.php}    |   0
 ...rror.class.php => InternalServerError.php} |   0
 ...Argument.class.php => InvalidArgument.php} |   0
 ...tFound.class.php => PermalinkNotFound.php} |   0
 ...fNotFound.class.php => SubdefNotFound.php} |   0
 .../{NotAllowed.class.php => NotAllowed.php}  |   0
 .../{NotFound.class.php => NotFound.php}      |   0
 ...NotFound.class.php => AdapterNotFound.php} |   0
 ...lable.class.php => ServiceUnavailable.php} |   0
 ...dyCreated.class.php => AlreadyCreated.php} |   0
 ...{BadSalinity.class.php => BadSalinity.php} |   0
 .../Session/{Closed.class.php => Closed.php}  |   0
 ...rNotFound.class.php => LoggerNotFound.php} |   0
 .../{MailLocked.class.php => MailLocked.php}  |   0
 ...ticated.class.php => NotAuthenticated.php} |   0
 ...reCaptcha.class.php => RequireCaptcha.php} |   0
 ...rageClosed.class.php => StorageClosed.php} |   0
 .../{WrongToken.class.php => WrongToken.php}  |   0
 ...File.class.php => CannotWriteLockFile.php} |   0
 ...ses.class.php => FixBadEmailAddresses.php} |   0
 ....class.php => PhraseaAlreadyInstalled.php} |   0
 ...ed.class.php => UpgradeAlreadyStarted.php} |   0
 ...nauthorized.class.php => Unauthorized.php} |   0
 ...ction.class.php => UnauthorizedAction.php} |   0
 ...riteFile.class.php => CannotWriteFile.php} |   0
 .../Upload/{Error.class.php => Error.php}     |   0
 .../{FileTooBig.class.php => FileTooBig.php}  |   0
 .../Feed/{Abstract.class.php => Abstract.php} |   0
 .../Feed/{Adapter.class.php => Adapter.php}   |   0
 .../{Aggregate.class.php => Aggregate.php}    |   0
 .../{Collection.class.php => Collection.php}  |   0
 ...face.class.php => CollectionInterface.php} |   0
 .../Entry/{Adapter.class.php => Adapter.php}  |   0
 .../{Collection.class.php => Collection.php}  |   0
 ...face.class.php => CollectionInterface.php} |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../Feed/Entry/{Item.class.php => Item.php}   |   0
 ...mInterface.class.php => ItemInterface.php} |   0
 .../{Interface.class.php => Interface.php}    |   0
 lib/classes/Feed/{Link.class.php => Link.php} |   0
 ...kInterface.class.php => LinkInterface.php} |   0
 .../{Adapter.class.php => Adapter.php}        |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../Feed/{Token.class.php => Token.php}       |   0
 ...Aggregate.class.php => TokenAggregate.php} |   0
 .../XML/{Abstract.class.php => Abstract.php}  |   0
 .../Feed/XML/{Atom.class.php => Atom.php}     |   0
 .../XML/{Cooliris.class.php => Cooliris.php}  |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../Feed/XML/{RSS.class.php => RSS.php}       |   0
 .../XML/RSS/{Image.class.php => Image.php}    |   0
 ...Interface.class.php => ImageInterface.php} |   0
 .../{Guest.class.php => Guest.php}            |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../{Native.class.php => Native.php}          |   0
 .../{None.class.php => None.php}              |   0
 ...tCookie.class.php => PersistentCookie.php} |   0
 .../{Token.class.php => Token.php}            |   0
 .../Session/{Logger.class.php => Logger.php}  |   0
 .../{Constraint.class.php => Constraint.php}  |   0
 ...ator.class.php => ConstraintsIterator.php} |   0
 .../{Registry.class.php => Registry.php}      |   0
 .../Setup/{Upgrade.class.php => Upgrade.php}  |   0
 .../User/{Adapter.class.php => Adapter.php}   |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../User/{Query.class.php => Query.php}       |   0
 ...Interface.class.php => QueryInterface.php} |   0
 ...roved.class.php => ZipArchiveImproved.php} |   0
 lib/classes/{appbox.class.php => appbox.php}  |   0
 .../{register.class.php => register.php}      |   0
 lib/classes/{base.class.php => base.php}      |   0
 lib/classes/bootstrap.class.php               |  80 --------
 ...rface.class.php => cacheableInterface.php} |   0
 .../cache/{databox.class.php => databox.php}  |   0
 .../Field/{Value.class.php => Value.php}      |   0
 .../caption/{field.class.php => field.php}    |   0
 .../{interface.class.php => interface.php}    |   0
 .../caption/{record.class.php => record.php}  |   0
 .../{collection.class.php => collection.php}  |   0
 .../{connection.class.php => connection.php}  |   0
 .../{abstract.class.php => abstract.php}      |   0
 .../{interface.class.php => interface.php}    |   0
 .../connection/{pdo.class.php => pdo.php}     |   0
 ...ger.class.php => pdoStatementDebugger.php} |   0
 .../{databox.class.php => databox.php}        |   0
 ...{Contributor.class.php => Contributor.php} |   0
 .../DCES/{Coverage.class.php => Coverage.php} |   0
 .../DCES/{Creator.class.php => Creator.php}   |   0
 .../Field/DCES/{Date.class.php => Date.php}   |   0
 ...{Description.class.php => Description.php} |   0
 .../DCES/{Format.class.php => Format.php}     |   0
 .../{Identifier.class.php => Identifier.php}  |   0
 .../DCES/{Language.class.php => Language.php} |   0
 .../{Publisher.class.php => Publisher.php}    |   0
 .../DCES/{Relation.class.php => Relation.php} |   0
 .../DCES/{Rights.class.php => Rights.php}     |   0
 .../DCES/{Source.class.php => Source.php}     |   0
 .../DCES/{Subject.class.php => Subject.php}   |   0
 .../Field/DCES/{Title.class.php => Title.php} |   0
 .../Field/DCES/{Type.class.php => Type.php}   |   0
 ...CESAbstract.class.php => DCESAbstract.php} |   0
 .../databox/{cgu.class.php => cgu.php}        |   0
 ...ure.class.php => descriptionStructure.php} |   0
 .../databox/{field.class.php => field.php}    |   0
 .../databox/{status.class.php => status.php}  |   0
 .../databox/{subdef.class.php => subdef.php}  |   0
 ...ructure.class.php => subdefsStructure.php} |   0
 .../{broker.class.php => broker.php}          |   0
 .../event/{test.class.php => test.php}        |   0
 ...ntAbstract.class.php => eventAbstract.php} |   0
 ...utoregister.class.php => autoregister.php} |   0
 ...oadfail.class.php => bridgeuploadfail.php} |   0
 ...ailfail.class.php => downloadmailfail.php} |   0
 .../notify/{feed.class.php => feed.php}       |   0
 .../notify/{order.class.php => order.php}     |   0
 ...rderdeliver.class.php => orderdeliver.php} |   0
 ...ivered.class.php => ordernotdelivered.php} |   0
 .../notify/{push.class.php => push.php}       |   0
 .../{register.class.php => register.php}      |   0
 ...rantine.class.php => uploadquarantine.php} |   0
 .../{validate.class.php => validate.php}      |   0
 ...ationdone.class.php => validationdone.php} |   0
 ...inder.class.php => validationreminder.php} |   0
 ...yAbstract.class.php => notifyAbstract.php} |   0
 lib/classes/{format.class.php => format.php}  |   0
 .../{ftpclient.class.php => ftpclient.php}    |   0
 .../{gatekeeper.class.php => gatekeeper.php}  |   0
 .../{geonames.class.php => geonames.php}      |   0
 .../http/{query.class.php => query.php}       |   0
 .../http/{request.class.php => request.php}   |   0
 lib/classes/{liste.class.php => liste.php}    |   0
 lib/classes/{login.class.php => login.php}    |   0
 lib/classes/{mail.class.php => mail.php}      |   0
 .../{Adapter.class.php => Adapter.php}        |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../{abstract.class.php => abstract.php}      |   0
 .../media/{adapter.class.php => adapter.php}  |   0
 .../media/{subdef.class.php => subdef.php}    |   0
 .../module/{client.class.php => client.php}   |   0
 ...boutAuthors.class.php => aboutAuthors.php} |   0
 ...boutLicense.class.php => aboutLicense.php} |   0
 ...Extension.class.php => checkExtension.php} |   0
 ...ieldsDelete.class.php => fieldsDelete.php} |   0
 .../{fieldsList.class.php => fieldsList.php}  |   0
 ...{fieldsMerge.class.php => fieldsMerge.php} |   0
 ...ieldsRename.class.php => fieldsRename.php} |   0
 ...ing.class.php => fileEnsureDevSetting.php} |   0
 ...ss.php => fileEnsureProductionSetting.php} |   0
 ...ulerStart.class.php => schedulerStart.php} |   0
 ...ulerState.class.php => schedulerState.php} |   0
 ...edulerStop.class.php => schedulerStop.php} |   0
 ...class.php => sphinxGenerateSuggestion.php} |   0
 ...mBackupDB.class.php => systemBackupDB.php} |   0
 ...arCache.class.php => systemClearCache.php} |   0
 ...gCheck.class.php => systemConfigCheck.php} |   0
 ...ystemExport.class.php => systemExport.php} |   0
 ...ailCheck.class.php => systemMailCheck.php} |   0
 ....class.php => systemTemplateGenerator.php} |   0
 ...temUpgrade.class.php => systemUpgrade.php} |   2 +-
 .../{taskState.class.php => taskState.php}    |   0
 .../{tasklist.class.php => tasklist.php}      |   0
 .../{taskrun.class.php => taskrun.php}        |   0
 .../module/{report.class.php => report.php}   |   0
 .../{activity.class.php => activity.php}      |   0
 .../module/report/{add.class.php => add.php}  |   0
 .../{connexion.class.php => connexion.php}    |   0
 .../{dashboard.class.php => dashboard.php}    |   0
 ...rface.class.php => componentInterface.php} |   0
 .../dashboard/{feed.class.php => feed.php}    |   0
 .../dashboard/{group.class.php => group.php}  |   0
 .../dashboard/{merge.class.php => merge.php}  |   0
 .../dashboard/{sort.class.php => sort.php}    |   0
 .../{download.class.php => download.php}      |   0
 .../report/{edit.class.php => edit.php}       |   0
 .../report/{filter.class.php => filter.php}   |   0
 .../module/report/{nav.class.php => nav.php}  |   0
 .../report/{push.class.php => push.php}       |   0
 .../{question.class.php => question.php}      |   0
 .../module/report/{sql.class.php => sql.php}  |   0
 ...rface.class.php => sqlReportInterface.php} |   0
 .../{sqlaction.class.php => sqlaction.php}    |   0
 ...qlconnexion.class.php => sqlconnexion.php} |   0
 ...{sqldownload.class.php => sqldownload.php} |   0
 .../{sqlfilter.class.php => sqlfilter.php}    |   0
 ...{sqlquestion.class.php => sqlquestion.php} |   0
 .../{validate.class.php => validate.php}      |   0
 .../{p4field.class.php => p4field.php}        |   0
 lib/classes/{p4file.class.php => p4file.php}  |   0
 .../{p4string.class.php => p4string.php}      |   0
 lib/classes/patch/{320.class.php => 320.php}  |   0
 .../patch/{320a.class.php => 320a.php}        |   0
 .../patch/{320ab.class.php => 320ab.php}      |   0
 .../patch/{320b.class.php => 320b.php}        |   0
 .../patch/{320c.class.php => 320c.php}        |   0
 .../patch/{320d.class.php => 320d.php}        |   0
 .../patch/{320e.class.php => 320e.php}        |   0
 .../patch/{320f.class.php => 320f.php}        |   0
 .../patch/{320h.class.php => 320h.php}        |   0
 lib/classes/patch/{360.class.php => 360.php}  |   0
 .../patch/{3602.class.php => 3602.php}        |   0
 .../patch/{3603.class.php => 3603.php}        |   0
 .../patch/{3604.class.php => 3604.php}        |   0
 lib/classes/patch/{361.class.php => 361.php}  |   0
 lib/classes/patch/{370.class.php => 370.php}  |   0
 .../patch/{370a3.class.php => 370a3.php}      |   0
 .../patch/{370a4.class.php => 370a4.php}      |   0
 .../patch/{370a5.class.php => 370a5.php}      |   0
 .../patch/{370a6.class.php => 370a6.php}      |   0
 .../patch/{370a7.class.php => 370a7.php}      |   0
 .../patch/{370a8.class.php => 370a8.php}      |   0
 .../patch/{370a9.class.php => 370a9.php}      |   0
 lib/classes/patch/{371.class.php => 371.php}  |   0
 lib/classes/patch/{373.class.php => 373.php}  |   0
 lib/classes/patch/{380.class.php => 380.php}  |   0
 .../patch/{3802.class.php => 3802.php}        |   0
 .../patch/{3803.class.php => 3803.php}        |   0
 ...Interface.class.php => patchInterface.php} |   0
 .../{phrasea.class.php => phrasea.php}        |  25 ---
 ...{phraseadate.class.php => phraseadate.php} |   0
 .../{queries.class.php => queries.php}        |   0
 lib/classes/{random.class.php => random.php}  |   0
 .../{Interface.class.php => Interface.php}    |   0
 .../record/{adapter.class.php => adapter.php} |   0
 ...ortElement.class.php => exportElement.php} |   0
 ...rderElement.class.php => orderElement.php} |   0
 .../record/{preview.class.php => preview.php} |   0
 ...{recordutils.class.php => recordutils.php} |   0
 .../{audio.class.php => audio.php}            |   0
 .../{document.class.php => document.php}      |   0
 .../{image.class.php => image.php}            |   0
 .../recordutils/{map.class.php => map.php}    |   0
 .../{video.class.php => video.php}            |   0
 .../{registry.class.php => registry.php}      |   0
 ...erface.class.php => registryInterface.php} |   0
 .../set/{abstract.class.php => abstract.php}  |   0
 .../set/{export.class.php => export.php}      |   0
 .../{exportftp.class.php => exportftp.php}    |   0
 .../set/{order.class.php => order.php}        |   0
 .../{selection.class.php => selection.php}    |   0
 lib/classes/{setup.class.php => setup.php}    |   0
 lib/classes/{sso.class.php => sso.php}        |   0
 .../system/{server.class.php => server.php}   |   0
 lib/classes/system/{url.class.php => url.php} |   0
 .../{Scheduler.class.php => Scheduler.php}    |   0
 .../task/{abstract.class.php => abstract.php} |   0
 ...xAbstract.class.php => appboxAbstract.php} |   0
 ...Abstract.class.php => databoxAbstract.php} |   0
 .../task/{manager.class.php => manager.php}   |   2 +-
 ...{RecordMover.class.php => RecordMover.php} |   0
 .../{apibridge.class.php => apibridge.php}    |   0
 .../period/{archive.class.php => archive.php} |   0
 .../{cindexer.class.php => cindexer.php}      |   0
 .../{emptyColl.class.php => emptyColl.php}    |   0
 .../task/period/{ftp.class.php => ftp.php}    |   0
 .../period/{ftpPull.class.php => ftpPull.php} |   0
 .../{outofdate.class.php => outofdate.php}    |   0
 .../period/{subdef.class.php => subdef.php}   |   0
 .../task/period/{test.class.php => test.php}  |   0
 .../{workflow01.class.php => workflow01.php}  |   0
 .../{writemeta.class.php => writemeta.php}    |   0
 .../{thesaurus.class.php => thesaurus.php}    |   0
 .../thesaurus/{xpath.class.php => xpath.php}  |   0
 .../{unicode.class.php => unicode.php}        |   0
 lib/classes/{uuid.class.php => uuid.php}      |   0
 phpunit.xml.dist                              |   4 +-
 .../Phrasea/Controller/BoilerPlate.php        |  34 ----
 .../Controller/Setup/FakeSetupApplication.inc |  28 ---
 .../Alchemy/Phrasea/Loader/AutoloaderTest.php |  43 ----
 .../Phrasea/Loader/CacheAutoloaderTest.php    |  87 --------
 .../Loader/Fixtures/Test/Hello.class.php      |   6 -
 .../Loader/Fixtures/Test/HelloCache.class.php |   6 -
 .../Loader/Fixtures/Test/test.class.php       |   6 -
 .../Phrasea/Setup/AbstractSetupTester.inc     |  79 --------
 .../Phrasea/Application/ApiAbstract.php}      |  20 +-
 .../Phrasea/Application/ApiJSONPTest.php      |   6 +-
 .../Phrasea/Application/ApiJsonTest.php       |   8 +-
 .../Phrasea/Application/ApiYamlTest.php       |   8 +-
 .../Phrasea/Application/LightboxTest.php      |  20 +-
 .../Phrasea/Application/OAuth2Test.php        |  20 +-
 .../Phrasea/Application/OverviewTest.php      |  10 +-
 .../Phrasea/Application/RootTest.php          |   6 +-
 .../Phrasea/Application/SetupTest.php         |   6 +-
 .../{ => Tests}/Phrasea/ApplicationTest.php   |   5 +-
 .../Phrasea/Border/Attribute/FactoryTest.php  |   7 +-
 .../Border/Attribute/MetaFieldTest.php        |   5 +-
 .../Phrasea/Border/Attribute/MetadataTest.php |   6 +-
 .../Phrasea/Border/Attribute/StatusTest.php   |   5 +-
 .../Phrasea/Border/Attribute/StoryTest.php    |   5 +-
 .../Border/Checker/AbstractCheckerTest.php    |   5 +-
 .../Phrasea/Border/Checker/ColorspaceTest.php |   5 +-
 .../Phrasea/Border/Checker/DimensionTest.php  |   5 +-
 .../Phrasea/Border/Checker/ExtensionTest.php  |   9 +-
 .../Phrasea/Border/Checker/FilenameTest.php   |   9 +-
 .../Phrasea/Border/Checker/MediaTypeTest.php  |   9 +-
 .../Phrasea/Border/Checker/ResponseTest.php   |   4 +-
 .../Phrasea/Border/Checker/Sha256Test.php     |  11 +-
 .../Phrasea/Border/Checker/UUIDTest.php       |   9 +-
 .../{ => Tests}/Phrasea/Border/FileTest.php   |  15 +-
 .../Phrasea/Border/ManagerTest.php            |  70 ++++---
 .../Phrasea/Border/MetaFieldsBagTest.php      |   5 +-
 .../Phrasea/Border/MetadataBagTest.php        |   5 +-
 .../{ => Tests}/Phrasea/Border/VisaTest.php   |  14 +-
 .../Phrasea/Cache/ApcCacheTest.php            |   6 +-
 .../Phrasea/Cache/ArrayCacheTest.php          |   6 +-
 .../Phrasea/Cache/MemcacheCacheTest.php       |   8 +-
 .../Phrasea/Cache/RedisCacheTest.php          |   8 +-
 .../Phrasea/Cache/XcacheCacheTest.php         |   6 +-
 .../Phrasea/Command/CommandTest.php           |   4 +-
 .../Phrasea/Command/UpgradeDBDatasTest.php    |   3 +-
 .../Controller/Admin/AdminCollectionTest.php  |  16 +-
 .../Controller/Admin/AdminDashboardTest.php   |   2 +-
 .../Controller/Admin/ConnectedUserTest.php    |   2 +-
 .../Phrasea/Controller/Admin/DataboxTest.php  |  16 +-
 .../Controller/Admin/DataboxesTest.php        |   2 +-
 .../Controller/Admin/DescriptionTest.php      |   4 +-
 .../Phrasea/Controller/Admin/FieldsTest.php   |   8 +-
 .../Controller/Admin/PublicationTest.php      |  56 +++---
 .../Phrasea/Controller/Admin/RootTest.php     |   4 +-
 .../Controller/Admin/SearchEngineTest.php     |   8 +-
 .../Phrasea/Controller/Admin/SetupTest.php    |   6 +-
 .../Phrasea/Controller/Admin/SubdefsTest.php  |  16 +-
 .../Controller/Admin/TaskManagerTest.php      |   2 +-
 .../Phrasea/Controller/Admin/UsersTest.php    |  24 +--
 .../Phrasea/Controller/Prod/BasketTest.php    |   4 +-
 .../Phrasea/Controller/Prod/BridgeTest.php    |  63 +++---
 .../Controller/Prod/DoDownloadTest.php        |   6 +-
 .../Phrasea/Controller/Prod/DownloadTest.php  |   2 +-
 .../Phrasea/Controller/Prod/EditTest.php      |   2 +-
 .../Phrasea/Controller/Prod/ExportTest.php    |   5 +-
 .../Phrasea/Controller/Prod/FeedTest.php      |  70 +++----
 .../Phrasea/Controller/Prod/LanguageTest.php  |   4 +-
 .../Phrasea/Controller/Prod/LazaretTest.php   |  14 +-
 .../Controller/Prod/MoveCollectionTest.php    |   2 +-
 .../Controller/Prod/MustacheLoaderTest.php    |   2 +-
 .../Phrasea/Controller/Prod/OrderTest.php     |   3 +-
 .../Phrasea/Controller/Prod/PrinterTest.php   |   2 +-
 .../Phrasea/Controller/Prod/PropertyTest.php  |   8 +-
 .../Phrasea/Controller/Prod/PushTest.php      |   2 +-
 .../Phrasea/Controller/Prod/QueryTest.php     |   6 +-
 .../Phrasea/Controller/Prod/RecordsTest.php   |  17 +-
 .../Phrasea/Controller/Prod/RootTest.php      |   4 +-
 .../Phrasea/Controller/Prod/ShareTest.php     |   2 +-
 .../Phrasea/Controller/Prod/StoryTest.php     |   5 +-
 .../Phrasea/Controller/Prod/TOUTest.php       |   2 +-
 .../Phrasea/Controller/Prod/TooltipTest.php   |  14 +-
 .../Phrasea/Controller/Prod/UploadTest.php    |   6 +-
 .../Phrasea/Controller/Prod/UsrListsTest.php  |   2 +-
 .../Phrasea/Controller/Prod/WorkZoneTest.php  |   2 +-
 .../Phrasea/Controller/RecordsRequestTest.php |   7 +-
 .../Phrasea/Controller/Root/AccountTest.php   |   4 +-
 .../Controller/Root/DevelopersTest.php        |   6 +-
 .../Phrasea/Controller/Root/LoginTest.php     |   4 +-
 .../Phrasea/Controller/Root/RSSFeedTest.php   | 190 +++++++++---------
 .../Phrasea/Controller/Root/SessionTest.php   |   2 +-
 .../Controller/Setup/FakeSetupApplication.inc |  28 +++
 .../Controller/Setup/InstallerTest.php        |   4 +-
 .../Controller/User/NotificationsTest.php     |   5 +-
 .../Controller/User/PreferencesTest.php       |   5 +-
 .../Controller/Utils/ConnectionTestTest.php   |   2 +-
 .../Controller/Utils/PathFileTestTest.php     |   4 +-
 .../Core/Configuration/ConfigurationTest.php  |   2 +-
 .../Configuration/confTestFiles/config.yml    |   0
 .../Configuration/confTestFiles/test.json     |   0
 .../BorderManagerServiceProviderTest.php      |   4 +-
 .../Provider/BrowserServiceProviderTest.php   |   4 +-
 .../Provider/CacheServiceProviderTest.php     |   4 +-
 .../ConfigurationServiceProviderTest.php      |   4 +-
 ...ConfigurationTesterServiceProviderTest.php |   4 +-
 .../Provider/GeonamesServiceProviderTest.php  |   4 +-
 .../Core/Provider/ORMServiceProviderTest.php  |   4 +-
 .../SearchEngineServiceProviderTest.php       |   4 +-
 .../TaskManagerServiceProviderTest.php        |   4 +-
 .../Provider/UnicodeServiceProviderTest.php   |   4 +-
 .../Core/Service/Border/BorderManagerTest.php |   5 +-
 .../Core/Service/Cache/ApcCacheTest.php       |   6 +-
 .../Core/Service/Cache/ArrayCacheTest.php     |   6 +-
 .../Core/Service/Cache/MemcacheCacheTest.php  |   6 +-
 .../Core/Service/Cache/XcacheCacheTest.php    |   6 +-
 .../Core/Service/Log/Doctrine/MonologTest.php |   6 +-
 .../Core/Service/Log/Doctrine/PhpechoTest.php |   6 +-
 .../Phrasea/Core/Service/Log/MonologTest.php  |   6 +-
 .../Phrasea/Core/Service/Orm/DoctrineTest.php |   6 +-
 .../Core/Service/ServiceAbtractTest.php       |   6 +-
 .../ServiceBuilder/AbstractBuilderTest.php    |   6 +-
 .../Core/ServiceBuilder/CacheBuilderTest.php  |   7 +-
 .../Core/ServiceBuilder/LogBuilderTest.php    |   6 +-
 .../Core/ServiceBuilder/OrmBuilderTest.php    |   7 +-
 .../{ => Tests}/Phrasea/Core/VersionTest.php  |   2 +-
 .../Phrasea/Media/Subdef/AudioTest.php        |   5 +-
 .../Phrasea/Media/Subdef/FlexPaperTest.php    |   5 +-
 .../Phrasea/Media/Subdef/GifTest.php          |   5 +-
 .../Phrasea/Media/Subdef/ImageTest.php        |   5 +-
 .../Media/Subdef/OptionType/BooleanTest.php   |   5 +-
 .../Media/Subdef/OptionType/EnumTest.php      |   5 +-
 .../Media/Subdef/OptionType/MultiTest.php     |   5 +-
 .../Media/Subdef/OptionType/RangeTest.php     |   5 +-
 .../Phrasea/Media/Subdef/ProviderTest.php     |   5 +-
 .../Phrasea/Media/Subdef/VideoTest.php        |   5 +-
 .../Phrasea/Media/Type/AudioTest.php          |   5 +-
 .../Phrasea/Media/Type/DocumentTest.php       |   5 +-
 .../Phrasea/Media/Type/FlashTest.php          |   5 +-
 .../Phrasea/Media/Type/ImageTest.php          |   5 +-
 .../Phrasea/Media/Type/VideoTest.php          |   5 +-
 .../Phrasea/Metadata/Tag/NosourceTest.php     |   4 +-
 .../Phrasea/Metadata/Tag/PdfTextTest.php      |   4 +-
 .../Metadata/Tag/TfArchivedateTest.php        |   4 +-
 .../Phrasea/Metadata/Tag/TfAtimeTest.php      |   4 +-
 .../Phrasea/Metadata/Tag/TfBasenameTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfBitsTest.php       |   4 +-
 .../Phrasea/Metadata/Tag/TfChannelsTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfCtimeTest.php      |   4 +-
 .../Phrasea/Metadata/Tag/TfDirnameTest.php    |   4 +-
 .../Phrasea/Metadata/Tag/TfDurationTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfEditDateTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfExtensionTest.php  |   4 +-
 .../Phrasea/Metadata/Tag/TfFilenameTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfFilepathTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfHeightTest.php     |   4 +-
 .../Phrasea/Metadata/Tag/TfMimeTypeTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfMtimeTest.php      |   4 +-
 .../Phrasea/Metadata/Tag/TfQuarantineTest.php |   4 +-
 .../Phrasea/Metadata/Tag/TfRecordidTest.php   |   4 +-
 .../Phrasea/Metadata/Tag/TfSizeTest.php       |   4 +-
 .../Phrasea/Metadata/Tag/TfWidthTest.php      |   4 +-
 .../ConfigurationPanelAbstractTest.php        |   4 +-
 .../PhraseaConfigurationPanelTest.php         |   7 +-
 .../SearchEngine/PhraseaEngineTest.php        |   7 +-
 .../SearchEngine/SearchEngineAbstractTest.php |  29 +--
 .../SearchEngine/SearchEngineLoggerTest.php   |   4 +-
 .../SearchEngine/SearchEngineOptionsTest.php  |   4 +-
 .../SearchEngine/SearchEngineResultTest.php   |   8 +-
 .../SearchEngineSuggestionTest.php            |   6 +-
 .../SphinxSearchConfigurationPanelTest.php    |   9 +-
 .../SearchEngine/SphinxSearchEngineTest.php   |   5 +-
 .../Phrasea/Security/FirewallTest.php         |   4 +-
 .../Phrasea/Setup/AbstractSetupTester.php     |  79 ++++++++
 .../Phrasea/Setup/ConfigurationTesterTest.php |  11 +-
 .../Phrasea/Setup/InstallerTest.php           |  12 +-
 .../Phrasea/Setup/TestSpecifications.php}     |   2 +-
 .../Version/Migration/Migration31Test.php     |  13 +-
 .../Version/Migration/Migration35Test.php     |  10 +-
 .../Setup/Version/Probe/Probe31Test.php       |   7 +-
 .../Setup/Version/Probe/Probe35Test.php       |   7 +-
 .../ControlProvider/UserProviderTest.php      |   4 +-
 .../Phrasea/Vocabulary/ControllerTest.php     |   4 +-
 .../Phrasea/Vocabulary/TermTest.php           |   5 +-
 tests/bootstrap.inc                           |   3 -
 tests/bootstrap.php                           |   5 +
 tests/{ => classes}/ACLTest.php               |   2 -
 .../Api/Auth/Bridge_Api_Auth_AbstractTest.php |   1 -
 .../Api/Auth/Bridge_Api_Auth_FlickrTest.php   |   1 -
 .../Api/Auth/Bridge_Api_Auth_OAuth2Test.php   |   1 -
 .../Api/Bridge_Api_AbstractCollectionTest.php |   1 -
 .../Bridge/Api/Bridge_Api_AbstractTest.php    |   1 -
 .../Bridge_Api_ContainerCollectionTest.php    |   1 -
 .../Api/Bridge_Api_ElementCollectionTest.php  |   1 -
 .../Bridge_Api_Dailymotion_ContainerTest.php  |   2 -
 .../Bridge_Api_Dailymotion_ElementTest.php    |   2 -
 .../Bridge_Api_Flickr_ContainerTest.php       |   1 -
 .../Flickr/Bridge_Api_Flickr_ElementTest.php  |   1 -
 .../Bridge_Api_Youtube_ContainerTest.php      |   1 -
 .../Bridge_Api_Youtube_ElementTest.php        |   1 -
 .../Bridge/Bridge_AccountSettingsTest.php     |   1 -
 .../Bridge/Bridge_AccountTest.php             |   1 -
 tests/{ => classes}/Bridge/Bridge_ApiTest.php |   1 -
 .../Bridge/Bridge_ElementTest.php             |   1 -
 tests/{ => classes}/Bridge/Bridge_datas.inc   |   0
 .../Doctrine/Entities/BasketTest.php          |   2 -
 .../ValidationParticipantRepositoryTest.php   |   2 -
 .../Feed/Entry/Feed_Entry_AdapterTest.php     |   2 -
 .../Feed/Entry/Feed_Entry_CollectionTest.php  |   2 -
 .../Feed/Entry/Feed_Entry_ItemTest.php        |   2 -
 tests/{ => classes}/Feed/Feed_AdapterTest.php |   6 +-
 .../{ => classes}/Feed/Feed_AggregateTest.php |   2 -
 .../Feed/Feed_CollectionTest.php              |   2 -
 tests/{ => classes}/Feed/Feed_LinkTest.php    |   2 -
 .../Publisher/Feed_Publisher_AdapterTest.php  |   4 +-
 .../Feed/XML/Feed_XML_AtomTest.php            |   2 -
 .../Feed/XML/Feed_XML_RSSTest.php             |   2 -
 .../Feed/XML/RSS/Feed_XML_RSS_ImageTest.php   |   2 -
 tests/{ => classes}/FeedValidator.inc         |   0
 .../PhraseanetPHPUnitAbstract.php}            |  14 +-
 ...hraseanetPHPUnitAuthenticatedAbstract.php} |   2 -
 .../PhraseanetPHPUnitListener.php}            |   0
 .../PhraseanetWebTestCaseAbstract.php}        |   2 -
 ...eanetWebTestCaseAuthenticatedAbstract.php} |   2 -
 .../Session_Authentication_GuestTest.php      |   2 -
 .../Session_Authentication_NativeTest.php     |   2 -
 .../Session/Session_LoggerTest.php            |   2 -
 .../Setup/Setup_ConstraintTest.php            |   2 -
 .../{ => classes}/Setup/Setup_UpgradeTest.php |   2 -
 .../api/oauthv2/API_OAuth2_AuthCodeTest.php   |   2 -
 .../oauthv2/API_OAuth2_RefreshTokenTest.php   |   2 -
 .../api/oauthv2/api_oauthv2_AccountTest.php   |   2 -
 .../oauthv2/api_oauthv2_ApplicationTest.php   |   2 -
 .../api/oauthv2/api_oauthv2_TokenTest.php     |   2 -
 .../api/v1/api_v1_adapterTest.php             |   6 +-
 .../api/v1/api_v1_resultTest.php              |   3 +-
 .../caption/caption_fieldTest.php             |   2 -
 .../caption/caption_recordTest.php            |   2 -
 tests/{ => classes}/collectionTest.php        |   8 +-
 .../databox_Field_DCES_ContributorTest.php    |   2 -
 .../DCES/databox_Field_DCES_CoverageTest.php  |   2 -
 .../DCES/databox_Field_DCES_CreatorTest.php   |   2 -
 .../DCES/databox_Field_DCES_DateTest.php      |   2 -
 .../databox_Field_DCES_DescriptionTest.php    |   2 -
 .../DCES/databox_Field_DCES_FormatTest.php    |   2 -
 .../databox_Field_DCES_IdentifierTest.php     |   2 -
 .../DCES/databox_Field_DCES_LanguageTest.php  |   2 -
 .../DCES/databox_Field_DCES_PublisherTest.php |   2 -
 .../DCES/databox_Field_DCES_RelationTest.php  |   2 -
 .../DCES/databox_Field_DCES_RightsTest.php    |   2 -
 .../DCES/databox_Field_DCES_SourceTest.php    |   2 -
 .../DCES/databox_Field_DCES_SubjectTest.php   |   2 -
 .../DCES/databox_Field_DCES_TitleTest.php     |   2 -
 .../DCES/databox_Field_DCES_TypeTest.php      |   2 -
 .../databox/databox_fieldTest.php             |   2 -
 .../databox/databox_statusTest.php            |   2 -
 .../databox/databox_subdefTest.php            |   0
 tests/{ => classes}/databoxTest.php           |   8 +-
 tests/{ => classes}/geonamesTest.php          |   2 -
 tests/{ => classes}/http/http_requestTest.php |   2 -
 .../Permalink/media_Permalink_AdapterTest.php |   2 -
 .../{ => classes}/media/media_subdefTest.php  |   4 +-
 .../module_console_aboutAuthorsTest.php       |   4 +-
 .../module_console_aboutLicenseTest.php       |   4 +-
 .../module_console_schedulerStateTest.php     |   2 -
 ...le_console_systemTemplateGeneratorTest.php |   2 -
 .../console/module_console_taskStateTest.php  |   2 -
 .../console/module_console_tasklistTest.php   |   2 -
 tests/{ => classes}/p4stringTest.php          |   2 -
 tests/{ => classes}/randomTest.php            |   2 -
 tests/{ => classes}/record/adapterTest.php    |   2 -
 tests/{ => classes}/registryTest.php          |   2 -
 tests/{ => classes}/report/activityTest.php   |   2 -
 tests/{ => classes}/report/addTest.php        |   2 -
 .../report/connexionReportTest.php            |   7 +-
 tests/{ => classes}/report/dashboardTest.php  |   2 -
 .../report/downloadReportTest.php             |   2 -
 tests/{ => classes}/report/editTest.php       |   2 -
 tests/{ => classes}/report/filterTest.php     |   2 -
 tests/{ => classes}/report/pushTest.php       |   2 -
 .../report/questionReportTest.php             |   2 -
 tests/{ => classes}/report/reportTest.php     |   2 -
 tests/{ => classes}/report/sqlActionTest.php  |   2 -
 tests/{ => classes}/report/sqlFilterTest.php  |   2 -
 tests/{ => classes}/report/sqlTest.php        |   2 -
 tests/{ => classes}/set/set_exportTest.php    |   6 +-
 .../system/system_serverTest.php              |   2 -
 tests/{ => classes}/system/system_urlTest.php |   2 -
 .../task/period/task_period_archiveTest.php   |   9 +-
 .../{ => classes}/task/task_abstractTest.php  |   2 -
 tests/{ => classes}/thesaurusTest.php         |   2 -
 tests/{ => classes}/unicodeTest.php           |  16 +-
 tests/{ => classes}/unitTestsTest.php         |  15 +-
 tests/{ => classes}/userTest.php              |   2 -
 tests/{ => classes}/uuidTest.php              |   2 -
 tests/{testfiles => files}/14082008057.mp4    | Bin
 tests/{testfiles => files}/HelloWorld.pdf     | Bin
 tests/{testfiles => files}/ISOLatin1.txt      |   0
 tests/{testfiles => files}/ISOLatin2.txt      |   0
 tests/{testfiles => files}/Latin5.txt         |   0
 tests/{testfiles => files}/MacOSRoman.txt     |   0
 tests/{testfiles => files}/UTF-8.txt          |   0
 tests/{testfiles => files}/WindowsLatin1.txt  |   0
 tests/{testfiles => files}/WindowsLatin2.txt  |   0
 tests/{testfiles => files}/cestlafete.jpg     | Bin
 tests/{testfiles => files}/extractfile.jpg    | Bin
 tests/{testfiles => files}/extractfile.xml    |   0
 tests/{testfiles => files}/heavy500.jpg       | Bin
 tests/{testfiles => files}/iphone_pic.jpg     | Bin
 tests/{testfiles => files}/logocoll.gif       | Bin
 tests/{testfiles => files}/p4logo.jpg         | Bin
 tests/{testfiles => files}/recta_logo.gif     | Bin
 tests/{testfiles => files}/rectb_logo.gif     | Bin
 tests/{testfiles => files}/test001.CR2        | Bin
 tests/{testfiles => files}/test002.CR2        | Bin
 tests/{testfiles => files}/test003.CR2        | Bin
 tests/{testfiles => files}/test004.CR2        | Bin
 tests/{testfiles => files}/test005.CR2        | Bin
 tests/{testfiles => files}/test006.wav        | Bin
 tests/{testfiles => files}/test007.ppt        | Bin
 tests/{testfiles => files}/test008.ai         |   0
 tests/{testfiles => files}/test009.TIFF       | Bin
 tests/{testfiles => files}/test010.fla        | Bin
 tests/{testfiles => files}/test011.swf        | Bin
 tests/{testfiles => files}/test012.wav        | Bin
 tests/{testfiles => files}/test013.ai         |   0
 tests/{testfiles => files}/test013.fla        | Bin
 tests/{testfiles => files}/test014.swf        | Bin
 tests/{testfiles => files}/test015.eps        | Bin
 tests/{testfiles => files}/test016.ai         |   0
 tests/{testfiles => files}/test017.wav        | Bin
 tests/{testfiles => files}/test018.TIFF       | Bin
 tests/{testfiles => files}/test019.mp3        | Bin
 tests/{testfiles => files}/test020.mp3        | Bin
 tests/{testfiles => files}/test021.fla        | Bin
 tests/{testfiles => files}/test022.swf        | Bin
 tests/{testfiles => files}/test023.mp4        | Bin
 tests/{testfiles => files}/test024.jpg        | Bin
 vendors.php                                   |   8 +-
 www/api/index.php                             |   2 +-
 www/api/oauthv2/index.php                     |   2 +-
 www/api/v1/index.php                          |   2 +-
 www/client/answer.php                         |   2 +-
 www/client/baskets.php                        |   2 +-
 www/client/clientFeedBack.php                 |   2 +-
 www/client/index.php                          |   2 +-
 www/include/geonames.feedback.php             |   8 +-
 www/index.php                                 |   2 +-
 www/report/ajax_chart.php                     |   2 +-
 www/report/ajax_info_dashboard.php            |   2 +-
 www/report/ajax_liste_base.php                |   2 +-
 www/report/ajax_table_content.php             |   2 +-
 www/report/charts/drawLinePlotWithLegend.php  |   6 +-
 www/report/charts/draw_pie.php                |   6 +-
 www/report/export_csv.php                     |   2 +-
 www/report/index.php                          |   2 +-
 www/report/report.php                         |   2 +-
 www/report/tab.php                            |   2 +-
 www/setup/installer.php                       |   2 +-
 www/thesaurus2/accept.php                     |   2 +-
 www/thesaurus2/export_text.php                |   2 +-
 www/thesaurus2/export_text_dlg.php            |   2 +-
 www/thesaurus2/export_topics.php              |   2 +-
 www/thesaurus2/export_topics_dlg.php          |   2 +-
 www/thesaurus2/import.php                     |   2 +-
 www/thesaurus2/import_dlg.php                 |   2 +-
 www/thesaurus2/index.php                      |   2 +-
 www/thesaurus2/linkfield.php                  |   2 +-
 www/thesaurus2/linkfield2.php                 |   2 +-
 www/thesaurus2/linkfield3.php                 |   2 +-
 www/thesaurus2/loadth.php                     |   2 +-
 www/thesaurus2/newsy_dlg.php                  |   2 +-
 www/thesaurus2/newterm.php                    |   2 +-
 www/thesaurus2/properties.php                 |   2 +-
 www/thesaurus2/replace.php                    |   2 +-
 www/thesaurus2/replace2.php                   |   2 +-
 www/thesaurus2/replace3.php                   |   2 +-
 www/thesaurus2/rescan.php                     |   2 +-
 www/thesaurus2/rescan_dlg.php                 |   2 +-
 www/thesaurus2/search.php                     |   2 +-
 www/thesaurus2/thesaurus.php                  |   2 +-
 www/thesaurus2/xmlhttp/accept.x.php           |   2 +-
 www/thesaurus2/xmlhttp/acceptcandidates.x.php |   2 +-
 www/thesaurus2/xmlhttp/changesylng.x.php      |   2 +-
 www/thesaurus2/xmlhttp/changesypos.x.php      |   2 +-
 www/thesaurus2/xmlhttp/deletenohits.x.php     |   2 +-
 www/thesaurus2/xmlhttp/delsy.x.php            |   2 +-
 www/thesaurus2/xmlhttp/delts.x.php            |   2 +-
 www/thesaurus2/xmlhttp/gethtmlbranch.x.php    |   2 +-
 www/thesaurus2/xmlhttp/getsy.x.php            |   2 +-
 www/thesaurus2/xmlhttp/getterm.x.php          |   2 +-
 www/thesaurus2/xmlhttp/killterm.x.php         |   2 +-
 www/thesaurus2/xmlhttp/newsy.x.php            |   2 +-
 www/thesaurus2/xmlhttp/newts.x.php            |   2 +-
 www/thesaurus2/xmlhttp/openbranches.x.php     |   2 +-
 www/thesaurus2/xmlhttp/reject.x.php           |   2 +-
 www/thesaurus2/xmlhttp/searchcandidate.x.php  |   2 +-
 www/thesaurus2/xmlhttp/searchnohits.x.php     |   2 +-
 www/xmlhttp/acceptcandidates.j.php            |   2 +-
 www/xmlhttp/checkcandidatetarget.j.php        |   2 +-
 www/xmlhttp/editing_presets.j.php             |   2 +-
 www/xmlhttp/getsy_prod.x.php                  |   2 +-
 www/xmlhttp/getterm_prod.h.php                |   2 +-
 www/xmlhttp/getterm_prod.x.php                |   2 +-
 www/xmlhttp/openbranch_prod.j.php             |   2 +-
 www/xmlhttp/openbranches_prod.h.php           |   2 +-
 www/xmlhttp/openbranches_prod.x.php           |   2 +-
 www/xmlhttp/replacecandidate.j.php            |   2 +-
 www/xmlhttp/search_th_term_prod.j.php         |   2 +-
 784 files changed, 1031 insertions(+), 1806 deletions(-)
 delete mode 100644 lib/Alchemy/Phrasea/Loader/ApcAutoloader.php
 delete mode 100644 lib/Alchemy/Phrasea/Loader/Autoloader.php
 delete mode 100644 lib/Alchemy/Phrasea/Loader/CacheAutoloader.php
 delete mode 100644 lib/Alchemy/Phrasea/Loader/LoaderStrategy.php
 delete mode 100644 lib/Alchemy/Phrasea/Loader/XcacheAutoloader.php
 delete mode 100644 lib/bootstrap.php
 rename lib/classes/{ACL.class.php => ACL.php} (100%)
 rename lib/classes/API/OAuth2/{Account.class.php => Account.php} (100%)
 rename lib/classes/API/OAuth2/{Adapter.class.php => Adapter.php} (100%)
 rename lib/classes/API/OAuth2/{Application.class.php => Application.php} (100%)
 rename lib/classes/API/OAuth2/Application/{Navigator.class.php => Navigator.php} (100%)
 rename lib/classes/API/OAuth2/{AuthCode.class.php => AuthCode.php} (100%)
 rename lib/classes/API/OAuth2/Exception/{Exception.class.php => Exception.php} (100%)
 rename lib/classes/API/OAuth2/Exception/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/API/OAuth2/Exception/{Redirect.class.php => Redirect.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{AccessDenied.class.php => AccessDenied.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{InvalidClient.class.php => InvalidClient.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{InvalidRequest.class.php => InvalidRequest.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{InvalidScope.class.php => InvalidScope.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{ServerError.class.php => ServerError.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{TemporaryUnavailable.class.php => TemporaryUnavailable.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{UnauthorizedClient.class.php => UnauthorizedClient.php} (100%)
 rename lib/classes/API/OAuth2/Exception/Redirect/{UnsupportedResponseType.class.php => UnsupportedResponseType.php} (100%)
 rename lib/classes/API/OAuth2/Exception/{WWWAuthenticate.class.php => WWWAuthenticate.php} (100%)
 rename lib/classes/API/OAuth2/Exception/WWWAuthenticate/{InvalidClient.class.php => InvalidClient.php} (100%)
 rename lib/classes/API/OAuth2/Exception/WWWAuthenticate/{InvalidRequest.class.php => InvalidRequest.php} (100%)
 rename lib/classes/API/OAuth2/Exception/WWWAuthenticate/{InvalidToken.class.php => InvalidToken.php} (100%)
 rename lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/{BadRequest.class.php => BadRequest.php} (100%)
 rename lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/{Forbidden.class.php => Forbidden.php} (100%)
 rename lib/classes/API/OAuth2/Form/{DevAppDesktop.class.php => DevAppDesktop.php} (100%)
 rename lib/classes/API/OAuth2/Form/{DevAppInternet.class.php => DevAppInternet.php} (100%)
 rename lib/classes/API/OAuth2/{RefreshToken.class.php => RefreshToken.php} (100%)
 rename lib/classes/API/OAuth2/{Token.class.php => Token.php} (100%)
 rename lib/classes/API/V1/{Abstract.class.php => Abstract.php} (100%)
 rename lib/classes/API/V1/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/API/V1/{Log.class.php => Log.php} (100%)
 rename lib/classes/API/V1/{adapter.class.php => adapter.php} (100%)
 rename lib/classes/API/V1/exception/{abstract.class.php => abstract.php} (100%)
 rename lib/classes/API/V1/exception/{badrequest.class.php => badrequest.php} (100%)
 rename lib/classes/API/V1/exception/{forbidden.class.php => forbidden.php} (100%)
 rename lib/classes/API/V1/exception/{internalservererror.class.php => internalservererror.php} (100%)
 rename lib/classes/API/V1/exception/{methodnotallowed.class.php => methodnotallowed.php} (100%)
 rename lib/classes/API/V1/exception/{notfound.class.php => notfound.php} (100%)
 rename lib/classes/API/V1/exception/{unauthorized.class.php => unauthorized.php} (100%)
 rename lib/classes/API/V1/{result.class.php => result.php} (100%)
 rename lib/classes/Bridge/{Account.class.php => Account.php} (100%)
 rename lib/classes/Bridge/{AccountSettings.class.php => AccountSettings.php} (100%)
 rename lib/classes/Bridge/{Api.class.php => Api.php} (100%)
 rename lib/classes/Bridge/Api/{Abstract.class.php => Abstract.php} (100%)
 rename lib/classes/Bridge/Api/{AbstractCollection.class.php => AbstractCollection.php} (100%)
 rename lib/classes/Bridge/Api/Auth/{Abstract.class.php => Abstract.php} (100%)
 rename lib/classes/Bridge/Api/Auth/{Flickr.class.php => Flickr.php} (100%)
 rename lib/classes/Bridge/Api/Auth/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/Bridge/Api/Auth/{OAuth2.class.php => OAuth2.php} (100%)
 rename lib/classes/Bridge/Api/Auth/{Youtube.class.php => Youtube.php} (100%)
 rename lib/classes/Bridge/Api/{ContainerCollection.class.php => ContainerCollection.php} (100%)
 rename lib/classes/Bridge/Api/{ContainerInterface.class.php => ContainerInterface.php} (100%)
 rename lib/classes/Bridge/Api/{Dailymotion.class.php => Dailymotion.php} (100%)
 rename lib/classes/Bridge/Api/Dailymotion/{Container.class.php => Container.php} (100%)
 rename lib/classes/Bridge/Api/Dailymotion/{Element.class.php => Element.php} (100%)
 rename lib/classes/Bridge/Api/{ElementCollection.class.php => ElementCollection.php} (100%)
 rename lib/classes/Bridge/Api/{ElementInterface.class.php => ElementInterface.php} (100%)
 rename lib/classes/Bridge/Api/{Flickr.class.php => Flickr.php} (100%)
 rename lib/classes/Bridge/Api/Flickr/{Container.class.php => Container.php} (100%)
 rename lib/classes/Bridge/Api/Flickr/{Element.class.php => Element.php} (100%)
 rename lib/classes/Bridge/Api/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/Bridge/Api/{Youtube.class.php => Youtube.php} (100%)
 rename lib/classes/Bridge/Api/Youtube/{Container.class.php => Container.php} (100%)
 rename lib/classes/Bridge/Api/Youtube/{Element.class.php => Element.php} (100%)
 rename lib/classes/Bridge/{Element.class.php => Element.php} (100%)
 rename lib/classes/Bridge/{Exception.class.php => Exception.php} (100%)
 rename lib/classes/Bridge/Exception/{AccountNotFound.class.php => AccountNotFound.php} (100%)
 rename lib/classes/Bridge/Exception/{ActionAuthBadConnection.class.php => ActionAuthBadConnection.php} (100%)
 rename lib/classes/Bridge/Exception/{ActionAuthNeedReconnect.class.php => ActionAuthNeedReconnect.php} (100%)
 rename lib/classes/Bridge/Exception/{ActionForbidden.class.php => ActionForbidden.php} (100%)
 rename lib/classes/Bridge/Exception/{ActionInvalidObjectId.class.php => ActionInvalidObjectId.php} (100%)
 rename lib/classes/Bridge/Exception/{ActionMandatoryField.class.php => ActionMandatoryField.php} (100%)
 rename lib/classes/Bridge/Exception/{ApiConnectorAccessTokenFailed.class.php => ApiConnectorAccessTokenFailed.php} (100%)
 rename lib/classes/Bridge/Exception/{ApiConnectorNotConfigured.class.php => ApiConnectorNotConfigured.php} (100%)
 rename lib/classes/Bridge/Exception/{ApiConnectorNotConnected.class.php => ApiConnectorNotConnected.php} (100%)
 rename lib/classes/Bridge/Exception/{ApiConnectorNotFound.class.php => ApiConnectorNotFound.php} (100%)
 rename lib/classes/Bridge/Exception/{ApiConnectorRequestFailed.class.php => ApiConnectorRequestFailed.php} (100%)
 rename lib/classes/Bridge/Exception/{ApiDisabled.class.php => ApiDisabled.php} (100%)
 rename lib/classes/Bridge/Exception/{ApiNotFound.class.php => ApiNotFound.php} (100%)
 rename lib/classes/Bridge/Exception/{ContainerUnknown.class.php => ContainerUnknown.php} (100%)
 rename lib/classes/Bridge/Exception/{ElementNotFound.class.php => ElementNotFound.php} (100%)
 rename lib/classes/Bridge/Exception/{ElementUnknown.class.php => ElementUnknown.php} (100%)
 rename lib/classes/Bridge/Exception/{InvalidRecordType.class.php => InvalidRecordType.php} (100%)
 rename lib/classes/Bridge/Exception/{ObjectUnknown.class.php => ObjectUnknown.php} (100%)
 rename lib/classes/Bridge/Exception/{TokenNotFound.class.php => TokenNotFound.php} (100%)
 rename lib/classes/{Browser.class.php => Browser.php} (100%)
 rename lib/classes/Exception/{Abstract.class.php => Abstract.php} (100%)
 rename lib/classes/Exception/{BadRequest.class.php => BadRequest.php} (100%)
 rename lib/classes/Exception/Databox/{CollectionNotFound.class.php => CollectionNotFound.php} (100%)
 rename lib/classes/Exception/Databox/{FieldNotFound.class.php => FieldNotFound.php} (100%)
 rename lib/classes/Exception/Databox/{SubdefNotFound.class.php => SubdefNotFound.php} (100%)
 rename lib/classes/Exception/Databox/{metadataDescriptionNotFound.class.php => metadataDescriptionNotFound.php} (100%)
 rename lib/classes/Exception/{DataboxNotFound.class.php => DataboxNotFound.php} (100%)
 rename lib/classes/Exception/Feed/{EntryNotFound.class.php => EntryNotFound.php} (100%)
 rename lib/classes/Exception/Feed/{ItemNotFound.class.php => ItemNotFound.php} (100%)
 rename lib/classes/Exception/Feed/{PublisherNotFound.class.php => PublisherNotFound.php} (100%)
 rename lib/classes/Exception/{FeedNotFound.class.php => FeedNotFound.php} (100%)
 rename lib/classes/Exception/{Forbidden.class.php => Forbidden.php} (100%)
 rename lib/classes/Exception/{InternalServerError.class.php => InternalServerError.php} (100%)
 rename lib/classes/Exception/{InvalidArgument.class.php => InvalidArgument.php} (100%)
 rename lib/classes/Exception/Media/Subdef/{PermalinkNotFound.class.php => PermalinkNotFound.php} (100%)
 rename lib/classes/Exception/Media/{SubdefNotFound.class.php => SubdefNotFound.php} (100%)
 rename lib/classes/Exception/{NotAllowed.class.php => NotAllowed.php} (100%)
 rename lib/classes/Exception/{NotFound.class.php => NotFound.php} (100%)
 rename lib/classes/Exception/Record/{AdapterNotFound.class.php => AdapterNotFound.php} (100%)
 rename lib/classes/Exception/{ServiceUnavailable.class.php => ServiceUnavailable.php} (100%)
 rename lib/classes/Exception/Session/{AlreadyCreated.class.php => AlreadyCreated.php} (100%)
 rename lib/classes/Exception/Session/{BadSalinity.class.php => BadSalinity.php} (100%)
 rename lib/classes/Exception/Session/{Closed.class.php => Closed.php} (100%)
 rename lib/classes/Exception/Session/{LoggerNotFound.class.php => LoggerNotFound.php} (100%)
 rename lib/classes/Exception/Session/{MailLocked.class.php => MailLocked.php} (100%)
 rename lib/classes/Exception/Session/{NotAuthenticated.class.php => NotAuthenticated.php} (100%)
 rename lib/classes/Exception/Session/{RequireCaptcha.class.php => RequireCaptcha.php} (100%)
 rename lib/classes/Exception/Session/{StorageClosed.class.php => StorageClosed.php} (100%)
 rename lib/classes/Exception/Session/{WrongToken.class.php => WrongToken.php} (100%)
 rename lib/classes/Exception/Setup/{CannotWriteLockFile.class.php => CannotWriteLockFile.php} (100%)
 rename lib/classes/Exception/Setup/{FixBadEmailAddresses.class.php => FixBadEmailAddresses.php} (100%)
 rename lib/classes/Exception/Setup/{PhraseaAlreadyInstalled.class.php => PhraseaAlreadyInstalled.php} (100%)
 rename lib/classes/Exception/Setup/{UpgradeAlreadyStarted.class.php => UpgradeAlreadyStarted.php} (100%)
 rename lib/classes/Exception/{Unauthorized.class.php => Unauthorized.php} (100%)
 rename lib/classes/Exception/{UnauthorizedAction.class.php => UnauthorizedAction.php} (100%)
 rename lib/classes/Exception/Upload/{CannotWriteFile.class.php => CannotWriteFile.php} (100%)
 rename lib/classes/Exception/Upload/{Error.class.php => Error.php} (100%)
 rename lib/classes/Exception/Upload/{FileTooBig.class.php => FileTooBig.php} (100%)
 rename lib/classes/Feed/{Abstract.class.php => Abstract.php} (100%)
 rename lib/classes/Feed/{Adapter.class.php => Adapter.php} (100%)
 rename lib/classes/Feed/{Aggregate.class.php => Aggregate.php} (100%)
 rename lib/classes/Feed/{Collection.class.php => Collection.php} (100%)
 rename lib/classes/Feed/{CollectionInterface.class.php => CollectionInterface.php} (100%)
 rename lib/classes/Feed/Entry/{Adapter.class.php => Adapter.php} (100%)
 rename lib/classes/Feed/Entry/{Collection.class.php => Collection.php} (100%)
 rename lib/classes/Feed/Entry/{CollectionInterface.class.php => CollectionInterface.php} (100%)
 rename lib/classes/Feed/Entry/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/Feed/Entry/{Item.class.php => Item.php} (100%)
 rename lib/classes/Feed/Entry/{ItemInterface.class.php => ItemInterface.php} (100%)
 rename lib/classes/Feed/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/Feed/{Link.class.php => Link.php} (100%)
 rename lib/classes/Feed/{LinkInterface.class.php => LinkInterface.php} (100%)
 rename lib/classes/Feed/Publisher/{Adapter.class.php => Adapter.php} (100%)
 rename lib/classes/Feed/Publisher/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/Feed/{Token.class.php => Token.php} (100%)
 rename lib/classes/Feed/{TokenAggregate.class.php => TokenAggregate.php} (100%)
 rename lib/classes/Feed/XML/{Abstract.class.php => Abstract.php} (100%)
 rename lib/classes/Feed/XML/{Atom.class.php => Atom.php} (100%)
 rename lib/classes/Feed/XML/{Cooliris.class.php => Cooliris.php} (100%)
 rename lib/classes/Feed/XML/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/Feed/XML/{RSS.class.php => RSS.php} (100%)
 rename lib/classes/Feed/XML/RSS/{Image.class.php => Image.php} (100%)
 rename lib/classes/Feed/XML/RSS/{ImageInterface.class.php => ImageInterface.php} (100%)
 rename lib/classes/Session/Authentication/{Guest.class.php => Guest.php} (100%)
 rename lib/classes/Session/Authentication/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/Session/Authentication/{Native.class.php => Native.php} (100%)
 rename lib/classes/Session/Authentication/{None.class.php => None.php} (100%)
 rename lib/classes/Session/Authentication/{PersistentCookie.class.php => PersistentCookie.php} (100%)
 rename lib/classes/Session/Authentication/{Token.class.php => Token.php} (100%)
 rename lib/classes/Session/{Logger.class.php => Logger.php} (100%)
 rename lib/classes/Setup/{Constraint.class.php => Constraint.php} (100%)
 rename lib/classes/Setup/{ConstraintsIterator.class.php => ConstraintsIterator.php} (100%)
 rename lib/classes/Setup/{Registry.class.php => Registry.php} (100%)
 rename lib/classes/Setup/{Upgrade.class.php => Upgrade.php} (100%)
 rename lib/classes/User/{Adapter.class.php => Adapter.php} (100%)
 rename lib/classes/User/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/User/{Query.class.php => Query.php} (100%)
 rename lib/classes/User/{QueryInterface.class.php => QueryInterface.php} (100%)
 rename lib/classes/{ZipArchiveImproved.class.php => ZipArchiveImproved.php} (100%)
 rename lib/classes/{appbox.class.php => appbox.php} (100%)
 rename lib/classes/appbox/{register.class.php => register.php} (100%)
 rename lib/classes/{base.class.php => base.php} (100%)
 delete mode 100644 lib/classes/bootstrap.class.php
 rename lib/classes/cache/{cacheableInterface.class.php => cacheableInterface.php} (100%)
 rename lib/classes/cache/{databox.class.php => databox.php} (100%)
 rename lib/classes/caption/Field/{Value.class.php => Value.php} (100%)
 rename lib/classes/caption/{field.class.php => field.php} (100%)
 rename lib/classes/caption/{interface.class.php => interface.php} (100%)
 rename lib/classes/caption/{record.class.php => record.php} (100%)
 rename lib/classes/{collection.class.php => collection.php} (100%)
 rename lib/classes/{connection.class.php => connection.php} (100%)
 rename lib/classes/connection/{abstract.class.php => abstract.php} (100%)
 rename lib/classes/connection/{interface.class.php => interface.php} (100%)
 rename lib/classes/connection/{pdo.class.php => pdo.php} (100%)
 rename lib/classes/connection/{pdoStatementDebugger.class.php => pdoStatementDebugger.php} (100%)
 rename lib/classes/{databox.class.php => databox.php} (100%)
 rename lib/classes/databox/Field/DCES/{Contributor.class.php => Contributor.php} (100%)
 rename lib/classes/databox/Field/DCES/{Coverage.class.php => Coverage.php} (100%)
 rename lib/classes/databox/Field/DCES/{Creator.class.php => Creator.php} (100%)
 rename lib/classes/databox/Field/DCES/{Date.class.php => Date.php} (100%)
 rename lib/classes/databox/Field/DCES/{Description.class.php => Description.php} (100%)
 rename lib/classes/databox/Field/DCES/{Format.class.php => Format.php} (100%)
 rename lib/classes/databox/Field/DCES/{Identifier.class.php => Identifier.php} (100%)
 rename lib/classes/databox/Field/DCES/{Language.class.php => Language.php} (100%)
 rename lib/classes/databox/Field/DCES/{Publisher.class.php => Publisher.php} (100%)
 rename lib/classes/databox/Field/DCES/{Relation.class.php => Relation.php} (100%)
 rename lib/classes/databox/Field/DCES/{Rights.class.php => Rights.php} (100%)
 rename lib/classes/databox/Field/DCES/{Source.class.php => Source.php} (100%)
 rename lib/classes/databox/Field/DCES/{Subject.class.php => Subject.php} (100%)
 rename lib/classes/databox/Field/DCES/{Title.class.php => Title.php} (100%)
 rename lib/classes/databox/Field/DCES/{Type.class.php => Type.php} (100%)
 rename lib/classes/databox/Field/{DCESAbstract.class.php => DCESAbstract.php} (100%)
 rename lib/classes/databox/{cgu.class.php => cgu.php} (100%)
 rename lib/classes/databox/{descriptionStructure.class.php => descriptionStructure.php} (100%)
 rename lib/classes/databox/{field.class.php => field.php} (100%)
 rename lib/classes/databox/{status.class.php => status.php} (100%)
 rename lib/classes/databox/{subdef.class.php => subdef.php} (100%)
 rename lib/classes/databox/{subdefsStructure.class.php => subdefsStructure.php} (100%)
 rename lib/classes/eventsmanager/{broker.class.php => broker.php} (100%)
 rename lib/classes/eventsmanager/event/{test.class.php => test.php} (100%)
 rename lib/classes/eventsmanager/{eventAbstract.class.php => eventAbstract.php} (100%)
 rename lib/classes/eventsmanager/notify/{autoregister.class.php => autoregister.php} (100%)
 rename lib/classes/eventsmanager/notify/{bridgeuploadfail.class.php => bridgeuploadfail.php} (100%)
 rename lib/classes/eventsmanager/notify/{downloadmailfail.class.php => downloadmailfail.php} (100%)
 rename lib/classes/eventsmanager/notify/{feed.class.php => feed.php} (100%)
 rename lib/classes/eventsmanager/notify/{order.class.php => order.php} (100%)
 rename lib/classes/eventsmanager/notify/{orderdeliver.class.php => orderdeliver.php} (100%)
 rename lib/classes/eventsmanager/notify/{ordernotdelivered.class.php => ordernotdelivered.php} (100%)
 rename lib/classes/eventsmanager/notify/{push.class.php => push.php} (100%)
 rename lib/classes/eventsmanager/notify/{register.class.php => register.php} (100%)
 rename lib/classes/eventsmanager/notify/{uploadquarantine.class.php => uploadquarantine.php} (100%)
 rename lib/classes/eventsmanager/notify/{validate.class.php => validate.php} (100%)
 rename lib/classes/eventsmanager/notify/{validationdone.class.php => validationdone.php} (100%)
 rename lib/classes/eventsmanager/notify/{validationreminder.class.php => validationreminder.php} (100%)
 rename lib/classes/eventsmanager/{notifyAbstract.class.php => notifyAbstract.php} (100%)
 rename lib/classes/{format.class.php => format.php} (100%)
 rename lib/classes/{ftpclient.class.php => ftpclient.php} (100%)
 rename lib/classes/{gatekeeper.class.php => gatekeeper.php} (100%)
 rename lib/classes/{geonames.class.php => geonames.php} (100%)
 rename lib/classes/http/{query.class.php => query.php} (100%)
 rename lib/classes/http/{request.class.php => request.php} (100%)
 rename lib/classes/{liste.class.php => liste.php} (100%)
 rename lib/classes/{login.class.php => login.php} (100%)
 rename lib/classes/{mail.class.php => mail.php} (100%)
 rename lib/classes/media/Permalink/{Adapter.class.php => Adapter.php} (100%)
 rename lib/classes/media/Permalink/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/media/{abstract.class.php => abstract.php} (100%)
 rename lib/classes/media/{adapter.class.php => adapter.php} (100%)
 rename lib/classes/media/{subdef.class.php => subdef.php} (100%)
 rename lib/classes/module/{client.class.php => client.php} (100%)
 rename lib/classes/module/console/{aboutAuthors.class.php => aboutAuthors.php} (100%)
 rename lib/classes/module/console/{aboutLicense.class.php => aboutLicense.php} (100%)
 rename lib/classes/module/console/{checkExtension.class.php => checkExtension.php} (100%)
 rename lib/classes/module/console/{fieldsDelete.class.php => fieldsDelete.php} (100%)
 rename lib/classes/module/console/{fieldsList.class.php => fieldsList.php} (100%)
 rename lib/classes/module/console/{fieldsMerge.class.php => fieldsMerge.php} (100%)
 rename lib/classes/module/console/{fieldsRename.class.php => fieldsRename.php} (100%)
 rename lib/classes/module/console/{fileEnsureDevSetting.class.php => fileEnsureDevSetting.php} (100%)
 rename lib/classes/module/console/{fileEnsureProductionSetting.class.php => fileEnsureProductionSetting.php} (100%)
 rename lib/classes/module/console/{schedulerStart.class.php => schedulerStart.php} (100%)
 rename lib/classes/module/console/{schedulerState.class.php => schedulerState.php} (100%)
 rename lib/classes/module/console/{schedulerStop.class.php => schedulerStop.php} (100%)
 rename lib/classes/module/console/{sphinxGenerateSuggestion.class.php => sphinxGenerateSuggestion.php} (100%)
 rename lib/classes/module/console/{systemBackupDB.class.php => systemBackupDB.php} (100%)
 rename lib/classes/module/console/{systemClearCache.class.php => systemClearCache.php} (100%)
 rename lib/classes/module/console/{systemConfigCheck.class.php => systemConfigCheck.php} (100%)
 rename lib/classes/module/console/{systemExport.class.php => systemExport.php} (100%)
 rename lib/classes/module/console/{systemMailCheck.class.php => systemMailCheck.php} (100%)
 rename lib/classes/module/console/{systemTemplateGenerator.class.php => systemTemplateGenerator.php} (100%)
 rename lib/classes/module/console/{systemUpgrade.class.php => systemUpgrade.php} (97%)
 rename lib/classes/module/console/{taskState.class.php => taskState.php} (100%)
 rename lib/classes/module/console/{tasklist.class.php => tasklist.php} (100%)
 rename lib/classes/module/console/{taskrun.class.php => taskrun.php} (100%)
 rename lib/classes/module/{report.class.php => report.php} (100%)
 rename lib/classes/module/report/{activity.class.php => activity.php} (100%)
 rename lib/classes/module/report/{add.class.php => add.php} (100%)
 rename lib/classes/module/report/{connexion.class.php => connexion.php} (100%)
 rename lib/classes/module/report/{dashboard.class.php => dashboard.php} (100%)
 rename lib/classes/module/report/dashboard/{componentInterface.class.php => componentInterface.php} (100%)
 rename lib/classes/module/report/dashboard/{feed.class.php => feed.php} (100%)
 rename lib/classes/module/report/dashboard/{group.class.php => group.php} (100%)
 rename lib/classes/module/report/dashboard/{merge.class.php => merge.php} (100%)
 rename lib/classes/module/report/dashboard/{sort.class.php => sort.php} (100%)
 rename lib/classes/module/report/{download.class.php => download.php} (100%)
 rename lib/classes/module/report/{edit.class.php => edit.php} (100%)
 rename lib/classes/module/report/{filter.class.php => filter.php} (100%)
 rename lib/classes/module/report/{nav.class.php => nav.php} (100%)
 rename lib/classes/module/report/{push.class.php => push.php} (100%)
 rename lib/classes/module/report/{question.class.php => question.php} (100%)
 rename lib/classes/module/report/{sql.class.php => sql.php} (100%)
 rename lib/classes/module/report/{sqlReportInterface.class.php => sqlReportInterface.php} (100%)
 rename lib/classes/module/report/{sqlaction.class.php => sqlaction.php} (100%)
 rename lib/classes/module/report/{sqlconnexion.class.php => sqlconnexion.php} (100%)
 rename lib/classes/module/report/{sqldownload.class.php => sqldownload.php} (100%)
 rename lib/classes/module/report/{sqlfilter.class.php => sqlfilter.php} (100%)
 rename lib/classes/module/report/{sqlquestion.class.php => sqlquestion.php} (100%)
 rename lib/classes/module/report/{validate.class.php => validate.php} (100%)
 rename lib/classes/{p4field.class.php => p4field.php} (100%)
 rename lib/classes/{p4file.class.php => p4file.php} (100%)
 rename lib/classes/{p4string.class.php => p4string.php} (100%)
 rename lib/classes/patch/{320.class.php => 320.php} (100%)
 rename lib/classes/patch/{320a.class.php => 320a.php} (100%)
 rename lib/classes/patch/{320ab.class.php => 320ab.php} (100%)
 rename lib/classes/patch/{320b.class.php => 320b.php} (100%)
 rename lib/classes/patch/{320c.class.php => 320c.php} (100%)
 rename lib/classes/patch/{320d.class.php => 320d.php} (100%)
 rename lib/classes/patch/{320e.class.php => 320e.php} (100%)
 rename lib/classes/patch/{320f.class.php => 320f.php} (100%)
 rename lib/classes/patch/{320h.class.php => 320h.php} (100%)
 rename lib/classes/patch/{360.class.php => 360.php} (100%)
 rename lib/classes/patch/{3602.class.php => 3602.php} (100%)
 rename lib/classes/patch/{3603.class.php => 3603.php} (100%)
 rename lib/classes/patch/{3604.class.php => 3604.php} (100%)
 rename lib/classes/patch/{361.class.php => 361.php} (100%)
 rename lib/classes/patch/{370.class.php => 370.php} (100%)
 rename lib/classes/patch/{370a3.class.php => 370a3.php} (100%)
 rename lib/classes/patch/{370a4.class.php => 370a4.php} (100%)
 rename lib/classes/patch/{370a5.class.php => 370a5.php} (100%)
 rename lib/classes/patch/{370a6.class.php => 370a6.php} (100%)
 rename lib/classes/patch/{370a7.class.php => 370a7.php} (100%)
 rename lib/classes/patch/{370a8.class.php => 370a8.php} (100%)
 rename lib/classes/patch/{370a9.class.php => 370a9.php} (100%)
 rename lib/classes/patch/{371.class.php => 371.php} (100%)
 rename lib/classes/patch/{373.class.php => 373.php} (100%)
 rename lib/classes/patch/{380.class.php => 380.php} (100%)
 rename lib/classes/patch/{3802.class.php => 3802.php} (100%)
 rename lib/classes/patch/{3803.class.php => 3803.php} (100%)
 rename lib/classes/{patchInterface.class.php => patchInterface.php} (100%)
 rename lib/classes/{phrasea.class.php => phrasea.php} (94%)
 rename lib/classes/{phraseadate.class.php => phraseadate.php} (100%)
 rename lib/classes/{queries.class.php => queries.php} (100%)
 rename lib/classes/{random.class.php => random.php} (100%)
 rename lib/classes/record/{Interface.class.php => Interface.php} (100%)
 rename lib/classes/record/{adapter.class.php => adapter.php} (100%)
 rename lib/classes/record/{exportElement.class.php => exportElement.php} (100%)
 rename lib/classes/record/{orderElement.class.php => orderElement.php} (100%)
 rename lib/classes/record/{preview.class.php => preview.php} (100%)
 rename lib/classes/{recordutils.class.php => recordutils.php} (100%)
 rename lib/classes/recordutils/{audio.class.php => audio.php} (100%)
 rename lib/classes/recordutils/{document.class.php => document.php} (100%)
 rename lib/classes/recordutils/{image.class.php => image.php} (100%)
 rename lib/classes/recordutils/{map.class.php => map.php} (100%)
 rename lib/classes/recordutils/{video.class.php => video.php} (100%)
 rename lib/classes/{registry.class.php => registry.php} (100%)
 rename lib/classes/{registryInterface.class.php => registryInterface.php} (100%)
 rename lib/classes/set/{abstract.class.php => abstract.php} (100%)
 rename lib/classes/set/{export.class.php => export.php} (100%)
 rename lib/classes/set/{exportftp.class.php => exportftp.php} (100%)
 rename lib/classes/set/{order.class.php => order.php} (100%)
 rename lib/classes/set/{selection.class.php => selection.php} (100%)
 rename lib/classes/{setup.class.php => setup.php} (100%)
 rename lib/classes/{sso.class.php => sso.php} (100%)
 rename lib/classes/system/{server.class.php => server.php} (100%)
 rename lib/classes/system/{url.class.php => url.php} (100%)
 rename lib/classes/task/{Scheduler.class.php => Scheduler.php} (100%)
 rename lib/classes/task/{abstract.class.php => abstract.php} (100%)
 rename lib/classes/task/{appboxAbstract.class.php => appboxAbstract.php} (100%)
 rename lib/classes/task/{databoxAbstract.class.php => databoxAbstract.php} (100%)
 rename lib/classes/task/{manager.class.php => manager.php} (99%)
 rename lib/classes/task/period/{RecordMover.class.php => RecordMover.php} (100%)
 rename lib/classes/task/period/{apibridge.class.php => apibridge.php} (100%)
 rename lib/classes/task/period/{archive.class.php => archive.php} (100%)
 rename lib/classes/task/period/{cindexer.class.php => cindexer.php} (100%)
 rename lib/classes/task/period/{emptyColl.class.php => emptyColl.php} (100%)
 rename lib/classes/task/period/{ftp.class.php => ftp.php} (100%)
 rename lib/classes/task/period/{ftpPull.class.php => ftpPull.php} (100%)
 rename lib/classes/task/period/{outofdate.class.php => outofdate.php} (100%)
 rename lib/classes/task/period/{subdef.class.php => subdef.php} (100%)
 rename lib/classes/task/period/{test.class.php => test.php} (100%)
 rename lib/classes/task/period/{workflow01.class.php => workflow01.php} (100%)
 rename lib/classes/task/period/{writemeta.class.php => writemeta.php} (100%)
 rename lib/classes/{thesaurus.class.php => thesaurus.php} (100%)
 rename lib/classes/thesaurus/{xpath.class.php => xpath.php} (100%)
 rename lib/classes/{unicode.class.php => unicode.php} (100%)
 rename lib/classes/{uuid.class.php => uuid.php} (100%)
 delete mode 100644 tests/Alchemy/Phrasea/Controller/BoilerPlate.php
 delete mode 100644 tests/Alchemy/Phrasea/Controller/Setup/FakeSetupApplication.inc
 delete mode 100644 tests/Alchemy/Phrasea/Loader/AutoloaderTest.php
 delete mode 100644 tests/Alchemy/Phrasea/Loader/CacheAutoloaderTest.php
 delete mode 100644 tests/Alchemy/Phrasea/Loader/Fixtures/Test/Hello.class.php
 delete mode 100644 tests/Alchemy/Phrasea/Loader/Fixtures/Test/HelloCache.class.php
 delete mode 100644 tests/Alchemy/Phrasea/Loader/Fixtures/Test/test.class.php
 delete mode 100644 tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc
 rename tests/Alchemy/{Phrasea/Application/ApiAbstract.inc => Tests/Phrasea/Application/ApiAbstract.php} (99%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/ApiJSONPTest.php (90%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/ApiJsonTest.php (59%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/ApiYamlTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/LightboxTest.php (94%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/OAuth2Test.php (84%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/OverviewTest.php (92%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/RootTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Application/SetupTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/ApplicationTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Attribute/FactoryTest.php (94%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Attribute/MetaFieldTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Attribute/MetadataTest.php (93%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Attribute/StatusTest.php (93%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Attribute/StoryTest.php (94%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/AbstractCheckerTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/ColorspaceTest.php (93%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/DimensionTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/ExtensionTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/FilenameTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/MediaTypeTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/ResponseTest.php (94%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/Sha256Test.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/Checker/UUIDTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/FileTest.php (94%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/ManagerTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/MetaFieldsBagTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/MetadataBagTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Border/VisaTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Cache/ApcCacheTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Cache/ArrayCacheTest.php (86%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Cache/MemcacheCacheTest.php (86%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Cache/RedisCacheTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Cache/XcacheCacheTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Command/CommandTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Command/UpgradeDBDatasTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/AdminCollectionTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/AdminDashboardTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/ConnectedUserTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/DataboxTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/DataboxesTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/DescriptionTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/FieldsTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/PublicationTest.php (80%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/RootTest.php (76%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/SearchEngineTest.php (92%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/SetupTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/SubdefsTest.php (80%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/TaskManagerTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Admin/UsersTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/BasketTest.php (99%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/BridgeTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/DoDownloadTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/DownloadTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/EditTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/ExportTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/FeedTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/LanguageTest.php (77%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/LazaretTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/MoveCollectionTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/MustacheLoaderTest.php (94%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/OrderTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/PrinterTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/PropertyTest.php (92%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/PushTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/QueryTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/RecordsTest.php (92%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/RootTest.php (78%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/ShareTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/StoryTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/TOUTest.php (96%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/TooltipTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/UploadTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/UsrListsTest.php (99%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Prod/WorkZoneTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/RecordsRequestTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Root/AccountTest.php (99%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Root/DevelopersTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Root/LoginTest.php (99%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Root/RSSFeedTest.php (76%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Root/SessionTest.php (97%)
 create mode 100644 tests/Alchemy/Tests/Phrasea/Controller/Setup/FakeSetupApplication.inc
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Setup/InstallerTest.php (90%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/User/NotificationsTest.php (92%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/User/PreferencesTest.php (93%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Utils/ConnectionTestTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Controller/Utils/PathFileTestTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Configuration/ConfigurationTest.php (99%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Configuration/confTestFiles/config.yml (100%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Configuration/confTestFiles/test.json (100%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php (73%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/BrowserServiceProviderTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/CacheServiceProviderTest.php (81%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php (74%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php (75%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/GeonamesServiceProviderTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/ORMServiceProviderTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php (78%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php (76%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Provider/UnicodeServiceProviderTest.php (75%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Border/BorderManagerTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Cache/ApcCacheTest.php (86%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Cache/ArrayCacheTest.php (83%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Cache/MemcacheCacheTest.php (90%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Cache/XcacheCacheTest.php (86%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Log/Doctrine/MonologTest.php (86%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Log/Doctrine/PhpechoTest.php (74%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Log/MonologTest.php (94%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/Orm/DoctrineTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/Service/ServiceAbtractTest.php (79%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/ServiceBuilder/AbstractBuilderTest.php (86%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/ServiceBuilder/CacheBuilderTest.php (82%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/ServiceBuilder/LogBuilderTest.php (92%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Core/VersionTest.php (86%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/AudioTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/FlexPaperTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/GifTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/ImageTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/OptionType/BooleanTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/OptionType/EnumTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/OptionType/MultiTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/OptionType/RangeTest.php (93%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/ProviderTest.php (90%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Subdef/VideoTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Type/AudioTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Type/DocumentTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Type/FlashTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Type/ImageTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Media/Type/VideoTest.php (70%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/NosourceTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/PdfTextTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfArchivedateTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfAtimeTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfBasenameTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfBitsTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfChannelsTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfCtimeTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfDirnameTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfDurationTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfEditDateTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfExtensionTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfFilenameTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfFilepathTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfHeightTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfMimeTypeTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfMtimeTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfQuarantineTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfRecordidTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfSizeTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Metadata/Tag/TfWidthTest.php (87%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/ConfigurationPanelAbstractTest.php (89%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php (81%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/PhraseaEngineTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/SearchEngineAbstractTest.php (96%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/SearchEngineLoggerTest.php (90%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/SearchEngineOptionsTest.php (98%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/SearchEngineResultTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/SearchEngineSuggestionTest.php (82%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php (91%)
 rename tests/Alchemy/{ => Tests}/Phrasea/SearchEngine/SphinxSearchEngineTest.php (97%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Security/FirewallTest.php (87%)
 create mode 100644 tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php
 rename tests/Alchemy/{ => Tests}/Phrasea/Setup/ConfigurationTesterTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Setup/InstallerTest.php (88%)
 rename tests/Alchemy/{Phrasea/Setup/TestSpecifications.inc => Tests/Phrasea/Setup/TestSpecifications.php} (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Setup/Version/Migration/Migration31Test.php (63%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Setup/Version/Migration/Migration35Test.php (84%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Setup/Version/Probe/Probe31Test.php (79%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Setup/Version/Probe/Probe35Test.php (79%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php (95%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Vocabulary/ControllerTest.php (88%)
 rename tests/Alchemy/{ => Tests}/Phrasea/Vocabulary/TermTest.php (94%)
 delete mode 100644 tests/bootstrap.inc
 create mode 100644 tests/bootstrap.php
 rename tests/{ => classes}/ACLTest.php (99%)
 rename tests/{ => classes}/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php (83%)
 rename tests/{ => classes}/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php (98%)
 rename tests/{ => classes}/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php (98%)
 rename tests/{ => classes}/Bridge/Api/Bridge_Api_AbstractCollectionTest.php (98%)
 rename tests/{ => classes}/Bridge/Api/Bridge_Api_AbstractTest.php (98%)
 rename tests/{ => classes}/Bridge/Api/Bridge_Api_ContainerCollectionTest.php (86%)
 rename tests/{ => classes}/Bridge/Api/Bridge_Api_ElementCollectionTest.php (86%)
 rename tests/{ => classes}/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php (94%)
 rename tests/{ => classes}/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php (97%)
 rename tests/{ => classes}/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php (97%)
 rename tests/{ => classes}/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php (98%)
 rename tests/{ => classes}/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php (97%)
 rename tests/{ => classes}/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php (98%)
 rename tests/{ => classes}/Bridge/Bridge_AccountSettingsTest.php (96%)
 rename tests/{ => classes}/Bridge/Bridge_AccountTest.php (98%)
 rename tests/{ => classes}/Bridge/Bridge_ApiTest.php (98%)
 rename tests/{ => classes}/Bridge/Bridge_ElementTest.php (98%)
 rename tests/{ => classes}/Bridge/Bridge_datas.inc (100%)
 rename tests/{ => classes}/Doctrine/Entities/BasketTest.php (98%)
 rename tests/{ => classes}/Doctrine/Repositories/ValidationParticipantRepositoryTest.php (89%)
 rename tests/{ => classes}/Feed/Entry/Feed_Entry_AdapterTest.php (98%)
 rename tests/{ => classes}/Feed/Entry/Feed_Entry_CollectionTest.php (97%)
 rename tests/{ => classes}/Feed/Entry/Feed_Entry_ItemTest.php (97%)
 rename tests/{ => classes}/Feed/Feed_AdapterTest.php (98%)
 rename tests/{ => classes}/Feed/Feed_AggregateTest.php (98%)
 rename tests/{ => classes}/Feed/Feed_CollectionTest.php (97%)
 rename tests/{ => classes}/Feed/Feed_LinkTest.php (91%)
 rename tests/{ => classes}/Feed/Publisher/Feed_Publisher_AdapterTest.php (96%)
 rename tests/{ => classes}/Feed/XML/Feed_XML_AtomTest.php (99%)
 rename tests/{ => classes}/Feed/XML/Feed_XML_RSSTest.php (98%)
 rename tests/{ => classes}/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php (96%)
 rename tests/{ => classes}/FeedValidator.inc (100%)
 rename tests/{PhraseanetPHPUnitAbstract.class.inc => classes/PhraseanetPHPUnitAbstract.php} (98%)
 rename tests/{PhraseanetPHPUnitAuthenticatedAbstract.class.inc => classes/PhraseanetPHPUnitAuthenticatedAbstract.php} (87%)
 rename tests/{PhraseanetPHPUnitListener.class.inc => classes/PhraseanetPHPUnitListener.php} (100%)
 rename tests/{PhraseanetWebTestCaseAbstract.class.inc => classes/PhraseanetWebTestCaseAbstract.php} (76%)
 rename tests/{PhraseanetWebTestCaseAuthenticatedAbstract.class.inc => classes/PhraseanetWebTestCaseAuthenticatedAbstract.php} (98%)
 rename tests/{ => classes}/Session/Authentication/Session_Authentication_GuestTest.php (87%)
 rename tests/{ => classes}/Session/Authentication/Session_Authentication_NativeTest.php (94%)
 rename tests/{ => classes}/Session/Session_LoggerTest.php (97%)
 rename tests/{ => classes}/Setup/Setup_ConstraintTest.php (94%)
 rename tests/{ => classes}/Setup/Setup_UpgradeTest.php (97%)
 rename tests/{ => classes}/api/oauthv2/API_OAuth2_AuthCodeTest.php (97%)
 rename tests/{ => classes}/api/oauthv2/API_OAuth2_RefreshTokenTest.php (97%)
 rename tests/{ => classes}/api/oauthv2/api_oauthv2_AccountTest.php (96%)
 rename tests/{ => classes}/api/oauthv2/api_oauthv2_ApplicationTest.php (98%)
 rename tests/{ => classes}/api/oauthv2/api_oauthv2_TokenTest.php (97%)
 rename tests/{ => classes}/api/v1/api_v1_adapterTest.php (98%)
 rename tests/{ => classes}/api/v1/api_v1_resultTest.php (99%)
 rename tests/{ => classes}/caption/caption_fieldTest.php (94%)
 rename tests/{ => classes}/caption/caption_recordTest.php (98%)
 rename tests/{ => classes}/collectionTest.php (97%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_ContributorTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_CoverageTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_CreatorTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_DateTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_FormatTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_LanguageTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_PublisherTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_RelationTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_RightsTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_SourceTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_SubjectTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_TitleTest.php (92%)
 rename tests/{ => classes}/databox/Field/DCES/databox_Field_DCES_TypeTest.php (92%)
 rename tests/{ => classes}/databox/databox_fieldTest.php (99%)
 rename tests/{ => classes}/databox/databox_statusTest.php (98%)
 rename tests/{ => classes}/databox/databox_subdefTest.php (100%)
 rename tests/{ => classes}/databoxTest.php (95%)
 rename tests/{ => classes}/geonamesTest.php (97%)
 rename tests/{ => classes}/http/http_requestTest.php (98%)
 rename tests/{ => classes}/media/Permalink/media_Permalink_AdapterTest.php (98%)
 rename tests/{ => classes}/media/media_subdefTest.php (98%)
 rename tests/{ => classes}/module/console/module_console_aboutAuthorsTest.php (83%)
 rename tests/{ => classes}/module/console/module_console_aboutLicenseTest.php (83%)
 rename tests/{ => classes}/module/console/module_console_schedulerStateTest.php (93%)
 rename tests/{ => classes}/module/console/module_console_systemTemplateGeneratorTest.php (91%)
 rename tests/{ => classes}/module/console/module_console_taskStateTest.php (96%)
 rename tests/{ => classes}/module/console/module_console_tasklistTest.php (92%)
 rename tests/{ => classes}/p4stringTest.php (98%)
 rename tests/{ => classes}/randomTest.php (98%)
 rename tests/{ => classes}/record/adapterTest.php (99%)
 rename tests/{ => classes}/registryTest.php (98%)
 rename tests/{ => classes}/report/activityTest.php (98%)
 rename tests/{ => classes}/report/addTest.php (98%)
 rename tests/{ => classes}/report/connexionReportTest.php (97%)
 rename tests/{ => classes}/report/dashboardTest.php (98%)
 rename tests/{ => classes}/report/downloadReportTest.php (98%)
 rename tests/{ => classes}/report/editTest.php (98%)
 rename tests/{ => classes}/report/filterTest.php (97%)
 rename tests/{ => classes}/report/pushTest.php (98%)
 rename tests/{ => classes}/report/questionReportTest.php (98%)
 rename tests/{ => classes}/report/reportTest.php (98%)
 rename tests/{ => classes}/report/sqlActionTest.php (87%)
 rename tests/{ => classes}/report/sqlFilterTest.php (98%)
 rename tests/{ => classes}/report/sqlTest.php (92%)
 rename tests/{ => classes}/set/set_exportTest.php (77%)
 rename tests/{ => classes}/system/system_serverTest.php (95%)
 rename tests/{ => classes}/system/system_urlTest.php (86%)
 rename tests/{ => classes}/task/period/task_period_archiveTest.php (98%)
 rename tests/{ => classes}/task/task_abstractTest.php (98%)
 rename tests/{ => classes}/thesaurusTest.php (86%)
 rename tests/{ => classes}/unicodeTest.php (89%)
 rename tests/{ => classes}/unitTestsTest.php (64%)
 rename tests/{ => classes}/userTest.php (94%)
 rename tests/{ => classes}/uuidTest.php (97%)
 rename tests/{testfiles => files}/14082008057.mp4 (100%)
 rename tests/{testfiles => files}/HelloWorld.pdf (100%)
 rename tests/{testfiles => files}/ISOLatin1.txt (100%)
 rename tests/{testfiles => files}/ISOLatin2.txt (100%)
 rename tests/{testfiles => files}/Latin5.txt (100%)
 rename tests/{testfiles => files}/MacOSRoman.txt (100%)
 rename tests/{testfiles => files}/UTF-8.txt (100%)
 rename tests/{testfiles => files}/WindowsLatin1.txt (100%)
 rename tests/{testfiles => files}/WindowsLatin2.txt (100%)
 rename tests/{testfiles => files}/cestlafete.jpg (100%)
 rename tests/{testfiles => files}/extractfile.jpg (100%)
 rename tests/{testfiles => files}/extractfile.xml (100%)
 rename tests/{testfiles => files}/heavy500.jpg (100%)
 rename tests/{testfiles => files}/iphone_pic.jpg (100%)
 rename tests/{testfiles => files}/logocoll.gif (100%)
 rename tests/{testfiles => files}/p4logo.jpg (100%)
 rename tests/{testfiles => files}/recta_logo.gif (100%)
 rename tests/{testfiles => files}/rectb_logo.gif (100%)
 rename tests/{testfiles => files}/test001.CR2 (100%)
 rename tests/{testfiles => files}/test002.CR2 (100%)
 rename tests/{testfiles => files}/test003.CR2 (100%)
 rename tests/{testfiles => files}/test004.CR2 (100%)
 rename tests/{testfiles => files}/test005.CR2 (100%)
 rename tests/{testfiles => files}/test006.wav (100%)
 rename tests/{testfiles => files}/test007.ppt (100%)
 rename tests/{testfiles => files}/test008.ai (100%)
 rename tests/{testfiles => files}/test009.TIFF (100%)
 rename tests/{testfiles => files}/test010.fla (100%)
 rename tests/{testfiles => files}/test011.swf (100%)
 rename tests/{testfiles => files}/test012.wav (100%)
 rename tests/{testfiles => files}/test013.ai (100%)
 rename tests/{testfiles => files}/test013.fla (100%)
 rename tests/{testfiles => files}/test014.swf (100%)
 rename tests/{testfiles => files}/test015.eps (100%)
 rename tests/{testfiles => files}/test016.ai (100%)
 rename tests/{testfiles => files}/test017.wav (100%)
 rename tests/{testfiles => files}/test018.TIFF (100%)
 rename tests/{testfiles => files}/test019.mp3 (100%)
 rename tests/{testfiles => files}/test020.mp3 (100%)
 rename tests/{testfiles => files}/test021.fla (100%)
 rename tests/{testfiles => files}/test022.swf (100%)
 rename tests/{testfiles => files}/test023.mp4 (100%)
 rename tests/{testfiles => files}/test024.jpg (100%)

diff --git a/bin/console b/bin/console
index b1e49cb105..65e5b85000 100755
--- a/bin/console
+++ b/bin/console
@@ -24,7 +24,7 @@ use Alchemy\Phrasea\Command\RecordAdd;
 use Alchemy\Phrasea\Command\CreateCollection;
 use Alchemy\Phrasea\CLI;
 
-require_once dirname(__FILE__) . '/../lib/bootstrap.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 try {
     $app = new CLI("
diff --git a/bin/doctrine b/bin/doctrine
index dcf1664884..83f4511b84 100755
--- a/bin/doctrine
+++ b/bin/doctrine
@@ -31,7 +31,7 @@ use Doctrine\ORM\Tools\Console\Command\ConvertMappingCommand;
 use Doctrine\ORM\Tools\Console\Command\RunDqlCommand;
 use Doctrine\ORM\Tools\Console\Command\ValidateSchemaCommand;
 
-require_once dirname(__FILE__) . '/../lib/bootstrap.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 try {
     $cli = new CLI("Phraseanet Doctrine Console");
diff --git a/bin/setup b/bin/setup
index e58135ad5b..b43d1fae58 100755
--- a/bin/setup
+++ b/bin/setup
@@ -21,7 +21,7 @@ use Alchemy\Phrasea\Command\UpgradeDBDatas;
 use Alchemy\Phrasea\Command\Setup\Install;
 use Alchemy\Phrasea\CLI;
 
-require_once dirname(__FILE__) . '/../lib/bootstrap.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 
 try {
     $app = new CLI("
diff --git a/builder.php b/builder.php
index 7c501862d2..2c0492df4b 100755
--- a/builder.php
+++ b/builder.php
@@ -5,15 +5,15 @@
  *
  */
 
+use Symfony\Component\Finder\Finder;
+
+require __DIR__ . '/vendor/autoload.php';
+
 printf('Retrieve vendors ...' . PHP_EOL);
 
 system('./vendors.php --no-dev');
 
-require_once __DIR__ . '/lib/classes/bootstrap.class.php';
-
-\bootstrap::register_autoloads();
-
-use Symfony\Component\Finder\Finder;
+system(__DIR__ . '/composer.phar dump-autoload');
 
 chdir(__DIR__);
 
diff --git a/cleaner.php b/cleaner.php
index 316453070c..1941a5737c 100755
--- a/cleaner.php
+++ b/cleaner.php
@@ -5,12 +5,10 @@
  *
  */
 
-require_once __DIR__ . '/lib/classes/bootstrap.class.php';
-
-\bootstrap::register_autoloads();
-
 use Symfony\Component\Finder\Finder;
 
+require __DIR__ . '/vendor/autoload.php';
+
 chdir(__DIR__);
 
 set_time_limit(0);
diff --git a/composer.json b/composer.json
index 96ee5e6f35..b8dcf6a579 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,15 @@
     ],
     "autoload": {
         "psr-0": {
-            "Alchemy": "lib"
+            "": "lib/classes",
+            "Alchemy": "lib",
+            "Doctrine": "lib",
+            "Entities": "lib/Doctrine",
+            "Types": "lib/Doctrine",
+            "Repositories": "lib/Doctrine",
+            "Proxies": "lib/Doctrine",
+            "PhraseaFixture": "lib/conf.d"
         }
-    }
+    },
+    "include-path": ["vendor/zend/gdata/library"]
 }
diff --git a/functionnal-tests/api/dailymotion.php b/functionnal-tests/api/dailymotion.php
index 4a7339a745..084c46eb2d 100644
--- a/functionnal-tests/api/dailymotion.php
+++ b/functionnal-tests/api/dailymotion.php
@@ -1,17 +1,12 @@
 <?php
 
-require_once __DIR__ . '/../../lib/classes/bootstrap.class.php';
 require_once __DIR__ . '/../../vendor/autoload.php';
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Yaml\Yaml;
 
-\bootstrap::register_autoloads();
-$core = \bootstrap::execute('dev');
-
 $console = new Application('Functionnal tests for dailymotion API');
 
 $console
@@ -24,10 +19,10 @@ $console
             $output->writeln('<error>could not parse configuration file</error>');
             return;
         }
-        
-        
+
+
         $appbox = \appbox::get_instance($core);
-        
+
         $found = false;
         foreach ($appbox->get_databoxes() as $databox) {
             /* @var $databox \databox */
@@ -44,16 +39,16 @@ $console
             }
             unset($stmt);
         }
-        
+
         if (!$found) {
             $output->writeln('<error>No video found, </error>');
             return;
         }
-        
+
         $bridge = new \Bridge_Api_Dailymotion($core['Registry'], new \Bridge_Api_Auth_OAuth2());
-        
+
         $bridge->set_oauth_token($configuration['dailymotion']['dev_token']);
-        
+
         $options = array();
         $samples = array(
             'title'         => $record->get_title(),
@@ -61,11 +56,11 @@ $console
             'tags'          => 'phraseanet upload test dm api',
             'private'       => true,
         );
-        
+
         foreach($bridge->get_fields() as $field) {
-           $options[$field['name']] = isset($samples[$field['name']]) ? $samples[$field['name']] : uniqid('test_upload'); 
+           $options[$field['name']] = isset($samples[$field['name']]) ? $samples[$field['name']] : uniqid('test_upload');
         }
-        
+
         try {
             $idVideo = $bridge->upload($record, $options);
             $output->writeln(sprintf('<info>video id is %s</info>', $idVideo));
diff --git a/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php b/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
index ea13abb98b..7378ecabe8 100644
--- a/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
+++ b/lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
@@ -30,8 +30,7 @@ class ConnectionTest implements ControllerProviderInterface
          * @todo : check this as it would lead to a security issue
          */
         $controllers->get('/mysql/', function(Application $app) {
-            require_once __DIR__ . '/../../../../classes/connection/pdo.class.php';
-
+            
             $request = $app['request'];
             $hostname = $request->query->get('hostname', '127.0.0.1');
             $port = (int) $request->query->get('port', 3306);
diff --git a/lib/Alchemy/Phrasea/Loader/ApcAutoloader.php b/lib/Alchemy/Phrasea/Loader/ApcAutoloader.php
deleted file mode 100644
index e5dc838526..0000000000
--- a/lib/Alchemy/Phrasea/Loader/ApcAutoloader.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2012 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Loader;
-
-require_once __DIR__ . '/LoaderStrategy.php';
-require_once __DIR__ . '/../../../../vendor/doctrine/common/lib/Doctrine/Common/Cache/Cache.php';
-require_once __DIR__ . '/../../../../vendor/doctrine/common/lib/Doctrine/Common/Cache/CacheProvider.php';
-require_once __DIR__ . '/../../../../vendor/doctrine/common/lib/Doctrine/Common/Cache/ApcCache.php';
-
-use Alchemy\Phrasea\Loader\LoaderStrategy as CacheStrategy;
-use Doctrine\Common\Cache\ApcCache;
-
-/**
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-Class ApcAutoloader extends ApcCache implements CacheStrategy
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isAvailable()
-    {
-        return extension_loaded('apc');
-    }
-}
diff --git a/lib/Alchemy/Phrasea/Loader/Autoloader.php b/lib/Alchemy/Phrasea/Loader/Autoloader.php
deleted file mode 100644
index 2b9a09f055..0000000000
--- a/lib/Alchemy/Phrasea/Loader/Autoloader.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2012 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Loader;
-
-require_once __DIR__ . "/../../../../vendor/symfony/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php";
-
-use Symfony\Component\ClassLoader\UniversalClassLoader;
-
-/**
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-class Autoloader extends UniversalClassLoader
-{
-    /**
-     * An array of path to check
-     * @var type
-     */
-    private $paths = array();
-    private $classmap = array();
-
-    /**
-     * Construct a new phrasea Autoloader
-     * Because some custom classes from library folder might be
-     * overwritten in config folder
-     * Phraseanet Loader look classes in configuration folders first
-     * then check library folder if no classes where matched
-     */
-    public function __construct()
-    {
-        $this->paths['config'] = __DIR__ . '/../../../../config/classes/';
-        $this->paths['library'] = __DIR__ . '/../../../classes/';
-
-        $getComposerClassMap = function() {
-                return require realpath(__DIR__ . '/../../../../vendor/composer/autoload_classmap.php');
-            };
-
-        $this->classmap = $getComposerClassMap();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function findFile($class)
-    {
-        if ( ! $file = $this->checkFile($class)) {
-            $file = parent::findFile($class);
-        }
-
-        return $file;
-    }
-
-    /**
-     * Add a path to look for autoloading phraseanet classes
-     * @param string $name
-     * @param string $path
-     */
-    public function addPath($name, $path)
-    {
-        $this->paths[$name] = \p4string::addEndSlash($path);
-    }
-
-    /**
-     * Check whether a class with $class name exists
-     * foreach declared paths
-     * @param  string $class
-     * @return mixed  string|null
-     */
-    private function checkFile($classname)
-    {
-        if (isset($this->classmap[$classname])) {
-            return $this->classmap[$classname];
-        }
-
-        $normalized_classname = str_replace('_', '/', $classname);
-
-        foreach ($this->paths as $path) {
-            $file = $path . $normalized_classname . '.class.php';
-
-            if (file_exists($file)) {
-                return $file;
-            }
-        }
-    }
-
-    /**
-     * Get Paths where classes are checked for autoloading
-     * @return Array
-     */
-    public function getPaths()
-    {
-        return $this->paths;
-    }
-}
diff --git a/lib/Alchemy/Phrasea/Loader/CacheAutoloader.php b/lib/Alchemy/Phrasea/Loader/CacheAutoloader.php
deleted file mode 100644
index be8d5e9172..0000000000
--- a/lib/Alchemy/Phrasea/Loader/CacheAutoloader.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2012 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Loader;
-
-require_once __DIR__ . '/Autoloader.php';
-
-/**
- * Loop throught op cache code adapter to cache autoloading
- * OpCache code available are apc et xcache
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-class CacheAutoloader extends Autoloader
-{
-    /**
-     * Array of all cache adapters
-     * @var type
-     */
-    private $cacheAdapters = array(
-        'Apc',
-        'Xcache'
-    );
-
-    /**
-     * The cache adapater
-     * @var type
-     */
-    private $cacheAdapter;
-
-    /**
-     * The prefix used to store id's in cache
-     * @var string
-     */
-    private $prefix;
-
-    /**
-     * Take a identifier cache key prefix
-     * @param  string         $prefix
-     * @throws \Exceptionwhen none of the op cache code are available
-     */
-    public function __construct($prefix, $namespace = null)
-    {
-        parent::__construct();
-
-        $this->prefix = $prefix;
-
-        foreach ($this->cacheAdapters as $className) {
-            $file = sprintf("%s/%sAutoloader.php", __DIR__, $className);
-
-            if ( ! file_exists($file)) {
-                continue;
-            }
-
-            require_once $file;
-
-            $className = sprintf("\Alchemy\Phrasea\Loader\%sAutoloader", $className);
-
-            if ( ! class_exists($className)) {
-                continue;
-            }
-
-            $method = new $className();
-
-            if ($namespace) {
-                $method->setNamespace($namespace);
-            }
-
-            if ($method instanceof LoaderStrategy && $method->isAvailable()) {
-                $this->cacheAdapter = $method;
-                break;
-            }
-        }
-
-        if (null === $this->cacheAdapter) {
-            throw new \Exception('No Cache available');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function findFile($class)
-    {
-        $file = $this->cacheAdapter->fetch($this->prefix . $class);
-
-        if (false === $file) {
-            $this->cacheAdapter->save($this->prefix . $class, $file = parent::findFile($class));
-        }
-
-        return $file;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Get the current cache Adapter
-     * @return LoaderStrategy
-     */
-    public function getAdapter()
-    {
-        return $this->cacheAdapter;
-    }
-
-    /**
-     * Get the identifier cache key prefix
-     * @return string
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-}
diff --git a/lib/Alchemy/Phrasea/Loader/LoaderStrategy.php b/lib/Alchemy/Phrasea/Loader/LoaderStrategy.php
deleted file mode 100644
index ed7b3d115d..0000000000
--- a/lib/Alchemy/Phrasea/Loader/LoaderStrategy.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2012 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Loader;
-
-/**
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-interface LoaderStrategy
-{
-
-    /**
-     * Check wether the cacheAdapter is available
-     * @Return boolean
-     */
-    public function isAvailable();
-}
diff --git a/lib/Alchemy/Phrasea/Loader/XcacheAutoloader.php b/lib/Alchemy/Phrasea/Loader/XcacheAutoloader.php
deleted file mode 100644
index 0cea107971..0000000000
--- a/lib/Alchemy/Phrasea/Loader/XcacheAutoloader.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2012 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Alchemy\Phrasea\Loader;
-
-require_once __DIR__ . '/LoaderStrategy.php';
-require_once __DIR__ . '/../../../../vendor/doctrine/common/lib/Doctrine/Common/Cache/Cache.php';
-require_once __DIR__ . '/../../../../vendor/doctrine/common/lib/Doctrine/Common/Cache/CacheProvider.php';
-require_once __DIR__ . '/../../../../vendor/doctrine/common/lib/Doctrine/Common/Cache/XcacheCache.php';
-
-use Alchemy\Phrasea\Loader\LoaderStrategy as CacheStrategy;
-use Doctrine\Common\Cache\XcacheCache;
-
-/**
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-Class XcacheAutoloader extends XcacheCache implements CacheStrategy
-{
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isAvailable()
-    {
-        return extension_loaded('xcache') && PHP_SAPI !== 'cli';
-    }
-}
diff --git a/lib/Doctrine/Entities/Basket.php b/lib/Doctrine/Entities/Basket.php
index 5a2a3e1f8d..ff12d9bd45 100644
--- a/lib/Doctrine/Entities/Basket.php
+++ b/lib/Doctrine/Entities/Basket.php
@@ -13,10 +13,6 @@ namespace Entities;
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . '/../../classes/cache/cacheableInterface.class.php';
-require_once __DIR__ . '/../../classes/User/Interface.class.php';
-require_once __DIR__ . '/../../classes/User/Adapter.class.php';
-
 /**
  *
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
diff --git a/lib/Doctrine/Entities/BasketElement.php b/lib/Doctrine/Entities/BasketElement.php
index 6c3c47de7e..892e6d18e3 100644
--- a/lib/Doctrine/Entities/BasketElement.php
+++ b/lib/Doctrine/Entities/BasketElement.php
@@ -13,9 +13,6 @@ namespace Entities;
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . '/../../classes/record/Interface.class.php';
-require_once __DIR__ . '/../../classes/record/adapter.class.php';
-
 /**
  * Kernel
  *
diff --git a/lib/Doctrine/Entities/StoryWZ.php b/lib/Doctrine/Entities/StoryWZ.php
index 4905dee61a..31a207f324 100644
--- a/lib/Doctrine/Entities/StoryWZ.php
+++ b/lib/Doctrine/Entities/StoryWZ.php
@@ -13,12 +13,6 @@ namespace Entities;
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . '/../../classes/record/Interface.class.php';
-require_once __DIR__ . '/../../classes/record/adapter.class.php';
-require_once __DIR__ . '/../../classes/cache/cacheableInterface.class.php';
-require_once __DIR__ . '/../../classes/User/Interface.class.php';
-require_once __DIR__ . '/../../classes/User/Adapter.class.php';
-
 /**
  *
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
deleted file mode 100644
index b0268da476..0000000000
--- a/lib/bootstrap.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2012 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- *
- * @return \Alchemy\Phrasea\Core
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-require_once __DIR__ . '/classes/bootstrap.class.php';
-
-bootstrap::register_autoloads();
diff --git a/lib/classes/ACL.class.php b/lib/classes/ACL.php
similarity index 100%
rename from lib/classes/ACL.class.php
rename to lib/classes/ACL.php
diff --git a/lib/classes/API/OAuth2/Account.class.php b/lib/classes/API/OAuth2/Account.php
similarity index 100%
rename from lib/classes/API/OAuth2/Account.class.php
rename to lib/classes/API/OAuth2/Account.php
diff --git a/lib/classes/API/OAuth2/Adapter.class.php b/lib/classes/API/OAuth2/Adapter.php
similarity index 100%
rename from lib/classes/API/OAuth2/Adapter.class.php
rename to lib/classes/API/OAuth2/Adapter.php
diff --git a/lib/classes/API/OAuth2/Application.class.php b/lib/classes/API/OAuth2/Application.php
similarity index 100%
rename from lib/classes/API/OAuth2/Application.class.php
rename to lib/classes/API/OAuth2/Application.php
diff --git a/lib/classes/API/OAuth2/Application/Navigator.class.php b/lib/classes/API/OAuth2/Application/Navigator.php
similarity index 100%
rename from lib/classes/API/OAuth2/Application/Navigator.class.php
rename to lib/classes/API/OAuth2/Application/Navigator.php
diff --git a/lib/classes/API/OAuth2/AuthCode.class.php b/lib/classes/API/OAuth2/AuthCode.php
similarity index 100%
rename from lib/classes/API/OAuth2/AuthCode.class.php
rename to lib/classes/API/OAuth2/AuthCode.php
diff --git a/lib/classes/API/OAuth2/Exception/Exception.class.php b/lib/classes/API/OAuth2/Exception/Exception.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Exception.class.php
rename to lib/classes/API/OAuth2/Exception/Exception.php
diff --git a/lib/classes/API/OAuth2/Exception/Interface.class.php b/lib/classes/API/OAuth2/Exception/Interface.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Interface.class.php
rename to lib/classes/API/OAuth2/Exception/Interface.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect.class.php b/lib/classes/API/OAuth2/Exception/Redirect.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.class.php b/lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/AccessDenied.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.class.php b/lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/InvalidClient.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.class.php b/lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/InvalidRequest.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.class.php b/lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/InvalidScope.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/ServerError.class.php b/lib/classes/API/OAuth2/Exception/Redirect/ServerError.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/ServerError.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/ServerError.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.class.php b/lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/TemporaryUnavailable.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.class.php b/lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/UnauthorizedClient.php
diff --git a/lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.class.php b/lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.class.php
rename to lib/classes/API/OAuth2/Exception/Redirect/UnsupportedResponseType.php
diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate.class.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/WWWAuthenticate.class.php
rename to lib/classes/API/OAuth2/Exception/WWWAuthenticate.php
diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.class.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.class.php
rename to lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidClient.php
diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.class.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.class.php
rename to lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidRequest.php
diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.class.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.class.php
rename to lib/classes/API/OAuth2/Exception/WWWAuthenticate/InvalidToken.php
diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.class.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.class.php
rename to lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/BadRequest.php
diff --git a/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.class.php b/lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.php
similarity index 100%
rename from lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.class.php
rename to lib/classes/API/OAuth2/Exception/WWWAuthenticate/Type/Forbidden.php
diff --git a/lib/classes/API/OAuth2/Form/DevAppDesktop.class.php b/lib/classes/API/OAuth2/Form/DevAppDesktop.php
similarity index 100%
rename from lib/classes/API/OAuth2/Form/DevAppDesktop.class.php
rename to lib/classes/API/OAuth2/Form/DevAppDesktop.php
diff --git a/lib/classes/API/OAuth2/Form/DevAppInternet.class.php b/lib/classes/API/OAuth2/Form/DevAppInternet.php
similarity index 100%
rename from lib/classes/API/OAuth2/Form/DevAppInternet.class.php
rename to lib/classes/API/OAuth2/Form/DevAppInternet.php
diff --git a/lib/classes/API/OAuth2/RefreshToken.class.php b/lib/classes/API/OAuth2/RefreshToken.php
similarity index 100%
rename from lib/classes/API/OAuth2/RefreshToken.class.php
rename to lib/classes/API/OAuth2/RefreshToken.php
diff --git a/lib/classes/API/OAuth2/Token.class.php b/lib/classes/API/OAuth2/Token.php
similarity index 100%
rename from lib/classes/API/OAuth2/Token.class.php
rename to lib/classes/API/OAuth2/Token.php
diff --git a/lib/classes/API/V1/Abstract.class.php b/lib/classes/API/V1/Abstract.php
similarity index 100%
rename from lib/classes/API/V1/Abstract.class.php
rename to lib/classes/API/V1/Abstract.php
diff --git a/lib/classes/API/V1/Interface.class.php b/lib/classes/API/V1/Interface.php
similarity index 100%
rename from lib/classes/API/V1/Interface.class.php
rename to lib/classes/API/V1/Interface.php
diff --git a/lib/classes/API/V1/Log.class.php b/lib/classes/API/V1/Log.php
similarity index 100%
rename from lib/classes/API/V1/Log.class.php
rename to lib/classes/API/V1/Log.php
diff --git a/lib/classes/API/V1/adapter.class.php b/lib/classes/API/V1/adapter.php
similarity index 100%
rename from lib/classes/API/V1/adapter.class.php
rename to lib/classes/API/V1/adapter.php
diff --git a/lib/classes/API/V1/exception/abstract.class.php b/lib/classes/API/V1/exception/abstract.php
similarity index 100%
rename from lib/classes/API/V1/exception/abstract.class.php
rename to lib/classes/API/V1/exception/abstract.php
diff --git a/lib/classes/API/V1/exception/badrequest.class.php b/lib/classes/API/V1/exception/badrequest.php
similarity index 100%
rename from lib/classes/API/V1/exception/badrequest.class.php
rename to lib/classes/API/V1/exception/badrequest.php
diff --git a/lib/classes/API/V1/exception/forbidden.class.php b/lib/classes/API/V1/exception/forbidden.php
similarity index 100%
rename from lib/classes/API/V1/exception/forbidden.class.php
rename to lib/classes/API/V1/exception/forbidden.php
diff --git a/lib/classes/API/V1/exception/internalservererror.class.php b/lib/classes/API/V1/exception/internalservererror.php
similarity index 100%
rename from lib/classes/API/V1/exception/internalservererror.class.php
rename to lib/classes/API/V1/exception/internalservererror.php
diff --git a/lib/classes/API/V1/exception/methodnotallowed.class.php b/lib/classes/API/V1/exception/methodnotallowed.php
similarity index 100%
rename from lib/classes/API/V1/exception/methodnotallowed.class.php
rename to lib/classes/API/V1/exception/methodnotallowed.php
diff --git a/lib/classes/API/V1/exception/notfound.class.php b/lib/classes/API/V1/exception/notfound.php
similarity index 100%
rename from lib/classes/API/V1/exception/notfound.class.php
rename to lib/classes/API/V1/exception/notfound.php
diff --git a/lib/classes/API/V1/exception/unauthorized.class.php b/lib/classes/API/V1/exception/unauthorized.php
similarity index 100%
rename from lib/classes/API/V1/exception/unauthorized.class.php
rename to lib/classes/API/V1/exception/unauthorized.php
diff --git a/lib/classes/API/V1/result.class.php b/lib/classes/API/V1/result.php
similarity index 100%
rename from lib/classes/API/V1/result.class.php
rename to lib/classes/API/V1/result.php
diff --git a/lib/classes/Bridge/Account.class.php b/lib/classes/Bridge/Account.php
similarity index 100%
rename from lib/classes/Bridge/Account.class.php
rename to lib/classes/Bridge/Account.php
diff --git a/lib/classes/Bridge/AccountSettings.class.php b/lib/classes/Bridge/AccountSettings.php
similarity index 100%
rename from lib/classes/Bridge/AccountSettings.class.php
rename to lib/classes/Bridge/AccountSettings.php
diff --git a/lib/classes/Bridge/Api.class.php b/lib/classes/Bridge/Api.php
similarity index 100%
rename from lib/classes/Bridge/Api.class.php
rename to lib/classes/Bridge/Api.php
diff --git a/lib/classes/Bridge/Api/Abstract.class.php b/lib/classes/Bridge/Api/Abstract.php
similarity index 100%
rename from lib/classes/Bridge/Api/Abstract.class.php
rename to lib/classes/Bridge/Api/Abstract.php
diff --git a/lib/classes/Bridge/Api/AbstractCollection.class.php b/lib/classes/Bridge/Api/AbstractCollection.php
similarity index 100%
rename from lib/classes/Bridge/Api/AbstractCollection.class.php
rename to lib/classes/Bridge/Api/AbstractCollection.php
diff --git a/lib/classes/Bridge/Api/Auth/Abstract.class.php b/lib/classes/Bridge/Api/Auth/Abstract.php
similarity index 100%
rename from lib/classes/Bridge/Api/Auth/Abstract.class.php
rename to lib/classes/Bridge/Api/Auth/Abstract.php
diff --git a/lib/classes/Bridge/Api/Auth/Flickr.class.php b/lib/classes/Bridge/Api/Auth/Flickr.php
similarity index 100%
rename from lib/classes/Bridge/Api/Auth/Flickr.class.php
rename to lib/classes/Bridge/Api/Auth/Flickr.php
diff --git a/lib/classes/Bridge/Api/Auth/Interface.class.php b/lib/classes/Bridge/Api/Auth/Interface.php
similarity index 100%
rename from lib/classes/Bridge/Api/Auth/Interface.class.php
rename to lib/classes/Bridge/Api/Auth/Interface.php
diff --git a/lib/classes/Bridge/Api/Auth/OAuth2.class.php b/lib/classes/Bridge/Api/Auth/OAuth2.php
similarity index 100%
rename from lib/classes/Bridge/Api/Auth/OAuth2.class.php
rename to lib/classes/Bridge/Api/Auth/OAuth2.php
diff --git a/lib/classes/Bridge/Api/Auth/Youtube.class.php b/lib/classes/Bridge/Api/Auth/Youtube.php
similarity index 100%
rename from lib/classes/Bridge/Api/Auth/Youtube.class.php
rename to lib/classes/Bridge/Api/Auth/Youtube.php
diff --git a/lib/classes/Bridge/Api/ContainerCollection.class.php b/lib/classes/Bridge/Api/ContainerCollection.php
similarity index 100%
rename from lib/classes/Bridge/Api/ContainerCollection.class.php
rename to lib/classes/Bridge/Api/ContainerCollection.php
diff --git a/lib/classes/Bridge/Api/ContainerInterface.class.php b/lib/classes/Bridge/Api/ContainerInterface.php
similarity index 100%
rename from lib/classes/Bridge/Api/ContainerInterface.class.php
rename to lib/classes/Bridge/Api/ContainerInterface.php
diff --git a/lib/classes/Bridge/Api/Dailymotion.class.php b/lib/classes/Bridge/Api/Dailymotion.php
similarity index 100%
rename from lib/classes/Bridge/Api/Dailymotion.class.php
rename to lib/classes/Bridge/Api/Dailymotion.php
diff --git a/lib/classes/Bridge/Api/Dailymotion/Container.class.php b/lib/classes/Bridge/Api/Dailymotion/Container.php
similarity index 100%
rename from lib/classes/Bridge/Api/Dailymotion/Container.class.php
rename to lib/classes/Bridge/Api/Dailymotion/Container.php
diff --git a/lib/classes/Bridge/Api/Dailymotion/Element.class.php b/lib/classes/Bridge/Api/Dailymotion/Element.php
similarity index 100%
rename from lib/classes/Bridge/Api/Dailymotion/Element.class.php
rename to lib/classes/Bridge/Api/Dailymotion/Element.php
diff --git a/lib/classes/Bridge/Api/ElementCollection.class.php b/lib/classes/Bridge/Api/ElementCollection.php
similarity index 100%
rename from lib/classes/Bridge/Api/ElementCollection.class.php
rename to lib/classes/Bridge/Api/ElementCollection.php
diff --git a/lib/classes/Bridge/Api/ElementInterface.class.php b/lib/classes/Bridge/Api/ElementInterface.php
similarity index 100%
rename from lib/classes/Bridge/Api/ElementInterface.class.php
rename to lib/classes/Bridge/Api/ElementInterface.php
diff --git a/lib/classes/Bridge/Api/Flickr.class.php b/lib/classes/Bridge/Api/Flickr.php
similarity index 100%
rename from lib/classes/Bridge/Api/Flickr.class.php
rename to lib/classes/Bridge/Api/Flickr.php
diff --git a/lib/classes/Bridge/Api/Flickr/Container.class.php b/lib/classes/Bridge/Api/Flickr/Container.php
similarity index 100%
rename from lib/classes/Bridge/Api/Flickr/Container.class.php
rename to lib/classes/Bridge/Api/Flickr/Container.php
diff --git a/lib/classes/Bridge/Api/Flickr/Element.class.php b/lib/classes/Bridge/Api/Flickr/Element.php
similarity index 100%
rename from lib/classes/Bridge/Api/Flickr/Element.class.php
rename to lib/classes/Bridge/Api/Flickr/Element.php
diff --git a/lib/classes/Bridge/Api/Interface.class.php b/lib/classes/Bridge/Api/Interface.php
similarity index 100%
rename from lib/classes/Bridge/Api/Interface.class.php
rename to lib/classes/Bridge/Api/Interface.php
diff --git a/lib/classes/Bridge/Api/Youtube.class.php b/lib/classes/Bridge/Api/Youtube.php
similarity index 100%
rename from lib/classes/Bridge/Api/Youtube.class.php
rename to lib/classes/Bridge/Api/Youtube.php
diff --git a/lib/classes/Bridge/Api/Youtube/Container.class.php b/lib/classes/Bridge/Api/Youtube/Container.php
similarity index 100%
rename from lib/classes/Bridge/Api/Youtube/Container.class.php
rename to lib/classes/Bridge/Api/Youtube/Container.php
diff --git a/lib/classes/Bridge/Api/Youtube/Element.class.php b/lib/classes/Bridge/Api/Youtube/Element.php
similarity index 100%
rename from lib/classes/Bridge/Api/Youtube/Element.class.php
rename to lib/classes/Bridge/Api/Youtube/Element.php
diff --git a/lib/classes/Bridge/Element.class.php b/lib/classes/Bridge/Element.php
similarity index 100%
rename from lib/classes/Bridge/Element.class.php
rename to lib/classes/Bridge/Element.php
diff --git a/lib/classes/Bridge/Exception.class.php b/lib/classes/Bridge/Exception.php
similarity index 100%
rename from lib/classes/Bridge/Exception.class.php
rename to lib/classes/Bridge/Exception.php
diff --git a/lib/classes/Bridge/Exception/AccountNotFound.class.php b/lib/classes/Bridge/Exception/AccountNotFound.php
similarity index 100%
rename from lib/classes/Bridge/Exception/AccountNotFound.class.php
rename to lib/classes/Bridge/Exception/AccountNotFound.php
diff --git a/lib/classes/Bridge/Exception/ActionAuthBadConnection.class.php b/lib/classes/Bridge/Exception/ActionAuthBadConnection.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ActionAuthBadConnection.class.php
rename to lib/classes/Bridge/Exception/ActionAuthBadConnection.php
diff --git a/lib/classes/Bridge/Exception/ActionAuthNeedReconnect.class.php b/lib/classes/Bridge/Exception/ActionAuthNeedReconnect.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ActionAuthNeedReconnect.class.php
rename to lib/classes/Bridge/Exception/ActionAuthNeedReconnect.php
diff --git a/lib/classes/Bridge/Exception/ActionForbidden.class.php b/lib/classes/Bridge/Exception/ActionForbidden.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ActionForbidden.class.php
rename to lib/classes/Bridge/Exception/ActionForbidden.php
diff --git a/lib/classes/Bridge/Exception/ActionInvalidObjectId.class.php b/lib/classes/Bridge/Exception/ActionInvalidObjectId.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ActionInvalidObjectId.class.php
rename to lib/classes/Bridge/Exception/ActionInvalidObjectId.php
diff --git a/lib/classes/Bridge/Exception/ActionMandatoryField.class.php b/lib/classes/Bridge/Exception/ActionMandatoryField.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ActionMandatoryField.class.php
rename to lib/classes/Bridge/Exception/ActionMandatoryField.php
diff --git a/lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.class.php b/lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.class.php
rename to lib/classes/Bridge/Exception/ApiConnectorAccessTokenFailed.php
diff --git a/lib/classes/Bridge/Exception/ApiConnectorNotConfigured.class.php b/lib/classes/Bridge/Exception/ApiConnectorNotConfigured.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ApiConnectorNotConfigured.class.php
rename to lib/classes/Bridge/Exception/ApiConnectorNotConfigured.php
diff --git a/lib/classes/Bridge/Exception/ApiConnectorNotConnected.class.php b/lib/classes/Bridge/Exception/ApiConnectorNotConnected.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ApiConnectorNotConnected.class.php
rename to lib/classes/Bridge/Exception/ApiConnectorNotConnected.php
diff --git a/lib/classes/Bridge/Exception/ApiConnectorNotFound.class.php b/lib/classes/Bridge/Exception/ApiConnectorNotFound.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ApiConnectorNotFound.class.php
rename to lib/classes/Bridge/Exception/ApiConnectorNotFound.php
diff --git a/lib/classes/Bridge/Exception/ApiConnectorRequestFailed.class.php b/lib/classes/Bridge/Exception/ApiConnectorRequestFailed.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ApiConnectorRequestFailed.class.php
rename to lib/classes/Bridge/Exception/ApiConnectorRequestFailed.php
diff --git a/lib/classes/Bridge/Exception/ApiDisabled.class.php b/lib/classes/Bridge/Exception/ApiDisabled.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ApiDisabled.class.php
rename to lib/classes/Bridge/Exception/ApiDisabled.php
diff --git a/lib/classes/Bridge/Exception/ApiNotFound.class.php b/lib/classes/Bridge/Exception/ApiNotFound.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ApiNotFound.class.php
rename to lib/classes/Bridge/Exception/ApiNotFound.php
diff --git a/lib/classes/Bridge/Exception/ContainerUnknown.class.php b/lib/classes/Bridge/Exception/ContainerUnknown.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ContainerUnknown.class.php
rename to lib/classes/Bridge/Exception/ContainerUnknown.php
diff --git a/lib/classes/Bridge/Exception/ElementNotFound.class.php b/lib/classes/Bridge/Exception/ElementNotFound.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ElementNotFound.class.php
rename to lib/classes/Bridge/Exception/ElementNotFound.php
diff --git a/lib/classes/Bridge/Exception/ElementUnknown.class.php b/lib/classes/Bridge/Exception/ElementUnknown.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ElementUnknown.class.php
rename to lib/classes/Bridge/Exception/ElementUnknown.php
diff --git a/lib/classes/Bridge/Exception/InvalidRecordType.class.php b/lib/classes/Bridge/Exception/InvalidRecordType.php
similarity index 100%
rename from lib/classes/Bridge/Exception/InvalidRecordType.class.php
rename to lib/classes/Bridge/Exception/InvalidRecordType.php
diff --git a/lib/classes/Bridge/Exception/ObjectUnknown.class.php b/lib/classes/Bridge/Exception/ObjectUnknown.php
similarity index 100%
rename from lib/classes/Bridge/Exception/ObjectUnknown.class.php
rename to lib/classes/Bridge/Exception/ObjectUnknown.php
diff --git a/lib/classes/Bridge/Exception/TokenNotFound.class.php b/lib/classes/Bridge/Exception/TokenNotFound.php
similarity index 100%
rename from lib/classes/Bridge/Exception/TokenNotFound.class.php
rename to lib/classes/Bridge/Exception/TokenNotFound.php
diff --git a/lib/classes/Browser.class.php b/lib/classes/Browser.php
similarity index 100%
rename from lib/classes/Browser.class.php
rename to lib/classes/Browser.php
diff --git a/lib/classes/Exception/Abstract.class.php b/lib/classes/Exception/Abstract.php
similarity index 100%
rename from lib/classes/Exception/Abstract.class.php
rename to lib/classes/Exception/Abstract.php
diff --git a/lib/classes/Exception/BadRequest.class.php b/lib/classes/Exception/BadRequest.php
similarity index 100%
rename from lib/classes/Exception/BadRequest.class.php
rename to lib/classes/Exception/BadRequest.php
diff --git a/lib/classes/Exception/Databox/CollectionNotFound.class.php b/lib/classes/Exception/Databox/CollectionNotFound.php
similarity index 100%
rename from lib/classes/Exception/Databox/CollectionNotFound.class.php
rename to lib/classes/Exception/Databox/CollectionNotFound.php
diff --git a/lib/classes/Exception/Databox/FieldNotFound.class.php b/lib/classes/Exception/Databox/FieldNotFound.php
similarity index 100%
rename from lib/classes/Exception/Databox/FieldNotFound.class.php
rename to lib/classes/Exception/Databox/FieldNotFound.php
diff --git a/lib/classes/Exception/Databox/SubdefNotFound.class.php b/lib/classes/Exception/Databox/SubdefNotFound.php
similarity index 100%
rename from lib/classes/Exception/Databox/SubdefNotFound.class.php
rename to lib/classes/Exception/Databox/SubdefNotFound.php
diff --git a/lib/classes/Exception/Databox/metadataDescriptionNotFound.class.php b/lib/classes/Exception/Databox/metadataDescriptionNotFound.php
similarity index 100%
rename from lib/classes/Exception/Databox/metadataDescriptionNotFound.class.php
rename to lib/classes/Exception/Databox/metadataDescriptionNotFound.php
diff --git a/lib/classes/Exception/DataboxNotFound.class.php b/lib/classes/Exception/DataboxNotFound.php
similarity index 100%
rename from lib/classes/Exception/DataboxNotFound.class.php
rename to lib/classes/Exception/DataboxNotFound.php
diff --git a/lib/classes/Exception/Feed/EntryNotFound.class.php b/lib/classes/Exception/Feed/EntryNotFound.php
similarity index 100%
rename from lib/classes/Exception/Feed/EntryNotFound.class.php
rename to lib/classes/Exception/Feed/EntryNotFound.php
diff --git a/lib/classes/Exception/Feed/ItemNotFound.class.php b/lib/classes/Exception/Feed/ItemNotFound.php
similarity index 100%
rename from lib/classes/Exception/Feed/ItemNotFound.class.php
rename to lib/classes/Exception/Feed/ItemNotFound.php
diff --git a/lib/classes/Exception/Feed/PublisherNotFound.class.php b/lib/classes/Exception/Feed/PublisherNotFound.php
similarity index 100%
rename from lib/classes/Exception/Feed/PublisherNotFound.class.php
rename to lib/classes/Exception/Feed/PublisherNotFound.php
diff --git a/lib/classes/Exception/FeedNotFound.class.php b/lib/classes/Exception/FeedNotFound.php
similarity index 100%
rename from lib/classes/Exception/FeedNotFound.class.php
rename to lib/classes/Exception/FeedNotFound.php
diff --git a/lib/classes/Exception/Forbidden.class.php b/lib/classes/Exception/Forbidden.php
similarity index 100%
rename from lib/classes/Exception/Forbidden.class.php
rename to lib/classes/Exception/Forbidden.php
diff --git a/lib/classes/Exception/InternalServerError.class.php b/lib/classes/Exception/InternalServerError.php
similarity index 100%
rename from lib/classes/Exception/InternalServerError.class.php
rename to lib/classes/Exception/InternalServerError.php
diff --git a/lib/classes/Exception/InvalidArgument.class.php b/lib/classes/Exception/InvalidArgument.php
similarity index 100%
rename from lib/classes/Exception/InvalidArgument.class.php
rename to lib/classes/Exception/InvalidArgument.php
diff --git a/lib/classes/Exception/Media/Subdef/PermalinkNotFound.class.php b/lib/classes/Exception/Media/Subdef/PermalinkNotFound.php
similarity index 100%
rename from lib/classes/Exception/Media/Subdef/PermalinkNotFound.class.php
rename to lib/classes/Exception/Media/Subdef/PermalinkNotFound.php
diff --git a/lib/classes/Exception/Media/SubdefNotFound.class.php b/lib/classes/Exception/Media/SubdefNotFound.php
similarity index 100%
rename from lib/classes/Exception/Media/SubdefNotFound.class.php
rename to lib/classes/Exception/Media/SubdefNotFound.php
diff --git a/lib/classes/Exception/NotAllowed.class.php b/lib/classes/Exception/NotAllowed.php
similarity index 100%
rename from lib/classes/Exception/NotAllowed.class.php
rename to lib/classes/Exception/NotAllowed.php
diff --git a/lib/classes/Exception/NotFound.class.php b/lib/classes/Exception/NotFound.php
similarity index 100%
rename from lib/classes/Exception/NotFound.class.php
rename to lib/classes/Exception/NotFound.php
diff --git a/lib/classes/Exception/Record/AdapterNotFound.class.php b/lib/classes/Exception/Record/AdapterNotFound.php
similarity index 100%
rename from lib/classes/Exception/Record/AdapterNotFound.class.php
rename to lib/classes/Exception/Record/AdapterNotFound.php
diff --git a/lib/classes/Exception/ServiceUnavailable.class.php b/lib/classes/Exception/ServiceUnavailable.php
similarity index 100%
rename from lib/classes/Exception/ServiceUnavailable.class.php
rename to lib/classes/Exception/ServiceUnavailable.php
diff --git a/lib/classes/Exception/Session/AlreadyCreated.class.php b/lib/classes/Exception/Session/AlreadyCreated.php
similarity index 100%
rename from lib/classes/Exception/Session/AlreadyCreated.class.php
rename to lib/classes/Exception/Session/AlreadyCreated.php
diff --git a/lib/classes/Exception/Session/BadSalinity.class.php b/lib/classes/Exception/Session/BadSalinity.php
similarity index 100%
rename from lib/classes/Exception/Session/BadSalinity.class.php
rename to lib/classes/Exception/Session/BadSalinity.php
diff --git a/lib/classes/Exception/Session/Closed.class.php b/lib/classes/Exception/Session/Closed.php
similarity index 100%
rename from lib/classes/Exception/Session/Closed.class.php
rename to lib/classes/Exception/Session/Closed.php
diff --git a/lib/classes/Exception/Session/LoggerNotFound.class.php b/lib/classes/Exception/Session/LoggerNotFound.php
similarity index 100%
rename from lib/classes/Exception/Session/LoggerNotFound.class.php
rename to lib/classes/Exception/Session/LoggerNotFound.php
diff --git a/lib/classes/Exception/Session/MailLocked.class.php b/lib/classes/Exception/Session/MailLocked.php
similarity index 100%
rename from lib/classes/Exception/Session/MailLocked.class.php
rename to lib/classes/Exception/Session/MailLocked.php
diff --git a/lib/classes/Exception/Session/NotAuthenticated.class.php b/lib/classes/Exception/Session/NotAuthenticated.php
similarity index 100%
rename from lib/classes/Exception/Session/NotAuthenticated.class.php
rename to lib/classes/Exception/Session/NotAuthenticated.php
diff --git a/lib/classes/Exception/Session/RequireCaptcha.class.php b/lib/classes/Exception/Session/RequireCaptcha.php
similarity index 100%
rename from lib/classes/Exception/Session/RequireCaptcha.class.php
rename to lib/classes/Exception/Session/RequireCaptcha.php
diff --git a/lib/classes/Exception/Session/StorageClosed.class.php b/lib/classes/Exception/Session/StorageClosed.php
similarity index 100%
rename from lib/classes/Exception/Session/StorageClosed.class.php
rename to lib/classes/Exception/Session/StorageClosed.php
diff --git a/lib/classes/Exception/Session/WrongToken.class.php b/lib/classes/Exception/Session/WrongToken.php
similarity index 100%
rename from lib/classes/Exception/Session/WrongToken.class.php
rename to lib/classes/Exception/Session/WrongToken.php
diff --git a/lib/classes/Exception/Setup/CannotWriteLockFile.class.php b/lib/classes/Exception/Setup/CannotWriteLockFile.php
similarity index 100%
rename from lib/classes/Exception/Setup/CannotWriteLockFile.class.php
rename to lib/classes/Exception/Setup/CannotWriteLockFile.php
diff --git a/lib/classes/Exception/Setup/FixBadEmailAddresses.class.php b/lib/classes/Exception/Setup/FixBadEmailAddresses.php
similarity index 100%
rename from lib/classes/Exception/Setup/FixBadEmailAddresses.class.php
rename to lib/classes/Exception/Setup/FixBadEmailAddresses.php
diff --git a/lib/classes/Exception/Setup/PhraseaAlreadyInstalled.class.php b/lib/classes/Exception/Setup/PhraseaAlreadyInstalled.php
similarity index 100%
rename from lib/classes/Exception/Setup/PhraseaAlreadyInstalled.class.php
rename to lib/classes/Exception/Setup/PhraseaAlreadyInstalled.php
diff --git a/lib/classes/Exception/Setup/UpgradeAlreadyStarted.class.php b/lib/classes/Exception/Setup/UpgradeAlreadyStarted.php
similarity index 100%
rename from lib/classes/Exception/Setup/UpgradeAlreadyStarted.class.php
rename to lib/classes/Exception/Setup/UpgradeAlreadyStarted.php
diff --git a/lib/classes/Exception/Unauthorized.class.php b/lib/classes/Exception/Unauthorized.php
similarity index 100%
rename from lib/classes/Exception/Unauthorized.class.php
rename to lib/classes/Exception/Unauthorized.php
diff --git a/lib/classes/Exception/UnauthorizedAction.class.php b/lib/classes/Exception/UnauthorizedAction.php
similarity index 100%
rename from lib/classes/Exception/UnauthorizedAction.class.php
rename to lib/classes/Exception/UnauthorizedAction.php
diff --git a/lib/classes/Exception/Upload/CannotWriteFile.class.php b/lib/classes/Exception/Upload/CannotWriteFile.php
similarity index 100%
rename from lib/classes/Exception/Upload/CannotWriteFile.class.php
rename to lib/classes/Exception/Upload/CannotWriteFile.php
diff --git a/lib/classes/Exception/Upload/Error.class.php b/lib/classes/Exception/Upload/Error.php
similarity index 100%
rename from lib/classes/Exception/Upload/Error.class.php
rename to lib/classes/Exception/Upload/Error.php
diff --git a/lib/classes/Exception/Upload/FileTooBig.class.php b/lib/classes/Exception/Upload/FileTooBig.php
similarity index 100%
rename from lib/classes/Exception/Upload/FileTooBig.class.php
rename to lib/classes/Exception/Upload/FileTooBig.php
diff --git a/lib/classes/Feed/Abstract.class.php b/lib/classes/Feed/Abstract.php
similarity index 100%
rename from lib/classes/Feed/Abstract.class.php
rename to lib/classes/Feed/Abstract.php
diff --git a/lib/classes/Feed/Adapter.class.php b/lib/classes/Feed/Adapter.php
similarity index 100%
rename from lib/classes/Feed/Adapter.class.php
rename to lib/classes/Feed/Adapter.php
diff --git a/lib/classes/Feed/Aggregate.class.php b/lib/classes/Feed/Aggregate.php
similarity index 100%
rename from lib/classes/Feed/Aggregate.class.php
rename to lib/classes/Feed/Aggregate.php
diff --git a/lib/classes/Feed/Collection.class.php b/lib/classes/Feed/Collection.php
similarity index 100%
rename from lib/classes/Feed/Collection.class.php
rename to lib/classes/Feed/Collection.php
diff --git a/lib/classes/Feed/CollectionInterface.class.php b/lib/classes/Feed/CollectionInterface.php
similarity index 100%
rename from lib/classes/Feed/CollectionInterface.class.php
rename to lib/classes/Feed/CollectionInterface.php
diff --git a/lib/classes/Feed/Entry/Adapter.class.php b/lib/classes/Feed/Entry/Adapter.php
similarity index 100%
rename from lib/classes/Feed/Entry/Adapter.class.php
rename to lib/classes/Feed/Entry/Adapter.php
diff --git a/lib/classes/Feed/Entry/Collection.class.php b/lib/classes/Feed/Entry/Collection.php
similarity index 100%
rename from lib/classes/Feed/Entry/Collection.class.php
rename to lib/classes/Feed/Entry/Collection.php
diff --git a/lib/classes/Feed/Entry/CollectionInterface.class.php b/lib/classes/Feed/Entry/CollectionInterface.php
similarity index 100%
rename from lib/classes/Feed/Entry/CollectionInterface.class.php
rename to lib/classes/Feed/Entry/CollectionInterface.php
diff --git a/lib/classes/Feed/Entry/Interface.class.php b/lib/classes/Feed/Entry/Interface.php
similarity index 100%
rename from lib/classes/Feed/Entry/Interface.class.php
rename to lib/classes/Feed/Entry/Interface.php
diff --git a/lib/classes/Feed/Entry/Item.class.php b/lib/classes/Feed/Entry/Item.php
similarity index 100%
rename from lib/classes/Feed/Entry/Item.class.php
rename to lib/classes/Feed/Entry/Item.php
diff --git a/lib/classes/Feed/Entry/ItemInterface.class.php b/lib/classes/Feed/Entry/ItemInterface.php
similarity index 100%
rename from lib/classes/Feed/Entry/ItemInterface.class.php
rename to lib/classes/Feed/Entry/ItemInterface.php
diff --git a/lib/classes/Feed/Interface.class.php b/lib/classes/Feed/Interface.php
similarity index 100%
rename from lib/classes/Feed/Interface.class.php
rename to lib/classes/Feed/Interface.php
diff --git a/lib/classes/Feed/Link.class.php b/lib/classes/Feed/Link.php
similarity index 100%
rename from lib/classes/Feed/Link.class.php
rename to lib/classes/Feed/Link.php
diff --git a/lib/classes/Feed/LinkInterface.class.php b/lib/classes/Feed/LinkInterface.php
similarity index 100%
rename from lib/classes/Feed/LinkInterface.class.php
rename to lib/classes/Feed/LinkInterface.php
diff --git a/lib/classes/Feed/Publisher/Adapter.class.php b/lib/classes/Feed/Publisher/Adapter.php
similarity index 100%
rename from lib/classes/Feed/Publisher/Adapter.class.php
rename to lib/classes/Feed/Publisher/Adapter.php
diff --git a/lib/classes/Feed/Publisher/Interface.class.php b/lib/classes/Feed/Publisher/Interface.php
similarity index 100%
rename from lib/classes/Feed/Publisher/Interface.class.php
rename to lib/classes/Feed/Publisher/Interface.php
diff --git a/lib/classes/Feed/Token.class.php b/lib/classes/Feed/Token.php
similarity index 100%
rename from lib/classes/Feed/Token.class.php
rename to lib/classes/Feed/Token.php
diff --git a/lib/classes/Feed/TokenAggregate.class.php b/lib/classes/Feed/TokenAggregate.php
similarity index 100%
rename from lib/classes/Feed/TokenAggregate.class.php
rename to lib/classes/Feed/TokenAggregate.php
diff --git a/lib/classes/Feed/XML/Abstract.class.php b/lib/classes/Feed/XML/Abstract.php
similarity index 100%
rename from lib/classes/Feed/XML/Abstract.class.php
rename to lib/classes/Feed/XML/Abstract.php
diff --git a/lib/classes/Feed/XML/Atom.class.php b/lib/classes/Feed/XML/Atom.php
similarity index 100%
rename from lib/classes/Feed/XML/Atom.class.php
rename to lib/classes/Feed/XML/Atom.php
diff --git a/lib/classes/Feed/XML/Cooliris.class.php b/lib/classes/Feed/XML/Cooliris.php
similarity index 100%
rename from lib/classes/Feed/XML/Cooliris.class.php
rename to lib/classes/Feed/XML/Cooliris.php
diff --git a/lib/classes/Feed/XML/Interface.class.php b/lib/classes/Feed/XML/Interface.php
similarity index 100%
rename from lib/classes/Feed/XML/Interface.class.php
rename to lib/classes/Feed/XML/Interface.php
diff --git a/lib/classes/Feed/XML/RSS.class.php b/lib/classes/Feed/XML/RSS.php
similarity index 100%
rename from lib/classes/Feed/XML/RSS.class.php
rename to lib/classes/Feed/XML/RSS.php
diff --git a/lib/classes/Feed/XML/RSS/Image.class.php b/lib/classes/Feed/XML/RSS/Image.php
similarity index 100%
rename from lib/classes/Feed/XML/RSS/Image.class.php
rename to lib/classes/Feed/XML/RSS/Image.php
diff --git a/lib/classes/Feed/XML/RSS/ImageInterface.class.php b/lib/classes/Feed/XML/RSS/ImageInterface.php
similarity index 100%
rename from lib/classes/Feed/XML/RSS/ImageInterface.class.php
rename to lib/classes/Feed/XML/RSS/ImageInterface.php
diff --git a/lib/classes/Session/Authentication/Guest.class.php b/lib/classes/Session/Authentication/Guest.php
similarity index 100%
rename from lib/classes/Session/Authentication/Guest.class.php
rename to lib/classes/Session/Authentication/Guest.php
diff --git a/lib/classes/Session/Authentication/Interface.class.php b/lib/classes/Session/Authentication/Interface.php
similarity index 100%
rename from lib/classes/Session/Authentication/Interface.class.php
rename to lib/classes/Session/Authentication/Interface.php
diff --git a/lib/classes/Session/Authentication/Native.class.php b/lib/classes/Session/Authentication/Native.php
similarity index 100%
rename from lib/classes/Session/Authentication/Native.class.php
rename to lib/classes/Session/Authentication/Native.php
diff --git a/lib/classes/Session/Authentication/None.class.php b/lib/classes/Session/Authentication/None.php
similarity index 100%
rename from lib/classes/Session/Authentication/None.class.php
rename to lib/classes/Session/Authentication/None.php
diff --git a/lib/classes/Session/Authentication/PersistentCookie.class.php b/lib/classes/Session/Authentication/PersistentCookie.php
similarity index 100%
rename from lib/classes/Session/Authentication/PersistentCookie.class.php
rename to lib/classes/Session/Authentication/PersistentCookie.php
diff --git a/lib/classes/Session/Authentication/Token.class.php b/lib/classes/Session/Authentication/Token.php
similarity index 100%
rename from lib/classes/Session/Authentication/Token.class.php
rename to lib/classes/Session/Authentication/Token.php
diff --git a/lib/classes/Session/Logger.class.php b/lib/classes/Session/Logger.php
similarity index 100%
rename from lib/classes/Session/Logger.class.php
rename to lib/classes/Session/Logger.php
diff --git a/lib/classes/Setup/Constraint.class.php b/lib/classes/Setup/Constraint.php
similarity index 100%
rename from lib/classes/Setup/Constraint.class.php
rename to lib/classes/Setup/Constraint.php
diff --git a/lib/classes/Setup/ConstraintsIterator.class.php b/lib/classes/Setup/ConstraintsIterator.php
similarity index 100%
rename from lib/classes/Setup/ConstraintsIterator.class.php
rename to lib/classes/Setup/ConstraintsIterator.php
diff --git a/lib/classes/Setup/Registry.class.php b/lib/classes/Setup/Registry.php
similarity index 100%
rename from lib/classes/Setup/Registry.class.php
rename to lib/classes/Setup/Registry.php
diff --git a/lib/classes/Setup/Upgrade.class.php b/lib/classes/Setup/Upgrade.php
similarity index 100%
rename from lib/classes/Setup/Upgrade.class.php
rename to lib/classes/Setup/Upgrade.php
diff --git a/lib/classes/User/Adapter.class.php b/lib/classes/User/Adapter.php
similarity index 100%
rename from lib/classes/User/Adapter.class.php
rename to lib/classes/User/Adapter.php
diff --git a/lib/classes/User/Interface.class.php b/lib/classes/User/Interface.php
similarity index 100%
rename from lib/classes/User/Interface.class.php
rename to lib/classes/User/Interface.php
diff --git a/lib/classes/User/Query.class.php b/lib/classes/User/Query.php
similarity index 100%
rename from lib/classes/User/Query.class.php
rename to lib/classes/User/Query.php
diff --git a/lib/classes/User/QueryInterface.class.php b/lib/classes/User/QueryInterface.php
similarity index 100%
rename from lib/classes/User/QueryInterface.class.php
rename to lib/classes/User/QueryInterface.php
diff --git a/lib/classes/ZipArchiveImproved.class.php b/lib/classes/ZipArchiveImproved.php
similarity index 100%
rename from lib/classes/ZipArchiveImproved.class.php
rename to lib/classes/ZipArchiveImproved.php
diff --git a/lib/classes/appbox.class.php b/lib/classes/appbox.php
similarity index 100%
rename from lib/classes/appbox.class.php
rename to lib/classes/appbox.php
diff --git a/lib/classes/appbox/register.class.php b/lib/classes/appbox/register.php
similarity index 100%
rename from lib/classes/appbox/register.class.php
rename to lib/classes/appbox/register.php
diff --git a/lib/classes/base.class.php b/lib/classes/base.php
similarity index 100%
rename from lib/classes/base.class.php
rename to lib/classes/base.php
diff --git a/lib/classes/bootstrap.class.php b/lib/classes/bootstrap.class.php
deleted file mode 100644
index 806027203a..0000000000
--- a/lib/classes/bootstrap.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2012 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Alchemy\Phrasea\Loader\Autoloader;
-use Alchemy\Phrasea\Loader\CacheAutoloader;
-
-/**
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-class bootstrap
-{
-    protected static $autoloader_initialized;
-
-    public static function register_autoloads($cacheAutoload = false)
-    {
-        if (static::$autoloader_initialized) {
-            return;
-        }
-
-        require_once __DIR__ . '/../Alchemy/Phrasea/Loader/Autoloader.php';
-        require_once __DIR__ . '/../Alchemy/Phrasea/Loader/Autoloader.php';
-
-        if ($cacheAutoload === true) {
-            try {
-                require_once __DIR__ . '/../Alchemy/Phrasea/Loader/CacheAutoloader.php';
-
-                $prefix = 'class_';
-                $namespace = md5(__DIR__);
-
-                $loader = new CacheAutoloader($prefix, $namespace);
-            } catch (\Exception $e) {
-                //no op code cache available
-                $loader = new Autoloader();
-            }
-        } else {
-            $loader = new Autoloader();
-        }
-
-        $getComposerNamespaces = function() {
-                return require realpath(__DIR__ . '/../../vendor/composer/autoload_namespaces.php');
-            };
-
-        foreach ($getComposerNamespaces() as $prefix => $path) {
-            if (substr($prefix, -1) === '_' || $prefix == 'Pimple') {
-                $loader->registerPrefix($prefix, $path);
-            } else {
-                $loader->registerNamespace($prefix, $path);
-            }
-        }
-
-        $loader->registerNamespaces(array(
-            'Entities'         => realpath(__DIR__ . '/../Doctrine/'),
-            'Repositories'     => realpath(__DIR__ . '/../Doctrine/'),
-            'Proxies'          => realpath(__DIR__ . '/../Doctrine/'),
-            'Doctrine\\Logger' => realpath(__DIR__ . '/../'),
-            'Types'            => realpath(__DIR__ . "/../Doctrine"),
-            'PhraseaFixture'   => realpath(__DIR__ . "/../conf.d"),
-        ));
-
-        $loader->register();
-
-        set_include_path(
-            get_include_path() . PATH_SEPARATOR . realpath(__DIR__ . '/../../vendor/zend/gdata/library')
-        );
-
-        static::$autoloader_initialized = true;
-
-        return;
-    }
-}
diff --git a/lib/classes/cache/cacheableInterface.class.php b/lib/classes/cache/cacheableInterface.php
similarity index 100%
rename from lib/classes/cache/cacheableInterface.class.php
rename to lib/classes/cache/cacheableInterface.php
diff --git a/lib/classes/cache/databox.class.php b/lib/classes/cache/databox.php
similarity index 100%
rename from lib/classes/cache/databox.class.php
rename to lib/classes/cache/databox.php
diff --git a/lib/classes/caption/Field/Value.class.php b/lib/classes/caption/Field/Value.php
similarity index 100%
rename from lib/classes/caption/Field/Value.class.php
rename to lib/classes/caption/Field/Value.php
diff --git a/lib/classes/caption/field.class.php b/lib/classes/caption/field.php
similarity index 100%
rename from lib/classes/caption/field.class.php
rename to lib/classes/caption/field.php
diff --git a/lib/classes/caption/interface.class.php b/lib/classes/caption/interface.php
similarity index 100%
rename from lib/classes/caption/interface.class.php
rename to lib/classes/caption/interface.php
diff --git a/lib/classes/caption/record.class.php b/lib/classes/caption/record.php
similarity index 100%
rename from lib/classes/caption/record.class.php
rename to lib/classes/caption/record.php
diff --git a/lib/classes/collection.class.php b/lib/classes/collection.php
similarity index 100%
rename from lib/classes/collection.class.php
rename to lib/classes/collection.php
diff --git a/lib/classes/connection.class.php b/lib/classes/connection.php
similarity index 100%
rename from lib/classes/connection.class.php
rename to lib/classes/connection.php
diff --git a/lib/classes/connection/abstract.class.php b/lib/classes/connection/abstract.php
similarity index 100%
rename from lib/classes/connection/abstract.class.php
rename to lib/classes/connection/abstract.php
diff --git a/lib/classes/connection/interface.class.php b/lib/classes/connection/interface.php
similarity index 100%
rename from lib/classes/connection/interface.class.php
rename to lib/classes/connection/interface.php
diff --git a/lib/classes/connection/pdo.class.php b/lib/classes/connection/pdo.php
similarity index 100%
rename from lib/classes/connection/pdo.class.php
rename to lib/classes/connection/pdo.php
diff --git a/lib/classes/connection/pdoStatementDebugger.class.php b/lib/classes/connection/pdoStatementDebugger.php
similarity index 100%
rename from lib/classes/connection/pdoStatementDebugger.class.php
rename to lib/classes/connection/pdoStatementDebugger.php
diff --git a/lib/classes/databox.class.php b/lib/classes/databox.php
similarity index 100%
rename from lib/classes/databox.class.php
rename to lib/classes/databox.php
diff --git a/lib/classes/databox/Field/DCES/Contributor.class.php b/lib/classes/databox/Field/DCES/Contributor.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Contributor.class.php
rename to lib/classes/databox/Field/DCES/Contributor.php
diff --git a/lib/classes/databox/Field/DCES/Coverage.class.php b/lib/classes/databox/Field/DCES/Coverage.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Coverage.class.php
rename to lib/classes/databox/Field/DCES/Coverage.php
diff --git a/lib/classes/databox/Field/DCES/Creator.class.php b/lib/classes/databox/Field/DCES/Creator.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Creator.class.php
rename to lib/classes/databox/Field/DCES/Creator.php
diff --git a/lib/classes/databox/Field/DCES/Date.class.php b/lib/classes/databox/Field/DCES/Date.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Date.class.php
rename to lib/classes/databox/Field/DCES/Date.php
diff --git a/lib/classes/databox/Field/DCES/Description.class.php b/lib/classes/databox/Field/DCES/Description.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Description.class.php
rename to lib/classes/databox/Field/DCES/Description.php
diff --git a/lib/classes/databox/Field/DCES/Format.class.php b/lib/classes/databox/Field/DCES/Format.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Format.class.php
rename to lib/classes/databox/Field/DCES/Format.php
diff --git a/lib/classes/databox/Field/DCES/Identifier.class.php b/lib/classes/databox/Field/DCES/Identifier.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Identifier.class.php
rename to lib/classes/databox/Field/DCES/Identifier.php
diff --git a/lib/classes/databox/Field/DCES/Language.class.php b/lib/classes/databox/Field/DCES/Language.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Language.class.php
rename to lib/classes/databox/Field/DCES/Language.php
diff --git a/lib/classes/databox/Field/DCES/Publisher.class.php b/lib/classes/databox/Field/DCES/Publisher.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Publisher.class.php
rename to lib/classes/databox/Field/DCES/Publisher.php
diff --git a/lib/classes/databox/Field/DCES/Relation.class.php b/lib/classes/databox/Field/DCES/Relation.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Relation.class.php
rename to lib/classes/databox/Field/DCES/Relation.php
diff --git a/lib/classes/databox/Field/DCES/Rights.class.php b/lib/classes/databox/Field/DCES/Rights.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Rights.class.php
rename to lib/classes/databox/Field/DCES/Rights.php
diff --git a/lib/classes/databox/Field/DCES/Source.class.php b/lib/classes/databox/Field/DCES/Source.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Source.class.php
rename to lib/classes/databox/Field/DCES/Source.php
diff --git a/lib/classes/databox/Field/DCES/Subject.class.php b/lib/classes/databox/Field/DCES/Subject.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Subject.class.php
rename to lib/classes/databox/Field/DCES/Subject.php
diff --git a/lib/classes/databox/Field/DCES/Title.class.php b/lib/classes/databox/Field/DCES/Title.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Title.class.php
rename to lib/classes/databox/Field/DCES/Title.php
diff --git a/lib/classes/databox/Field/DCES/Type.class.php b/lib/classes/databox/Field/DCES/Type.php
similarity index 100%
rename from lib/classes/databox/Field/DCES/Type.class.php
rename to lib/classes/databox/Field/DCES/Type.php
diff --git a/lib/classes/databox/Field/DCESAbstract.class.php b/lib/classes/databox/Field/DCESAbstract.php
similarity index 100%
rename from lib/classes/databox/Field/DCESAbstract.class.php
rename to lib/classes/databox/Field/DCESAbstract.php
diff --git a/lib/classes/databox/cgu.class.php b/lib/classes/databox/cgu.php
similarity index 100%
rename from lib/classes/databox/cgu.class.php
rename to lib/classes/databox/cgu.php
diff --git a/lib/classes/databox/descriptionStructure.class.php b/lib/classes/databox/descriptionStructure.php
similarity index 100%
rename from lib/classes/databox/descriptionStructure.class.php
rename to lib/classes/databox/descriptionStructure.php
diff --git a/lib/classes/databox/field.class.php b/lib/classes/databox/field.php
similarity index 100%
rename from lib/classes/databox/field.class.php
rename to lib/classes/databox/field.php
diff --git a/lib/classes/databox/status.class.php b/lib/classes/databox/status.php
similarity index 100%
rename from lib/classes/databox/status.class.php
rename to lib/classes/databox/status.php
diff --git a/lib/classes/databox/subdef.class.php b/lib/classes/databox/subdef.php
similarity index 100%
rename from lib/classes/databox/subdef.class.php
rename to lib/classes/databox/subdef.php
diff --git a/lib/classes/databox/subdefsStructure.class.php b/lib/classes/databox/subdefsStructure.php
similarity index 100%
rename from lib/classes/databox/subdefsStructure.class.php
rename to lib/classes/databox/subdefsStructure.php
diff --git a/lib/classes/eventsmanager/broker.class.php b/lib/classes/eventsmanager/broker.php
similarity index 100%
rename from lib/classes/eventsmanager/broker.class.php
rename to lib/classes/eventsmanager/broker.php
diff --git a/lib/classes/eventsmanager/event/test.class.php b/lib/classes/eventsmanager/event/test.php
similarity index 100%
rename from lib/classes/eventsmanager/event/test.class.php
rename to lib/classes/eventsmanager/event/test.php
diff --git a/lib/classes/eventsmanager/eventAbstract.class.php b/lib/classes/eventsmanager/eventAbstract.php
similarity index 100%
rename from lib/classes/eventsmanager/eventAbstract.class.php
rename to lib/classes/eventsmanager/eventAbstract.php
diff --git a/lib/classes/eventsmanager/notify/autoregister.class.php b/lib/classes/eventsmanager/notify/autoregister.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/autoregister.class.php
rename to lib/classes/eventsmanager/notify/autoregister.php
diff --git a/lib/classes/eventsmanager/notify/bridgeuploadfail.class.php b/lib/classes/eventsmanager/notify/bridgeuploadfail.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/bridgeuploadfail.class.php
rename to lib/classes/eventsmanager/notify/bridgeuploadfail.php
diff --git a/lib/classes/eventsmanager/notify/downloadmailfail.class.php b/lib/classes/eventsmanager/notify/downloadmailfail.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/downloadmailfail.class.php
rename to lib/classes/eventsmanager/notify/downloadmailfail.php
diff --git a/lib/classes/eventsmanager/notify/feed.class.php b/lib/classes/eventsmanager/notify/feed.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/feed.class.php
rename to lib/classes/eventsmanager/notify/feed.php
diff --git a/lib/classes/eventsmanager/notify/order.class.php b/lib/classes/eventsmanager/notify/order.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/order.class.php
rename to lib/classes/eventsmanager/notify/order.php
diff --git a/lib/classes/eventsmanager/notify/orderdeliver.class.php b/lib/classes/eventsmanager/notify/orderdeliver.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/orderdeliver.class.php
rename to lib/classes/eventsmanager/notify/orderdeliver.php
diff --git a/lib/classes/eventsmanager/notify/ordernotdelivered.class.php b/lib/classes/eventsmanager/notify/ordernotdelivered.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/ordernotdelivered.class.php
rename to lib/classes/eventsmanager/notify/ordernotdelivered.php
diff --git a/lib/classes/eventsmanager/notify/push.class.php b/lib/classes/eventsmanager/notify/push.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/push.class.php
rename to lib/classes/eventsmanager/notify/push.php
diff --git a/lib/classes/eventsmanager/notify/register.class.php b/lib/classes/eventsmanager/notify/register.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/register.class.php
rename to lib/classes/eventsmanager/notify/register.php
diff --git a/lib/classes/eventsmanager/notify/uploadquarantine.class.php b/lib/classes/eventsmanager/notify/uploadquarantine.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/uploadquarantine.class.php
rename to lib/classes/eventsmanager/notify/uploadquarantine.php
diff --git a/lib/classes/eventsmanager/notify/validate.class.php b/lib/classes/eventsmanager/notify/validate.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/validate.class.php
rename to lib/classes/eventsmanager/notify/validate.php
diff --git a/lib/classes/eventsmanager/notify/validationdone.class.php b/lib/classes/eventsmanager/notify/validationdone.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/validationdone.class.php
rename to lib/classes/eventsmanager/notify/validationdone.php
diff --git a/lib/classes/eventsmanager/notify/validationreminder.class.php b/lib/classes/eventsmanager/notify/validationreminder.php
similarity index 100%
rename from lib/classes/eventsmanager/notify/validationreminder.class.php
rename to lib/classes/eventsmanager/notify/validationreminder.php
diff --git a/lib/classes/eventsmanager/notifyAbstract.class.php b/lib/classes/eventsmanager/notifyAbstract.php
similarity index 100%
rename from lib/classes/eventsmanager/notifyAbstract.class.php
rename to lib/classes/eventsmanager/notifyAbstract.php
diff --git a/lib/classes/format.class.php b/lib/classes/format.php
similarity index 100%
rename from lib/classes/format.class.php
rename to lib/classes/format.php
diff --git a/lib/classes/ftpclient.class.php b/lib/classes/ftpclient.php
similarity index 100%
rename from lib/classes/ftpclient.class.php
rename to lib/classes/ftpclient.php
diff --git a/lib/classes/gatekeeper.class.php b/lib/classes/gatekeeper.php
similarity index 100%
rename from lib/classes/gatekeeper.class.php
rename to lib/classes/gatekeeper.php
diff --git a/lib/classes/geonames.class.php b/lib/classes/geonames.php
similarity index 100%
rename from lib/classes/geonames.class.php
rename to lib/classes/geonames.php
diff --git a/lib/classes/http/query.class.php b/lib/classes/http/query.php
similarity index 100%
rename from lib/classes/http/query.class.php
rename to lib/classes/http/query.php
diff --git a/lib/classes/http/request.class.php b/lib/classes/http/request.php
similarity index 100%
rename from lib/classes/http/request.class.php
rename to lib/classes/http/request.php
diff --git a/lib/classes/liste.class.php b/lib/classes/liste.php
similarity index 100%
rename from lib/classes/liste.class.php
rename to lib/classes/liste.php
diff --git a/lib/classes/login.class.php b/lib/classes/login.php
similarity index 100%
rename from lib/classes/login.class.php
rename to lib/classes/login.php
diff --git a/lib/classes/mail.class.php b/lib/classes/mail.php
similarity index 100%
rename from lib/classes/mail.class.php
rename to lib/classes/mail.php
diff --git a/lib/classes/media/Permalink/Adapter.class.php b/lib/classes/media/Permalink/Adapter.php
similarity index 100%
rename from lib/classes/media/Permalink/Adapter.class.php
rename to lib/classes/media/Permalink/Adapter.php
diff --git a/lib/classes/media/Permalink/Interface.class.php b/lib/classes/media/Permalink/Interface.php
similarity index 100%
rename from lib/classes/media/Permalink/Interface.class.php
rename to lib/classes/media/Permalink/Interface.php
diff --git a/lib/classes/media/abstract.class.php b/lib/classes/media/abstract.php
similarity index 100%
rename from lib/classes/media/abstract.class.php
rename to lib/classes/media/abstract.php
diff --git a/lib/classes/media/adapter.class.php b/lib/classes/media/adapter.php
similarity index 100%
rename from lib/classes/media/adapter.class.php
rename to lib/classes/media/adapter.php
diff --git a/lib/classes/media/subdef.class.php b/lib/classes/media/subdef.php
similarity index 100%
rename from lib/classes/media/subdef.class.php
rename to lib/classes/media/subdef.php
diff --git a/lib/classes/module/client.class.php b/lib/classes/module/client.php
similarity index 100%
rename from lib/classes/module/client.class.php
rename to lib/classes/module/client.php
diff --git a/lib/classes/module/console/aboutAuthors.class.php b/lib/classes/module/console/aboutAuthors.php
similarity index 100%
rename from lib/classes/module/console/aboutAuthors.class.php
rename to lib/classes/module/console/aboutAuthors.php
diff --git a/lib/classes/module/console/aboutLicense.class.php b/lib/classes/module/console/aboutLicense.php
similarity index 100%
rename from lib/classes/module/console/aboutLicense.class.php
rename to lib/classes/module/console/aboutLicense.php
diff --git a/lib/classes/module/console/checkExtension.class.php b/lib/classes/module/console/checkExtension.php
similarity index 100%
rename from lib/classes/module/console/checkExtension.class.php
rename to lib/classes/module/console/checkExtension.php
diff --git a/lib/classes/module/console/fieldsDelete.class.php b/lib/classes/module/console/fieldsDelete.php
similarity index 100%
rename from lib/classes/module/console/fieldsDelete.class.php
rename to lib/classes/module/console/fieldsDelete.php
diff --git a/lib/classes/module/console/fieldsList.class.php b/lib/classes/module/console/fieldsList.php
similarity index 100%
rename from lib/classes/module/console/fieldsList.class.php
rename to lib/classes/module/console/fieldsList.php
diff --git a/lib/classes/module/console/fieldsMerge.class.php b/lib/classes/module/console/fieldsMerge.php
similarity index 100%
rename from lib/classes/module/console/fieldsMerge.class.php
rename to lib/classes/module/console/fieldsMerge.php
diff --git a/lib/classes/module/console/fieldsRename.class.php b/lib/classes/module/console/fieldsRename.php
similarity index 100%
rename from lib/classes/module/console/fieldsRename.class.php
rename to lib/classes/module/console/fieldsRename.php
diff --git a/lib/classes/module/console/fileEnsureDevSetting.class.php b/lib/classes/module/console/fileEnsureDevSetting.php
similarity index 100%
rename from lib/classes/module/console/fileEnsureDevSetting.class.php
rename to lib/classes/module/console/fileEnsureDevSetting.php
diff --git a/lib/classes/module/console/fileEnsureProductionSetting.class.php b/lib/classes/module/console/fileEnsureProductionSetting.php
similarity index 100%
rename from lib/classes/module/console/fileEnsureProductionSetting.class.php
rename to lib/classes/module/console/fileEnsureProductionSetting.php
diff --git a/lib/classes/module/console/schedulerStart.class.php b/lib/classes/module/console/schedulerStart.php
similarity index 100%
rename from lib/classes/module/console/schedulerStart.class.php
rename to lib/classes/module/console/schedulerStart.php
diff --git a/lib/classes/module/console/schedulerState.class.php b/lib/classes/module/console/schedulerState.php
similarity index 100%
rename from lib/classes/module/console/schedulerState.class.php
rename to lib/classes/module/console/schedulerState.php
diff --git a/lib/classes/module/console/schedulerStop.class.php b/lib/classes/module/console/schedulerStop.php
similarity index 100%
rename from lib/classes/module/console/schedulerStop.class.php
rename to lib/classes/module/console/schedulerStop.php
diff --git a/lib/classes/module/console/sphinxGenerateSuggestion.class.php b/lib/classes/module/console/sphinxGenerateSuggestion.php
similarity index 100%
rename from lib/classes/module/console/sphinxGenerateSuggestion.class.php
rename to lib/classes/module/console/sphinxGenerateSuggestion.php
diff --git a/lib/classes/module/console/systemBackupDB.class.php b/lib/classes/module/console/systemBackupDB.php
similarity index 100%
rename from lib/classes/module/console/systemBackupDB.class.php
rename to lib/classes/module/console/systemBackupDB.php
diff --git a/lib/classes/module/console/systemClearCache.class.php b/lib/classes/module/console/systemClearCache.php
similarity index 100%
rename from lib/classes/module/console/systemClearCache.class.php
rename to lib/classes/module/console/systemClearCache.php
diff --git a/lib/classes/module/console/systemConfigCheck.class.php b/lib/classes/module/console/systemConfigCheck.php
similarity index 100%
rename from lib/classes/module/console/systemConfigCheck.class.php
rename to lib/classes/module/console/systemConfigCheck.php
diff --git a/lib/classes/module/console/systemExport.class.php b/lib/classes/module/console/systemExport.php
similarity index 100%
rename from lib/classes/module/console/systemExport.class.php
rename to lib/classes/module/console/systemExport.php
diff --git a/lib/classes/module/console/systemMailCheck.class.php b/lib/classes/module/console/systemMailCheck.php
similarity index 100%
rename from lib/classes/module/console/systemMailCheck.class.php
rename to lib/classes/module/console/systemMailCheck.php
diff --git a/lib/classes/module/console/systemTemplateGenerator.class.php b/lib/classes/module/console/systemTemplateGenerator.php
similarity index 100%
rename from lib/classes/module/console/systemTemplateGenerator.class.php
rename to lib/classes/module/console/systemTemplateGenerator.php
diff --git a/lib/classes/module/console/systemUpgrade.class.php b/lib/classes/module/console/systemUpgrade.php
similarity index 97%
rename from lib/classes/module/console/systemUpgrade.class.php
rename to lib/classes/module/console/systemUpgrade.php
index 27bba027a3..d4bec5127d 100644
--- a/lib/classes/module/console/systemUpgrade.class.php
+++ b/lib/classes/module/console/systemUpgrade.php
@@ -38,7 +38,7 @@ class module_console_systemUpgrade extends Command
 
     protected function doExecute(InputInterface $input, OutputInterface $output)
     {
-        require_once dirname(__FILE__) . '/../../../../lib/bootstrap.php';
+        require_once dirname(__FILE__) . '/../../../../vendor/autoload.php';
 
         $interactive = !$input->getOption('yes');
 
diff --git a/lib/classes/module/console/taskState.class.php b/lib/classes/module/console/taskState.php
similarity index 100%
rename from lib/classes/module/console/taskState.class.php
rename to lib/classes/module/console/taskState.php
diff --git a/lib/classes/module/console/tasklist.class.php b/lib/classes/module/console/tasklist.php
similarity index 100%
rename from lib/classes/module/console/tasklist.class.php
rename to lib/classes/module/console/tasklist.php
diff --git a/lib/classes/module/console/taskrun.class.php b/lib/classes/module/console/taskrun.php
similarity index 100%
rename from lib/classes/module/console/taskrun.class.php
rename to lib/classes/module/console/taskrun.php
diff --git a/lib/classes/module/report.class.php b/lib/classes/module/report.php
similarity index 100%
rename from lib/classes/module/report.class.php
rename to lib/classes/module/report.php
diff --git a/lib/classes/module/report/activity.class.php b/lib/classes/module/report/activity.php
similarity index 100%
rename from lib/classes/module/report/activity.class.php
rename to lib/classes/module/report/activity.php
diff --git a/lib/classes/module/report/add.class.php b/lib/classes/module/report/add.php
similarity index 100%
rename from lib/classes/module/report/add.class.php
rename to lib/classes/module/report/add.php
diff --git a/lib/classes/module/report/connexion.class.php b/lib/classes/module/report/connexion.php
similarity index 100%
rename from lib/classes/module/report/connexion.class.php
rename to lib/classes/module/report/connexion.php
diff --git a/lib/classes/module/report/dashboard.class.php b/lib/classes/module/report/dashboard.php
similarity index 100%
rename from lib/classes/module/report/dashboard.class.php
rename to lib/classes/module/report/dashboard.php
diff --git a/lib/classes/module/report/dashboard/componentInterface.class.php b/lib/classes/module/report/dashboard/componentInterface.php
similarity index 100%
rename from lib/classes/module/report/dashboard/componentInterface.class.php
rename to lib/classes/module/report/dashboard/componentInterface.php
diff --git a/lib/classes/module/report/dashboard/feed.class.php b/lib/classes/module/report/dashboard/feed.php
similarity index 100%
rename from lib/classes/module/report/dashboard/feed.class.php
rename to lib/classes/module/report/dashboard/feed.php
diff --git a/lib/classes/module/report/dashboard/group.class.php b/lib/classes/module/report/dashboard/group.php
similarity index 100%
rename from lib/classes/module/report/dashboard/group.class.php
rename to lib/classes/module/report/dashboard/group.php
diff --git a/lib/classes/module/report/dashboard/merge.class.php b/lib/classes/module/report/dashboard/merge.php
similarity index 100%
rename from lib/classes/module/report/dashboard/merge.class.php
rename to lib/classes/module/report/dashboard/merge.php
diff --git a/lib/classes/module/report/dashboard/sort.class.php b/lib/classes/module/report/dashboard/sort.php
similarity index 100%
rename from lib/classes/module/report/dashboard/sort.class.php
rename to lib/classes/module/report/dashboard/sort.php
diff --git a/lib/classes/module/report/download.class.php b/lib/classes/module/report/download.php
similarity index 100%
rename from lib/classes/module/report/download.class.php
rename to lib/classes/module/report/download.php
diff --git a/lib/classes/module/report/edit.class.php b/lib/classes/module/report/edit.php
similarity index 100%
rename from lib/classes/module/report/edit.class.php
rename to lib/classes/module/report/edit.php
diff --git a/lib/classes/module/report/filter.class.php b/lib/classes/module/report/filter.php
similarity index 100%
rename from lib/classes/module/report/filter.class.php
rename to lib/classes/module/report/filter.php
diff --git a/lib/classes/module/report/nav.class.php b/lib/classes/module/report/nav.php
similarity index 100%
rename from lib/classes/module/report/nav.class.php
rename to lib/classes/module/report/nav.php
diff --git a/lib/classes/module/report/push.class.php b/lib/classes/module/report/push.php
similarity index 100%
rename from lib/classes/module/report/push.class.php
rename to lib/classes/module/report/push.php
diff --git a/lib/classes/module/report/question.class.php b/lib/classes/module/report/question.php
similarity index 100%
rename from lib/classes/module/report/question.class.php
rename to lib/classes/module/report/question.php
diff --git a/lib/classes/module/report/sql.class.php b/lib/classes/module/report/sql.php
similarity index 100%
rename from lib/classes/module/report/sql.class.php
rename to lib/classes/module/report/sql.php
diff --git a/lib/classes/module/report/sqlReportInterface.class.php b/lib/classes/module/report/sqlReportInterface.php
similarity index 100%
rename from lib/classes/module/report/sqlReportInterface.class.php
rename to lib/classes/module/report/sqlReportInterface.php
diff --git a/lib/classes/module/report/sqlaction.class.php b/lib/classes/module/report/sqlaction.php
similarity index 100%
rename from lib/classes/module/report/sqlaction.class.php
rename to lib/classes/module/report/sqlaction.php
diff --git a/lib/classes/module/report/sqlconnexion.class.php b/lib/classes/module/report/sqlconnexion.php
similarity index 100%
rename from lib/classes/module/report/sqlconnexion.class.php
rename to lib/classes/module/report/sqlconnexion.php
diff --git a/lib/classes/module/report/sqldownload.class.php b/lib/classes/module/report/sqldownload.php
similarity index 100%
rename from lib/classes/module/report/sqldownload.class.php
rename to lib/classes/module/report/sqldownload.php
diff --git a/lib/classes/module/report/sqlfilter.class.php b/lib/classes/module/report/sqlfilter.php
similarity index 100%
rename from lib/classes/module/report/sqlfilter.class.php
rename to lib/classes/module/report/sqlfilter.php
diff --git a/lib/classes/module/report/sqlquestion.class.php b/lib/classes/module/report/sqlquestion.php
similarity index 100%
rename from lib/classes/module/report/sqlquestion.class.php
rename to lib/classes/module/report/sqlquestion.php
diff --git a/lib/classes/module/report/validate.class.php b/lib/classes/module/report/validate.php
similarity index 100%
rename from lib/classes/module/report/validate.class.php
rename to lib/classes/module/report/validate.php
diff --git a/lib/classes/p4field.class.php b/lib/classes/p4field.php
similarity index 100%
rename from lib/classes/p4field.class.php
rename to lib/classes/p4field.php
diff --git a/lib/classes/p4file.class.php b/lib/classes/p4file.php
similarity index 100%
rename from lib/classes/p4file.class.php
rename to lib/classes/p4file.php
diff --git a/lib/classes/p4string.class.php b/lib/classes/p4string.php
similarity index 100%
rename from lib/classes/p4string.class.php
rename to lib/classes/p4string.php
diff --git a/lib/classes/patch/320.class.php b/lib/classes/patch/320.php
similarity index 100%
rename from lib/classes/patch/320.class.php
rename to lib/classes/patch/320.php
diff --git a/lib/classes/patch/320a.class.php b/lib/classes/patch/320a.php
similarity index 100%
rename from lib/classes/patch/320a.class.php
rename to lib/classes/patch/320a.php
diff --git a/lib/classes/patch/320ab.class.php b/lib/classes/patch/320ab.php
similarity index 100%
rename from lib/classes/patch/320ab.class.php
rename to lib/classes/patch/320ab.php
diff --git a/lib/classes/patch/320b.class.php b/lib/classes/patch/320b.php
similarity index 100%
rename from lib/classes/patch/320b.class.php
rename to lib/classes/patch/320b.php
diff --git a/lib/classes/patch/320c.class.php b/lib/classes/patch/320c.php
similarity index 100%
rename from lib/classes/patch/320c.class.php
rename to lib/classes/patch/320c.php
diff --git a/lib/classes/patch/320d.class.php b/lib/classes/patch/320d.php
similarity index 100%
rename from lib/classes/patch/320d.class.php
rename to lib/classes/patch/320d.php
diff --git a/lib/classes/patch/320e.class.php b/lib/classes/patch/320e.php
similarity index 100%
rename from lib/classes/patch/320e.class.php
rename to lib/classes/patch/320e.php
diff --git a/lib/classes/patch/320f.class.php b/lib/classes/patch/320f.php
similarity index 100%
rename from lib/classes/patch/320f.class.php
rename to lib/classes/patch/320f.php
diff --git a/lib/classes/patch/320h.class.php b/lib/classes/patch/320h.php
similarity index 100%
rename from lib/classes/patch/320h.class.php
rename to lib/classes/patch/320h.php
diff --git a/lib/classes/patch/360.class.php b/lib/classes/patch/360.php
similarity index 100%
rename from lib/classes/patch/360.class.php
rename to lib/classes/patch/360.php
diff --git a/lib/classes/patch/3602.class.php b/lib/classes/patch/3602.php
similarity index 100%
rename from lib/classes/patch/3602.class.php
rename to lib/classes/patch/3602.php
diff --git a/lib/classes/patch/3603.class.php b/lib/classes/patch/3603.php
similarity index 100%
rename from lib/classes/patch/3603.class.php
rename to lib/classes/patch/3603.php
diff --git a/lib/classes/patch/3604.class.php b/lib/classes/patch/3604.php
similarity index 100%
rename from lib/classes/patch/3604.class.php
rename to lib/classes/patch/3604.php
diff --git a/lib/classes/patch/361.class.php b/lib/classes/patch/361.php
similarity index 100%
rename from lib/classes/patch/361.class.php
rename to lib/classes/patch/361.php
diff --git a/lib/classes/patch/370.class.php b/lib/classes/patch/370.php
similarity index 100%
rename from lib/classes/patch/370.class.php
rename to lib/classes/patch/370.php
diff --git a/lib/classes/patch/370a3.class.php b/lib/classes/patch/370a3.php
similarity index 100%
rename from lib/classes/patch/370a3.class.php
rename to lib/classes/patch/370a3.php
diff --git a/lib/classes/patch/370a4.class.php b/lib/classes/patch/370a4.php
similarity index 100%
rename from lib/classes/patch/370a4.class.php
rename to lib/classes/patch/370a4.php
diff --git a/lib/classes/patch/370a5.class.php b/lib/classes/patch/370a5.php
similarity index 100%
rename from lib/classes/patch/370a5.class.php
rename to lib/classes/patch/370a5.php
diff --git a/lib/classes/patch/370a6.class.php b/lib/classes/patch/370a6.php
similarity index 100%
rename from lib/classes/patch/370a6.class.php
rename to lib/classes/patch/370a6.php
diff --git a/lib/classes/patch/370a7.class.php b/lib/classes/patch/370a7.php
similarity index 100%
rename from lib/classes/patch/370a7.class.php
rename to lib/classes/patch/370a7.php
diff --git a/lib/classes/patch/370a8.class.php b/lib/classes/patch/370a8.php
similarity index 100%
rename from lib/classes/patch/370a8.class.php
rename to lib/classes/patch/370a8.php
diff --git a/lib/classes/patch/370a9.class.php b/lib/classes/patch/370a9.php
similarity index 100%
rename from lib/classes/patch/370a9.class.php
rename to lib/classes/patch/370a9.php
diff --git a/lib/classes/patch/371.class.php b/lib/classes/patch/371.php
similarity index 100%
rename from lib/classes/patch/371.class.php
rename to lib/classes/patch/371.php
diff --git a/lib/classes/patch/373.class.php b/lib/classes/patch/373.php
similarity index 100%
rename from lib/classes/patch/373.class.php
rename to lib/classes/patch/373.php
diff --git a/lib/classes/patch/380.class.php b/lib/classes/patch/380.php
similarity index 100%
rename from lib/classes/patch/380.class.php
rename to lib/classes/patch/380.php
diff --git a/lib/classes/patch/3802.class.php b/lib/classes/patch/3802.php
similarity index 100%
rename from lib/classes/patch/3802.class.php
rename to lib/classes/patch/3802.php
diff --git a/lib/classes/patch/3803.class.php b/lib/classes/patch/3803.php
similarity index 100%
rename from lib/classes/patch/3803.class.php
rename to lib/classes/patch/3803.php
diff --git a/lib/classes/patchInterface.class.php b/lib/classes/patchInterface.php
similarity index 100%
rename from lib/classes/patchInterface.class.php
rename to lib/classes/patchInterface.php
diff --git a/lib/classes/phrasea.class.php b/lib/classes/phrasea.php
similarity index 94%
rename from lib/classes/phrasea.class.php
rename to lib/classes/phrasea.php
index 8d9bb7623c..492462836e 100644
--- a/lib/classes/phrasea.class.php
+++ b/lib/classes/phrasea.php
@@ -48,31 +48,6 @@ class phrasea
         return $retval;
     }
 
-    public static function start(Configuration $configuration)
-    {
-        $choosenConnexion = $configuration->getPhraseanet()->get('database');
-
-        $connexion = $configuration->getConnexion($choosenConnexion);
-
-        $hostname = $connexion->get('host');
-        $port = (int) $connexion->get('port');
-        $user = $connexion->get('user');
-        $password = $connexion->get('password');
-        $dbname = $connexion->get('dbname');
-
-        if (!extension_loaded('phrasea2')) {
-            throw new RuntimeException('Phrasea extension is required');
-        }
-
-        if (!function_exists('phrasea_conn')) {
-            throw new RuntimeException('Phrasea extension requires upgrade');
-        }
-
-        if (phrasea_conn($hostname, $port, $user, $password, $dbname) !== true) {
-            throw new RuntimeException('Unable to initialize Phrasea connection');
-        }
-    }
-
     public function getHome(Application $app, $type = 'PUBLI', $context = 'prod')
     {
         if ($type == 'HELP') {
diff --git a/lib/classes/phraseadate.class.php b/lib/classes/phraseadate.php
similarity index 100%
rename from lib/classes/phraseadate.class.php
rename to lib/classes/phraseadate.php
diff --git a/lib/classes/queries.class.php b/lib/classes/queries.php
similarity index 100%
rename from lib/classes/queries.class.php
rename to lib/classes/queries.php
diff --git a/lib/classes/random.class.php b/lib/classes/random.php
similarity index 100%
rename from lib/classes/random.class.php
rename to lib/classes/random.php
diff --git a/lib/classes/record/Interface.class.php b/lib/classes/record/Interface.php
similarity index 100%
rename from lib/classes/record/Interface.class.php
rename to lib/classes/record/Interface.php
diff --git a/lib/classes/record/adapter.class.php b/lib/classes/record/adapter.php
similarity index 100%
rename from lib/classes/record/adapter.class.php
rename to lib/classes/record/adapter.php
diff --git a/lib/classes/record/exportElement.class.php b/lib/classes/record/exportElement.php
similarity index 100%
rename from lib/classes/record/exportElement.class.php
rename to lib/classes/record/exportElement.php
diff --git a/lib/classes/record/orderElement.class.php b/lib/classes/record/orderElement.php
similarity index 100%
rename from lib/classes/record/orderElement.class.php
rename to lib/classes/record/orderElement.php
diff --git a/lib/classes/record/preview.class.php b/lib/classes/record/preview.php
similarity index 100%
rename from lib/classes/record/preview.class.php
rename to lib/classes/record/preview.php
diff --git a/lib/classes/recordutils.class.php b/lib/classes/recordutils.php
similarity index 100%
rename from lib/classes/recordutils.class.php
rename to lib/classes/recordutils.php
diff --git a/lib/classes/recordutils/audio.class.php b/lib/classes/recordutils/audio.php
similarity index 100%
rename from lib/classes/recordutils/audio.class.php
rename to lib/classes/recordutils/audio.php
diff --git a/lib/classes/recordutils/document.class.php b/lib/classes/recordutils/document.php
similarity index 100%
rename from lib/classes/recordutils/document.class.php
rename to lib/classes/recordutils/document.php
diff --git a/lib/classes/recordutils/image.class.php b/lib/classes/recordutils/image.php
similarity index 100%
rename from lib/classes/recordutils/image.class.php
rename to lib/classes/recordutils/image.php
diff --git a/lib/classes/recordutils/map.class.php b/lib/classes/recordutils/map.php
similarity index 100%
rename from lib/classes/recordutils/map.class.php
rename to lib/classes/recordutils/map.php
diff --git a/lib/classes/recordutils/video.class.php b/lib/classes/recordutils/video.php
similarity index 100%
rename from lib/classes/recordutils/video.class.php
rename to lib/classes/recordutils/video.php
diff --git a/lib/classes/registry.class.php b/lib/classes/registry.php
similarity index 100%
rename from lib/classes/registry.class.php
rename to lib/classes/registry.php
diff --git a/lib/classes/registryInterface.class.php b/lib/classes/registryInterface.php
similarity index 100%
rename from lib/classes/registryInterface.class.php
rename to lib/classes/registryInterface.php
diff --git a/lib/classes/set/abstract.class.php b/lib/classes/set/abstract.php
similarity index 100%
rename from lib/classes/set/abstract.class.php
rename to lib/classes/set/abstract.php
diff --git a/lib/classes/set/export.class.php b/lib/classes/set/export.php
similarity index 100%
rename from lib/classes/set/export.class.php
rename to lib/classes/set/export.php
diff --git a/lib/classes/set/exportftp.class.php b/lib/classes/set/exportftp.php
similarity index 100%
rename from lib/classes/set/exportftp.class.php
rename to lib/classes/set/exportftp.php
diff --git a/lib/classes/set/order.class.php b/lib/classes/set/order.php
similarity index 100%
rename from lib/classes/set/order.class.php
rename to lib/classes/set/order.php
diff --git a/lib/classes/set/selection.class.php b/lib/classes/set/selection.php
similarity index 100%
rename from lib/classes/set/selection.class.php
rename to lib/classes/set/selection.php
diff --git a/lib/classes/setup.class.php b/lib/classes/setup.php
similarity index 100%
rename from lib/classes/setup.class.php
rename to lib/classes/setup.php
diff --git a/lib/classes/sso.class.php b/lib/classes/sso.php
similarity index 100%
rename from lib/classes/sso.class.php
rename to lib/classes/sso.php
diff --git a/lib/classes/system/server.class.php b/lib/classes/system/server.php
similarity index 100%
rename from lib/classes/system/server.class.php
rename to lib/classes/system/server.php
diff --git a/lib/classes/system/url.class.php b/lib/classes/system/url.php
similarity index 100%
rename from lib/classes/system/url.class.php
rename to lib/classes/system/url.php
diff --git a/lib/classes/task/Scheduler.class.php b/lib/classes/task/Scheduler.php
similarity index 100%
rename from lib/classes/task/Scheduler.class.php
rename to lib/classes/task/Scheduler.php
diff --git a/lib/classes/task/abstract.class.php b/lib/classes/task/abstract.php
similarity index 100%
rename from lib/classes/task/abstract.class.php
rename to lib/classes/task/abstract.php
diff --git a/lib/classes/task/appboxAbstract.class.php b/lib/classes/task/appboxAbstract.php
similarity index 100%
rename from lib/classes/task/appboxAbstract.class.php
rename to lib/classes/task/appboxAbstract.php
diff --git a/lib/classes/task/databoxAbstract.class.php b/lib/classes/task/databoxAbstract.php
similarity index 100%
rename from lib/classes/task/databoxAbstract.class.php
rename to lib/classes/task/databoxAbstract.php
diff --git a/lib/classes/task/manager.class.php b/lib/classes/task/manager.php
similarity index 99%
rename from lib/classes/task/manager.class.php
rename to lib/classes/task/manager.php
index 02c505bc3a..ff98cb75e3 100644
--- a/lib/classes/task/manager.class.php
+++ b/lib/classes/task/manager.php
@@ -215,7 +215,7 @@ class task_manager
             if (($hdir = @opendir($path)) != FALSE) {
                 $max = 9999;
                 while (($max-- > 0) && (($file = readdir($hdir)) !== false)) {
-                    if (!is_file($path . '/' . $file) || substr($file, 0, 1) == "." || substr($file, -10) != ".class.php") {
+                    if (!is_file($path . '/' . $file) || substr($file, 0, 1) == "." || substr($file, -10) != ".php") {
                         continue;
                     }
 
diff --git a/lib/classes/task/period/RecordMover.class.php b/lib/classes/task/period/RecordMover.php
similarity index 100%
rename from lib/classes/task/period/RecordMover.class.php
rename to lib/classes/task/period/RecordMover.php
diff --git a/lib/classes/task/period/apibridge.class.php b/lib/classes/task/period/apibridge.php
similarity index 100%
rename from lib/classes/task/period/apibridge.class.php
rename to lib/classes/task/period/apibridge.php
diff --git a/lib/classes/task/period/archive.class.php b/lib/classes/task/period/archive.php
similarity index 100%
rename from lib/classes/task/period/archive.class.php
rename to lib/classes/task/period/archive.php
diff --git a/lib/classes/task/period/cindexer.class.php b/lib/classes/task/period/cindexer.php
similarity index 100%
rename from lib/classes/task/period/cindexer.class.php
rename to lib/classes/task/period/cindexer.php
diff --git a/lib/classes/task/period/emptyColl.class.php b/lib/classes/task/period/emptyColl.php
similarity index 100%
rename from lib/classes/task/period/emptyColl.class.php
rename to lib/classes/task/period/emptyColl.php
diff --git a/lib/classes/task/period/ftp.class.php b/lib/classes/task/period/ftp.php
similarity index 100%
rename from lib/classes/task/period/ftp.class.php
rename to lib/classes/task/period/ftp.php
diff --git a/lib/classes/task/period/ftpPull.class.php b/lib/classes/task/period/ftpPull.php
similarity index 100%
rename from lib/classes/task/period/ftpPull.class.php
rename to lib/classes/task/period/ftpPull.php
diff --git a/lib/classes/task/period/outofdate.class.php b/lib/classes/task/period/outofdate.php
similarity index 100%
rename from lib/classes/task/period/outofdate.class.php
rename to lib/classes/task/period/outofdate.php
diff --git a/lib/classes/task/period/subdef.class.php b/lib/classes/task/period/subdef.php
similarity index 100%
rename from lib/classes/task/period/subdef.class.php
rename to lib/classes/task/period/subdef.php
diff --git a/lib/classes/task/period/test.class.php b/lib/classes/task/period/test.php
similarity index 100%
rename from lib/classes/task/period/test.class.php
rename to lib/classes/task/period/test.php
diff --git a/lib/classes/task/period/workflow01.class.php b/lib/classes/task/period/workflow01.php
similarity index 100%
rename from lib/classes/task/period/workflow01.class.php
rename to lib/classes/task/period/workflow01.php
diff --git a/lib/classes/task/period/writemeta.class.php b/lib/classes/task/period/writemeta.php
similarity index 100%
rename from lib/classes/task/period/writemeta.class.php
rename to lib/classes/task/period/writemeta.php
diff --git a/lib/classes/thesaurus.class.php b/lib/classes/thesaurus.php
similarity index 100%
rename from lib/classes/thesaurus.class.php
rename to lib/classes/thesaurus.php
diff --git a/lib/classes/thesaurus/xpath.class.php b/lib/classes/thesaurus/xpath.php
similarity index 100%
rename from lib/classes/thesaurus/xpath.class.php
rename to lib/classes/thesaurus/xpath.php
diff --git a/lib/classes/unicode.class.php b/lib/classes/unicode.php
similarity index 100%
rename from lib/classes/unicode.class.php
rename to lib/classes/unicode.php
diff --git a/lib/classes/uuid.class.php b/lib/classes/uuid.php
similarity index 100%
rename from lib/classes/uuid.class.php
rename to lib/classes/uuid.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 78296c7c70..8edf7086da 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
          stopOnFailure="false"
          syntaxCheck="true"
          verbose="false"
-         bootstrap="tests/bootstrap.inc"
+         bootstrap="tests/bootstrap.php"
 >
 <!--
     <logging>
@@ -42,7 +42,7 @@
     </filter>
 
   <listeners>
-    <listener class="PhraseanetPHPUnitListener" file="tests/PhraseanetPHPUnitListener.class.inc"></listener>
+    <listener class="PhraseanetPHPUnitListener" file="tests/classes/PhraseanetPHPUnitListener.php"></listener>
   </listeners>
 
 </phpunit>
diff --git a/tests/Alchemy/Phrasea/Controller/BoilerPlate.php b/tests/Alchemy/Phrasea/Controller/BoilerPlate.php
deleted file mode 100644
index a5b38690db..0000000000
--- a/tests/Alchemy/Phrasea/Controller/BoilerPlate.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAbstract.class.inc';
-/**
- * Always load the controller file for CodeCoverage
- */
-require_once __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Controller/My/Controller.php';
-
-use Silex\WebTestCase;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- *
- * This class is a BoilerPlate for a Controller Test
- *
- *  - You should extends PhraseanetWebTestCaseAuthenticatedAbstract if the
- * controller required authentication
- *
- *  - The Class Name should end with "Test" to be detected by
- *
- */
-class BoilerPlate extends \PhraseanetWebTestCaseAbstract
-{
-
-    /**
-     * Default route test
-     */
-    public function testRouteSlash()
-    {
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-}
diff --git a/tests/Alchemy/Phrasea/Controller/Setup/FakeSetupApplication.inc b/tests/Alchemy/Phrasea/Controller/Setup/FakeSetupApplication.inc
deleted file mode 100644
index 3e6c34c2d8..0000000000
--- a/tests/Alchemy/Phrasea/Controller/Setup/FakeSetupApplication.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Alchemy\Phrasea\Application;
-
-use Alchemy\Phrasea\Application as PhraseaApplication;
-use Alchemy\Phrasea\Controller\Setup as Controller;
-use Alchemy\Phrasea\Controller\Utils as ControllerUtils;
-
-return call_user_func(function() {
-            $app = new PhraseaApplication('test');
-
-            $app['install'] = true;
-
-            $app->get('/', function() use ($app) {
-                return $app->redirect('/setup/installer/');
-            });
-
-            $app->mount('/installer/', new Controller\Installer());
-            $app->mount('/test', new ControllerUtils\PathFileTest());
-            $app->mount('/connection_test', new ControllerUtils\ConnectionTest());
-
-
-            $app->error(function($e) {
-
-                });
-
-            return $app;
-        });
diff --git a/tests/Alchemy/Phrasea/Loader/AutoloaderTest.php b/tests/Alchemy/Phrasea/Loader/AutoloaderTest.php
deleted file mode 100644
index 6d81cbed10..0000000000
--- a/tests/Alchemy/Phrasea/Loader/AutoloaderTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
-class AutoloaderTest extends \PhraseanetPHPUnitAbstract
-{
-
-    /**
-     * @covers Alchemy\Phrasea\Loader\Autoloader::findFile
-     */
-    public function testFindFile()
-    {
-        $testClassName = 'Test_Hello';
-        $autoloader = new Alchemy\Phrasea\Loader\Autoloader();
-        $autoloader->addPath('fixture', __DIR__ . '/Fixtures');
-        $autoloader->loadClass($testClassName);
-        $this->assertTrue(class_exists($testClassName));
-    }
-
-    /**
-     * @covers Alchemy\Phrasea\Loader\Autoloader::addPath
-     */
-    public function testAddPath()
-    {
-        $autoloader = new Alchemy\Phrasea\Loader\Autoloader();
-        $pathNb = count($autoloader->getPaths());
-        $autoloader->addPath('fixture', __DIR__ . '/Fixtures');
-        $this->assertGreaterThan($pathNb, count($autoloader->getPaths()));
-        $this->assertArrayHasKey('fixture', $autoloader->getPaths());
-    }
-
-    /**
-     * @covers Alchemy\Phrasea\Loader\Autoloader::getPaths
-     */
-    public function testGetPath()
-    {
-        $autoloader = new Alchemy\Phrasea\Loader\Autoloader();
-        $this->assertTrue(is_array($autoloader->getPaths()));
-        $this->assertTrue(2 === count($autoloader->getPaths()));
-        $this->assertArrayHasKey('config', $autoloader->getPaths());
-        $this->assertArrayHasKey('library', $autoloader->getPaths());
-    }
-}
diff --git a/tests/Alchemy/Phrasea/Loader/CacheAutoloaderTest.php b/tests/Alchemy/Phrasea/Loader/CacheAutoloaderTest.php
deleted file mode 100644
index 9bf40e7f38..0000000000
--- a/tests/Alchemy/Phrasea/Loader/CacheAutoloaderTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
-class CacheAutoloaderTest extends \PhraseanetPHPUnitAbstract
-{
-    private $apc = false;
-    private $xcache = false;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (extension_loaded('apc')) {
-            $this->apc = true;
-        }
-
-        if (extension_loaded('xcache')) {
-            $this->xcache = true;
-        }
-    }
-
-    public function testConstruct()
-    {
-        if ( ! $this->apc && ! $this->xcache) {
-            try {
-                $autoloader = new Alchemy\Phrasea\Loader\CacheAutoloader('test_prefix_');
-                $this->fail("should raise an exception");
-            } catch (\Exception $e) {
-
-            }
-        }
-    }
-
-    public function testFindFileApc()
-    {
-        if ($this->apc) {
-            if ( ! (ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {
-                $this->markTestSkipped('The apc extension is available, but not enabled.');
-            } else {
-                apc_clear_cache('user');
-            }
-
-            $autoloader = new Alchemy\Phrasea\Loader\CacheAutoloader('test_prefix_');
-            $cacheAdapter = $autoloader->getAdapter();
-            $this->assertEquals($autoloader->findFile('Test_HelloCache'), $cacheAdapter->fetch('test_prefix_Test_Hello'));
-        }
-    }
-
-    public function testGetPrefix()
-    {
-        if ($this->apc) {
-            $autoloader = new Alchemy\Phrasea\Loader\CacheAutoloader('test_prefix_');
-            $this->assertEquals('test_prefix_', $autoloader->getPrefix());
-        }
-    }
-
-    public function testRegister()
-    {
-        if ($this->apc) {
-            if ( ! (ini_get('apc.enabled') && ini_get('apc.enable_cli'))) {
-                $this->markTestSkipped('The apc extension is available, but not enabled.');
-            } else {
-                apc_clear_cache('user');
-            }
-            $autoloader = new Alchemy\Phrasea\Loader\CacheAutoloader('test_prefix_');
-            $autoloader->addPath('fixture', __DIR__ . '/Fixtures');
-            $autoloader->register();
-            $this->assertTrue(class_exists("Test_test"));
-        }
-    }
-
-    public function testFindFileXcache()
-    {
-        if ($this->xcache) {
-            $this->marktestSkipped("can't use xcache in cli mode");
-        }
-    }
-
-    public function tearDown()
-    {
-        if (ini_get('apc.enabled') && ini_get('apc.enable_cli')) {
-            apc_clear_cache('user');
-        }
-        parent::tearDown();
-    }
-}
diff --git a/tests/Alchemy/Phrasea/Loader/Fixtures/Test/Hello.class.php b/tests/Alchemy/Phrasea/Loader/Fixtures/Test/Hello.class.php
deleted file mode 100644
index 6ede4ef74d..0000000000
--- a/tests/Alchemy/Phrasea/Loader/Fixtures/Test/Hello.class.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class Test_hello
-{
-
-}
diff --git a/tests/Alchemy/Phrasea/Loader/Fixtures/Test/HelloCache.class.php b/tests/Alchemy/Phrasea/Loader/Fixtures/Test/HelloCache.class.php
deleted file mode 100644
index b242167d12..0000000000
--- a/tests/Alchemy/Phrasea/Loader/Fixtures/Test/HelloCache.class.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class HelloCache
-{
-
-}
diff --git a/tests/Alchemy/Phrasea/Loader/Fixtures/Test/test.class.php b/tests/Alchemy/Phrasea/Loader/Fixtures/Test/test.class.php
deleted file mode 100644
index 547b169918..0000000000
--- a/tests/Alchemy/Phrasea/Loader/Fixtures/Test/test.class.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class Test_test
-{
-
-}
diff --git a/tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc b/tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc
deleted file mode 100644
index 490ef9f9d6..0000000000
--- a/tests/Alchemy/Phrasea/Setup/AbstractSetupTester.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Alchemy\Phrasea\Setup;
-
-use Alchemy\Phrasea\Application;
-
-abstract class AbstractSetupTester extends \PHPUnit_Framework_TestCase
-{
-    private $tearDownHandlers = array();
-
-    public function tearDown()
-    {
-        foreach ($this->tearDownHandlers as $handler) {
-            $handler();
-        }
-
-        parent::tearDown();
-    }
-
-    protected function uninstall()
-    {
-        rename(__DIR__ . '/../../../../config/config.yml', __DIR__ . '/../../../../config/config.yml.test');
-        rename(__DIR__ . '/../../../../config/connexions.yml', __DIR__ . '/../../../../config/connexions.yml.test');
-        rename(__DIR__ . '/../../../../config/services.yml', __DIR__ . '/../../../../config/services.yml.test');
-
-        $this->tearDownHandlers[] = function() {
-                rename(__DIR__ . '/../../../../config/config.yml.test', __DIR__ . '/../../../../config/config.yml');
-                rename(__DIR__ . '/../../../../config/connexions.yml.test', __DIR__ . '/../../../../config/connexions.yml');
-                rename(__DIR__ . '/../../../../config/services.yml.test', __DIR__ . '/../../../../config/services.yml');
-            };
-    }
-
-    protected function goBackTo31()
-    {
-        $app = new Application('test');
-        $credentials = $app['phraseanet.appbox']->get_connection()->get_credentials();
-
-        $this->uninstall();
-
-        copy(__DIR__ . '/../../../../hudson/_GV.php', __DIR__ . '/../../../../config/_GV.php');
-
-        file_put_contents( __DIR__ . '/../../../../config/_GV.php', str_replace('http://local.phrasea/', 'http://local.phrasea.tester/', file_get_contents( __DIR__ . '/../../../../config/_GV.php')));
-
-        file_put_contents(__DIR__ . '/../../../../config/connexion.inc', "<?php\n
-\$hostname = '".$credentials['hostname']."';
-\$port = '".$credentials['port']."';
-\$user = '".$credentials['user']."';
-\$password = '".$credentials['password']."';
-\$dbname = 'ab_unitTests';
-            ");
-
-        $this->tearDownHandlers[] = function() {
-            @unlink(__DIR__ . '/../../../../config/_GV.php');
-            @unlink(__DIR__ . '/../../../../config/connexion.inc');
-        };
-    }
-
-    protected function goBackTo35()
-    {
-        $app = new Application('test');
-        $credentials = $app['phraseanet.appbox']->get_connection()->get_credentials();
-
-        $this->uninstall();
-
-        file_put_contents(__DIR__ . '/../../../../config/config.inc', "<?php\n\$servername = 'http://local.phrasea';\n");
-        file_put_contents(__DIR__ . '/../../../../config/connexion.inc', "<?php\n
-\$hostname = '".$credentials['hostname']."';
-\$port = '".$credentials['port']."';
-\$user = '".$credentials['user']."';
-\$password = '".$credentials['password']."';
-\$dbname = '".$credentials['dbname']."';
-            ");
-
-        $this->tearDownHandlers[] = function() {
-                @unlink(__DIR__ . '/../../../../config/config.inc');
-                @unlink(__DIR__ . '/../../../../config/connexion.inc');
-            };
-    }
-}
diff --git a/tests/Alchemy/Phrasea/Application/ApiAbstract.inc b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
similarity index 99%
rename from tests/Alchemy/Phrasea/Application/ApiAbstract.inc
rename to tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
index b6557b6041..f5a4c703d3 100644
--- a/tests/Alchemy/Phrasea/Application/ApiAbstract.inc
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Application;
-
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Application;
 
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Manager;
@@ -67,13 +65,13 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
         self::$DI['app'] = self::$DI->share(function() {
 
             $environment = 'test';
-            $app = require __DIR__ . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
+            $app = require __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Application/Api.php';
 
             $app['debug'] = true;
 
             $app['EM'] = $app->share($app->extend('EM', function($em) {
                 @unlink('/tmp/db.sqlite');
-                copy(__DIR__ . '/../../../db-ref.sqlite', '/tmp/db.sqlite');
+                copy(__DIR__ . '/../../../../db-ref.sqlite', '/tmp/db.sqlite');
 
                 return $em;
             }));
@@ -88,7 +86,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
         parent::setUpBeforeClass();
 
         $environment = 'test';
-        $application = require __DIR__ . '/../../../../lib/Alchemy/Phrasea/Application/Api.php';
+        $application = require __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Application/Api.php';
 
         self::$oauthApplication = \API_OAuth2_Application::create($application, self::$DI['user_notAdmin'], 'test API v1');
         self::$account = \API_OAuth2_Account::load_with_user($application, self::$oauthApplication, self::$DI['user_notAdmin']);
@@ -991,7 +989,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
     {
         $this->setToken(self::$token);
 
-        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../testfiles/cestlafete.jpg');
+        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../files/cestlafete.jpg');
         self::$DI['record_story_1']->substitute_subdef('preview', $media, self::$DI['app']);
         self::$DI['record_story_1']->substitute_subdef('thumbnail', $media, self::$DI['app']);
 
@@ -1091,7 +1089,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
     {
         $this->setToken(self::$token);
 
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../testfiles/test001.CR2'), self::$DI['collection']);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../files/test001.CR2'), self::$DI['collection']);
         $record = \record_adapter::createFromFile($file, self::$DI['app']);
 
         $route = '/records/' . $record->get_sbas_id() . '/' . $record->get_record_id() . '/setmetadatas/';
@@ -1211,7 +1209,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
      */
     public function testMoveRecordToCollection()
     {
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../testfiles/test001.CR2'), self::$DI['collection']);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../files/test001.CR2'), self::$DI['collection']);
         $record = \record_adapter::createFromFile($file, self::$DI['app']);
 
         $this->setToken(self::$token);
@@ -1910,7 +1908,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
             };
 
         $tmpname = tempnam(sys_get_temp_dir(), 'test_quarantine');
-        copy(__DIR__ . '/../../../testfiles/iphone_pic.jpg', $tmpname);
+        copy(__DIR__ . '/../../../../files/iphone_pic.jpg', $tmpname);
 
         $file = File::buildFromPathfile($tmpname, self::$DI['collection'], self::$DI['app']);
         self::$DI['app']['border-manager']->process($lazaretSession, $file, $callback, Manager::FORCE_LAZARET);
@@ -2004,7 +2002,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract
     protected function getAddRecordFile()
     {
         $file = tempnam(sys_get_temp_dir(), 'upload');
-        copy(__DIR__ . '/../../../testfiles/iphone_pic.jpg', $file);
+        copy(__DIR__ . '/../../../../files/iphone_pic.jpg', $file);
 
         return array(
             'file' => new \Symfony\Component\HttpFoundation\File\UploadedFile($file, 'upload.jpg')
diff --git a/tests/Alchemy/Phrasea/Application/ApiJSONPTest.php b/tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php
similarity index 90%
rename from tests/Alchemy/Phrasea/Application/ApiJSONPTest.php
rename to tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php
index a18125573e..71fa87ae1b 100644
--- a/tests/Alchemy/Phrasea/Application/ApiJSONPTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php
@@ -1,11 +1,7 @@
 <?php
 
-namespace Alchemy\Phrasea\Application;
+namespace Alchemy\Tests\Phrasea\Application;
 
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAbstract.class.inc';
-require_once __DIR__ . '/ApiAbstract.inc';
-
-use Silex\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 
 class ApiJSONPApplication extends ApiAbstract
diff --git a/tests/Alchemy/Phrasea/Application/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
similarity index 59%
rename from tests/Alchemy/Phrasea/Application/ApiJsonTest.php
rename to tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
index 023319aa18..a817e84f18 100644
--- a/tests/Alchemy/Phrasea/Application/ApiJsonTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
@@ -1,12 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Application;
-
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAbstract.class.inc';
-require_once __DIR__ . '/ApiAbstract.inc';
-
-use Silex\WebTestCase;
-use Symfony\Component\HttpFoundation\Response;
+namespace Alchemy\Tests\Phrasea\Application;
 
 class ApiJsonApplication extends ApiAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Application/ApiYamlTest.php b/tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Application/ApiYamlTest.php
rename to tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
index 9e6e1f2b83..39ac6a3f2a 100644
--- a/tests/Alchemy/Phrasea/Application/ApiYamlTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
@@ -1,12 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Application;
-
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAbstract.class.inc';
-require_once __DIR__ . '/ApiAbstract.inc';
-
-use Silex\WebTestCase;
-use Symfony\Component\HttpFoundation\Response;
+namespace Alchemy\Tests\Phrasea\Application;
 
 class ApiYamlApplication extends ApiAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Application/LightboxTest.php b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Application/LightboxTest.php
rename to tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
index 1e92e8f6ee..aec9f56097 100644
--- a/tests/Alchemy/Phrasea/Application/LightboxTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Application;
 
-class ApplicationLightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
+class ApplicationLightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
 
     protected $client;
@@ -14,23 +14,23 @@ class ApplicationLightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
     public function setUp()
     {
         parent::setUp();
-        $this->feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $this->feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
         $publishers = $this->feed->get_publishers();
         $publisher = array_shift($publishers);
-        $this->entry = Feed_Entry_Adapter::create(self::$DI['app'], $this->feed, $publisher, 'title', "sub Titkle", " jean pierre", "jp@test.com");
-        $this->item = Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $this->entry, self::$DI['record_1']);
+        $this->entry = \Feed_Entry_Adapter::create(self::$DI['app'], $this->feed, $publisher, 'title', "sub Titkle", " jean pierre", "jp@test.com");
+        $this->item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $this->entry, self::$DI['record_1']);
     }
 
     public function tearDown()
     {
-        if ($this->feed instanceof Feed_Adapter)
+        if ($this->feed instanceof \Feed_Adapter)
             $this->feed->delete();
         parent::tearDown();
     }
 
     public function testRouteSlash()
     {
-        $auth = new Session_Authentication_None(self::$DI['user']);
+        $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
         $baskets = $this->insertFiveBasket();
@@ -179,7 +179,7 @@ class ApplicationLightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testValidate()
     {
-        $auth = new Session_Authentication_None(self::$DI['user']);
+        $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
         $basket = $this->insertOneValidationBasket();
@@ -205,7 +205,7 @@ class ApplicationLightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testCompare()
     {
-        $auth = new Session_Authentication_None(self::$DI['user']);
+        $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
         $basket = $this->insertOneBasket();
@@ -231,7 +231,7 @@ class ApplicationLightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testFeedEntry()
     {
-        $auth = new Session_Authentication_None(self::$DI['user']);
+        $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
         $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']);
diff --git a/tests/Alchemy/Phrasea/Application/OAuth2Test.php b/tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
similarity index 84%
rename from tests/Alchemy/Phrasea/Application/OAuth2Test.php
rename to tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
index 41f98efadc..f9c5ecc5a2 100644
--- a/tests/Alchemy/Phrasea/Application/OAuth2Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Application;
 
 /**
  * Test oauthv2 flow based on ietf authv2 spec
@@ -24,13 +24,13 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
         parent::setUpBeforeClass();
 
         $environment = 'test';
-        $application = require __DIR__ . '/../../../../lib/Alchemy/Phrasea/Application/OAuth2.php';
+        $application = require __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Application/OAuth2.php';
 
-        self::$appli = API_OAuth2_Application::create($application, self::$DI['user'], 'test');
+        self::$appli = \API_OAuth2_Application::create($application, self::$DI['user'], 'test');
         self::$appli->set_description('une description')
             ->set_redirect_uri('http://callback.com/callback/')
             ->set_website('http://website.com/')
-            ->set_type(API_OAuth2_Application::WEB_TYPE);
+            ->set_type(\API_OAuth2_Application::WEB_TYPE);
     }
 
     public static function tearDownAfterClass()
@@ -46,7 +46,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
         parent::setUp();
 
         $environment = 'test';
-        self::$DI['app'] = require __DIR__ . '/../../../../lib/Alchemy/Phrasea/Application/OAuth2.php';
+        self::$DI['app'] = require __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Application/OAuth2.php';
 
         $this->queryParameters = array(
             "response_type" => "code",
@@ -57,7 +57,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
         );
     }
 
-    public static function deleteInsertedRow(appbox $appbox, API_OAuth2_Application $app)
+    public static function deleteInsertedRow(\appbox $appbox, \API_OAuth2_Application $app)
     {
         $conn = $appbox->get_connection();
         $sql = '
@@ -84,7 +84,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
         $conn = self::$DI['app']['phraseanet.appbox']->get_connection();
         $stmt = $conn->prepare($sql);
         $stmt->execute($t);
-        $result = $stmt->fetch(PDO::FETCH_ASSOC);
+        $result = $stmt->fetch(\PDO::FETCH_ASSOC);
 
         return $result;
     }
@@ -96,9 +96,9 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
         $conn = self::$DI['app']['phraseanet.appbox']->get_connection();
         $stmt = $conn->prepare($sql);
         $stmt->execute($t);
-        $row = $stmt->fetch(PDO::FETCH_ASSOC);
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        return new API_OAuth2_Account(self::$DI['app'], $row["api_account_id"]);
+        return new \API_OAuth2_Account(self::$DI['app'], $row["api_account_id"]);
     }
 
     public function setQueryParameters($parameter, $value)
@@ -115,7 +115,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
     public function testAuthorizeRedirect()
     {
         //session off
-        $apps = API_OAuth2_Application::load_authorized_app_by_user(self::$DI['app'], self::$DI['user']);
+        $apps = \API_OAuth2_Application::load_authorized_app_by_user(self::$DI['app'], self::$DI['user']);
         foreach ($apps as $app) {
             if ($app->get_client_id() == self::$appli->get_client_id()) {
                 $authorize = true;
diff --git a/tests/Alchemy/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
similarity index 92%
rename from tests/Alchemy/Phrasea/Application/OverviewTest.php
rename to tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
index 1856154f2b..bc0d67d935 100644
--- a/tests/Alchemy/Phrasea/Application/OverviewTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
@@ -1,12 +1,12 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Application;
 
 use Alchemy\Phrasea\Border\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
-class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
+class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
     function testDatafilesRouteAuthenticated()
     {
@@ -31,12 +31,12 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
     function testEtag()
     {
         $tmp = tempnam(sys_get_temp_dir(), 'testEtag');
-        copy(__DIR__ . '/../../../testfiles/cestlafete.jpg', $tmp);
+        copy(__DIR__ . '/../../../../files/cestlafete.jpg', $tmp);
 
         $media = self::$DI['app']['mediavorus']->guess($tmp);
 
         $file = new File(self::$DI['app'], $media, self::$DI['collection']);
-        $record = record_adapter::createFromFile($file, self::$DI['app']);
+        $record = \record_adapter::createFromFile($file, self::$DI['app']);
 
         $record->generate_subdefs($record->get_databox(), self::$DI['app']);
 
@@ -110,7 +110,7 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
             ->disableOriginalConstructor()
             ->getMock();
 
-        $symfoFile = new UploadedFile(__DIR__ . '/../../../testfiles/cestlafete.jpg', 'cestlafete.jpg');
+        $symfoFile = new UploadedFile(__DIR__ . '/../../../../files/cestlafete.jpg', 'cestlafete.jpg');
 
         $media->expects($this->any())
             ->method('getFile')
diff --git a/tests/Alchemy/Phrasea/Application/RootTest.php b/tests/Alchemy/Tests/Phrasea/Application/RootTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Application/RootTest.php
rename to tests/Alchemy/Tests/Phrasea/Application/RootTest.php
index b1dd365379..f49d41345f 100644
--- a/tests/Alchemy/Phrasea/Application/RootTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/RootTest.php
@@ -1,14 +1,14 @@
 <?php
 
+namespace Alchemy\Tests\Phrasea\Application;
+
 use Alchemy\Phrasea\Application;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\BrowserKit\Cookie as BrowserCookie;
 use Symfony\Component\BrowserKit\CookieJar;
 
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
-class ApplicationRootTest extends PhraseanetWebTestCaseAuthenticatedAbstract
+class ApplicationRootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
     public function testRouteSlash()
     {
diff --git a/tests/Alchemy/Phrasea/Application/SetupTest.php b/tests/Alchemy/Tests/Phrasea/Application/SetupTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Application/SetupTest.php
rename to tests/Alchemy/Tests/Phrasea/Application/SetupTest.php
index 1a71d26f7f..09d7bf78db 100644
--- a/tests/Alchemy/Phrasea/Application/SetupTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/SetupTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Application;
 
-class ApplicationSetupTest extends PhraseanetWebTestCaseAbstract
+class ApplicationSetupTest extends \PhraseanetWebTestCaseAbstract
 {
     protected $client;
     protected $root;
@@ -24,7 +24,7 @@ class ApplicationSetupTest extends PhraseanetWebTestCaseAbstract
     {
         $this->markTestSkipped('To review');
         parent::setUp();
-        $this->root = __DIR__ . '/../../../../';
+        $this->root = __DIR__ . '/../../../../../';
         $this->temporaryUnInstall();
         $this->connection = self::$DI['app']['phraseanet.appbox']->get_connection();
 
diff --git a/tests/Alchemy/Phrasea/ApplicationTest.php b/tests/Alchemy/Tests/Phrasea/ApplicationTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/ApplicationTest.php
rename to tests/Alchemy/Tests/Phrasea/ApplicationTest.php
index 08f52967c6..03a25c0106 100644
--- a/tests/Alchemy/Phrasea/ApplicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/ApplicationTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea;
+namespace Alchemy\Tests\Phrasea;
 
+use Alchemy\Phrasea\Application;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -10,8 +11,6 @@ use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\BrowserKit\CookieJar;
 use Symfony\Component\BrowserKit\Cookie as BrowserCookie;
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class ApplicationTest extends \PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Alchemy/Phrasea/Border/Attribute/FactoryTest.php b/tests/Alchemy/Tests/Phrasea/Border/Attribute/FactoryTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Border/Attribute/FactoryTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Attribute/FactoryTest.php
index 6f058399c7..be27630f5a 100644
--- a/tests/Alchemy/Phrasea/Border/Attribute/FactoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Attribute/FactoryTest.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Attribute;
+namespace Alchemy\Tests\Phrasea\Border\Attribute;
 
+use Alchemy\Phrasea\Border\Attribute\Factory;
+use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
+use Alchemy\Phrasea\Border\Attribute\MetaField;
 use PHPExiftool\Driver\Tag\IPTC\UniqueDocumentID;
 use PHPExiftool\Driver\Value\Mono;
 use PHPExiftool\Driver\Metadata\Metadata;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class FactoryTest extends \PhraseanetPHPUnitAbstract
 {
 
diff --git a/tests/Alchemy/Phrasea/Border/Attribute/MetaFieldTest.php b/tests/Alchemy/Tests/Phrasea/Border/Attribute/MetaFieldTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Border/Attribute/MetaFieldTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Attribute/MetaFieldTest.php
index 997e009108..0d2e28d62e 100644
--- a/tests/Alchemy/Phrasea/Border/Attribute/MetaFieldTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Attribute/MetaFieldTest.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Border\Attribute;
+namespace Alchemy\Tests\Phrasea\Border\Attribute;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\Attribute\MetaField;
+use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
 
 class MetaFieldTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Border/Attribute/MetadataTest.php b/tests/Alchemy/Tests/Phrasea/Border/Attribute/MetadataTest.php
similarity index 93%
rename from tests/Alchemy/Phrasea/Border/Attribute/MetadataTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Attribute/MetadataTest.php
index 64f7650434..fba9a425ea 100644
--- a/tests/Alchemy/Phrasea/Border/Attribute/MetadataTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Attribute/MetadataTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Attribute;
+namespace Alchemy\Tests\Phrasea\Border\Attribute;
 
+use Alchemy\Phrasea\Border\Attribute\Metadata;
+use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
 use PHPExiftool\Driver\Tag\IPTC\ObjectName;
 use PHPExiftool\Driver\Value\Mono;
 use PHPExiftool\Driver\Metadata\Metadata as ExiftoolMeta;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class MetadataTest extends \PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Alchemy/Phrasea/Border/Attribute/StatusTest.php b/tests/Alchemy/Tests/Phrasea/Border/Attribute/StatusTest.php
similarity index 93%
rename from tests/Alchemy/Phrasea/Border/Attribute/StatusTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Attribute/StatusTest.php
index b4fb3484c8..680f452042 100644
--- a/tests/Alchemy/Phrasea/Border/Attribute/StatusTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Attribute/StatusTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Attribute;
+namespace Alchemy\Tests\Phrasea\Border\Attribute;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\Attribute\Status;
+use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
 
 class StatusTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Border/Attribute/StoryTest.php b/tests/Alchemy/Tests/Phrasea/Border/Attribute/StoryTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Border/Attribute/StoryTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Attribute/StoryTest.php
index 63312852d6..0b2055c150 100644
--- a/tests/Alchemy/Phrasea/Border/Attribute/StoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Attribute/StoryTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Attribute;
+namespace Alchemy\Tests\Phrasea\Border\Attribute;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\Attribute\Story;
+use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
 
 class StoryTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Border/Checker/AbstractCheckerTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/AbstractCheckerTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Border/Checker/AbstractCheckerTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/AbstractCheckerTest.php
index 5afb9e3ef0..f1335c4cfe 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/AbstractCheckerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/AbstractCheckerTest.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
+use Alchemy\Phrasea\Border\Checker\AbstractChecker;
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Application;
 use Doctrine\ORM\EntityManager;
 
-require_once __DIR__ . "/../../../../PhraseanetPHPUnitAbstract.class.inc";
-
 class AbstractCheckerTest extends \PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Alchemy/Phrasea/Border/Checker/ColorspaceTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/ColorspaceTest.php
similarity index 93%
rename from tests/Alchemy/Phrasea/Border/Checker/ColorspaceTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/ColorspaceTest.php
index 318650ab52..914ec57e48 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/ColorspaceTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/ColorspaceTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
 use Alchemy\Phrasea\Border\File;
-
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\Checker\Colorspace;
 
 class ColorspaceTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Border/Checker/DimensionTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/DimensionTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Border/Checker/DimensionTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/DimensionTest.php
index 6d701cb102..098c5d0afe 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/DimensionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/DimensionTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
 use Alchemy\Phrasea\Border\File;
-
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\Checker\Dimension;
 
 class DimensionTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Border/Checker/ExtensionTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/ExtensionTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/Border/Checker/ExtensionTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/ExtensionTest.php
index 0cbd1c37c7..9f68f3450a 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/ExtensionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/ExtensionTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
 use Alchemy\Phrasea\Border\File;
-
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\Checker\Extension;
 
 class ExtensionTest extends \PhraseanetPHPUnitAbstract
 {
@@ -37,7 +36,7 @@ class ExtensionTest extends \PhraseanetPHPUnitAbstract
 
         foreach ($tests as $extension => $result) {
 
-            $spl = $this->getMock('\\Symfony\\Component\\HttpFoundation\\File\\File', array('getExtension'), array(__DIR__ . '/../../../../testfiles/test001.CR2'));
+            $spl = $this->getMock('\\Symfony\\Component\\HttpFoundation\\File\\File', array('getExtension'), array(__DIR__ . '/../../../../../files/test001.CR2'));
 
             $spl->expects($this->any())
                 ->method('getExtension')
@@ -72,6 +71,6 @@ class ExtensionTest extends \PhraseanetPHPUnitAbstract
      */
     public function testContructorInvalidArgumentException()
     {
-        new Dimension(self::$DI['app'], array(array('jpg', 'png', 'tiff')));
+        new Extension(self::$DI['app'], array(array('jpg', 'png', 'tiff')));
     }
 }
diff --git a/tests/Alchemy/Phrasea/Border/Checker/FilenameTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/FilenameTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/Border/Checker/FilenameTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/FilenameTest.php
index 34e70ff9d9..e743dac67b 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/FilenameTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/FilenameTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
-
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
 use Alchemy\Phrasea\Border\File;
+use Alchemy\Phrasea\Border\Checker\Filename;
 
 class FilenameTest extends \PhraseanetPHPUnitAbstract
 {
@@ -23,8 +22,8 @@ class FilenameTest extends \PhraseanetPHPUnitAbstract
     {
         parent::setUp();
         $this->object = new Filename(self::$DI['app']);
-        $this->filename = __DIR__ . '/../../../../../tmp/test001.CR2';
-        copy(__DIR__ . '/../../../../testfiles/test001.CR2', $this->filename);
+        $this->filename = __DIR__ . '/../../../../../../tmp/test001.CR2';
+        copy(__DIR__ . '/../../../../../files/test001.CR2', $this->filename);
         $this->media = self::$DI['app']['mediavorus']->guess($this->filename);
     }
 
diff --git a/tests/Alchemy/Phrasea/Border/Checker/MediaTypeTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/MediaTypeTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/Border/Checker/MediaTypeTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/MediaTypeTest.php
index 8665a7619c..98be8a8041 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/MediaTypeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/MediaTypeTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
 use Alchemy\Phrasea\Border\File;
-
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\Checker\MediaType;
 
 class MediaTypeTest extends \PhraseanetPHPUnitAbstract
 {
@@ -28,7 +27,7 @@ class MediaTypeTest extends \PhraseanetPHPUnitAbstract
      */
     public function testCheck()
     {
-        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/test001.CR2');
+        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/test001.CR2');
         $file = new File(self::$DI['app'], $media, self::$DI['collection']);
         $response = $this->object->check(self::$DI['app']['EM'], $file);
 
@@ -36,7 +35,7 @@ class MediaTypeTest extends \PhraseanetPHPUnitAbstract
 
         $object = new MediaType(self::$DI['app'], array('mediatypes' => array(MediaType::TYPE_VIDEO, MediaType::TYPE_AUDIO)));
 
-        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/test001.CR2');
+        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/test001.CR2');
         $file = new File(self::$DI['app'], $media, self::$DI['collection']);
         $response = $object->check(self::$DI['app']['EM'], $file);
 
diff --git a/tests/Alchemy/Phrasea/Border/Checker/ResponseTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/ResponseTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Border/Checker/ResponseTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/ResponseTest.php
index c1d8259e9d..35de04f622 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/ResponseTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/ResponseTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
+namespace Alchemy\Tests\Phrasea\Border\Checker;
+
+use Alchemy\Phrasea\Border\Checker\Response;
 
 class ResponseTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Border/Checker/Sha256Test.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Border/Checker/Sha256Test.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
index 8645aec427..1c6074ecb6 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/Sha256Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/Sha256Test.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
-
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
 use Alchemy\Phrasea\Border\Manager;
 use Alchemy\Phrasea\Border\File;
+use Alchemy\Phrasea\Border\Checker\Sha256;
 
 class Sha256Test extends \PhraseanetPHPUnitAbstract
 {
@@ -20,8 +19,8 @@ class Sha256Test extends \PhraseanetPHPUnitAbstract
     {
         parent::setUp();
         $this->object = new Sha256(self::$DI['app']);
-        $this->filename = __DIR__ . '/../../../../../tmp/test001.CR2';
-        copy(__DIR__ . '/../../../../testfiles/test001.CR2', $this->filename);
+        $this->filename = __DIR__ . '/../../../../../../tmp/test001.CR2';
+        copy(__DIR__ . '/../../../../../files/test001.CR2', $this->filename);
         $this->media = self::$DI['app']['mediavorus']->guess($this->filename);
     }
 
@@ -49,7 +48,7 @@ class Sha256Test extends \PhraseanetPHPUnitAbstract
         $mock
             ->expects($this->once())
             ->method('getSha256')
-            ->will($this->returnValue($this->media->getHash('sha256', __DIR__ . '/../../../../testfiles/test001.CR2')))
+            ->will($this->returnValue($this->media->getHash('sha256', __DIR__ . '/../../../../../files/test001.CR2')))
         ;
 
         $response = $this->object->check(self::$DI['app']['EM'], $mock);
diff --git a/tests/Alchemy/Phrasea/Border/Checker/UUIDTest.php b/tests/Alchemy/Tests/Phrasea/Border/Checker/UUIDTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Border/Checker/UUIDTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/Checker/UUIDTest.php
index 6c888d5cfc..38d7646a51 100644
--- a/tests/Alchemy/Phrasea/Border/Checker/UUIDTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/Checker/UUIDTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Border\Checker;
-
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Border\Checker;
 
 use Alchemy\Phrasea\Border\File;
+use Alchemy\Phrasea\Border\Checker\UUID;
 
 class UUIDTest extends \PhraseanetPHPUnitAbstract
 {
@@ -19,8 +18,8 @@ class UUIDTest extends \PhraseanetPHPUnitAbstract
     {
         parent::setUp();
         $this->object = new UUID(self::$DI['app']);
-        $this->filename = __DIR__ . '/../../../../../tmp/test001.CR2';
-        copy(__DIR__ . '/../../../../testfiles/test001.CR2', $this->filename);
+        $this->filename = __DIR__ . '/../../../../../../tmp/test001.CR2';
+        copy(__DIR__ . '/../../../../../files/test001.CR2', $this->filename);
         $this->media = self::$DI['app']['mediavorus']->guess($this->filename);
     }
 
diff --git a/tests/Alchemy/Phrasea/Border/FileTest.php b/tests/Alchemy/Tests/Phrasea/Border/FileTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Border/FileTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/FileTest.php
index e4d77d527c..c74f76d9fa 100644
--- a/tests/Alchemy/Phrasea/Border/FileTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/FileTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Border;
+namespace Alchemy\Tests\Phrasea\Border;
 
+use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Media\Type\Image;
 use Alchemy\Phrasea\Media\Type\Flash;
 use Alchemy\Phrasea\Media\Type\Audio;
@@ -15,8 +16,6 @@ use PHPExiftool\Driver\Value\Multi;
 use PHPExiftool\Driver\Metadata\Metadata as PHPExiftoolMetadata;
 use Alchemy\Phrasea\Border\Attribute\Metadata;
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class FileTest extends \PhraseanetPHPUnitAbstract
 {
     /**
@@ -32,8 +31,8 @@ class FileTest extends \PhraseanetPHPUnitAbstract
     public function setUp()
     {
         parent::setUp();
-        $this->filename = __DIR__ . '/../../../../tmp/iphone_pic.jpg';
-        copy(__DIR__ . '/../../../testfiles/iphone_pic.jpg', $this->filename);
+        $this->filename = __DIR__ . '/../../../../../tmp/iphone_pic.jpg';
+        copy(__DIR__ . '/../../../../files/iphone_pic.jpg', $this->filename);
 
         $this->media = self::$DI['app']['mediavorus']->guess($this->filename);
 
@@ -65,13 +64,13 @@ class FileTest extends \PhraseanetPHPUnitAbstract
      */
     public function testNewUuid()
     {
-        $file = __DIR__ . '/../../../testfiles/temporay.jpg';
+        $file = __DIR__ . '/../../../../files/temporay.jpg';
 
         if (file_exists($file)) {
             unlink($file);
         }
 
-        copy(__DIR__ . '/../../../testfiles/p4logo.jpg', $file);
+        copy(__DIR__ . '/../../../../files/p4logo.jpg', $file);
 
         $borderFile = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess($file), self::$DI['collection']);
         $uuid = $borderFile->getUUID(true, false);
@@ -120,7 +119,7 @@ class FileTest extends \PhraseanetPHPUnitAbstract
     public function testGetFile()
     {
         $this->assertInstanceOf('\\MediaVorus\\File', $this->object->getFile());
-        $this->assertEquals(realpath(__DIR__ . '/../../../../tmp/iphone_pic.jpg'), $this->object->getFile()->getRealPath());
+        $this->assertEquals(realpath(__DIR__ . '/../../../../../tmp/iphone_pic.jpg'), $this->object->getFile()->getRealPath());
     }
 
     /**
diff --git a/tests/Alchemy/Phrasea/Border/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Border/ManagerTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
index eba24b1312..f87dab4234 100644
--- a/tests/Alchemy/Phrasea/Border/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
@@ -1,10 +1,18 @@
 <?php
 
-namespace Alchemy\Phrasea\Border;
+namespace Alchemy\Tests\Phrasea\Border;
 
+use Alchemy\Phrasea\Border\File;
+use Alchemy\Phrasea\Border\Manager;
+use Alchemy\Phrasea\Border\Checker\Sha256;
+use Alchemy\Phrasea\Border\Checker\Filename;
+use Alchemy\Phrasea\Border\Checker\UUID;
 use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
-
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+use Alchemy\Phrasea\Border\Attribute\Factory;
+use Alchemy\Phrasea\Border\Attribute\MetaField;
+use Alchemy\Phrasea\Border\Attribute\Metadata;
+use Alchemy\Phrasea\Border\Attribute\Status;
+use Alchemy\Phrasea\Border\Attribute\Story;
 
 class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -22,10 +30,10 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $tmpDir = sys_get_temp_dir();
 
         self::$file1 = $tmpDir . '/test.jpg';
-        copy(__DIR__ . '/../../../testfiles/iphone_pic.jpg', self::$file1);
+        copy(__DIR__ . '/../../../../files/iphone_pic.jpg', self::$file1);
 
         self::$file2 = $tmpDir . '/test.txt';
-        copy(__DIR__ . '/../../../testfiles/ISOLatin1.txt', self::$file2);
+        copy(__DIR__ . '/../../../../files/ISOLatin1.txt', self::$file2);
     }
 
     public static function tearDownAfterClass()
@@ -74,7 +82,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             };
 
         $this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, File::buildFromPathfile(self::$file1, self::$DI['collection'], self::$DI['app']), $postProcessRecord));
-        $shaChecker = new Checker\Sha256(self::$DI['app']);
+        $shaChecker = new Sha256(self::$DI['app']);
         $this->object->registerChecker($shaChecker);
 
         $phpunit = $this;
@@ -155,7 +163,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
                 $data[] = null;
                 $value = new \PHPExiftool\Driver\Value\Multi($data);
 
-                $file->addAttribute(new Attribute\Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
+                $file->addAttribute(new Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
             } else {
 
                 $data = array('Hello Mono ' . $databox_field->get_tag()->getTagname());
@@ -165,19 +173,19 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
                         $value = new \PHPExiftool\Driver\Value\Mono(current($data));
                         $tofetch [$databox_field->get_name()] = $data;
 
-                        $file->addAttribute(new Attribute\Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
+                        $file->addAttribute(new Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
                     } else {
                         $value = new \PHPExiftool\Driver\Value\Mono(current($data));
                         $tofetch [$databox_field->get_name()] = $data;
 
-                        $file->addAttribute(new Attribute\MetaField($databox_field, array(current($data))));
+                        $file->addAttribute(new MetaField($databox_field, array(current($data))));
                     }
                 }
                 if ($first) {
                     $value = new \PHPExiftool\Driver\Value\Mono(null);
                     $first = false;
 
-                    $file->addAttribute(new Attribute\Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
+                    $file->addAttribute(new Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
                 }
             }
 
@@ -185,7 +193,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         }
 
         $story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']);
-        $file->addAttribute(new Attribute\Story($story));
+        $file->addAttribute(new Story($story));
 
         $status = '';
         foreach (range(0, 31) as $i) {
@@ -196,7 +204,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             }
         }
 
-        $file->addAttribute(new Attribute\Status(self::$DI['app'], strrev($status)));
+        $file->addAttribute(new Status(self::$DI['app'], strrev($status)));
 
         $this->assertEquals(Manager::RECORD_CREATED, $this->object->process($this->session, $file, $postProcessRecord, Manager::FORCE_RECORD));
 
@@ -267,7 +275,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
                 $value = new \PHPExiftool\Driver\Value\Multi($data);
 
-                $file->addAttribute(new Attribute\Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
+                $file->addAttribute(new Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
             } else {
 
                 $data = array('Hello Mono ' . $databox_field->get_tag()->getTagname());
@@ -276,25 +284,25 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
                     $value = new \PHPExiftool\Driver\Value\Mono(current($data));
                     $tofetchMeta [$databox_field->get_tag()->getTagname()] = $data;
 
-                    $file->addAttribute(new Attribute\Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
+                    $file->addAttribute(new Metadata(new \PHPExiftool\Driver\Metadata\Metadata($databox_field->get_tag(), $value)));
                 } else {
                     $tofetchField [$databox_field->get_name()] = $data;
 
-                    $file->addAttribute(new Attribute\MetaField($databox_field, array(current($data))));
+                    $file->addAttribute(new MetaField($databox_field, array(current($data))));
                 }
             }
 
             $odd = !$odd;
         }
 
-        $file->addAttribute(new Attribute\Story(self::$DI['record_story_1']));
+        $file->addAttribute(new Story(self::$DI['record_story_1']));
 
         $status = '1';
         foreach (range(1, 31) as $i) {
             $status .= '0';
         }
 
-        $file->addAttribute(new Attribute\Status(self::$DI['app'], $status));
+        $file->addAttribute(new Status(self::$DI['app'], $status));
 
         $this->assertEquals(Manager::LAZARET_CREATED, $this->object->process($this->session, $file, $postProcessRecord, Manager::FORCE_LAZARET));
 
@@ -304,7 +312,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         /* @var $lazaret \Entities\LazaretFile */
         foreach ($lazaret->getAttributes() as $attr) {
-            $attribute = Attribute\Factory::getFileAttribute(self::$DI['app'], $attr->getName(), $attr->getValue());
+            $attribute = Factory::getFileAttribute(self::$DI['app'], $attr->getName(), $attr->getValue());
 
             if ($attribute->getName() == AttributeInterface::NAME_STORY) {
                 if ($attribute->getValue()->get_serialize_key() == self::$DI['record_story_1']->get_serialize_key()) {
@@ -370,8 +378,8 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $multiValue = new \PHPExiftool\Driver\Value\Multi(array('Babar', 'Celeste'));
         $multiData = new \PHPExiftool\Driver\Metadata\Metadata($personInImageTag, $multiValue);
 
-        $file->addAttribute(new Attribute\Metadata($monoData));
-        $file->addAttribute(new Attribute\Metadata($multiData));
+        $file->addAttribute(new Metadata($monoData));
+        $file->addAttribute(new Metadata($multiData));
 
         $phpunit = $this;
         $application = self::$DI['app'];
@@ -382,7 +390,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
                 /* @var $element \Entities\LazaretFile */
                 foreach ($element->getAttributes() as $attribute) {
                     $phpunit->assertEquals('metadata', $attribute->getName());
-                    $value = Attribute\Factory::getFileAttribute($application, $attribute->getName(), $attribute->getValue());
+                    $value = Factory::getFileAttribute($application, $attribute->getName(), $attribute->getValue());
                     $phpunit->assertInstanceOf('\\Alchemy\\Phrasea\\Border\\Attribute\\Metadata', $value);
                 }
             };
@@ -403,7 +411,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $manager->setPdfToText(self::$DI['app']['xpdf.pdf2text']);
 
-        $file = File::buildFromPathfile(__DIR__ . '/../../../testfiles/HelloWorld.pdf', self::$DI['collection'], self::$DI['app']);
+        $file = File::buildFromPathfile(__DIR__ . '/../../../../files/HelloWorld.pdf', self::$DI['collection'], self::$DI['app']);
 
         $count = count($file->getAttributes());
         $manager->addMediaAttributesTester($file);
@@ -451,7 +459,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $manager = new ManagerTester(self::$DI['app']);
 
-        $file = File::buildFromPathfile(__DIR__ . '/../../../testfiles/test012.wav', self::$DI['collection'], self::$DI['app']);
+        $file = File::buildFromPathfile(__DIR__ . '/../../../../files/test012.wav', self::$DI['collection'], self::$DI['app']);
 
         $count = count($file->getAttributes());
         $manager->addMediaAttributesTester($file);
@@ -563,7 +571,7 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue($visa->isValid());
 
-        $this->object->registerChecker(new Checker\Sha256(self::$DI['app']));
+        $this->object->registerChecker(new Sha256(self::$DI['app']));
 
         $visa = $this->object->getVisa(File::buildFromPathfile(self::$file1, self::$DI['collection'], self::$DI['app']));
 
@@ -586,9 +594,9 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $this->assertEquals(array(), $this->object->getCheckers());
 
-        $shaChecker = new Checker\Sha256(self::$DI['app']);
+        $shaChecker = new Sha256(self::$DI['app']);
         $this->object->registerChecker($shaChecker);
-        $uuidChecker = new Checker\UUID(self::$DI['app']);
+        $uuidChecker = new UUID(self::$DI['app']);
         $this->object->registerChecker($uuidChecker);
 
         $this->assertEquals(array($shaChecker, $uuidChecker), $this->object->getCheckers());
@@ -602,8 +610,8 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $this->assertEquals(array(), $this->object->getCheckers());
 
-        $shaChecker = new Checker\Sha256(self::$DI['app']);
-        $uuidChecker = new Checker\UUID(self::$DI['app']);
+        $shaChecker = new Sha256(self::$DI['app']);
+        $uuidChecker = new UUID(self::$DI['app']);
         $this->object->registerCheckers(array($shaChecker, $uuidChecker));
 
         $this->assertEquals(array($shaChecker, $uuidChecker), $this->object->getCheckers());
@@ -616,9 +624,9 @@ class ManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $this->assertEquals(array(), $this->object->getCheckers());
 
-        $shaChecker = new Checker\Sha256(self::$DI['app']);
-        $uuidChecker = new Checker\UUID(self::$DI['app']);
-        $filenameChecker = new Checker\Filename(self::$DI['app']);
+        $shaChecker = new Sha256(self::$DI['app']);
+        $uuidChecker = new UUID(self::$DI['app']);
+        $filenameChecker = new Filename(self::$DI['app']);
         $this->object->registerCheckers(array($shaChecker, $uuidChecker, $filenameChecker));
 
         $this->assertEquals(array($shaChecker, $uuidChecker, $filenameChecker), $this->object->getCheckers());
diff --git a/tests/Alchemy/Phrasea/Border/MetaFieldsBagTest.php b/tests/Alchemy/Tests/Phrasea/Border/MetaFieldsBagTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Border/MetaFieldsBagTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/MetaFieldsBagTest.php
index b991d29097..457997c433 100644
--- a/tests/Alchemy/Phrasea/Border/MetaFieldsBagTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/MetaFieldsBagTest.php
@@ -9,11 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Border;
+namespace Alchemy\Tests\Phrasea\Border;
 
 use Alchemy\Phrasea\Border\Attribute\MetaField;
-
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Border\MetaFieldsBag;
 
 class MetaFieldsBagTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Border/MetadataBagTest.php b/tests/Alchemy/Tests/Phrasea/Border/MetadataBagTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Border/MetadataBagTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/MetadataBagTest.php
index b1c8540b33..97661ee328 100644
--- a/tests/Alchemy/Phrasea/Border/MetadataBagTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/MetadataBagTest.php
@@ -9,14 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Alchemy\Phrasea\Border;
+namespace Alchemy\Tests\Phrasea\Border;
 
+use Alchemy\Phrasea\Border\MetadataBag;
 use PHPExiftool\Driver\Metadata\Metadata;
 use PHPExiftool\Driver\Value\Mono;
 use PHPExiftool\Driver\Value\Multi;
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class MetadataBagTest extends \PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Alchemy/Phrasea/Border/VisaTest.php b/tests/Alchemy/Tests/Phrasea/Border/VisaTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Border/VisaTest.php
rename to tests/Alchemy/Tests/Phrasea/Border/VisaTest.php
index 87649d572d..a449d0fd85 100644
--- a/tests/Alchemy/Phrasea/Border/VisaTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/VisaTest.php
@@ -1,6 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Border;
+namespace Alchemy\Tests\Phrasea\Border;
+
+use Alchemy\Phrasea\Border\Visa;
+use Alchemy\Phrasea\Border\Checker\Filename;
+use Alchemy\Phrasea\Border\Checker\Response;
 
 class VisaTest extends \PhraseanetPHPUnitAbstract
 {
@@ -25,9 +29,9 @@ class VisaTest extends \PhraseanetPHPUnitAbstract
 
         $this->assertEquals(array(), $visa->getResponses());
 
-        $response = new Checker\Response(true, new Checker\Filename(self::$DI['app']));
+        $response = new Response(true, new Filename(self::$DI['app']));
         $visa->addResponse($response);
-        $response2 = new Checker\Response(false, new Checker\Filename(self::$DI['app']));
+        $response2 = new Response(false, new Filename(self::$DI['app']));
         $visa->addResponse($response2);
 
         $this->assertSame(array($response, $response2), $visa->getResponses());
@@ -42,12 +46,12 @@ class VisaTest extends \PhraseanetPHPUnitAbstract
 
         $this->assertTrue($visa->isValid());
 
-        $response = new Checker\Response(true, new Checker\Filename(self::$DI['app']));
+        $response = new Response(true, new Filename(self::$DI['app']));
         $visa->addResponse($response);
 
         $this->assertTrue($visa->isValid());
 
-        $response2 = new Checker\Response(false, new Checker\Filename(self::$DI['app']));
+        $response2 = new Response(false, new Filename(self::$DI['app']));
         $visa->addResponse($response2);
 
         $this->assertFalse($visa->isValid());
diff --git a/tests/Alchemy/Phrasea/Cache/ApcCacheTest.php b/tests/Alchemy/Tests/Phrasea/Cache/ApcCacheTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Cache/ApcCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Cache/ApcCacheTest.php
index ba9ce136ea..a421bdf7b7 100644
--- a/tests/Alchemy/Phrasea/Cache/ApcCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Cache/ApcCacheTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Cache;
+
+use Alchemy\Phrasea\Cache\ApcCache;
 
 class ApcCacheTest extends \PHPUnit_Framework_TestCase
 {
@@ -14,7 +16,7 @@ class ApcCacheTest extends \PHPUnit_Framework_TestCase
         if ( ! extension_loaded('apc') || ! ini_get('apc.enable_cli')) {
             $this->markTestSkipped('Apc is not installed');
         }
-        $this->object = new \Alchemy\Phrasea\Cache\ApcCache;
+        $this->object = new ApcCache;
     }
 
     public function testIsServer()
diff --git a/tests/Alchemy/Phrasea/Cache/ArrayCacheTest.php b/tests/Alchemy/Tests/Phrasea/Cache/ArrayCacheTest.php
similarity index 86%
rename from tests/Alchemy/Phrasea/Cache/ArrayCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Cache/ArrayCacheTest.php
index 508cc4697a..913ac15cca 100644
--- a/tests/Alchemy/Phrasea/Cache/ArrayCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Cache/ArrayCacheTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Cache;
+
+use Alchemy\Phrasea\Cache\ArrayCache;
 
 class ArrayCacheTest extends \PHPUnit_Framework_TestCase
 {
@@ -11,7 +13,7 @@ class ArrayCacheTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->object = new \Alchemy\Phrasea\Cache\ArrayCache;
+        $this->object = new ArrayCache;
     }
 
     public function testIsServer()
diff --git a/tests/Alchemy/Phrasea/Cache/MemcacheCacheTest.php b/tests/Alchemy/Tests/Phrasea/Cache/MemcacheCacheTest.php
similarity index 86%
rename from tests/Alchemy/Phrasea/Cache/MemcacheCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Cache/MemcacheCacheTest.php
index 39016536d0..654633df81 100644
--- a/tests/Alchemy/Phrasea/Cache/MemcacheCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Cache/MemcacheCacheTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Cache;
+
+use Alchemy\Phrasea\Cache\MemcacheCache;
 
 class MemcacheCacheTest extends \PHPUnit_Framework_TestCase
 {
@@ -11,13 +13,13 @@ class MemcacheCacheTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->object = new \Alchemy\Phrasea\Cache\MemcacheCache;
+        $this->object = new MemcacheCache();
 
         if ( ! class_exists('Memcache')) {
             $this->markTestSkipped('No memcache extension');
         }
 
-        $memcache = new Memcache();
+        $memcache = new \Memcache();
         if ( ! @$memcache->connect('localhost', 11211)) {
             $this->markTestSkipped('No memcache server');
         }
diff --git a/tests/Alchemy/Phrasea/Cache/RedisCacheTest.php b/tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Cache/RedisCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
index 2c19ad33d6..c2d3b0d02b 100644
--- a/tests/Alchemy/Phrasea/Cache/RedisCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Cache;
+
+use \Alchemy\Phrasea\Cache\RedisCache;
 
 class RedisTest extends \PhraseanetPHPUnitAbstract
 {
@@ -8,7 +10,7 @@ class RedisTest extends \PhraseanetPHPUnitAbstract
     public function testBasics()
     {
         if (extension_loaded('Redis')) {
-            $redis = new Redis();
+            $redis = new \Redis();
             try {
                 $ok = @$redis->connect('127.0.0.1', 6379);
             } catch (\Exception $e) {
@@ -21,7 +23,7 @@ class RedisTest extends \PhraseanetPHPUnitAbstract
             $this->markTestSkipped('The ' . __CLASS__ . ' requires the use of redis');
         }
 
-        $cache = new \Alchemy\Phrasea\Cache\RedisCache();
+        $cache = new RedisCache();
         $cache->setRedis($redis);
         // Test save
         $cache->save('test_key', 'testing this out');
diff --git a/tests/Alchemy/Phrasea/Cache/XcacheCacheTest.php b/tests/Alchemy/Tests/Phrasea/Cache/XcacheCacheTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Cache/XcacheCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Cache/XcacheCacheTest.php
index ccfb93f5f7..d7ab635136 100644
--- a/tests/Alchemy/Phrasea/Cache/XcacheCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Cache/XcacheCacheTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Cache;
+
+use Alchemy\Phrasea\Cache\XcacheCache;
 
 class XcacheCacheTest extends \PHPUnit_Framework_TestCase
 {
@@ -15,7 +17,7 @@ class XcacheCacheTest extends \PHPUnit_Framework_TestCase
             $this->markTestSkipped('Xcache not loaded');
         }
 
-        $this->object = new \Alchemy\Phrasea\Cache\XcacheCache;
+        $this->object = new XcacheCache;
     }
 
     public function testIsServer()
diff --git a/tests/Alchemy/Phrasea/Command/CommandTest.php b/tests/Alchemy/Tests/Phrasea/Command/CommandTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/Command/CommandTest.php
rename to tests/Alchemy/Tests/Phrasea/Command/CommandTest.php
index f002785d61..73538c654e 100644
--- a/tests/Alchemy/Phrasea/Command/CommandTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/CommandTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Command;
+namespace Alchemy\Tests\Phrasea\Command;
 
-use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/tests/Alchemy/Phrasea/Command/UpgradeDBDatasTest.php b/tests/Alchemy/Tests/Phrasea/Command/UpgradeDBDatasTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Command/UpgradeDBDatasTest.php
rename to tests/Alchemy/Tests/Phrasea/Command/UpgradeDBDatasTest.php
index 6da2efa2bd..0b7d84720b 100644
--- a/tests/Alchemy/Phrasea/Command/UpgradeDBDatasTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/UpgradeDBDatasTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Command;
+namespace Alchemy\Tests\Phrasea\Command;
 
 use Alchemy\Phrasea\Application;
+use Alchemy\Phrasea\Command\UpgradeDBDatas;
 use Alchemy\Phrasea\Command\Upgrade\Step31;
 use Alchemy\Phrasea\Command\Upgrade\Step35;
 
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/AdminCollectionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/Admin/AdminCollectionTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
index ea70a187cc..8ba561e864 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/AdminCollectionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
@@ -111,7 +111,7 @@ class AdminCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $collection = $this->createOneCollection();
 
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/test001.CR2'), $collection);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/test001.CR2'), $collection);
         \record_adapter::createFromFile($file, self::$DI['app']);
 
         self::$DI['client']->request('GET', '/admin/collection/' . $collection->get_base_id() . '/informations/details/');
@@ -431,7 +431,7 @@ class AdminCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $collection = $this->createOneCollection();
 
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/test001.CR2'), $collection);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/test001.CR2'), $collection);
         \record_adapter::createFromFile($file, self::$DI['app']);
 
         if ($collection->get_record_amount() === 0) {
@@ -558,7 +558,7 @@ class AdminCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->setAdmin(true);
 
         $target = tempnam(sys_get_temp_dir(), 'p4logo') . '.jpg';
-        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../testfiles/p4logo.jpg', $target);
+        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../../files/p4logo.jpg', $target);
         $files = array(
             'newLogo' => new \Symfony\Component\HttpFoundation\File\UploadedFile($target, 'logo.jpg')
         );
@@ -605,7 +605,7 @@ class AdminCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->setAdmin(true);
 
         $target = tempnam(sys_get_temp_dir(), 'p4logo') . '.jpg';
-        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../testfiles/p4logo.jpg', $target);
+        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../../files/p4logo.jpg', $target);
         $files = array(
             'newWm' => new \Symfony\Component\HttpFoundation\File\UploadedFile($target, 'logo.jpg')
         );
@@ -652,7 +652,7 @@ class AdminCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->setAdmin(true);
 
         $target = tempnam(sys_get_temp_dir(), 'p4logo') . '.jpg';
-        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../testfiles/p4logo.jpg', $target);
+        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../../files/p4logo.jpg', $target);
         $files = array(
             'newStamp' => new \Symfony\Component\HttpFoundation\File\UploadedFile($target, 'logo.jpg')
         );
@@ -700,7 +700,7 @@ class AdminCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->setAdmin(true);
 
         $target = tempnam(sys_get_temp_dir(), 'p4logo') . '.jpg';
-        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../testfiles/p4logo.jpg', $target);
+        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../../files/p4logo.jpg', $target);
         $files = array(
             'newBanner' => new \Symfony\Component\HttpFoundation\File\UploadedFile($target, 'logo.jpg')
         );
@@ -828,7 +828,7 @@ class AdminCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $collection = $this->createOneCollection();
 
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/test001.CR2'), $collection);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/test001.CR2'), $collection);
         \record_adapter::createFromFile($file, self::$DI['app']);
 
         if ($collection->get_record_amount() === 0) {
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/AdminDashboardTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminDashboardTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Admin/AdminDashboardTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminDashboardTest.php
index d1cc6719b4..28b774164c 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/AdminDashboardTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminDashboardTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 class AdminDashboardTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/ConnectedUserTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/ConnectedUserTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/Controller/Admin/ConnectedUserTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/ConnectedUserTest.php
index b005e04c2a..9338175b52 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/ConnectedUserTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/ConnectedUserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Controller\Admin\ConnectedUsers;
 
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/DataboxTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/Admin/DataboxTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
index ae0016d8b9..d387727699 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/DataboxTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxTest.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Controller\Admin;
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 class DataboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
     protected $client;
@@ -119,6 +117,8 @@ class DataboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
 
+        $databox->unmount_databox();
+        $databox->delete();
         /**
          * @todo test if order is set
          */
@@ -510,7 +510,7 @@ class DataboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->setAdmin(true);
 
         $target = tempnam(sys_get_temp_dir(), 'p4logo') . '.jpg';
-        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../testfiles/p4logo.jpg', $target);
+        self::$DI['app']['filesystem']->copy(__DIR__ . '/../../../../../files/p4logo.jpg', $target);
         $files = array(
             'newLogoPdf' => new \Symfony\Component\HttpFoundation\File\UploadedFile($target, 'logo.jpg')
         );
@@ -573,7 +573,7 @@ class DataboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $base = $this->createDatabox();
         $collection = \collection::create(self::$DI['app'], $base, self::$DI['app']['phraseanet.appbox'], 'TESTTODELETE');
         self::$createdCollections[] = $collection;
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/test001.CR2'), $collection);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/test001.CR2'), $collection);
         \record_adapter::createFromFile($file, self::$DI['app']);
 
         if ($collection->get_record_amount() === 0) {
@@ -585,6 +585,9 @@ class DataboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $json = $this->getJson(self::$DI['client']->getResponse());
         $this->assertTrue($json->success);
         $this->assertEquals(0, $collection->get_record_amount());
+
+        $base->unmount_databox();
+        $base->delete();
     }
 
     /**
@@ -646,5 +649,8 @@ class DataboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         if (!$found) {
             $this->fail('Task for empty collection has not been created');
         }
+
+        $base->unmount_databox();
+        $base->delete();
     }
 }
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/DataboxesTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxesTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/Admin/DataboxesTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxesTest.php
index 0580b7bcd9..6662b864b3 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/DataboxesTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DataboxesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 class DataboxesTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/DescriptionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DescriptionTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/Admin/DescriptionTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/DescriptionTest.php
index 7a91034b75..78c687cbe8 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/DescriptionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/DescriptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
@@ -74,7 +74,7 @@ class DescriptionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $find = false;
 
         foreach ($fields as $field) {
-            if ($field->get_name() === databox_field::generateName($name)) {
+            if ($field->get_name() === \databox_field::generateName($name)) {
                 $field->delete();
                 $find = true;
             }
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/FieldsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/Controller/Admin/FieldsTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
index f107eb395e..bb2bac5cdf 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/FieldsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
+
+use PHPExiftool\Driver\Tag\IPTC\ObjectName;
 
 class ControllerFieldsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -12,7 +14,7 @@ class ControllerFieldsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
         $databox = array_shift($databoxes);
 
-        $tag = new PHPExiftool\Driver\Tag\IPTC\ObjectName();
+        $tag = new ObjectName();
 
         $field = \databox_field::create(self::$DI['app'], $databox, "test" . time(), false);
         $field->set_tag($tag)->save();
@@ -34,7 +36,7 @@ class ControllerFieldsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
         $databox = array_shift($databoxes);
 
-        $tag = new PHPExiftool\Driver\Tag\IPTC\ObjectName();
+        $tag = new ObjectName();
 
         $field = \databox_field::create(self::$DI['app'], $databox, "test" . time(), false);
         $field->set_tag($tag)->save();
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
similarity index 80%
rename from tests/Alchemy/Phrasea/Controller/Admin/PublicationTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
index 7471baf864..c46d78113e 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/PublicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
-class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthenticatedAbstract
+class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
     public static $account = null;
     public static $api = null;
@@ -19,7 +19,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
         $crawler = self::$DI['client']->request('GET', '/admin/publications/list/');
         $pageContent = self::$DI['client']->getResponse()->getContent();
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $feeds = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
+        $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
 
         foreach ($feeds->get_feeds() as $feed) {
             $this->assertRegExp('/\/admin\/publications\/feed\/' . $feed->get_id() . '/', $pageContent);
@@ -32,14 +32,14 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testCreate()
     {
-        $feeds = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
+        $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
         $count = sizeof($feeds->get_feeds());
 
         $crawler = self::$DI['client']->request('POST', '/admin/publications/create/', array("title"    => "hello", "subtitle" => "coucou", "base_id"  => self::$DI['collection']->get_base_id()));
 
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect('/admin/publications/list/'));
 
-        $feeds = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
+        $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
         $count_after = sizeof($feeds->get_feeds());
         $this->assertGreaterThan($count, $count_after);
 
@@ -51,7 +51,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testGetFeed()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
         $crawler = self::$DI['client']->request('GET', '/admin/publications/feed/' . $feed->get_id() . '/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
         $this->assertEquals(1, $crawler->filterXPath("//form[@action='/admin/publications/feed/" . $feed->get_id() . "/update/']")->count());
@@ -63,7 +63,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testUpdateFeedNotOwner()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/update/");
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect(), 'update fails, i\'m redirected');
         $this->assertTrue(
@@ -77,7 +77,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
     public function testUpdatedFeedException()
     {
 
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/update/", array(
             'title'    => 'test'
@@ -85,7 +85,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
             , 'public'   => '1'
         ));
 
-        $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+        $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
 
         $this->assertTrue(
             strpos(
@@ -103,7 +103,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testUpdatedFeedOwner()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/update/", array(
             'title'    => 'test'
@@ -119,7 +119,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
             ) === 0);
 
 
-        $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+        $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
 
         $collection = $feed->get_collection();
 
@@ -139,7 +139,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testIconUploadErrorOwner()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/iconupload/", array(), array(), array('HTTP_ACCEPT' => 'application/json'));
 
@@ -156,7 +156,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testIconUploadErrorFileData()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request(
             "POST"
@@ -176,13 +176,13 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testIconUploadErrorFileType()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request(
             "POST"
             , "/admin/publications/feed/" . $feed->get_id() . "/iconupload/"
             , array()
-            , array('Filedata' => array('error'    => 0, 'tmp_name' => __DIR__ . '/../../../../testfiles/test007.ppt'))
+            , array('Filedata' => array('error'    => 0, 'tmp_name' => __DIR__ . '/../../../../../files/test007.ppt'))
         );
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isOk());
@@ -196,12 +196,12 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testIconUpload()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         $files = array(
             'files' => array(
                 new \Symfony\Component\HttpFoundation\File\UploadedFile(
-                    __DIR__ . '/../../../../testfiles/logocoll.gif', 'logocoll.gif'
+                    __DIR__ . '/../../../../../files/logocoll.gif', 'logocoll.gif'
                 )
             )
         );
@@ -221,14 +221,14 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
         $this->assertTrue($content->success);
 
-        $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+        $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
 
         $feed->delete();
     }
 
     public function testAddPublisher()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/addpublisher/", array(
             'usr_id' => self::$DI['user_alt1']->get_id()
@@ -237,7 +237,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+        $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
         $publishers = $feed->get_publishers();
 
         $this->assertTrue(isset($publishers[self::$DI['user_alt1']->get_id()]));
@@ -252,11 +252,11 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testAddPublisherException()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/addpublisher/");
 
-        $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+        $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
         $this->assertTrue(
@@ -270,7 +270,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testRemovePublisher()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/removepublisher/", array(
             'usr_id' => self::$DI['user_alt1']->get_id()
@@ -279,7 +279,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+        $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
         $publishers = $feed->get_publishers();
 
         $this->assertFalse(isset($publishers[self::$DI['user_alt1']->get_id()]));
@@ -294,14 +294,14 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testRemovePublisherException()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/removepublisher/");
 
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
 
-        $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+        $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
 
         $this->assertTrue(
             strpos(
@@ -314,7 +314,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
 
     public function testDeleteFeed()
     {
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou');
 
         self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/delete/");
 
@@ -322,7 +322,7 @@ class Module_Admin_Route_PublicationTest extends PhraseanetWebTestCaseAuthentica
         $this->assertTrue($response->isRedirect());
 
         try {
-            $feed = new Feed_Adapter(self::$DI['app'], $feed->get_id());
+            $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id());
             $feed->delete();
             $this->fail("fail deleting feed");
         } catch (\Exception $e) {
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
similarity index 76%
rename from tests/Alchemy/Phrasea/Controller/Admin/RootTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
index 26879ac34f..f4f8c5f79d 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/RootTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -11,7 +11,7 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testRouteSlash()
     {
-        $auth = new Session_Authentication_None(self::$DI['user']);
+        $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
         self::$DI['client']->request('GET', '/admin/', array('section' => 'base:featured'));
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/SearchEngineTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SearchEngineTest.php
similarity index 92%
rename from tests/Alchemy/Phrasea/Controller/Admin/SearchEngineTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/SearchEngineTest.php
index 1e338269d7..d0c29d6853 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/SearchEngineTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SearchEngineTest.php
@@ -1,11 +1,11 @@
 <?php
 
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
+
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine;
 use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine;
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 class SearchEngineTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
 
@@ -20,7 +20,7 @@ class SearchEngineTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         self::$DI['client']->request('GET', '/admin/search-engine/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
     }
-    
+
     /**
      * @covers Alchemy\Phrasea\Controller\Admin\SearchEngine::postSearchEngineConfigurationPanel
      * @dataProvider getSearchEngines
@@ -36,7 +36,7 @@ class SearchEngineTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function getSearchEngines()
     {
         $app = new Application('test');
-        
+
         return array(
             array(new PhraseaEngine($app)),
             array(new SphinxSearchEngine($app, 'localhost', 9306, 'localhost', 9308)),
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/SetupTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SetupTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Controller/Admin/SetupTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/SetupTest.php
index e2ea770b3b..855f478793 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/SetupTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SetupTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
+
+use Symfony\Component\HttpKernel\Client;
 
 class SetupTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -43,7 +45,7 @@ class SetupTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
                 $this->isType('string'));
 
         self::$DI['app']['phraseanet.registry'] = $registry;
-        self::$DI['client'] = new Symfony\Component\HttpKernel\Client(self::$DI['app']);
+        self::$DI['client'] = new Client(self::$DI['app']);
         self::$DI['client']->request('POST', '/admin/setup/');
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
     }
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/SubdefsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
similarity index 80%
rename from tests/Alchemy/Phrasea/Controller/Admin/SubdefsTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
index ba7cd0199b..d76137da3d 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/SubdefsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
+
+use Alchemy\Phrasea\Media\Subdef\Image;
 
 class ControllerSubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -40,7 +42,7 @@ class ControllerSubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             )));
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
 
-        $subdefs = new databox_subdefsStructure(new databox(self::$DI['app'], $this->databox->get_sbas_id()));
+        $subdefs = new \databox_subdefsStructure(new \databox(self::$DI['app'], $this->databox->get_sbas_id()));
         $subdef = $subdefs->get_subdef("image", $name);
         $subdefs->delete_subdef('image', $name);
     }
@@ -81,7 +83,7 @@ class ControllerSubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         );
 
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
-        $subdefs = new databox_subdefsStructure(new databox(self::$DI['app'], $this->databox->get_sbas_id()));
+        $subdefs = new \databox_subdefsStructure(new \databox(self::$DI['app'], $this->databox->get_sbas_id()));
         $subdef = $subdefs->get_subdef("image", $name);
 
         /* @var $subdef \databox_subdef */
@@ -91,10 +93,10 @@ class ControllerSubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue(is_array($options));
 
-        $this->assertEquals(400, $options[\Alchemy\Phrasea\Media\Subdef\Image::OPTION_SIZE]->getValue());
-        $this->assertEquals(83, $options[\Alchemy\Phrasea\Media\Subdef\Image::OPTION_RESOLUTION]->getValue());
-        $this->assertEquals(90, $options[\Alchemy\Phrasea\Media\Subdef\Image::OPTION_QUALITY]->getValue());
-        $this->assertFalse($options[\Alchemy\Phrasea\Media\Subdef\Image::OPTION_STRIP]->getValue());
+        $this->assertEquals(400, $options[Image::OPTION_SIZE]->getValue());
+        $this->assertEquals(83, $options[Image::OPTION_RESOLUTION]->getValue());
+        $this->assertEquals(90, $options[Image::OPTION_QUALITY]->getValue());
+        $this->assertFalse($options[Image::OPTION_STRIP]->getValue());
 
         $subdefs->delete_subdef("image", $name);
     }
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/TaskManagerTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/TaskManagerTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Admin/TaskManagerTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/TaskManagerTest.php
index fdcb9a88e4..36edd3384c 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/TaskManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/TaskManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 class TaskManagerTest extends \PhraseanetWebTestCaseAuthenticatedAbstract {
 
diff --git a/tests/Alchemy/Phrasea/Controller/Admin/UsersTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/Controller/Admin/UsersTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
index a37ea04e34..b8b1d469e5 100644
--- a/tests/Alchemy/Phrasea/Controller/Admin/UsersTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Admin;
 
 class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -31,14 +31,14 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
 
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
         $id = $user->get_id();
 
         self::$DI['client']->request('POST', '/admin/users/delete/', array('users'   => $id));
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isRedirect());
         try {
-            $user = User_Adapter::getInstance($id, self::$DI['app']);
+            $user = \User_Adapter::getInstance($id, self::$DI['app']);
             $user->delete();
             $this->fail("user not deleted");
         } catch (\Exception $e) {
@@ -50,7 +50,7 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
 
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
 
         $base_id = self::$DI['collection']->get_base_id();
         $_GET['values'] = 'canreport_' . $base_id . '=1&manage_' . self::$DI['collection']->get_base_id() . '=1&canpush_' . self::$DI['collection']->get_base_id() . '=1';
@@ -75,7 +75,7 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->markTestIncomplete();
         $_GET = array();
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
         $base_id = self::$DI['collection']->get_base_id();
         $_GET['values'] = 'canreport_' . $base_id . '=1&manage_' . self::$DI['collection']->get_base_id() . '=1&canpush_' . self::$DI['collection']->get_base_id() . '=1';
         $_GET['user_infos'] = "user_infos[email]=" . $user->get_email();
@@ -135,7 +135,7 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testRouteRightTimeApply()
     {
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
         $base_id = self::$DI['collection']->get_base_id();
         $date = new \Datetime();
         $date->modify("-10 days");
@@ -145,7 +145,6 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         self::$DI['client']->request('POST', '/admin/users/rights/time/apply/', array('base_id' => $base_id, 'dmin'    => $dmin, 'dmax'    => $dmax, 'limit'   => 1, 'users'   => $user->get_id()));
         $response = self::$DI['client']->getResponse();
         $this->assertTrue($response->isOK());
-//    $this->assertTrue($user->ACL()->is_limited($base_id));
         $user->delete();
     }
 
@@ -165,7 +164,7 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->markTestIncomplete();
         $base_id = self::$DI['collection']->get_base_id();
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
         self::$DI['client']->request('POST', '/admin/users/rights/masks/apply/', array(
             'base_id' => $base_id, 'vand_and', 'vand_or', 'vxor_or', 'vxor_and'
         ));
@@ -202,11 +201,11 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
 
         $templateName = uniqid('template_');
-        $template = User_Adapter::create(self::$DI['app'], $templateName, "test", $templateName . "@email.com", false);
+        $template = \User_Adapter::create(self::$DI['app'], $templateName, "test", $templateName . "@email.com", false);
         $template->set_template(self::$DI['user']);
 
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
 
         self::$DI['client']->request('POST', '/admin/users/apply_template/', array(
             'template' => $template->get_id()
@@ -244,9 +243,8 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testRouteCreateUser()
     {
-
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
 
         self::$DI['client']->request('POST', '/admin/users/create/', array('value'    => $username . "@email.com", 'template' => '0'));
 
@@ -279,7 +277,7 @@ class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testResetRights()
     {
         $username = uniqid('user_');
-        $user = User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
+        $user = \User_Adapter::create(self::$DI['app'], $username, "test", $username . "@email.com", false);
 
         $user->ACL()->give_access_to_sbas(array_keys(self::$DI['app']['phraseanet.appbox']->get_databoxes()));
 
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/BasketTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
similarity index 99%
rename from tests/Alchemy/Phrasea/Controller/Prod/BasketTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
index 4589c3a647..8e08ffcbe2 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/BasketTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Application;
 
-class ControllerBasketTest extends PhraseanetWebTestCaseAuthenticatedAbstract
+class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
     protected $client;
 
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/BridgeTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/Controller/Prod/BridgeTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
index 7c8dad8c10..ba2b716da8 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/BridgeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
@@ -1,9 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-require_once __DIR__ . '/../../../../Bridge/Bridge_datas.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
-class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
+require_once __DIR__ . '/../../../../../classes/Bridge/Bridge_datas.inc';
+
+class BridgeApplication extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
     public static $account = null;
     public static $api = null;
@@ -13,24 +14,24 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
     {
         parent::setUp();
         try {
-            self::$api = Bridge_Api::get_by_api_name(self::$DI['app'], 'apitest');
-        } catch (Bridge_Exception_ApiNotFound $e) {
-            self::$api = Bridge_Api::create(self::$DI['app'], 'apitest');
+            self::$api = \Bridge_Api::get_by_api_name(self::$DI['app'], 'apitest');
+        } catch (\Bridge_Exception_ApiNotFound $e) {
+            self::$api = \Bridge_Api::create(self::$DI['app'], 'apitest');
         }
 
         try {
-            self::$account = Bridge_Account::load_account_from_distant_id(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo');
-        } catch (Bridge_Exception_AccountNotFound $e) {
-            self::$account = Bridge_Account::create(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo', 'coucou');
+            self::$account = \Bridge_Account::load_account_from_distant_id(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo');
+        } catch (\Bridge_Exception_AccountNotFound $e) {
+            self::$account = \Bridge_Account::create(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo', 'coucou');
         }
     }
 
     public function tearDown()
     {
-        if (self::$api instanceof Bridge_Api) {
+        if (self::$api instanceof \Bridge_Api) {
             self::$api->delete();
         }
-        if (self::$account instanceof Bridge_Account) {
+        if (self::$account instanceof \Bridge_Account) {
             self::$account->delete();
         }
         parent::tearDown();
@@ -41,7 +42,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testManager()
     {
-        $accounts = Bridge_Account::get_accounts_by_user(self::$DI['app'], self::$DI['user']);
+        $accounts = \Bridge_Account::get_accounts_by_user(self::$DI['app'], self::$DI['user']);
         $usr_id = self::$DI['user']->get_id();
 
         $basket = $this->insertOneBasket();
@@ -54,7 +55,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
     public function testLogin()
     {
         self::$DI['client']->request('GET', '/prod/bridge/login/Apitest/');
-        $test = new Bridge_Api_Apitest(self::$DI['app']['phraseanet.registry'], new Bridge_Api_Auth_None());
+        $test = new \Bridge_Api_Apitest(self::$DI['app']['phraseanet.registry'], new \Bridge_Api_Auth_None());
         $this->assertTrue(self::$DI['client']->getResponse()->getStatusCode() == 302);
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect($test->get_auth_url()));
     }
@@ -92,7 +93,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testCallBackAccountNoDefined()
     {
-        if (self::$account instanceof Bridge_Account)
+        if (self::$account instanceof \Bridge_Account)
             self::$account->delete();
         $crawler = self::$DI['client']->request('GET', '/prod/bridge/callback/apitest/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
@@ -107,7 +108,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
                     }
                 });
         try {
-            self::$account = Bridge_Account::load_account_from_distant_id(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo');
+            self::$account = \Bridge_Account::load_account_from_distant_id(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo');
             $settings = self::$account->get_settings();
             $this->assertEquals("kikoo", $settings->get("auth_token"));
             $this->assertEquals("kooki", $settings->get("refresh_token"));
@@ -115,12 +116,12 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
             $settings->delete("auth_token");
             $settings->delete("refresh_token");
             $settings->delete("access_token");
-        } catch (Bridge_Exception_AccountNotFound $e) {
+        } catch (\Bridge_Exception_AccountNotFound $e) {
             $this->fail("No account created after callback");
         }
 
-        if ( ! self::$account instanceof Bridge_Account)
-            self::$account = Bridge_Account::create(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo', 'coucou');
+        if ( ! self::$account instanceof \Bridge_Account)
+            self::$account = \Bridge_Account::create(self::$DI['app'], self::$api, self::$DI['user'], 'kirikoo', 'coucou');
     }
 
     public function testLogout()
@@ -137,7 +138,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
     {
         self::$account->get_settings()->set("auth_token", "somethingNotNull"); //connected
         $url = sprintf("/prod/bridge/adapter/%s/load-elements/%s/", self::$account->get_id(), self::$account->get_api()->get_connector()->get_default_element_type());
-        $account = new Bridge_Account(self::$DI['app'], self::$api, self::$account->get_id());
+        $account = new \Bridge_Account(self::$DI['app'], self::$api, self::$account->get_id());
         $crawler = self::$DI['client']->request('GET', $url, array("page" => 1));
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
         $this->assertNotContains(self::$account->get_api()->generate_login_url(self::$DI['app']['phraseanet.registry'], self::$account->get_api()->get_connector()->get_name()), self::$DI['client']->getResponse()->getContent());
@@ -148,7 +149,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
         self::$account->get_settings()->set("auth_token", "somethingNotNull"); //connected
         $url = sprintf("/prod/bridge/adapter/%s/load-records/", self::$account->get_id());
         $crawler = self::$DI['client']->request('GET', $url, array("page"    => 1));
-        $elements = Bridge_Element::get_elements_by_account(self::$DI['app'], self::$account);
+        $elements = \Bridge_Element::get_elements_by_account(self::$DI['app'], self::$account);
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
         $this->assertEquals(sizeof($elements), $crawler->filterXPath("//table/tr")->count());
         $this->assertNotContains(self::$account->get_api()->generate_login_url(self::$DI['app']['phraseanet.registry'], self::$account->get_api()->get_connector()->get_name()), self::$DI['client']->getResponse()->getContent());
@@ -170,7 +171,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
         self::$account->get_settings()->set("auth_token", "somethingNotNull"); //connected
         $url = sprintf("/prod/bridge/adapter/%s/load-containers/%s/", self::$account->get_id(), self::$account->get_api()->get_connector()->get_default_container_type());
         $crawler = self::$DI['client']->request('GET', $url, array("page"    => 1));
-        $elements = Bridge_Element::get_elements_by_account(self::$DI['app'], self::$account);
+        $elements = \Bridge_Element::get_elements_by_account(self::$DI['app'], self::$account);
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
         $this->assertNotContains(self::$account->get_api()->generate_login_url(self::$DI['app']['phraseanet.registry'], self::$account->get_api()->get_connector()->get_name()), self::$DI['client']->getResponse()->getContent());
     }
@@ -227,14 +228,14 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
         try {
             $crawler = self::$DI['client']->request('GET', $url, array("elements_list" => "1;2;3"));
             $this->fail("expected Exception here");
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
 
         }
 
         try {
             $crawler = self::$DI['client']->request('POST', $url, array("elements_list" => "1;2;3"));
             $this->fail("expected Exception here");
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
 
         }
     }
@@ -269,7 +270,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
     public function testActionModifyElementError()
     {
         self::$account->get_settings()->set("auth_token", "somethingNotNull");
-        Bridge_Api_Apitest::$hasError = true;
+        \Bridge_Api_Apitest::$hasError = true;
         $url = sprintf("/prod/bridge/action/%s/modify/%s/", self::$account->get_id(), self::$account->get_api()->get_connector()->get_default_element_type());
         self::$DI['client']->request('POST', $url, array("elements_list" => "element123qcs789"));
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
@@ -278,7 +279,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
     public function testActionModifyElementException()
     {
         self::$account->get_settings()->set("auth_token", "somethingNotNull");
-        Bridge_Api_Apitest::$hasException = true;
+        \Bridge_Api_Apitest::$hasException = true;
         $url = sprintf("/prod/bridge/action/%s/modify/%s/", self::$account->get_id(), self::$account->get_api()->get_connector()->get_default_element_type());
         self::$DI['client']->request('POST', $url, array("elements_list" => "element123qcs789"));
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
@@ -292,7 +293,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
         self::$DI['client']->request('GET', $url, array("elements_list" => "element123qcs789"));
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
 
-        Bridge_Api_Apitest::$hasException = true;
+        \Bridge_Api_Apitest::$hasException = true;
         $url = sprintf("/prod/bridge/action/%s/deleteelement/%s/", self::$account->get_id(), self::$account->get_api()->get_connector()->get_default_element_type());
         self::$DI['client']->request('POST', $url, array("elements_list" => "element123qcs789"));
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
@@ -312,7 +313,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
 
 
-        Bridge_Api_Apitest::$hasException = true;
+        \Bridge_Api_Apitest::$hasException = true;
         $url = sprintf("/prod/bridge/action/%s/createcontainer/%s/", self::$account->get_id(), self::$account->get_api()->get_connector()->get_default_element_type());
         self::$DI['client']->request('POST', $url);
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
@@ -353,7 +354,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertRegexp('/success/', self::$DI['client']->getResponse()->headers->get('location'));
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
 
-        Bridge_Api_Apitest::$hasException = true;
+        \Bridge_Api_Apitest::$hasException = true;
         self::$DI['client']->request('POST', $url, array("elements_list" => "containerudt456shn", 'destination'   => self::$account->get_api()->get_connector()->get_default_container_type()));
         $this->assertRegexp('/error/', self::$DI['client']->getResponse()->headers->get('location'));
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
@@ -378,7 +379,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
             self::$DI['record_1']->get_serialize_key()
         );
 
-        Bridge_Api_Apitest::$hasError = true;
+        \Bridge_Api_Apitest::$hasError = true;
         $lst = implode(';', $records);
         self::$DI['client']->request('POST', $url, array("account_id" => self::$account->get_id(), 'lst'        => $lst));
         $response = self::$DI['client']->getResponse();
@@ -391,7 +392,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testDeleteAccount()
     {
-        $account = Bridge_Account::create(self::$DI['app'], self::$api, self::$DI['app']['phraseanet.user'], 'hello', 'you');
+        $account = \Bridge_Account::create(self::$DI['app'], self::$api, self::$DI['app']['phraseanet.user'], 'hello', 'you');
         $url = "/prod/bridge/adapter/" . $account->get_id() . "/delete/";
         self::$DI['client']->request('POST', $url);
         $response = self::$DI['client']->getResponse();
@@ -402,7 +403,7 @@ class BridgeApplication extends PhraseanetWebTestCaseAuthenticatedAbstract
         try {
             \Bridge_Account::load_account(self::$DI['app'], $account->get_id());
             $this->fail('Account is not deleted');
-        } catch(Bridge_Exception_AccountNotFound $e) {
+        } catch(\Bridge_Exception_AccountNotFound $e) {
 
         }
         unset($account, $response);
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/DoDownloadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DoDownloadTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/Prod/DoDownloadTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/DoDownloadTest.php
index 7afbab199d..376c0896bb 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/DoDownloadTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DoDownloadTest.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
-use Symfony\Component\HttpKernel\KernelEvents;
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class DoDownloadTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -170,7 +168,7 @@ class DoDownloadTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             self::$DI['app'],
             $token,
             $list,
-            sprintf('%s/../../../../../tmp/download/%s.zip', __DIR__, $datas['value']) // Dest file
+            sprintf('%s/../../../../../../tmp/download/%s.zip', __DIR__, $datas['value']) // Dest file
         );
 
         // Check response
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/DownloadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DownloadTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/Prod/DownloadTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/DownloadTest.php
index ba831d57e0..ddaf87fd80 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/DownloadTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/DownloadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class DownloadTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/EditTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Controller/Prod/EditTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
index 34567801fc..299cddc162 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/EditTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class ControllerEditTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/ExportTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Prod/ExportTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php
index 3003b0876c..eb8a76bc5a 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/ExportTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php
@@ -1,9 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
-use Alchemy\Phrasea\Controller\Prod\Export;
-use Symfony\Component\HttpFoundation\Request;
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 /**
  * @todo Test Alchemy\Phrasea\Controller\Prod\Export::exportMail
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Controller/Prod/FeedTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
index 483ed4ee6f..77df1b78ec 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/FeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Application;
 use Symfony\Component\CssSelector\CssSelector;
@@ -9,25 +9,25 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
     /**
      *
-     * @var Feed_Adapter
+     * @var \Feed_Adapter
      */
     protected $feed;
 
     /**
      *
-     * @var Feed_Entry_Adapter
+     * @var \Feed_Entry_Adapter
      */
     protected $entry;
 
     /**
      *
-     * @var Feed_Entry_Item
+     * @var \Feed_Entry_Item
      */
     protected $item;
 
     /**
      *
-     * @var Feed_Publisher_Adapter
+     * @var \Feed_Publisher_Adapter
      */
     protected $publisher;
     protected $client;
@@ -43,15 +43,15 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
         parent::setUp();
 
 
-        $this->feed = Feed_Adapter::create(
+        $this->feed = \Feed_Adapter::create(
                 self::$DI['app'], self::$DI['user'], $this->feed_title, $this->feed_subtitle
         );
 
-        $this->publisher = Feed_Publisher_Adapter::getPublisher(
+        $this->publisher = \Feed_Publisher_Adapter::getPublisher(
                 self::$DI['app']['phraseanet.appbox'], $this->feed, self::$DI['user']
         );
 
-        $this->entry = Feed_Entry_Adapter::create(
+        $this->entry = \Feed_Entry_Adapter::create(
                 self::$DI['app']
                 , $this->feed
                 , $this->publisher
@@ -61,7 +61,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
                 , $this->entry_authormail
         );
 
-        $this->item = Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $this->entry, self::$DI['record_1']);
+        $this->item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $this->entry, self::$DI['record_1']);
     }
 
     public static function setUpBeforeClass()
@@ -77,11 +77,11 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function tearDown()
     {
-        if ($this->feed instanceof Feed_Adapter) {
+        if ($this->feed instanceof \Feed_Adapter) {
             $this->feed->delete();
-        } else if ($this->entry instanceof Feed_Entry_Adapter) {
+        } else if ($this->entry instanceof \Feed_Entry_Adapter) {
             $this->entry->delete();
-            if ($this->publisher instanceof Feed_Publisher_Adapter) {
+            if ($this->publisher instanceof \Feed_Publisher_Adapter) {
                 $this->publisher->delete();
             }
         }
@@ -93,7 +93,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $crawler = self::$DI['client']->request('POST', '/prod/feeds/requestavailable/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
-        $feeds = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
+        $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
         foreach ($feeds->get_feeds() as $one_feed) {
             if ($one_feed->is_publisher(self::$DI['user'])) {
                 $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $one_feed->get_id() . "']")->count());
@@ -160,15 +160,15 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testEntryEditUnauthorized()
     {
 
-        $feed = Feed_Adapter::create(
+        $feed = \Feed_Adapter::create(
                 self::$DI['app'], self::$DI['user_alt1'], $this->feed_title, $this->feed_subtitle
         );
 
-        $publisher = Feed_Publisher_Adapter::getPublisher(
+        $publisher = \Feed_Publisher_Adapter::getPublisher(
                 self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1']
         );
 
-        $entry = Feed_Entry_Adapter::create(
+        $entry = \Feed_Entry_Adapter::create(
                 self::$DI['app']
                 , $feed
                 , $publisher
@@ -182,7 +182,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
         try {
             $crawler = self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->get_id() . '/edit/');
             $this->fail('Should raise an exception');
-        } catch (Exception_UnauthorizedAction $e) {
+        } catch (\Exception_UnauthorizedAction $e) {
 
         }
 
@@ -213,7 +213,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testEntryUpdateChangeFeed()
     {
-        $newfeed = Feed_Adapter::create(
+        $newfeed = \Feed_Adapter::create(
                 self::$DI['app'], self::$DI['user'], $this->feed_title, $this->feed_subtitle
         );
 
@@ -236,7 +236,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertTrue(is_string($pageContent->datas));
         $this->assertRegExp("/entry_" . $this->entry->get_id() . "/", $pageContent->datas);
 
-        $retrievedentry = Feed_Entry_Adapter::load_from_id(self::$DI['app'], $this->entry->get_id());
+        $retrievedentry = \Feed_Entry_Adapter::load_from_id(self::$DI['app'], $this->entry->get_id());
         $this->assertEquals($newfeed->get_id(), $retrievedentry->get_feed()->get_id());
 
         $newfeed->delete();
@@ -244,7 +244,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testEntryUpdateChangeFeedNoAccess()
     {
-        $newfeed = Feed_Adapter::create(
+        $newfeed = \Feed_Adapter::create(
                 self::$DI['app'], self::$DI['user'], $this->feed_title, $this->feed_subtitle
         );
         $newfeed->set_collection(self::$DI['collection_no_access']);
@@ -345,10 +345,10 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
         /**
          * I CREATE A FEED THAT IS NOT MINE
          * */
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
-        $publisher = Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1']);
-        $entry = Feed_Entry_Adapter::create(self::$DI['app'], $feed, $publisher, "hello", "coucou", "salut", "bonjour@phraseanet.com");
-        $item = Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']);
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
+        $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1']);
+        $entry = \Feed_Entry_Adapter::create(self::$DI['app'], $feed, $publisher, "hello", "coucou", "salut", "bonjour@phraseanet.com");
+        $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']);
 
         $params = array(
             "feed_id"      => $feed->get_id()
@@ -389,9 +389,9 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->assertTrue(is_string($pageContent->message));
 
         try {
-            Feed_Entry_Adapter::load_from_id(self::$DI['app'], $this->entry->get_id());
+            \Feed_Entry_Adapter::load_from_id(self::$DI['app'], $this->entry->get_id());
             $this->fail("Failed to delete entry");
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
 
         }
     }
@@ -417,11 +417,11 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
         /**
          * I CREATE A FEED
          * */
-        $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
+        $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou');
 
-        $publisher = Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1']);
-        $entry = Feed_Entry_Adapter::create(self::$DI['app'], $feed, $publisher, "hello", "coucou", "salut", "bonjour@phraseanet.com");
-        $item = Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']);
+        $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1']);
+        $entry = \Feed_Entry_Adapter::create(self::$DI['app'], $feed, $publisher, "hello", "coucou", "salut", "bonjour@phraseanet.com");
+        $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']);
 
         $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->get_id() . '/delete/');
 
@@ -447,7 +447,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
 
-        $feeds = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
+        $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
 
         foreach ($feeds->get_feeds() as $one_feed) {
 
@@ -465,7 +465,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testGetFeed()
     {
 
-        $feeds = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
+        $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
 
         $crawler = self::$DI['client']->request('GET', '/prod/feeds/feed/' . $this->feed->get_id() . "/");
         $pageContent = self::$DI['client']->getResponse()->getContent();
@@ -484,14 +484,14 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
     public function testSuscribeAggregate()
     {
-        $feeds = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
+        $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']);
         $crawler = self::$DI['client']->request('GET', '/prod/feeds/subscribe/aggregated/');
         $this->assertTrue(self::$DI['client']->getResponse()->isOk());
         $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type"));
         $pageContent = json_decode(self::$DI['client']->getResponse()->getContent());
         $this->assertTrue(is_object($pageContent));
         $this->assertTrue(is_string($pageContent->texte));
-        $suscribe_link = $feeds->get_aggregate()->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_RSS, null, false)->get_href();
+        $suscribe_link = $feeds->get_aggregate()->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_RSS, null, false)->get_href();
         $this->assertContains($suscribe_link, $pageContent->texte);
     }
 
@@ -503,7 +503,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $pageContent = json_decode(self::$DI['client']->getResponse()->getContent());
         $this->assertTrue(is_object($pageContent));
         $this->assertTrue(is_string($pageContent->texte));
-        $suscribe_link = $this->feed->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_RSS, null, false)->get_href();
+        $suscribe_link = $this->feed->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_RSS, null, false)->get_href();
         $this->assertContains($suscribe_link, $pageContent->texte);
     }
 }
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/LanguageTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
similarity index 77%
rename from tests/Alchemy/Phrasea/Controller/Prod/LanguageTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
index 12d2d472dc..77dcbb3ae8 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/LanguageTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
-class ControllerLanguageTest extends PhraseanetWebTestCaseAbstract
+class ControllerLanguageTest extends \PhraseanetWebTestCaseAbstract
 {
     protected $client;
 
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/LazaretTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Prod/LazaretTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
index b7ee0d7e13..6bd692aecd 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/LazaretTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
@@ -1,10 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-require_once __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
-use Silex\WebTestCase;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -175,8 +173,8 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $lazaretFileName = self::$DI['app']['phraseanet.registry']->get('GV_RootPath') . 'tmp/lazaret/' . $lazaretFile->getFilename();
         $lazaretThumbFileName = self::$DI['app']['phraseanet.registry']->get('GV_RootPath') . 'tmp/lazaret/' . $lazaretFile->getThumbFilename();
 
-        copy(__DIR__ . '/../../../../testfiles/cestlafete.jpg', $lazaretFileName);
-        copy(__DIR__ . '/../../../../testfiles/cestlafete.jpg', $lazaretThumbFileName);
+        copy(__DIR__ . '/../../../../../files/cestlafete.jpg', $lazaretFileName);
+        copy(__DIR__ . '/../../../../../files/cestlafete.jpg', $lazaretThumbFileName);
 
         //mock lazaret Attribute
         $lazaretAttribute = $this->getMock('Entities\LazaretAttribute', array(), array(), '', false);
@@ -194,7 +192,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             ->will($this->onConsecutiveCalls(
             AttributeInterface::NAME_METADATA, AttributeInterface::NAME_STORY, AttributeInterface::NAME_STATUS, AttributeInterface::NAME_METAFIELD
                 ));
-        $story = record_adapter::createStory(self::$DI['app'], self::$DI['collection']);
+        $story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']);
         //Provide some valid test values
         $lazaretAttribute->expects($this->exactly(4))
             ->method('getValue')
@@ -413,7 +411,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             ->method('getRecordsToSubstitute')
             ->will($this->returnValue(array(self::$DI['record_2'], self::$DI['record_1'])));
 
-        copy(__DIR__ . '/../../../../testfiles/cestlafete.jpg', __DIR__ . '/../../../../../tmp/lazaret/cestlafete.jpg');
+        copy(__DIR__ . '/../../../../../files/cestlafete.jpg', __DIR__ . '/../../../../../../tmp/lazaret/cestlafete.jpg');
 
         $lazaretFile->expects($this->any())
             ->method('getFilename')
@@ -575,7 +573,7 @@ class LazaretTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
         $lazaretFile = $this->getMock('Entities\LazaretFile', array(), array(), '', false);
 
-        copy(__DIR__ . '/../../../../testfiles/cestlafete.jpg', __DIR__ . '/../../../../../tmp/lazaret/cestlafete.jpg');
+        copy(__DIR__ . '/../../../../../files/cestlafete.jpg', __DIR__ . '/../../../../../../tmp/lazaret/cestlafete.jpg');
 
         $lazaretFile->expects($this->any())
             ->method('getThumbFilename')
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/MoveCollectionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/Controller/Prod/MoveCollectionTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
index 9bfef3a247..bdc94005c9 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/MoveCollectionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class ControllerMoveCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/MustacheLoaderTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/MustacheLoaderTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Controller/Prod/MustacheLoaderTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/MustacheLoaderTest.php
index fec27984aa..3cdddc07b2 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/MustacheLoaderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/MustacheLoaderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class MustacheLoaderTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/OrderTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Prod/OrderTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
index 28aef4e3e5..4c14b039c1 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/OrderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/OrderTest.php
@@ -1,7 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-require_once __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Controller/Prod/Order.php';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/PrinterTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Controller/Prod/PrinterTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
index 30d9fb1f0c..e3ce3f21e2 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/PrinterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class ControllerPrinterTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/PropertyTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PropertyTest.php
similarity index 92%
rename from tests/Alchemy/Phrasea/Controller/Prod/PropertyTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/PropertyTest.php
index c4f3cf3a47..a1234c8417 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/PropertyTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PropertyTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
+
+use Alchemy\Phrasea\Border\File;
 
 class PropertyTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -51,7 +53,7 @@ class PropertyTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testChangeStatus()
     {
-        $file = new Alchemy\Phrasea\Border\File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/cestlafete.jpg'), self::$DI['collection']);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']);
         $record = \record_adapter::createFromFile($file, self::$DI['app']);
         $record2 = \record_adapter::createFromFile($file, self::$DI['app']);
         $story = \record_adapter::createStory(self::$DI['app'], self::$DI['collection']);
@@ -105,7 +107,7 @@ class PropertyTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testChangeType()
     {
-        $file = new Alchemy\Phrasea\Border\File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/cestlafete.jpg'), self::$DI['collection']);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']);
         $record = \record_adapter::createFromFile($file, self::$DI['app']);
         $record2 = \record_adapter::createFromFile($file, self::$DI['app']);
 
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/PushTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Prod/PushTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
index af6db0ee79..7f8a5f8444 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/PushTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class ControllerPushTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/QueryTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/QueryTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/Controller/Prod/QueryTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/QueryTest.php
index ff93bea8f0..290a0a1b97 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/QueryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/QueryTest.php
@@ -1,12 +1,10 @@
 <?php
 
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
+
 namespace Alchemy\Phrasea\Controller\Prod;
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
-use Alchemy\Phrasea\Controller\Prod\Query;
-use Symfony\Component\HttpFoundation\Request;
 
 class QueryTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/RecordsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
similarity index 92%
rename from tests/Alchemy/Phrasea/Controller/Prod/RecordsTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
index 93d84e6183..250a060c81 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/RecordsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php
@@ -1,7 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
+use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 
 /**
@@ -14,7 +15,7 @@ class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 
     public static function tearDownAfterClass()
     {
-        if(self::$feed instanceof Feed_Adapter){
+        if(self::$feed instanceof \Feed_Adapter){
             self::$feed->delete();
         }
 
@@ -37,7 +38,7 @@ class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testDoDeleteRecords()
     {
-        $file = new Alchemy\Phrasea\Border\File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/cestlafete.jpg'), self::$DI['collection']);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']);
         $record = \record_adapter::createFromFile($file, self::$DI['app']);
         $this->XMLHTTPRequest('POST', '/prod/records/delete/', array('lst'     => $record->get_serialize_key()));
         $response = self::$DI['client']->getResponse();
@@ -57,7 +58,7 @@ class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testRenewUrl()
     {
-        $file = new Alchemy\Phrasea\Border\File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../testfiles/cestlafete.jpg'), self::$DI['collection']);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../../../files/cestlafete.jpg'), self::$DI['collection']);
         $record = \record_adapter::createFromFile($file, self::$DI['app']);
         $this->XMLHTTPRequest('POST', '/prod/records/renew-url/', array('lst'     => $record->get_serialize_key()));
         $response = self::$DI['client']->getResponse();
@@ -195,17 +196,17 @@ class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
-        self::$feed = Feed_Adapter::create(
+        self::$feed = \Feed_Adapter::create(
             self::$DI['app'],
             self::$DI['user'],
             'titi',
             'toto'
         );
 
-        $feedEntry = Feed_Entry_Adapter::create(
+        $feedEntry = \Feed_Entry_Adapter::create(
             self::$DI['app'],
             self::$feed,
-            Feed_Publisher_Adapter::getPublisher(
+            \Feed_Publisher_Adapter::getPublisher(
                 self::$DI['app']['phraseanet.appbox'],
                 self::$feed,
                 self::$DI['user']
@@ -216,7 +217,7 @@ class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             'tutu@test.fr'
         );
 
-        Feed_Entry_Item::create(
+        \Feed_Entry_Item::create(
             self::$DI['app']['phraseanet.appbox'],
             $feedEntry,
             self::$DI['record_1']
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
similarity index 78%
rename from tests/Alchemy/Phrasea/Controller/Prod/RootTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
index 3d831e8b71..4bd3e14f5c 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/RootTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class ControllerRootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -11,7 +11,7 @@ class ControllerRootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testRouteSlash()
     {
-        $auth = new Session_Authentication_None(self::$DI['user']);
+        $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
         $crawler = self::$DI['client']->request('GET', '/prod/');
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/ShareTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Prod/ShareTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
index be0b5af083..d413b362e8 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/ShareTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ShareTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Controller\Prod\Share;
 
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/StoryTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Prod/StoryTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
index 605b5ab30d..49cb100651 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/StoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
@@ -1,9 +1,8 @@
 <?php
 
-use Symfony\Component\HttpKernel\Client;
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-require_once __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Controller/Prod/Story.php';
+use Symfony\Component\HttpKernel\Client;
 
 class ControllerStoryTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/TOUTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/TOUTest.php
similarity index 96%
rename from tests/Alchemy/Phrasea/Controller/Prod/TOUTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/TOUTest.php
index 8b728312e1..cfe1ee8148 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/TOUTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/TOUTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Application;
 
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/TooltipTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/Controller/Prod/TooltipTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
index d98a3a0fb9..dcb0904fde 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/TooltipTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
@@ -1,12 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
-require_once __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
-use Silex\WebTestCase;
-use Symfony\Component\HttpFoundation\Response;
 
 class ControllerTooltipTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -123,10 +119,10 @@ class ControllerTooltipTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     {
         $databox = self::$DI['record_1']->get_databox();
         $dces = array(
-            databox_field::DCES_CONTRIBUTOR => new databox_Field_DCES_Contributor()
-            , databox_field::DCES_COVERAGE    => new databox_Field_DCES_Coverage()
-            , databox_field::DCES_CREATOR     => new databox_Field_DCES_Creator()
-            , databox_field::DCES_DESCRIPTION => new databox_Field_DCES_Description()
+            \databox_field::DCES_CONTRIBUTOR => new \databox_Field_DCES_Contributor()
+            , \databox_field::DCES_COVERAGE    => new \databox_Field_DCES_Coverage()
+            , \databox_field::DCES_CREATOR     => new \databox_Field_DCES_Creator()
+            , \databox_field::DCES_DESCRIPTION => new \databox_Field_DCES_Description()
         );
 
         foreach ($databox->get_meta_structure() as $field) {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
index 15df4e923e..a48e43957a 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/UploadTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\Manager;
@@ -22,7 +22,7 @@ class UploadTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         parent::setUp();
         self::$DI['app.use-exception-handler'] = true;
         $this->tmpFile = sys_get_temp_dir() . '/' . time() . mt_rand(1000, 9999) . '.jpg';
-        copy(__DIR__ . '/../../../../testfiles/cestlafete.jpg', $this->tmpFile);
+        copy(__DIR__ . '/../../../../../files/cestlafete.jpg', $this->tmpFile);
     }
 
     public function tearDown()
@@ -94,7 +94,7 @@ class UploadTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         if ($datas['element'] == 'record') {
             $id = explode('_', $datas['id']);
 
-            $record = new record_adapter($id[0], $id[1]);
+            $record = new \record_adapter($id[0], $id[1]);
         }
     }
 
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/UsrListsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
similarity index 99%
rename from tests/Alchemy/Phrasea/Controller/Prod/UsrListsTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
index 6c108efaf8..28e3891bf3 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/UsrListsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Prod/WorkZoneTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/Prod/WorkZoneTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
index e428ef467f..5caf83206e 100644
--- a/tests/Alchemy/Phrasea/Controller/Prod/WorkZoneTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Prod;
 
 class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/RecordsRequestTest.php b/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Controller/RecordsRequestTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
index 31c6d9b92b..4dc05bd199 100644
--- a/tests/Alchemy/Phrasea/Controller/RecordsRequestTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/RecordsRequestTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Controller;
+namespace Alchemy\Tests\Phrasea\Controller;
 
-use Symfony\Component\HttpFoundation\Request;
+use Alchemy\Phrasea\Controller\RecordsRequest;
 use Alchemy\Phrasea\Application;
-
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+use Symfony\Component\HttpFoundation\Request;
 
 class RecordsRequestTest extends \PhraseanetPHPUnitAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Root/AccountTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php
similarity index 99%
rename from tests/Alchemy/Phrasea/Controller/Root/AccountTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php
index 50f043d40c..a5ab5d64dc 100644
--- a/tests/Alchemy/Phrasea/Controller/Root/AccountTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/AccountTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use Alchemy\Phrasea\Application;
+namespace Alchemy\Tests\Phrasea\Controller\Root;
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+use Alchemy\Phrasea\Application;
 
 class AccountTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Root/DevelopersTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/DevelopersTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Root/DevelopersTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Root/DevelopersTest.php
index cf38ac0513..9fb4aba2ec 100644
--- a/tests/Alchemy/Phrasea/Controller/Root/DevelopersTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/DevelopersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Root;
 
 class DevelopersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
@@ -53,7 +53,7 @@ class DevelopersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
      */
     public function testPostNewApp()
     {
-        $apps = API_OAuth2_Application::load_dev_app_by_user(self::$DI['app'], self::$DI['user']);
+        $apps = \API_OAuth2_Application::load_dev_app_by_user(self::$DI['app'], self::$DI['user']);
         $nbApp = count($apps);
 
         self::$DI['client']->request('POST', '/developers/application/', array(
@@ -66,7 +66,7 @@ class DevelopersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             'scheme-callback' => 'http://'
         ));
 
-        $apps = API_OAuth2_Application::load_dev_app_by_user(self::$DI['app'], self::$DI['user']);
+        $apps = \API_OAuth2_Application::load_dev_app_by_user(self::$DI['app'], self::$DI['user']);
 
         $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
         $this->assertGreaterThan($nbApp, count($apps));
diff --git a/tests/Alchemy/Phrasea/Controller/Root/LoginTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
similarity index 99%
rename from tests/Alchemy/Phrasea/Controller/Root/LoginTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
index f0b2de1106..0ca095e5e3 100644
--- a/tests/Alchemy/Phrasea/Controller/Root/LoginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Root;
 
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -596,7 +596,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
             $this->fail('User not created');
         }
 
-        $user = new User_Adapter((int) $userId, self::$DI['app']);
+        $user = new \User_Adapter((int) $userId, self::$DI['app']);
 
         $user->delete();
 
diff --git a/tests/Alchemy/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
similarity index 76%
rename from tests/Alchemy/Phrasea/Controller/Root/RSSFeedTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
index 148b0f53c0..8bf9960e21 100644
--- a/tests/Alchemy/Phrasea/Controller/Root/RSSFeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
@@ -1,42 +1,42 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAbstract.class.inc';
-require_once __DIR__ . '/../../../../FeedValidator.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Root;
 
-require_once __DIR__ . '/../../../../../lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php';
+require_once __DIR__ . '/../../../../../classes/FeedValidator.inc';
 
+use Alchemy\Phrasea\Application;
 use Symfony\Component\HttpFoundation\Response;
 
-class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
+class RssFeedTest extends \PhraseanetWebTestCaseAbstract
 {
     /**
      *
-     * @var Feed_Adapter
+     * @var \Feed_Adapter
      */
     public static $feed;
 
     /**
      *
-     * @var Feed_Adapter_Entry
+     * @var \Feed_Adapter_Entry
      */
     public static $entry;
     public static $publisher;
 
     /**
      *
-     * @var Feed_Collection
+     * @var \Feed_Collection
      */
     protected static $public_feeds;
 
     /**
      *
-     * @var Feed_Collection
+     * @var \Feed_Collection
      */
     protected static $private_feeds;
 
     /**
      *
-     * @var Feed_Adapter
+     * @var \Feed_Adapter
      */
     protected static $feed_1_private;
     protected static $feed_1_private_title = 'Feed 1 title';
@@ -48,7 +48,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     /**
      *
-     * @var Feed_Adapter
+     * @var \Feed_Adapter
      */
     protected static $feed_2_private;
     protected static $feed_2_private_title = 'Feed 2 title';
@@ -56,7 +56,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     /**
      *
-     * @var Feed_Adapter
+     * @var \Feed_Adapter
      */
     protected static $feed_3_public;
     protected static $feed_3_public_title = 'Feed 3 title';
@@ -64,7 +64,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     /**
      *
-     * @var Feed_Adapter
+     * @var \Feed_Adapter
      */
     protected static $feed_4_public;
     protected static $feed_4_public_title = 'Feed 4 title';
@@ -75,23 +75,23 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
     {
         parent::setUp();
         self::$DI['app.use-exception-handler'] = true;
-        self::$feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], 'title', 'subtitle');
-        self::$publisher = Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], self::$feed, self::$DI['user']);
-        self::$entry = Feed_Entry_Adapter::create(self::$DI['app'], self::$feed, self::$publisher, 'title_entry', 'subtitle', 'hello', "test@mail.com");
-        Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], self::$entry, self::$DI['record_1']);
-        Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], self::$entry, self::$DI['record_2']);
+        self::$feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], 'title', 'subtitle');
+        self::$publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], self::$feed, self::$DI['user']);
+        self::$entry = \Feed_Entry_Adapter::create(self::$DI['app'], self::$feed, self::$publisher, 'title_entry', 'subtitle', 'hello', "test@mail.com");
+        \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], self::$entry, self::$DI['record_1']);
+        \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], self::$entry, self::$DI['record_2']);
         self::$feed->set_public(true);
     }
 
     public function tearDown()
     {
-        if (self::$publisher instanceof Feed_Publisher_Adapter) {
+        if (self::$publisher instanceof \Feed_Publisher_Adapter) {
             self::$publisher->delete();
         }
-        if (self::$entry instanceof Feed_Entry_Adapter) {
+        if (self::$entry instanceof \Feed_Entry_Adapter) {
             self::$entry->delete();
         }
-        if (self::$feed instanceof Feed_Adapter) {
+        if (self::$feed instanceof \Feed_Adapter) {
             self::$feed->delete();
         }
         parent::tearDown();
@@ -101,66 +101,66 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
     {
         parent::setUpBeforeClass();
 
-        $application = new Alchemy\Phrasea\Application('test');
+        $application = new Application('test');
 
         @unlink('/tmp/db.sqlite');
-        copy(__DIR__ . '/../../../../db-ref.sqlite', '/tmp/db.sqlite');
+        copy(__DIR__ . '/../../../../../db-ref.sqlite', '/tmp/db.sqlite');
 
         $application['session']->clear();
         $application['session']->set('usr_id', self::$DI['user']->get_id());
 
-        self::$feed_1_private = Feed_Adapter::create($application, self::$DI['user'], self::$feed_1_private_title, self::$feed_1_private_subtitle);
+        self::$feed_1_private = \Feed_Adapter::create($application, self::$DI['user'], self::$feed_1_private_title, self::$feed_1_private_subtitle);
         self::$feed_1_private->set_public(false);
-        self::$feed_1_private->set_icon(__DIR__ . '/../../../../testfiles/logocoll.gif');
+        self::$feed_1_private->set_icon(__DIR__ . '/../../../../../files/logocoll.gif');
 
-        self::$feed_2_private = Feed_Adapter::create($application, self::$DI['user'], self::$feed_2_private_title, self::$feed_2_private_subtitle);
+        self::$feed_2_private = \Feed_Adapter::create($application, self::$DI['user'], self::$feed_2_private_title, self::$feed_2_private_subtitle);
         self::$feed_2_private->set_public(false);
 
-        self::$feed_3_public = Feed_Adapter::create($application, self::$DI['user'], self::$feed_3_public_title, self::$feed_3_public_subtitle);
+        self::$feed_3_public = \Feed_Adapter::create($application, self::$DI['user'], self::$feed_3_public_title, self::$feed_3_public_subtitle);
         self::$feed_3_public->set_public(true);
-        self::$feed_3_public->set_icon(__DIR__ . '/../../../../testfiles/logocoll.gif');
+        self::$feed_3_public->set_icon(__DIR__ . '/../../../../../files/logocoll.gif');
 
-        self::$feed_4_public = Feed_Adapter::create($application, self::$DI['user'], self::$feed_4_public_title, self::$feed_4_public_subtitle);
+        self::$feed_4_public = \Feed_Adapter::create($application, self::$DI['user'], self::$feed_4_public_title, self::$feed_4_public_subtitle);
         self::$feed_4_public->set_public(true);
 
         $publishers = self::$feed_4_public->get_publishers();
         $publisher = array_shift($publishers);
 
         for ($i = 1; $i != 15; $i++) {
-            $entry = Feed_Entry_Adapter::create($application, self::$feed_4_public, $publisher, 'titre entry', 'soustitre entry', 'Jean-Marie Biggaro', 'author@example.com');
+            $entry = \Feed_Entry_Adapter::create($application, self::$feed_4_public, $publisher, 'titre entry', 'soustitre entry', 'Jean-Marie Biggaro', 'author@example.com');
 
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_6']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_7']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_8']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_9']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_10']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_13']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_15']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_16']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_19']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_6']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_7']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_8']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_9']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_10']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_13']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_15']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_16']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_19']);
 
-            $entry = Feed_Entry_Adapter::create($application, self::$feed_1_private, $publisher, 'titre entry', 'soustitre entry', 'Jean-Marie Biggaro', 'author@example.com');
+            $entry = \Feed_Entry_Adapter::create($application, self::$feed_1_private, $publisher, 'titre entry', 'soustitre entry', 'Jean-Marie Biggaro', 'author@example.com');
 
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_6']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_7']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_8']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_9']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_10']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_13']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_15']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_16']);
-            $item = Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_19']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_6']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_7']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_8']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_9']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_10']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_1']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_13']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_15']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_16']);
+            $item = \Feed_Entry_Item::create($application['phraseanet.appbox'], $entry, self::$DI['record_19']);
 
             self::$feed_4_entries[] = $entry;
         }
 
 
-        self::$public_feeds = Feed_Collection::load_public_feeds($application);
-        self::$private_feeds = Feed_Collection::load_all($application, self::$DI['user']);
+        self::$public_feeds = \Feed_Collection::load_public_feeds($application);
+        self::$private_feeds = \Feed_Collection::load_all($application, self::$DI['user']);
         $application['session']->clear();
     }
 
@@ -188,11 +188,11 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     protected function evaluateAtom(Response $response)
     {
-        $dom_doc = new DOMDocument();
+        $dom_doc = new \DOMDocument();
         $dom_doc->preserveWhiteSpace = false;
         $dom_doc->loadXML($response->getContent());
 
-        $xpath = new DOMXPath($dom_doc);
+        $xpath = new \DOMXPath($dom_doc);
         $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
 
         $this->assertEquals(1, $xpath->query('/atom:feed/atom:title')->length);
@@ -205,7 +205,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     protected function evaluateGoodXML(Response $response)
     {
-        $dom_doc = new DOMDocument();
+        $dom_doc = new \DOMDocument();
         $dom_doc->loadXML($response->getContent());
         $this->assertInstanceOf('DOMDocument', $dom_doc);
         $this->assertEquals($dom_doc->saveXML(), $response->getContent());
@@ -221,7 +221,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
     {
         $this->authenticate(self::$DI['app']);
 
-        $link = self::$feed_3_public->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href();
+        $link = self::$feed_3_public->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_ATOM)->get_href();
         $link = str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/', '/', $link);
 
         $this->logout(self::$DI['app']);
@@ -239,7 +239,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
     {
         $this->authenticate(self::$DI['app']);
 
-        $link = self::$private_feeds->get_aggregate()->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href();
+        $link = self::$private_feeds->get_aggregate()->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_ATOM)->get_href();
         $link = str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/', '/', $link);
 
         $this->logout(self::$DI['app']);
@@ -257,7 +257,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
     {
         $this->authenticate(self::$DI['app']);
 
-        $link = self::$feed_1_private->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href();
+        $link = self::$feed_1_private->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_ATOM)->get_href();
         $link = str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/', '/', $link);
 
         $this->logout(self::$DI['app']);
@@ -273,7 +273,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     public function testGetFeedFormat()
     {
-        $feeds = Feed_Collection::load_public_feeds(self::$DI['app']);
+        $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']);
         $all_feeds = $feeds->get_feeds();
         $feed = array_shift($all_feeds);
 
@@ -302,7 +302,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     public function testAggregatedRss()
     {
-        $feeds = Feed_Collection::load_public_feeds(self::$DI['app']);
+        $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']);
         $all_feeds = $feeds->get_feeds();
         foreach ($all_feeds as $feed) {
             $this->assertTrue($feed->is_public());
@@ -316,7 +316,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     public function testAggregatedAtom()
     {
-        $feeds = Feed_Collection::load_public_feeds(self::$DI['app']);
+        $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']);
         $all_feeds = $feeds->get_feeds();
         foreach ($all_feeds as $feed) {
             $this->assertTrue($feed->is_public());
@@ -344,7 +344,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     public function testGetFeedId()
     {
-        $feeds = Feed_Collection::load_public_feeds(self::$DI['app']);
+        $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']);
         $all_feeds = $feeds->get_feeds();
         $feed = array_shift($all_feeds);
 
@@ -362,7 +362,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
 
     public function testPrivateFeedAccess()
     {
-        $private_feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], 'title', 'subtitle');
+        $private_feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], 'title', 'subtitle');
         $private_feed->set_public(false);
         self::$DI['client']->request("GET", "/feeds/feed/" . $private_feed->get_id() . "/rss/");
         $this->assertFalse(self::$DI['client']->getResponse()->isOk());
@@ -387,12 +387,12 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         }
     }
 
-    function verifyRSS(Feed_Adapter $feed, $xml_string)
+    function verifyRSS(\Feed_Adapter $feed, $xml_string)
     {
-        $dom_doc = new DOMDocument();
+        $dom_doc = new \DOMDocument();
         $dom_doc->loadXML($xml_string);
 
-        $xpath = new DOMXPath($dom_doc);
+        $xpath = new \DOMXPath($dom_doc);
         $xpath->registerNamespace("media", "http://search.yahoo.com/mrss/");
         $xpath->registerNamespace("atom", "http://www.w3.org/2005/Atom");
         $xpath->registerNamespace("dc", "http://purl.org/dc/elements/1.1/");
@@ -400,7 +400,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         $this->checkRSSEntryNode($xpath, $feed);
     }
 
-    function checkRSSRootNode(DOMXPath $xpath, Feed_Adapter $feed)
+    function checkRSSRootNode(\DOMXPath $xpath, \Feed_Adapter $feed)
     {
         $channel = $xpath->query("/rss/channel");
         foreach ($channel->item(0)->childNodes as $child) {
@@ -416,10 +416,10 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                         $this->assertEquals($feed->get_subtitle(), $child->nodeValue);
                         break;
                     case 'link':
-                        $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_RSS, 1)->get_href(), $child->nodeValue);
+                        $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_RSS, 1)->get_href(), $child->nodeValue);
                         break;
                     case 'pubDate':
-                        $this->assertTrue(new DateTime() >= new DateTime($child->nodeValue));
+                        $this->assertTrue(new \DateTime() >= new \DateTime($child->nodeValue));
                         break;
                     case 'generator':
                         $this->assertEquals("Phraseanet", $child->nodeValue);
@@ -430,7 +430,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                     case 'atom:link':
                         foreach ($child->attributes as $attribute) {
                             if ($attribute->name == "href") {
-                                $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_RSS, 1)->get_href(), $attribute->value);
+                                $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_RSS, 1)->get_href(), $attribute->value);
                                 break;
                             }
                         }
@@ -440,7 +440,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         }
     }
 
-    function checkRSSEntryNode(DOMXPath $xpath, Feed_Adapter $feed)
+    function checkRSSEntryNode(\DOMXPath $xpath, \Feed_Adapter $feed)
     {
         $list_entries = $xpath->query("/rss/channel/item");
         $count = 0;
@@ -489,7 +489,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         $this->assertEquals($feed->get_count_total_entries(), $count);
     }
 
-    function checkRSSEntryItemsNode(DOMXPath $xpath, Feed_Entry_Adapter $entry, $count)
+    function checkRSSEntryItemsNode(\DOMXPath $xpath, \Feed_Entry_Adapter $entry, $count)
     {
         $content = $entry->get_content();
         $available_medium = array('image', 'audio', 'video');
@@ -503,7 +503,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         }
     }
 
-    public function verifyMediaItem(Feed_Entry_Item $item, DOMNode $node)
+    public function verifyMediaItem(\Feed_Entry_Item $item, \DOMNode $node)
     {
         foreach ($node->childNodes as $node) {
             if ($node->nodeType !== XML_TEXT_NODE) {
@@ -520,7 +520,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         }
     }
 
-    public function parseAttributes(DOMNode $node)
+    public function parseAttributes(\DOMNode $node)
     {
         $current_attributes = array();
         foreach ($node->attributes as $attribute) {
@@ -530,7 +530,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         return $current_attributes;
     }
 
-    public function checkMediaContentAttributes(Feed_Entry_Item $entry_item, DOMNode $node)
+    public function checkMediaContentAttributes(\Feed_Entry_Item $entry_item, \DOMNode $node)
     {
         $current_attributes = $this->parseAttributes($node);
         $is_thumbnail = false;
@@ -589,11 +589,11 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         }
     }
 
-    public function checkOptionnalMediaGroupNode(DOMNode $node, Feed_Entry_Item $entry_item)
+    public function checkOptionnalMediaGroupNode(\DOMNode $node, \Feed_Entry_Item $entry_item)
     {
         $fields = array(
             'title' => array(
-                'dc_field'    => databox_Field_DCESAbstract::Title,
+                'dc_field'    => \databox_Field_DCESAbstract::Title,
                 'media_field' => array(
                     'name'       => 'media:title',
                     'attributes' => array(
@@ -603,7 +603,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                 'separator'   => ' '
             )
             , 'description' => array(
-                'dc_field'    => databox_Field_DCESAbstract::Description,
+                'dc_field'    => \databox_Field_DCESAbstract::Description,
                 'media_field' => array(
                     'name'       => 'media:description',
                     'attributes' => array()
@@ -611,7 +611,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                 'separator'   => ' '
             )
             , 'contributor' => array(
-                'dc_field'    => databox_Field_DCESAbstract::Contributor,
+                'dc_field'    => \databox_Field_DCESAbstract::Contributor,
                 'media_field' => array(
                     'name'       => 'media:credit',
                     'attributes' => array(
@@ -622,7 +622,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                 'separator' => ' '
             )
             , 'director'  => array(
-                'dc_field'    => databox_Field_DCESAbstract::Creator,
+                'dc_field'    => \databox_Field_DCESAbstract::Creator,
                 'media_field' => array(
                     'name'       => 'media:credit',
                     'attributes' => array(
@@ -633,7 +633,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                 'separator' => ' '
             )
             , 'publisher' => array(
-                'dc_field'    => databox_Field_DCESAbstract::Publisher,
+                'dc_field'    => \databox_Field_DCESAbstract::Publisher,
                 'media_field' => array(
                     'name'       => 'media:credit',
                     'attributes' => array(
@@ -644,7 +644,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                 'separator' => ' '
             )
             , 'rights'    => array(
-                'dc_field'    => databox_Field_DCESAbstract::Rights,
+                'dc_field'    => \databox_Field_DCESAbstract::Rights,
                 'media_field' => array(
                     'name'       => 'media:copyright',
                     'attributes' => array()
@@ -652,7 +652,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
                 'separator' => ' '
             )
             , 'keywords'  => array(
-                'dc_field'    => databox_Field_DCESAbstract::Subject,
+                'dc_field'    => \databox_Field_DCESAbstract::Subject,
                 'media_field' => array(
                     'name'       => 'media:keywords',
                     'attributes' => array()
@@ -714,23 +714,23 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         return $remove;
     }
 
-    public function verifyATOM(Feed_Adapter $feed, $xml_string)
+    public function verifyATOM(\Feed_Adapter $feed, $xml_string)
     {
         $this->verifyXML($xml_string);
-        $dom_doc = new DOMDocument();
+        $dom_doc = new \DOMDocument();
         $dom_doc->loadXML($xml_string);
 
-        $xpath = new DOMXPath($dom_doc);
+        $xpath = new \DOMXPath($dom_doc);
         $xpath->registerNamespace("media", "http://search.yahoo.com/mrss/");
         $xpath->registerNamespace("Atom", "http://www.w3.org/2005/Atom");
 
         $this->checkATOMRootNode($dom_doc, $xpath, $feed);
     }
 
-    public function checkATOMRootNode(DOMDocument $dom_doc, DOMXPath $xpath, Feed_Adapter $feed)
+    public function checkATOMRootNode(\DOMDocument $dom_doc, \DOMXPath $xpath, \Feed_Adapter $feed)
     {
         $ids = $xpath->query('/Atom:feed/Atom:id');
-        $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $ids->item(0)->nodeValue);
+        $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $ids->item(0)->nodeValue);
 
         $titles = $xpath->query('/Atom:feed/Atom:title');
         $this->assertEquals($feed->get_title(), $titles->item(0)->nodeValue);
@@ -740,7 +740,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
             $this->assertEquals($feed->get_subtitle(), $subtitles->item(0)->nodeValue);
 
         $updateds = $xpath->query('/Atom:feed/Atom:updated');
-        $this->assertTrue(new DateTime() >= new DateTime($updateds->item(0)->nodeValue));
+        $this->assertTrue(new \DateTime() >= new \DateTime($updateds->item(0)->nodeValue));
 
         $entries_item = $xpath->query('/Atom:feed/Atom:entry');
 
@@ -765,18 +765,18 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
         $this->assertEquals($feed->get_count_total_entries(), $count);
     }
 
-    public function checkATOMEntryNode(DOMNode $node, DOMXPath $xpath, Feed_Adapter $feed, Feed_Entry_Adapter $entry)
+    public function checkATOMEntryNode(\DOMNode $node, \DOMXPath $xpath, \Feed_Adapter $feed, \Feed_Entry_Adapter $entry)
     {
         foreach ($node->childNodes as $child) {
             if ($child->nodeType !== XML_TEXT_NODE) {
                 switch ($child->nodeName) {
                     case 'id':
-                        $this->assertEquals(sprintf('%sentry/%d/', $feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $entry->get_id()), $child->nodeValue);
+                        $this->assertEquals(sprintf('%sentry/%d/', $feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $entry->get_id()), $child->nodeValue);
                         break;
                     case 'link':
                         foreach ($child->attributes as $attribute) {
                             if ($attribute->name == "href") {
-                                $this->assertEquals(sprintf('%sentry/%d/', $feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $entry->get_id()), $attribute->value);
+                                $this->assertEquals(sprintf('%sentry/%d/', $feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $entry->get_id()), $attribute->value);
                                 break;
                             }
                         }
@@ -819,7 +819,7 @@ class ControllerRssFeedTest extends \PhraseanetWebTestCaseAbstract
             foreach ($media_group as $media) {
 
                 $entry_item = array_shift($content);
-                if ($entry_item instanceof Feed_Entry_Item) {
+                if ($entry_item instanceof \Feed_Entry_Item) {
                     $this->verifyMediaItem($entry_item, $media);
                 }
             }
diff --git a/tests/Alchemy/Phrasea/Controller/Root/SessionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Root/SessionTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
index 6d423bdeb7..9c2d8ad73c 100644
--- a/tests/Alchemy/Phrasea/Controller/Root/SessionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Root;
 
 class SessionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Setup/FakeSetupApplication.inc b/tests/Alchemy/Tests/Phrasea/Controller/Setup/FakeSetupApplication.inc
new file mode 100644
index 0000000000..385edea8d2
--- /dev/null
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Setup/FakeSetupApplication.inc
@@ -0,0 +1,28 @@
+<?php
+
+namespace Alchemy\Tests\Phrasea\Controller\Setup;
+
+use Alchemy\Phrasea\Application as PhraseaApplication;
+use Alchemy\Phrasea\Controller\Setup\Installer;
+use Alchemy\Phrasea\Controller\Utils\PathFileTest;
+use Alchemy\Phrasea\Controller\Utils\ConnectionTest;
+
+return call_user_func(function() {
+    $app = new PhraseaApplication('test');
+
+    $app['install'] = true;
+
+    $app->get('/', function() use ($app) {
+        return $app->redirect('/setup/installer/');
+    });
+
+    $app->mount('/installer/', new Installer());
+    $app->mount('/test', new PathFileTest());
+    $app->mount('/connection_test', new ConnectionTest());
+
+    $app->error(function($e) {
+
+    });
+
+    return $app;
+});
diff --git a/tests/Alchemy/Phrasea/Controller/Setup/InstallerTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Setup/InstallerTest.php
similarity index 90%
rename from tests/Alchemy/Phrasea/Controller/Setup/InstallerTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Setup/InstallerTest.php
index 1bb8781cee..ce7e4d0b1c 100644
--- a/tests/Alchemy/Phrasea/Controller/Setup/InstallerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Setup/InstallerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Setup;
 
-class ControllerInstallerTest extends \PhraseanetWebTestCaseAbstract
+class InstallerTest extends \PhraseanetWebTestCaseAbstract
 {
 
     public function setUp()
diff --git a/tests/Alchemy/Phrasea/Controller/User/NotificationsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/User/NotificationsTest.php
similarity index 92%
rename from tests/Alchemy/Phrasea/Controller/User/NotificationsTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/User/NotificationsTest.php
index d27f9a4c51..078ed59a45 100644
--- a/tests/Alchemy/Phrasea/Controller/User/NotificationsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/User/NotificationsTest.php
@@ -1,9 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
-use Alchemy\Phrasea\Controller\User\Notifications;
-use Symfony\Component\HttpFoundation\Request;
+namespace Alchemy\Tests\Phrasea\Controller\User;
 
 class NotificationsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/User/PreferencesTest.php b/tests/Alchemy/Tests/Phrasea/Controller/User/PreferencesTest.php
similarity index 93%
rename from tests/Alchemy/Phrasea/Controller/User/PreferencesTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/User/PreferencesTest.php
index 6f0a5701fb..f82a948d34 100644
--- a/tests/Alchemy/Phrasea/Controller/User/PreferencesTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/User/PreferencesTest.php
@@ -1,9 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
-use Alchemy\Phrasea\Controller\User\Preferences;
-use Symfony\Component\HttpFoundation\Request;
+namespace Alchemy\Tests\Phrasea\Controller\User;
 
 class PreferencesTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Controller/Utils/ConnectionTestTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Controller/Utils/ConnectionTestTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
index 880bb73e1a..ac13d77836 100644
--- a/tests/Alchemy/Phrasea/Controller/Utils/ConnectionTestTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Utils;
 
 use Alchemy\Phrasea\Core\Configuration;
 
diff --git a/tests/Alchemy/Phrasea/Controller/Utils/PathFileTestTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/Controller/Utils/PathFileTestTest.php
rename to tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
index 3050c88219..80bb5e4262 100644
--- a/tests/Alchemy/Phrasea/Controller/Utils/PathFileTestTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetWebTestCaseAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Controller\Utils;
 
 class ControllerPathFileTestTest extends \PhraseanetWebTestCaseAbstract
 {
@@ -9,7 +9,7 @@ class ControllerPathFileTestTest extends \PhraseanetWebTestCaseAbstract
      */
     public function testRoutePath()
     {
-        $file = new \SplFileObject(__DIR__ . '/../../../../testfiles/cestlafete.jpg');
+        $file = new \SplFileObject(__DIR__ . '/../../../../../files/cestlafete.jpg');
         self::$DI['client']->request("GET", "/admin/tests/pathurl/path/", array('path' => $file->getPathname()));
 
         $response = self::$DI['client']->getResponse();
diff --git a/tests/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php b/tests/Alchemy/Tests/Phrasea/Core/Configuration/ConfigurationTest.php
similarity index 99%
rename from tests/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Configuration/ConfigurationTest.php
index 69c73b8d94..b6fda1a3a8 100644
--- a/tests/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/ConfigurationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Configuration;
 
 class ConfigurationTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Configuration/confTestFiles/config.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/confTestFiles/config.yml
similarity index 100%
rename from tests/Alchemy/Phrasea/Core/Configuration/confTestFiles/config.yml
rename to tests/Alchemy/Tests/Phrasea/Core/Configuration/confTestFiles/config.yml
diff --git a/tests/Alchemy/Phrasea/Core/Configuration/confTestFiles/test.json b/tests/Alchemy/Tests/Phrasea/Core/Configuration/confTestFiles/test.json
similarity index 100%
rename from tests/Alchemy/Phrasea/Core/Configuration/confTestFiles/test.json
rename to tests/Alchemy/Tests/Phrasea/Core/Configuration/confTestFiles/test.json
diff --git a/tests/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
similarity index 73%
rename from tests/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
index 1424272c94..834bc878a8 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\BorderManagerServiceProvider;
 
 class BorderManagerServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/BrowserServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Core/Provider/BrowserServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php
index e1f5b758f7..46c71cb2cc 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/BrowserServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\BrowserServiceProvider;
 
 class BrowserServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/CacheServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php
similarity index 81%
rename from tests/Alchemy/Phrasea/Core/Provider/CacheServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php
index 5baff21b0f..b385560550 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/CacheServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\CacheServiceProvider;
 
 class CacheServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
similarity index 74%
rename from tests/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
index 28dad3714d..9bf71f5399 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider;
 
 class ConfigurationServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
similarity index 75%
rename from tests/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
index 9e7160ceb7..9788175802 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\ConfigurationTesterServiceProvider;
 
 class ConfigurationTesterServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/GeonamesServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/GeonamesServiceProviderTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Core/Provider/GeonamesServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/GeonamesServiceProviderTest.php
index 88af9d97d1..25fad8bf8a 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/GeonamesServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/GeonamesServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\GeonamesServiceProvider;
 
 class GeonamesServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/ORMServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Core/Provider/ORMServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
index e0eb353339..fc72b1b560 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/ORMServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\ORMServiceProvider;
 
 class ORMServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
similarity index 78%
rename from tests/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
index f112fc891d..b3a573a229 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\SearchEngineServiceProvider;
 
 class SearchEngineServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
similarity index 76%
rename from tests/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
index 41d2d9e814..e2208c53dd 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\TaskManagerServiceProvider;
 
 class TaskManagerServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Provider/UnicodeServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
similarity index 75%
rename from tests/Alchemy/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
index 9f0dad0ed1..7162c60ed4 100644
--- a/tests/Alchemy/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Provider;
+namespace Alchemy\Tests\Phrasea\Core\Provider;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider;
 
 class UnicodeServiceProvidertest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Service/Border/BorderManagerTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Border/BorderManagerTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/Core/Service/Border/BorderManagerTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Border/BorderManagerTest.php
index 907c12c3f0..b4e9becfe0 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Border/BorderManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Border/BorderManagerTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Core\Service\Border;
+namespace Alchemy\Tests\Phrasea\Core\Service\Border;
 
 use Alchemy\Phrasea\Application;
-
-require_once __DIR__ . '/../../../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Core\Service\Border\BorderManager;
 
 class BorderManagerTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Core/Service/Cache/ApcCacheTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/ApcCacheTest.php
similarity index 86%
rename from tests/Alchemy/Phrasea/Core/Service/Cache/ApcCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Cache/ApcCacheTest.php
index 0edd8024d5..c345a82820 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Cache/ApcCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/ApcCacheTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Cache;
 
-class ServiceApcCacheTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Cache\ApcCache;
+
+class ServiceApcCacheTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testService()
diff --git a/tests/Alchemy/Phrasea/Core/Service/Cache/ArrayCacheTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/ArrayCacheTest.php
similarity index 83%
rename from tests/Alchemy/Phrasea/Core/Service/Cache/ArrayCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Cache/ArrayCacheTest.php
index a3641e1e0c..876dc1cb79 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Cache/ArrayCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/ArrayCacheTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Cache;
 
-class ServiceArrayCacheTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Cache\ArrayCache;
+
+class ServiceArrayCacheTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testService()
diff --git a/tests/Alchemy/Phrasea/Core/Service/Cache/MemcacheCacheTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/MemcacheCacheTest.php
similarity index 90%
rename from tests/Alchemy/Phrasea/Core/Service/Cache/MemcacheCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Cache/MemcacheCacheTest.php
index a3923f2a55..5dd605cb52 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Cache/MemcacheCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/MemcacheCacheTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Cache;
 
-class ServiceMemcacheCacheTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Cache\MemcacheCache;
+
+class ServiceMemcacheCacheTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testService()
diff --git a/tests/Alchemy/Phrasea/Core/Service/Cache/XcacheCacheTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/XcacheCacheTest.php
similarity index 86%
rename from tests/Alchemy/Phrasea/Core/Service/Cache/XcacheCacheTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Cache/XcacheCacheTest.php
index 89e8c4f33a..3bfa85401e 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Cache/XcacheCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Cache/XcacheCacheTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Cache;
 
-class ServiceXcacheCacheTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Cache\XcacheCache;
+
+class ServiceXcacheCacheTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testService()
diff --git a/tests/Alchemy/Phrasea/Core/Service/Log/Doctrine/MonologTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Log/Doctrine/MonologTest.php
similarity index 86%
rename from tests/Alchemy/Phrasea/Core/Service/Log/Doctrine/MonologTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Log/Doctrine/MonologTest.php
index cc076fb233..a9135cbad2 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Log/Doctrine/MonologTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Log/Doctrine/MonologTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Log\Doctrine;
 
-class DoctrineMonologTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Log\Monolog;
+
+class DoctrineMonologTest extends \PhraseanetPHPUnitAbstract
 {
     protected $options = array(
         "handler"  => "rotate"
diff --git a/tests/Alchemy/Phrasea/Core/Service/Log/Doctrine/PhpechoTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Log/Doctrine/PhpechoTest.php
similarity index 74%
rename from tests/Alchemy/Phrasea/Core/Service/Log/Doctrine/PhpechoTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Log/Doctrine/PhpechoTest.php
index 71ed78233a..7eb445e752 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Log/Doctrine/PhpechoTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Log/Doctrine/PhpechoTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Log\Doctrine;
 
-class DoctrinePhpechoTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Log\Doctrine\Phpecho;
+
+class DoctrinePhpechoTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testService()
diff --git a/tests/Alchemy/Phrasea/Core/Service/Log/MonologTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Log/MonologTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Core/Service/Log/MonologTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Log/MonologTest.php
index 4a2c8c6d86..935f5b3361 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Log/MonologTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Log/MonologTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Log;
 
-class MonologTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Log\Monolog;
+
+class MonologTest extends \PhraseanetPHPUnitAbstract
 {
     protected $options;
 
diff --git a/tests/Alchemy/Phrasea/Core/Service/Orm/DoctrineTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/Orm/DoctrineTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/Core/Service/Orm/DoctrineTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/Orm/DoctrineTest.php
index 6799c0c6d0..41af9e233e 100644
--- a/tests/Alchemy/Phrasea/Core/Service/Orm/DoctrineTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/Orm/DoctrineTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service\Orm;
 
-class DoctrineTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Tests\Phrasea\Core\Service\Orm\DoctrineTest;
+
+class DoctrineTest extends \PhraseanetPHPUnitAbstract
 {
     protected $options;
 
diff --git a/tests/Alchemy/Phrasea/Core/Service/ServiceAbtractTest.php b/tests/Alchemy/Tests/Phrasea/Core/Service/ServiceAbtractTest.php
similarity index 79%
rename from tests/Alchemy/Phrasea/Core/Service/ServiceAbtractTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/Service/ServiceAbtractTest.php
index b02f10c4a7..08013c3676 100644
--- a/tests/Alchemy/Phrasea/Core/Service/ServiceAbtractTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Service/ServiceAbtractTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\Service;
 
-class ServiceAbstractTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\ServiceAbstract;
+
+class ServiceAbstractTest extends \PhraseanetPHPUnitAbstract
 {
     /**
      *
diff --git a/tests/Alchemy/Phrasea/Core/ServiceBuilder/AbstractBuilderTest.php b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/AbstractBuilderTest.php
similarity index 86%
rename from tests/Alchemy/Phrasea/Core/ServiceBuilder/AbstractBuilderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/AbstractBuilderTest.php
index bca7ff7712..700b812b1a 100644
--- a/tests/Alchemy/Phrasea/Core/ServiceBuilder/AbstractBuilderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/AbstractBuilderTest.php
@@ -1,8 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core\ServiceBuilder;
 
-class AbstractBuilderTest extends PhraseanetPHPUnitAbstract
+use Alchemy\Phrasea\Core\Service\Builder;
+
+class AbstractBuilderTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testConstructExceptionNameEmpty()
diff --git a/tests/Alchemy/Phrasea/Core/ServiceBuilder/CacheBuilderTest.php b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/CacheBuilderTest.php
similarity index 82%
rename from tests/Alchemy/Phrasea/Core/ServiceBuilder/CacheBuilderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/CacheBuilderTest.php
index de8c9c469b..e07fd9d2a9 100644
--- a/tests/Alchemy/Phrasea/Core/ServiceBuilder/CacheBuilderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/CacheBuilderTest.php
@@ -1,12 +1,11 @@
 <?php
 
-use Alchemy\Phrasea\Application;
+namespace Alchemy\Tests\Phrasea\Core\ServiceBuilder;
+
 use Alchemy\Phrasea\Core\Service\Builder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
-
-class CacheBuilderTest extends PhraseanetPHPUnitAbstract
+class CacheBuilderTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testCreateException()
diff --git a/tests/Alchemy/Phrasea/Core/ServiceBuilder/LogBuilderTest.php b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/LogBuilderTest.php
similarity index 92%
rename from tests/Alchemy/Phrasea/Core/ServiceBuilder/LogBuilderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/LogBuilderTest.php
index 3bb5a8a307..aefaf3e217 100644
--- a/tests/Alchemy/Phrasea/Core/ServiceBuilder/LogBuilderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/LogBuilderTest.php
@@ -1,12 +1,12 @@
 <?php
 
+namespace Alchemy\Tests\Phrasea\Core\ServiceBuilder;
+
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Core\Service\Builder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
-
-class LogBuilderTest extends PhraseanetPHPUnitAbstract
+class LogBuilderTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testCreateException()
diff --git a/tests/Alchemy/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php
index 1e5fe61c62..f2c818d793 100644
--- a/tests/Alchemy/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php
@@ -1,12 +1,11 @@
 <?php
 
-use Alchemy\Phrasea\Application;
+namespace Alchemy\Tests\Phrasea\Core\ServiceBuilder;
+
 use Alchemy\Phrasea\Core\Service\Builder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
-
-class OrmBuilderTest extends PhraseanetPHPUnitAbstract
+class OrmBuilderTest extends \PhraseanetPHPUnitAbstract
 {
 
     public function testCreateException()
diff --git a/tests/Alchemy/Phrasea/Core/VersionTest.php b/tests/Alchemy/Tests/Phrasea/Core/VersionTest.php
similarity index 86%
rename from tests/Alchemy/Phrasea/Core/VersionTest.php
rename to tests/Alchemy/Tests/Phrasea/Core/VersionTest.php
index 95f6340d35..93cfa2185f 100644
--- a/tests/Alchemy/Phrasea/Core/VersionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/VersionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Core;
 
 use Alchemy\Phrasea\Core\Version;
 
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/AudioTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/AudioTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Media/Subdef/AudioTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/AudioTest.php
index d397ef60bc..be82cc5680 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/AudioTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/AudioTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef;
+namespace Alchemy\Tests\Phrasea\Media\Subdef;
+
+use Alchemy\Phrasea\Media\Subdef\Audio;
+use Alchemy\Phrasea\Media\Subdef\Subdef;
 
 class AudioTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/FlexPaperTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/FlexPaperTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Media/Subdef/FlexPaperTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/FlexPaperTest.php
index 539279d74b..903b728d7b 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/FlexPaperTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/FlexPaperTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef;
+namespace Alchemy\Tests\Phrasea\Media\Subdef;
+
+use Alchemy\Phrasea\Media\Subdef\FlexPaper;
+use Alchemy\Phrasea\Media\Subdef\Subdef;
 
 class FlexPaperTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/GifTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/GifTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Media/Subdef/GifTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/GifTest.php
index f40eb3687a..30d7b56365 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/GifTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/GifTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef;
+namespace Alchemy\Tests\Phrasea\Media\Subdef;
+
+use Alchemy\Phrasea\Media\Subdef\Gif;
+use Alchemy\Phrasea\Media\Subdef\Subdef;
 
 class GifTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/ImageTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/ImageTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Media/Subdef/ImageTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/ImageTest.php
index adb56fdb4c..c3de25c238 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/ImageTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/ImageTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef;
+namespace Alchemy\Tests\Phrasea\Media\Subdef;
+
+use Alchemy\Phrasea\Media\Subdef\Image;
+use Alchemy\Phrasea\Media\Subdef\Subdef;
 
 class ImageTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/BooleanTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/BooleanTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Media/Subdef/OptionType/BooleanTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/BooleanTest.php
index 0109d70aa5..3b5c7e1e4c 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/BooleanTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/BooleanTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef\OptionType;
+namespace Alchemy\Tests\Phrasea\Media\Subdef\OptionType;
+
+use Alchemy\Phrasea\Media\Subdef\OptionType\Boolean;
+use Alchemy\Phrasea\Media\Subdef\OptionType\OptionType;
 
 class BooleanTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/EnumTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/EnumTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/Media/Subdef/OptionType/EnumTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/EnumTest.php
index 5e8aeffc71..f727cb6338 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/EnumTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/EnumTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef\OptionType;
+namespace Alchemy\Tests\Phrasea\Media\Subdef\OptionType;
+
+use Alchemy\Phrasea\Media\Subdef\OptionType\Enum;
+use Alchemy\Phrasea\Media\Subdef\OptionType\OptionType;
 
 class EnumTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/MultiTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/MultiTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/Media/Subdef/OptionType/MultiTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/MultiTest.php
index 334cb846e0..08906dc004 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/MultiTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/MultiTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef\OptionType;
+namespace Alchemy\Tests\Phrasea\Media\Subdef\OptionType;
+
+use Alchemy\Phrasea\Media\Subdef\OptionType\Multi;
+use Alchemy\Phrasea\Media\Subdef\OptionType\OptionType;
 
 class MultiTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/RangeTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/RangeTest.php
similarity index 93%
rename from tests/Alchemy/Phrasea/Media/Subdef/OptionType/RangeTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/RangeTest.php
index 331e1d2d06..208df21a2f 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/OptionType/RangeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/OptionType/RangeTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef\OptionType;
+namespace Alchemy\Tests\Phrasea\Media\Subdef\OptionType;
+
+use Alchemy\Phrasea\Media\Subdef\OptionType\Range;
+use Alchemy\Phrasea\Media\Subdef\OptionType\OptionType;
 
 class RangeTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/ProviderTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/ProviderTest.php
similarity index 90%
rename from tests/Alchemy/Phrasea/Media/Subdef/ProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/ProviderTest.php
index 2dde6024fa..823d5babed 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/ProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/ProviderTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef;
+namespace Alchemy\Tests\Phrasea\Media\Subdef;
+
+use Alchemy\Phrasea\Media\Subdef\Provider;
+use Alchemy\Phrasea\Media\Subdef\Image;
 
 class ProviderTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Subdef/VideoTest.php b/tests/Alchemy/Tests/Phrasea/Media/Subdef/VideoTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Media/Subdef/VideoTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Subdef/VideoTest.php
index 7693bc433c..bd60d0b088 100644
--- a/tests/Alchemy/Phrasea/Media/Subdef/VideoTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Subdef/VideoTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Subdef;
+namespace Alchemy\Tests\Phrasea\Media\Subdef;
+
+use Alchemy\Phrasea\Media\Subdef\Video;
+use Alchemy\Phrasea\Media\Subdef\Subdef;
 
 class VideoTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Type/AudioTest.php b/tests/Alchemy/Tests/Phrasea/Media/Type/AudioTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Media/Type/AudioTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Type/AudioTest.php
index 74382f63b3..4fae04c9b2 100644
--- a/tests/Alchemy/Phrasea/Media/Type/AudioTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Type/AudioTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Type;
+namespace Alchemy\Tests\Phrasea\Media\Type;
+
+use Alchemy\Phrasea\Media\Type\Audio;
+use Alchemy\Phrasea\Media\Type\Type;
 
 class AudioTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Type/DocumentTest.php b/tests/Alchemy/Tests/Phrasea/Media/Type/DocumentTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Media/Type/DocumentTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Type/DocumentTest.php
index 8325ad29df..413ec6ca49 100644
--- a/tests/Alchemy/Phrasea/Media/Type/DocumentTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Type/DocumentTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Type;
+namespace Alchemy\Tests\Phrasea\Media\Type;
+
+use Alchemy\Phrasea\Media\Type\Document;
+use Alchemy\Phrasea\Media\Type\Type;
 
 class DocumentTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Type/FlashTest.php b/tests/Alchemy/Tests/Phrasea/Media/Type/FlashTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Media/Type/FlashTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Type/FlashTest.php
index ff55633d65..de6192eb57 100644
--- a/tests/Alchemy/Phrasea/Media/Type/FlashTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Type/FlashTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Type;
+namespace Alchemy\Tests\Phrasea\Media\Type;
+
+use Alchemy\Phrasea\Media\Type\Flash;
+use Alchemy\Phrasea\Media\Type\Type;
 
 class FlashTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Type/ImageTest.php b/tests/Alchemy/Tests/Phrasea/Media/Type/ImageTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Media/Type/ImageTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Type/ImageTest.php
index acfa231e76..493c29eebd 100644
--- a/tests/Alchemy/Phrasea/Media/Type/ImageTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Type/ImageTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Type;
+namespace Alchemy\Tests\Phrasea\Media\Type;
+
+use Alchemy\Phrasea\Media\Type\Image;
+use Alchemy\Phrasea\Media\Type\Type;
 
 class ImageTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Media/Type/VideoTest.php b/tests/Alchemy/Tests/Phrasea/Media/Type/VideoTest.php
similarity index 70%
rename from tests/Alchemy/Phrasea/Media/Type/VideoTest.php
rename to tests/Alchemy/Tests/Phrasea/Media/Type/VideoTest.php
index d10a0c2c7f..284128f1ae 100644
--- a/tests/Alchemy/Phrasea/Media/Type/VideoTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Media/Type/VideoTest.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Media\Type;
+namespace Alchemy\Tests\Phrasea\Media\Type;
+
+use Alchemy\Phrasea\Media\Type\Video;
+use Alchemy\Phrasea\Media\Type\Type;
 
 class VideoTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/NosourceTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/NosourceTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/NosourceTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/NosourceTest.php
index 43d3744ba3..a9d5dfd66e 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/NosourceTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/NosourceTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\Nosource;
 
 class NosourceTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/PdfTextTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/PdfTextTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/PdfTextTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/PdfTextTest.php
index c47fbb253d..14458d8981 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/PdfTextTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/PdfTextTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\PdfText;
 
 class PdfTextTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfArchivedateTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfArchivedateTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfArchivedateTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfArchivedateTest.php
index bf098cd59d..520e48eff5 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfArchivedateTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfArchivedateTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfArchivedate;
 
 class TfArchivedateTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfAtimeTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfAtimeTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfAtimeTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfAtimeTest.php
index ed5f5f8b6b..b1269d0933 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfAtimeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfAtimeTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfAtime;
 
 class TfAtimeTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfBasenameTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfBasenameTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfBasenameTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfBasenameTest.php
index a13c61d22e..bc2bda79ee 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfBasenameTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfBasenameTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfBasename;
 
 class TfBasenameTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfBitsTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfBitsTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfBitsTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfBitsTest.php
index d6dc6fef31..390f0e16e8 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfBitsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfBitsTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfBits;
 
 class TfBitsTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfChannelsTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfChannelsTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfChannelsTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfChannelsTest.php
index 610023d39c..3949bba5d0 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfChannelsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfChannelsTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfChannels;
 
 class TfChannelsTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfCtimeTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfCtimeTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfCtimeTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfCtimeTest.php
index c53e20ddb9..7603b026b8 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfCtimeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfCtimeTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfCtime;
 
 class TfCtimeTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfDirnameTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfDirnameTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfDirnameTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfDirnameTest.php
index bec0f74a82..0690ca5320 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfDirnameTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfDirnameTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfDirname;
 
 class TfDirnameTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfDurationTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfDurationTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfDurationTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfDurationTest.php
index 191a91b5d1..024ebc5966 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfDurationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfDurationTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfDuration;
 
 class TfDurationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfEditDateTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfEditDateTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
index 1f3cc0f6a7..416e18cb56 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfEditDateTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfEditdate;
 
 class TfEditdateTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfExtensionTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfExtensionTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfExtensionTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfExtensionTest.php
index 9d6b700506..f732f38634 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfExtensionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfExtensionTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfExtension;
 
 class TfExtensionTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfFilenameTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfFilenameTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfFilenameTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfFilenameTest.php
index 1301421ad5..1301da9d52 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfFilenameTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfFilenameTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfFilename;
 
 class TfFilenameTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfFilepathTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfFilepathTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfFilepathTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfFilepathTest.php
index 421ef2c83f..00df2639c8 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfFilepathTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfFilepathTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfFilepath;
 
 class TfFilepathTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfHeightTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfHeightTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfHeightTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfHeightTest.php
index 49f1174e50..7275ac9dfc 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfHeightTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfHeightTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfHeight;
 
 class TfHeightTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfMimeTypeTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfMimeTypeTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
index 3d631242d0..b2b176f6ab 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfMimeTypeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfMimetype;
 
 class TfMimetypeTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfMtimeTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMtimeTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfMtimeTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMtimeTest.php
index c1b553e9bf..1ae9398ff0 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfMtimeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMtimeTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfMtime;
 
 class TfMtimeTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfQuarantineTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfQuarantineTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfQuarantineTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfQuarantineTest.php
index 78af074447..80ef6bcf52 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfQuarantineTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfQuarantineTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfQuarantine;
 
 class TfQuarantineTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfRecordidTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfRecordidTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfRecordidTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfRecordidTest.php
index 0a0ad79fa2..70f7cd762d 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfRecordidTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfRecordidTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfRecordid;
 
 class TfRecordidTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfSizeTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfSizeTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfSizeTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfSizeTest.php
index f6d1aa3498..4078ec9318 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfSizeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfSizeTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfSize;
 
 class TfSizeTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/Metadata/Tag/TfWidthTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfWidthTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Metadata/Tag/TfWidthTest.php
rename to tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfWidthTest.php
index 102dec5fc6..39587891ae 100644
--- a/tests/Alchemy/Phrasea/Metadata/Tag/TfWidthTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfWidthTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Metadata\Tag;
+namespace Alchemy\Tests\Phrasea\Metadata\Tag;
+
+use Alchemy\Phrasea\Metadata\Tag\TfWidth;
 
 class TfWidthTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Alchemy/Phrasea/SearchEngine/ConfigurationPanelAbstractTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/ConfigurationPanelAbstractTest.php
similarity index 89%
rename from tests/Alchemy/Phrasea/SearchEngine/ConfigurationPanelAbstractTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/ConfigurationPanelAbstractTest.php
index 219d71ed42..d295bf321d 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/ConfigurationPanelAbstractTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/ConfigurationPanelAbstractTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
-
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
 abstract class ConfigurationPanelAbstractTest extends \PhraseanetPHPUnitAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
similarity index 81%
rename from tests/Alchemy/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
index 9bee7ef1d9..9e9a51e17d 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
 use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine;
 use Alchemy\Phrasea\SearchEngine\Phrasea\ConfigurationPanel;
-
-require_once __DIR__ . '/ConfigurationPanelAbstractTest.php';
+use Alchemy\Tests\Phrasea\SearchEngine\ConfigurationPanelAbstractTest;
 
 class PhraseaConfigurationPanelTest extends ConfigurationPanelAbstractTest
 {
@@ -16,7 +15,7 @@ class PhraseaConfigurationPanelTest extends ConfigurationPanelAbstractTest
     {
         parent::setUpBeforeClass();
     }
-    
+
     public function getPanel()
     {
         return new ConfigurationPanel(new PhraseaEngine(self::$DI['app']));
diff --git a/tests/Alchemy/Phrasea/SearchEngine/PhraseaEngineTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/SearchEngine/PhraseaEngineTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php
index 6447f7ab99..8783cfe75d 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/PhraseaEngineTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
 use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine;
+use Alchemy\Tests\Phrasea\SearchEngine\SearchEngineAbstractTest;
 use Symfony\Component\Process\Process;
 
-require_once __DIR__ . '/SearchEngineAbstractTest.php';
-
 class PhraseaEngineTest extends SearchEngineAbstractTest
 {
     /**
@@ -16,7 +15,7 @@ class PhraseaEngineTest extends SearchEngineAbstractTest
     {
         parent::setUpBeforeClass();
     }
-    
+
     public function initialize()
     {
         self::$searchEngine = PhraseaEngine::create(self::$DI['app']);
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
similarity index 96%
rename from tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
index 1c24d01775..5d7344ca88 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
-use Symfony\Component\Process\Process;
-
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
+use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
+use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
 
 abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedAbstract
 {
@@ -39,28 +38,6 @@ abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedA
 
         $this->initialize();
 
-        if (!self::$initialized) {
-            $found = false;
-            foreach (self::$DI['record_24']->get_databox()->get_meta_structure()->get_elements() as $field) {
-                if (!$field->isBusiness()) {
-                    continue;
-                }
-                $found = true;
-            }
-
-            if (!$found) {
-                $field = \databox_field::create(self::$DI['app'], self::$DI['record_24']->get_databox(), 'testBusiness' . mt_rand(), false);
-                $field->set_business(true);
-                $field->save();
-            }
-
-            foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
-                break;
-            }
-        }
-
-        $this->initialize();
-
         if (!self::$searchEngine instanceof SearchEngineInterface) {
             $this->markTestSkipped('Unable to initialize search Engine');
         }
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineLoggerTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineLoggerTest.php
similarity index 90%
rename from tests/Alchemy/Phrasea/SearchEngine/SearchEngineLoggerTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineLoggerTest.php
index 30ce0d28b1..9c30d6115e 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineLoggerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineLoggerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\SearchEngine\SearchEngineLogger;
 
 class SearchEngineLoggerTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineOptionsTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineOptionsTest.php
similarity index 98%
rename from tests/Alchemy/Phrasea/SearchEngine/SearchEngineOptionsTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineOptionsTest.php
index 1828580fe0..e3e35b399d 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineOptionsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineOptionsTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
-
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineResultTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineResultTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/SearchEngine/SearchEngineResultTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineResultTest.php
index b1b3460295..684386e0e9 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineResultTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineResultTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
+use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
-class SphinxSearchResultTest extends \PhraseanetPHPUnitAbstract
+class SearchEngineResultTest extends \PhraseanetPHPUnitAbstract
 {
     /**
      * @covers Alchemy\Phrasea\SearchEngine\SearchEngineResult
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestionTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineSuggestionTest.php
similarity index 82%
rename from tests/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestionTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineSuggestionTest.php
index e72b0281a6..b62ceec795 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineSuggestionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineSuggestionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion;
 
 class SearchEngineSuggestionTest extends \PhraseanetPHPUnitAbstract
 {
@@ -14,7 +14,7 @@ class SearchEngineSuggestionTest extends \PhraseanetPHPUnitAbstract
         $words = 'plutôt cela';
         $query = 'Katy Query';
         $hits = 42;
-        
+
         $suggestion = new SearchEngineSuggestion($query, $words, $hits);
         $this->assertEquals($hits, $suggestion->getHits());
         $this->assertEquals($query, $suggestion->getQuery());
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
similarity index 91%
rename from tests/Alchemy/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
index 496327a18b..d29717a341 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
 use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine;
 use Alchemy\Phrasea\SearchEngine\SphinxSearch\ConfigurationPanel;
-
-require_once __DIR__ . '/ConfigurationPanelAbstractTest.php';
+use Alchemy\Tests\Phrasea\SearchEngine\ConfigurationPanelAbstractTest;
 
 class SphinxSearchConfigurationPanelTest extends ConfigurationPanelAbstractTest
 {
@@ -16,7 +15,7 @@ class SphinxSearchConfigurationPanelTest extends ConfigurationPanelAbstractTest
     {
         parent::setUpBeforeClass();
     }
-    
+
     public function getPanel()
     {
         return new ConfigurationPanel(new SphinxSearchEngine(self::$DI['app'], 'localhost', 9306, 'localhost', 9308));
@@ -37,7 +36,7 @@ class SphinxSearchConfigurationPanelTest extends ConfigurationPanelAbstractTest
     {
         $databoxes = self::$DI['app']['phraseanet.appbox']->get_databoxes();
         $configuration = $this->getPanel()->getConfiguration();
-        
+
         $conf = $this->getPanel()->generateSphinxConf($databoxes, $configuration);
         $this->assertInternalType('string', $conf);
     }
diff --git a/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchEngineTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
similarity index 97%
rename from tests/Alchemy/Phrasea/SearchEngine/SphinxSearchEngineTest.php
rename to tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
index 3c2b256b5c..5a7f3ecb41 100644
--- a/tests/Alchemy/Phrasea/SearchEngine/SphinxSearchEngineTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
@@ -1,14 +1,13 @@
 <?php
 
-namespace Alchemy\Phrasea\SearchEngine;
+namespace Alchemy\Tests\Phrasea\SearchEngine;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine;
+use Alchemy\Tests\Phrasea\SearchEngine\SearchEngineAbstractTest;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\Process;
 
-require_once __DIR__ . '/SearchEngineAbstractTest.php';
-
 class SphinxSearchEngineTest extends SearchEngineAbstractTest
 {
     protected static $config;
diff --git a/tests/Alchemy/Phrasea/Security/FirewallTest.php b/tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
similarity index 87%
rename from tests/Alchemy/Phrasea/Security/FirewallTest.php
rename to tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
index d95f4fa674..dfc8ea5f8a 100644
--- a/tests/Alchemy/Phrasea/Security/FirewallTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Security;
+
+use Alchemy\Phrasea\Security\Firewall;
 
 class FirewallTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php b/tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php
new file mode 100644
index 0000000000..e71c9cd7ca
--- /dev/null
+++ b/tests/Alchemy/Tests/Phrasea/Setup/AbstractSetupTester.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Alchemy\Tests\Phrasea\Setup;
+
+use Alchemy\Phrasea\Application;
+
+abstract class AbstractSetupTester extends \PHPUnit_Framework_TestCase
+{
+    private $tearDownHandlers = array();
+
+    public function tearDown()
+    {
+        foreach ($this->tearDownHandlers as $handler) {
+            $handler();
+        }
+
+        parent::tearDown();
+    }
+
+    protected function uninstall()
+    {
+        rename(__DIR__ . '/../../../../../config/config.yml', __DIR__ . '/../../../../../config/config.yml.test');
+        rename(__DIR__ . '/../../../../../config/connexions.yml', __DIR__ . '/../../../../../config/connexions.yml.test');
+        rename(__DIR__ . '/../../../../../config/services.yml', __DIR__ . '/../../../../../config/services.yml.test');
+
+        $this->tearDownHandlers[] = function() {
+                rename(__DIR__ . '/../../../../../config/config.yml.test', __DIR__ . '/../../../../../config/config.yml');
+                rename(__DIR__ . '/../../../../../config/connexions.yml.test', __DIR__ . '/../../../../../config/connexions.yml');
+                rename(__DIR__ . '/../../../../../config/services.yml.test', __DIR__ . '/../../../../../config/services.yml');
+            };
+    }
+
+    protected function goBackTo31()
+    {
+        $app = new Application('test');
+        $credentials = $app['phraseanet.appbox']->get_connection()->get_credentials();
+
+        $this->uninstall();
+
+        copy(__DIR__ . '/../../../../../hudson/_GV.php', __DIR__ . '/../../../../../config/_GV.php');
+
+        file_put_contents( __DIR__ . '/../../../../../config/_GV.php', str_replace('http://local.phrasea/', 'http://local.phrasea.tester/', file_get_contents( __DIR__ . '/../../../../../config/_GV.php')));
+
+        file_put_contents(__DIR__ . '/../../../../../config/connexion.inc', "<?php\n
+\$hostname = '".$credentials['hostname']."';
+\$port = '".$credentials['port']."';
+\$user = '".$credentials['user']."';
+\$password = '".$credentials['password']."';
+\$dbname = 'ab_unitTests';
+            ");
+
+        $this->tearDownHandlers[] = function() {
+            @unlink(__DIR__ . '/../../../../../config/_GV.php');
+            @unlink(__DIR__ . '/../../../../../config/connexion.inc');
+        };
+    }
+
+    protected function goBackTo35()
+    {
+        $app = new Application('test');
+        $credentials = $app['phraseanet.appbox']->get_connection()->get_credentials();
+
+        $this->uninstall();
+
+        file_put_contents(__DIR__ . '/../../../../../config/config.inc', "<?php\n\$servername = 'http://local.phrasea';\n");
+        file_put_contents(__DIR__ . '/../../../../../config/connexion.inc', "<?php\n
+\$hostname = '".$credentials['hostname']."';
+\$port = '".$credentials['port']."';
+\$user = '".$credentials['user']."';
+\$password = '".$credentials['password']."';
+\$dbname = '".$credentials['dbname']."';
+            ");
+
+        $this->tearDownHandlers[] = function() {
+                @unlink(__DIR__ . '/../../../../../config/config.inc');
+                @unlink(__DIR__ . '/../../../../../config/connexion.inc');
+            };
+    }
+}
diff --git a/tests/Alchemy/Phrasea/Setup/ConfigurationTesterTest.php b/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Setup/ConfigurationTesterTest.php
rename to tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php
index a8cce75338..f124d8d865 100644
--- a/tests/Alchemy/Phrasea/Setup/ConfigurationTesterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup;
+namespace Alchemy\Tests\Phrasea\Setup;
 
 use Alchemy\Phrasea\Application;
-
-require_once __DIR__ . '/AbstractSetupTester.inc';
+use Alchemy\Phrasea\Setup\ConfigurationTester;
 
 class ConfigurationTesterTest extends AbstractSetupTester
 {
@@ -24,8 +23,8 @@ class ConfigurationTesterTest extends AbstractSetupTester
 
     public function testNotMigrableEvenIfOldFilesFrom31Present()
     {
-        $gvFile = __DIR__ . '/../../../../config/_GV.php';
-        $connexionFile = __DIR__ . '/../../../../config/connexion.inc';
+        $gvFile = __DIR__ . '/../../../../../config/_GV.php';
+        $connexionFile = __DIR__ . '/../../../../../config/connexion.inc';
 
         file_put_contents($connexionFile, "");
         file_put_contents($gvFile, "");
@@ -99,7 +98,7 @@ class ConfigurationTesterTest extends AbstractSetupTester
             ->will($this->returnValue('3.9'));
 
         $tester = $this->getTester($app);
-        
+
         $tester->registerVersionProbe($probe);
 
         $this->assertTrue($tester->isMigrable());
diff --git a/tests/Alchemy/Phrasea/Setup/InstallerTest.php b/tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Setup/InstallerTest.php
rename to tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
index 9342ba7be2..b0166d9faa 100644
--- a/tests/Alchemy/Phrasea/Setup/InstallerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
@@ -1,14 +1,12 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup;
+namespace Alchemy\Tests\Phrasea\Setup;
 
+use Alchemy\Phrasea\Setup\Installer;
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Setup\TestSpecifications;
+use Alchemy\Tests\Phrasea\Setup\TestSpecifications;
 use Alchemy\Phrasea\Core\Configuration;
 use Symfony\Component\Yaml\Parser;
-use Symfony\Component\HttpKernel\Client;
-
-require_once __DIR__ . '/TestSpecifications.inc';
 
 class InstallerTest extends \PHPUnit_Framework_TestCase
 {
@@ -42,7 +40,7 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
         $app = new Application('test');
 
         $parser = new Parser();
-        $connDatas = $parser->parse(file_get_contents(__DIR__ . '/../../../../config/connexions.yml'));
+        $connDatas = $parser->parse(file_get_contents(__DIR__ . '/../../../../../config/connexions.yml'));
         $credentials = $connDatas['main_connexion'];
 
         $specifications = new TestSpecifications();
@@ -52,7 +50,7 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
         $dbConn = new \connection_pdo('dbConn', 'localhost', 3306, $credentials['user'], $credentials['password'], 'db_unitTests');
 
         $template = 'en';
-        $dataPath = __DIR__ . '/../../../../datas/';
+        $dataPath = __DIR__ . '/../../../../../datas/';
 
         $installer = new Installer($app, 'admin@example.com', 'sdfsdsd', $abConn, 'http://local.phrasea.test.installer/', $dataPath, $dbConn, $template);
         $installer->install();
diff --git a/tests/Alchemy/Phrasea/Setup/TestSpecifications.inc b/tests/Alchemy/Tests/Phrasea/Setup/TestSpecifications.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Setup/TestSpecifications.inc
rename to tests/Alchemy/Tests/Phrasea/Setup/TestSpecifications.php
index 889fb1b5e8..b50ce4e9db 100644
--- a/tests/Alchemy/Phrasea/Setup/TestSpecifications.inc
+++ b/tests/Alchemy/Tests/Phrasea/Setup/TestSpecifications.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup;
+namespace Alchemy\Tests\Phrasea\Setup;
 
 use Alchemy\Phrasea\Core\Configuration\ApplicationSpecification;
 
diff --git a/tests/Alchemy/Phrasea/Setup/Version/Migration/Migration31Test.php b/tests/Alchemy/Tests/Phrasea/Setup/Version/Migration/Migration31Test.php
similarity index 63%
rename from tests/Alchemy/Phrasea/Setup/Version/Migration/Migration31Test.php
rename to tests/Alchemy/Tests/Phrasea/Setup/Version/Migration/Migration31Test.php
index 883960ecfb..506af2ec8a 100644
--- a/tests/Alchemy/Phrasea/Setup/Version/Migration/Migration31Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/Version/Migration/Migration31Test.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\Version\Migration;
+namespace Alchemy\Tests\Phrasea\Setup\Version\Migration;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Setup\AbstractSetupTester;
-
-require_once __DIR__ . '/../../AbstractSetupTester.inc';
+use Alchemy\Phrasea\Setup\Version\Migration\Migration31;
+use Alchemy\Tests\Phrasea\Setup\AbstractSetupTester;
 
 class Migration31Test extends AbstractSetupTester
 {
@@ -27,12 +26,12 @@ class Migration31Test extends AbstractSetupTester
         $migration = $this->getMigration();
         $migration->migrate();
 
-        require __DIR__ . '/../../../../../../config/config.inc';
+        require __DIR__ . '/../../../../../../../config/config.inc';
 
         $this->assertEquals('http://local.phrasea.tester/', $servername);
 
-        unlink(__DIR__ . '/../../../../../../config/_GV.php.old');
-        unlink(__DIR__ . '/../../../../../../config/config.inc');
+        unlink(__DIR__ . '/../../../../../../../config/_GV.php.old');
+        unlink(__DIR__ . '/../../../../../../../config/config.inc');
     }
 
     private function getMigration()
diff --git a/tests/Alchemy/Phrasea/Setup/Version/Migration/Migration35Test.php b/tests/Alchemy/Tests/Phrasea/Setup/Version/Migration/Migration35Test.php
similarity index 84%
rename from tests/Alchemy/Phrasea/Setup/Version/Migration/Migration35Test.php
rename to tests/Alchemy/Tests/Phrasea/Setup/Version/Migration/Migration35Test.php
index f1a8a3d9d2..6410cfe466 100644
--- a/tests/Alchemy/Phrasea/Setup/Version/Migration/Migration35Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/Version/Migration/Migration35Test.php
@@ -1,14 +1,12 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\Version\Migration;
+namespace Alchemy\Tests\Phrasea\Setup\Version\Migration;
 
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Core\Configuration;
-use Alchemy\Phrasea\Setup\TestSpecifications;
-use Alchemy\Phrasea\Setup\AbstractSetupTester;
-
-require_once __DIR__ . '/../../AbstractSetupTester.inc';
-require_once __DIR__ . '/../../TestSpecifications.inc';
+use Alchemy\Phrasea\Setup\Version\Migration\Migration35;
+use Alchemy\Tests\Phrasea\Setup\TestSpecifications;
+use Alchemy\Tests\Phrasea\Setup\AbstractSetupTester;
 
 class Migration35Test extends AbstractSetupTester
 {
diff --git a/tests/Alchemy/Phrasea/Setup/Version/Probe/Probe31Test.php b/tests/Alchemy/Tests/Phrasea/Setup/Version/Probe/Probe31Test.php
similarity index 79%
rename from tests/Alchemy/Phrasea/Setup/Version/Probe/Probe31Test.php
rename to tests/Alchemy/Tests/Phrasea/Setup/Version/Probe/Probe31Test.php
index d9b2c0b2dd..93de09eaa1 100644
--- a/tests/Alchemy/Phrasea/Setup/Version/Probe/Probe31Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/Version/Probe/Probe31Test.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\Version\Probe;
+namespace Alchemy\Tests\Phrasea\Setup\Version\Probe;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Setup\AbstractSetupTester;
-
-require_once __DIR__ . '/../../AbstractSetupTester.inc';
+use Alchemy\Tests\Phrasea\Setup\AbstractSetupTester;
+use Alchemy\Phrasea\Setup\Version\Probe\Probe31;
 
 class Probe31Test extends AbstractSetupTester
 {
diff --git a/tests/Alchemy/Phrasea/Setup/Version/Probe/Probe35Test.php b/tests/Alchemy/Tests/Phrasea/Setup/Version/Probe/Probe35Test.php
similarity index 79%
rename from tests/Alchemy/Phrasea/Setup/Version/Probe/Probe35Test.php
rename to tests/Alchemy/Tests/Phrasea/Setup/Version/Probe/Probe35Test.php
index 7c03270a24..f1d5a7d351 100644
--- a/tests/Alchemy/Phrasea/Setup/Version/Probe/Probe35Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Setup/Version/Probe/Probe35Test.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Setup\Version\Probe;
+namespace Alchemy\Tests\Phrasea\Setup\Version\Probe;
 
 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Setup\AbstractSetupTester;
-
-require_once __DIR__ . '/../../AbstractSetupTester.inc';
+use Alchemy\Phrasea\Setup\Version\Probe\Probe35;
+use Alchemy\Tests\Phrasea\Setup\AbstractSetupTester;
 
 class Probe35Test extends AbstractSetupTester
 {
diff --git a/tests/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php b/tests/Alchemy/Tests/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
similarity index 95%
rename from tests/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
rename to tests/Alchemy/Tests/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
index 7944afcd60..800ac9784b 100644
--- a/tests/Alchemy/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
@@ -1,6 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../../../../PhraseanetPHPUnitAbstract.class.inc';
+namespace Alchemy\Tests\Phrasea\Vocabulary\ControllerProvider;
+
+use Alchemy\Phrasea\Vocabulary\ControlProvider\UserProvider;
 
 class UserProviderTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Vocabulary/ControllerTest.php b/tests/Alchemy/Tests/Phrasea/Vocabulary/ControllerTest.php
similarity index 88%
rename from tests/Alchemy/Phrasea/Vocabulary/ControllerTest.php
rename to tests/Alchemy/Tests/Phrasea/Vocabulary/ControllerTest.php
index fbb29ccfa4..1edffc9c9f 100644
--- a/tests/Alchemy/Phrasea/Vocabulary/ControllerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Vocabulary/ControllerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Vocabulary;
+namespace Alchemy\Tests\Phrasea\Vocabulary;
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
+use Alchemy\Phrasea\Vocabulary\Controller;
 
 class ControllerTest extends \PhraseanetPHPUnitAbstract
 {
diff --git a/tests/Alchemy/Phrasea/Vocabulary/TermTest.php b/tests/Alchemy/Tests/Phrasea/Vocabulary/TermTest.php
similarity index 94%
rename from tests/Alchemy/Phrasea/Vocabulary/TermTest.php
rename to tests/Alchemy/Tests/Phrasea/Vocabulary/TermTest.php
index a7bc61e14b..0e718bf0cd 100644
--- a/tests/Alchemy/Phrasea/Vocabulary/TermTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Vocabulary/TermTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Alchemy\Phrasea\Vocabulary;
+namespace Alchemy\Tests\Phrasea\Vocabulary;
 
+use Alchemy\Phrasea\Vocabulary\Term;
 use Alchemy\Phrasea\Vocabulary\ControlProvider\UserProvider;
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class TermTest extends \PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/bootstrap.inc b/tests/bootstrap.inc
deleted file mode 100644
index 62fbbf85e5..0000000000
--- a/tests/bootstrap.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-require dirname(__FILE__) . '/../lib/bootstrap.php';
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000000..6aff6af6ba
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+
+$loader = require __DIR__ . '/../vendor/autoload.php';
+$loader->add('Alchemy\\Tests', __DIR__);
+$loader->add('', __DIR__ . "/classes");
diff --git a/tests/ACLTest.php b/tests/classes/ACLTest.php
similarity index 99%
rename from tests/ACLTest.php
rename to tests/classes/ACLTest.php
index 5c94e80b59..75176c05a5 100644
--- a/tests/ACLTest.php
+++ b/tests/classes/ACLTest.php
@@ -2,8 +2,6 @@
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class ACLTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php b/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
similarity index 83%
rename from tests/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
rename to tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
index 398ef85355..ffb9ba05f4 100644
--- a/tests/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
+++ b/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
 
 class Bridge_Api_Auth_AbstractTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php b/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
similarity index 98%
rename from tests/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
rename to tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
index 6398e64858..a839f7dc59 100644
--- a/tests/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
+++ b/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
 
 class Bridge_Api_Auth_FlickrTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php b/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
similarity index 98%
rename from tests/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
rename to tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
index 3d1b924e13..93a6ee7714 100644
--- a/tests/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
+++ b/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
 
 class Bridge_Api_Auth_OAuth2Test extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Bridge_Api_AbstractCollectionTest.php b/tests/classes/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
similarity index 98%
rename from tests/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
rename to tests/classes/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
index dd8c136fe1..94b85c0bda 100644
--- a/tests/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
+++ b/tests/classes/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../Bridge_datas.inc';
 
 class Bridge_Api_AbstractCollectionTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Bridge_Api_AbstractTest.php b/tests/classes/Bridge/Api/Bridge_Api_AbstractTest.php
similarity index 98%
rename from tests/Bridge/Api/Bridge_Api_AbstractTest.php
rename to tests/classes/Bridge/Api/Bridge_Api_AbstractTest.php
index 2df30342e3..6a1b26edd2 100644
--- a/tests/Bridge/Api/Bridge_Api_AbstractTest.php
+++ b/tests/classes/Bridge/Api/Bridge_Api_AbstractTest.php
@@ -2,7 +2,6 @@
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . '/../../PhraseanetWebTestCaseAbstract.class.inc';
 require_once __DIR__ . '/../Bridge_datas.inc';
 
 class Bridge_Api_AbstractTest extends PhraseanetWebTestCaseAbstract
diff --git a/tests/Bridge/Api/Bridge_Api_ContainerCollectionTest.php b/tests/classes/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
similarity index 86%
rename from tests/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
rename to tests/classes/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
index f479a41de9..7cd6050d96 100644
--- a/tests/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
+++ b/tests/classes/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../Bridge_datas.inc';
 
 class Bridge_Api_ContainerCollectionTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Bridge_Api_ElementCollectionTest.php b/tests/classes/Bridge/Api/Bridge_Api_ElementCollectionTest.php
similarity index 86%
rename from tests/Bridge/Api/Bridge_Api_ElementCollectionTest.php
rename to tests/classes/Bridge/Api/Bridge_Api_ElementCollectionTest.php
index 150eeb5274..00767e2f0e 100644
--- a/tests/Bridge/Api/Bridge_Api_ElementCollectionTest.php
+++ b/tests/classes/Bridge/Api/Bridge_Api_ElementCollectionTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../Bridge_datas.inc';
 
 class Bridge_Api_ElementCollectionTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php b/tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
similarity index 94%
rename from tests/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
rename to tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
index d687faefab..d0560d1c9e 100644
--- a/tests/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
+++ b/tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
-require_once __DIR__ . '/../../../../lib/classes/Bridge/Api/Dailymotion/Container.class.php';
 
 class Bridge_Api_Dailymotion_ContainerTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php b/tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
similarity index 97%
rename from tests/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
rename to tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
index 29d574c150..46e66fa345 100644
--- a/tests/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
+++ b/tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
-require_once __DIR__ . '/../../../../lib/classes/Bridge/Api/Dailymotion/Element.class.php';
 
 class Bridge_Api_Dailymotion_ElementTest extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php b/tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
similarity index 97%
rename from tests/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
rename to tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
index d44eeee1b8..e9e31aba5b 100644
--- a/tests/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
+++ b/tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
 
 class Bridge_Api_Flickr_ContainerTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php b/tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
similarity index 98%
rename from tests/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
rename to tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
index 9714dc87fb..6208d74f01 100644
--- a/tests/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
+++ b/tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
 
 class Bridge_Api_Flickr_ElementTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php b/tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
similarity index 97%
rename from tests/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
rename to tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
index 426e0ef20f..1aeadcc45f 100644
--- a/tests/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
+++ b/tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
 
 class Bridge_Api_Youtube_ContainerTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php b/tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
similarity index 98%
rename from tests/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
rename to tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
index beef0a742c..d4df057e9c 100644
--- a/tests/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
+++ b/tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/../../Bridge_datas.inc';
 
 class Bridge_Api_Youtube_ElementTest extends PHPUnit_Framework_TestCase
diff --git a/tests/Bridge/Bridge_AccountSettingsTest.php b/tests/classes/Bridge/Bridge_AccountSettingsTest.php
similarity index 96%
rename from tests/Bridge/Bridge_AccountSettingsTest.php
rename to tests/classes/Bridge/Bridge_AccountSettingsTest.php
index 209c25fdd5..ec7bf10b28 100644
--- a/tests/Bridge/Bridge_AccountSettingsTest.php
+++ b/tests/classes/Bridge/Bridge_AccountSettingsTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/Bridge_datas.inc';
 
 class Bridge_AccountSettingsTest extends PhraseanetPHPUnitAuthenticatedAbstract
diff --git a/tests/Bridge/Bridge_AccountTest.php b/tests/classes/Bridge/Bridge_AccountTest.php
similarity index 98%
rename from tests/Bridge/Bridge_AccountTest.php
rename to tests/classes/Bridge/Bridge_AccountTest.php
index 841d66833c..51d60fbad0 100644
--- a/tests/Bridge/Bridge_AccountTest.php
+++ b/tests/classes/Bridge/Bridge_AccountTest.php
@@ -2,7 +2,6 @@
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/Bridge_datas.inc';
 
 class Bridge_AccountTest extends PhraseanetPHPUnitAuthenticatedAbstract
diff --git a/tests/Bridge/Bridge_ApiTest.php b/tests/classes/Bridge/Bridge_ApiTest.php
similarity index 98%
rename from tests/Bridge/Bridge_ApiTest.php
rename to tests/classes/Bridge/Bridge_ApiTest.php
index 00321bf62d..91b0cb5c93 100644
--- a/tests/Bridge/Bridge_ApiTest.php
+++ b/tests/classes/Bridge/Bridge_ApiTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/Bridge_datas.inc';
 
 class Bridge_ApiTest extends PhraseanetPHPUnitAuthenticatedAbstract
diff --git a/tests/Bridge/Bridge_ElementTest.php b/tests/classes/Bridge/Bridge_ElementTest.php
similarity index 98%
rename from tests/Bridge/Bridge_ElementTest.php
rename to tests/classes/Bridge/Bridge_ElementTest.php
index a27ae62972..612788a303 100644
--- a/tests/Bridge/Bridge_ElementTest.php
+++ b/tests/classes/Bridge/Bridge_ElementTest.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
 require_once __DIR__ . '/Bridge_datas.inc';
 
 class Bridge_ElementTest extends PhraseanetPHPUnitAuthenticatedAbstract
diff --git a/tests/Bridge/Bridge_datas.inc b/tests/classes/Bridge/Bridge_datas.inc
similarity index 100%
rename from tests/Bridge/Bridge_datas.inc
rename to tests/classes/Bridge/Bridge_datas.inc
diff --git a/tests/Doctrine/Entities/BasketTest.php b/tests/classes/Doctrine/Entities/BasketTest.php
similarity index 98%
rename from tests/Doctrine/Entities/BasketTest.php
rename to tests/classes/Doctrine/Entities/BasketTest.php
index 2af24f5c04..de2fce549f 100644
--- a/tests/Doctrine/Entities/BasketTest.php
+++ b/tests/classes/Doctrine/Entities/BasketTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class EntityBasketTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/Doctrine/Repositories/ValidationParticipantRepositoryTest.php b/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
similarity index 89%
rename from tests/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
rename to tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
index a59cb99eff..bd4ede556d 100644
--- a/tests/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
+++ b/tests/classes/Doctrine/Repositories/ValidationParticipantRepositoryTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class ValidationParticipantRepositoryTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
 
diff --git a/tests/Feed/Entry/Feed_Entry_AdapterTest.php b/tests/classes/Feed/Entry/Feed_Entry_AdapterTest.php
similarity index 98%
rename from tests/Feed/Entry/Feed_Entry_AdapterTest.php
rename to tests/classes/Feed/Entry/Feed_Entry_AdapterTest.php
index b115648f10..32d2663f1a 100644
--- a/tests/Feed/Entry/Feed_Entry_AdapterTest.php
+++ b/tests/classes/Feed/Entry/Feed_Entry_AdapterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class Feed_Entry_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/Feed/Entry/Feed_Entry_CollectionTest.php b/tests/classes/Feed/Entry/Feed_Entry_CollectionTest.php
similarity index 97%
rename from tests/Feed/Entry/Feed_Entry_CollectionTest.php
rename to tests/classes/Feed/Entry/Feed_Entry_CollectionTest.php
index 180ce9f953..d2cd0490d7 100644
--- a/tests/Feed/Entry/Feed_Entry_CollectionTest.php
+++ b/tests/classes/Feed/Entry/Feed_Entry_CollectionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class Feed_Entry_CollectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/Feed/Entry/Feed_Entry_ItemTest.php b/tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
similarity index 97%
rename from tests/Feed/Entry/Feed_Entry_ItemTest.php
rename to tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
index 2188142e13..9ada243e7b 100644
--- a/tests/Feed/Entry/Feed_Entry_ItemTest.php
+++ b/tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class Feed_Entry_ItemTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/Feed/Feed_AdapterTest.php b/tests/classes/Feed/Feed_AdapterTest.php
similarity index 98%
rename from tests/Feed/Feed_AdapterTest.php
rename to tests/classes/Feed/Feed_AdapterTest.php
index 138fc3327c..8046b6b31a 100644
--- a/tests/Feed/Feed_AdapterTest.php
+++ b/tests/classes/Feed/Feed_AdapterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class Feed_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
@@ -32,7 +30,7 @@ class Feed_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
     public function testSet_icon()
     {
         $this->assertEquals('/skins/icons/rss32.gif', self::$object->get_icon_url());
-        $file = __DIR__ . '/../testfiles/p4logo.jpg';
+        $file = __DIR__ . '/../../files/p4logo.jpg';
         self::$object->set_icon($file);
         $this->assertEquals('/custom/feed_' . self::$object->get_id() . '.jpg', self::$object->get_icon_url());
     }
@@ -42,7 +40,7 @@ class Feed_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
      */
     public function testSet_iconFail()
     {
-        $file = __DIR__ . '/../testfiles/unknown.jpg';
+        $file = __DIR__ . '/../../files/unknown.jpg';
         self::$object->set_icon($file);
     }
 
diff --git a/tests/Feed/Feed_AggregateTest.php b/tests/classes/Feed/Feed_AggregateTest.php
similarity index 98%
rename from tests/Feed/Feed_AggregateTest.php
rename to tests/classes/Feed/Feed_AggregateTest.php
index 0046f255b4..16e846b588 100644
--- a/tests/Feed/Feed_AggregateTest.php
+++ b/tests/classes/Feed/Feed_AggregateTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class Feed_AggregateTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/Feed/Feed_CollectionTest.php b/tests/classes/Feed/Feed_CollectionTest.php
similarity index 97%
rename from tests/Feed/Feed_CollectionTest.php
rename to tests/classes/Feed/Feed_CollectionTest.php
index 255fbc08e7..265b51c60d 100644
--- a/tests/Feed/Feed_CollectionTest.php
+++ b/tests/classes/Feed/Feed_CollectionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class Feed_CollectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/Feed/Feed_LinkTest.php b/tests/classes/Feed/Feed_LinkTest.php
similarity index 91%
rename from tests/Feed/Feed_LinkTest.php
rename to tests/classes/Feed/Feed_LinkTest.php
index 8f8635f14c..33c0f5a9ba 100644
--- a/tests/Feed/Feed_LinkTest.php
+++ b/tests/classes/Feed/Feed_LinkTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class Feed_LinkTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Feed/Publisher/Feed_Publisher_AdapterTest.php b/tests/classes/Feed/Publisher/Feed_Publisher_AdapterTest.php
similarity index 96%
rename from tests/Feed/Publisher/Feed_Publisher_AdapterTest.php
rename to tests/classes/Feed/Publisher/Feed_Publisher_AdapterTest.php
index 949cdaa4d5..286298a52a 100644
--- a/tests/Feed/Publisher/Feed_Publisher_AdapterTest.php
+++ b/tests/classes/Feed/Publisher/Feed_Publisher_AdapterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class Feed_Publisher_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
@@ -19,7 +17,7 @@ class Feed_Publisher_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
     public static function setUpBeforeClass()
     {
         parent::setUpBeforeClass();
-        
+
         self::$feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], self::$title, self::$subtitle);
         $publishers = self::$feed->get_publishers();
         self::$object = array_pop($publishers);
diff --git a/tests/Feed/XML/Feed_XML_AtomTest.php b/tests/classes/Feed/XML/Feed_XML_AtomTest.php
similarity index 99%
rename from tests/Feed/XML/Feed_XML_AtomTest.php
rename to tests/classes/Feed/XML/Feed_XML_AtomTest.php
index f5cdf01e24..eae6ee8ba4 100644
--- a/tests/Feed/XML/Feed_XML_AtomTest.php
+++ b/tests/classes/Feed/XML/Feed_XML_AtomTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class Feed_XML_AtomTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Feed/XML/Feed_XML_RSSTest.php b/tests/classes/Feed/XML/Feed_XML_RSSTest.php
similarity index 98%
rename from tests/Feed/XML/Feed_XML_RSSTest.php
rename to tests/classes/Feed/XML/Feed_XML_RSSTest.php
index 4624427fad..fa8a05cf69 100644
--- a/tests/Feed/XML/Feed_XML_RSSTest.php
+++ b/tests/classes/Feed/XML/Feed_XML_RSSTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class Feed_XML_RSSTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php b/tests/classes/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
similarity index 96%
rename from tests/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
rename to tests/classes/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
index 43ae6b3edc..7f8a76ac51 100644
--- a/tests/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
+++ b/tests/classes/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class Feed_XML_RSS_ImageTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/FeedValidator.inc b/tests/classes/FeedValidator.inc
similarity index 100%
rename from tests/FeedValidator.inc
rename to tests/classes/FeedValidator.inc
diff --git a/tests/PhraseanetPHPUnitAbstract.class.inc b/tests/classes/PhraseanetPHPUnitAbstract.php
similarity index 98%
rename from tests/PhraseanetPHPUnitAbstract.class.inc
rename to tests/classes/PhraseanetPHPUnitAbstract.php
index 5c2822cb2c..290d72e68a 100644
--- a/tests/PhraseanetPHPUnitAbstract.class.inc
+++ b/tests/classes/PhraseanetPHPUnitAbstract.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . "/PhraseanetPHPUnitListener.class.inc";
-
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
 use Doctrine\Common\DataFixtures\Loader;
@@ -110,7 +108,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
         self::$DI['app'] = self::$DI->share(function($DI) {
             $environment = 'test';
-            $app = require __DIR__ . '/../lib/Alchemy/Phrasea/Application/Root.php';
+            $app = require __DIR__ . '/../../lib/Alchemy/Phrasea/Application/Root.php';
 
             $app['debug'] = true;
 
@@ -120,7 +118,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
             $app['EM'] = $app->share($app->extend('EM', function($em) {
                 @unlink('/tmp/db.sqlite');
-                copy(__DIR__ . '/db-ref.sqlite', '/tmp/db.sqlite');
+                copy(__DIR__ . '/../db-ref.sqlite', '/tmp/db.sqlite');
 
                 return $em;
             }));
@@ -527,7 +525,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
             $application['phraseanet.appbox']->forceUpgrade($upgrader, $application);
             unset($upgrader);
 
-            $command = __DIR__ . '/../bin/doctrine orm:schema-tool:update --force';
+            $command = __DIR__ . '/../../bin/doctrine orm:schema-tool:update --force';
 
             try {
                 $process = new Symfony\Component\Process\Process('php ' . $command);
@@ -743,7 +741,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
                 $name = $i < 10 ? 'test00' . $i . '.*' : 'test0' . $i . '.*';
 
-                $finder->name($name)->in(__DIR__ . '/testfiles/');
+                $finder->name($name)->in(__DIR__ . '/../files/');
 
                 foreach ($finder as $file) {
                     return $file;
@@ -780,7 +778,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
                 PhraseanetPHPUnitAbstract::$recordsInitialized[] = 'no_access';
 
-                $file = new File($DI['app'], $DI['app']['mediavorus']->guess(__DIR__ . '/testfiles/cestlafete.jpg'), $DI['collection_no_access']);
+                $file = new File($DI['app'], $DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), $DI['collection_no_access']);
 
                 return \record_adapter::createFromFile($file, $DI['app']);
             });
@@ -789,7 +787,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 
                 PhraseanetPHPUnitAbstract::$recordsInitialized[] = 'no_access_by_status';
 
-                $file = new File($DI['app'], $DI['app']['mediavorus']->guess(__DIR__ . '/testfiles/cestlafete.jpg'), $DI['collection_no_access']);
+                $file = new File($DI['app'], $DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), $DI['collection_no_access']);
 
                 return \record_adapter::createFromFile($file, $DI['app']);
             });
diff --git a/tests/PhraseanetPHPUnitAuthenticatedAbstract.class.inc b/tests/classes/PhraseanetPHPUnitAuthenticatedAbstract.php
similarity index 87%
rename from tests/PhraseanetPHPUnitAuthenticatedAbstract.class.inc
rename to tests/classes/PhraseanetPHPUnitAuthenticatedAbstract.php
index 7c54a3e64e..cadf9f2a32 100644
--- a/tests/PhraseanetPHPUnitAuthenticatedAbstract.class.inc
+++ b/tests/classes/PhraseanetPHPUnitAuthenticatedAbstract.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 use Silex\WebTestCase;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/tests/PhraseanetPHPUnitListener.class.inc b/tests/classes/PhraseanetPHPUnitListener.php
similarity index 100%
rename from tests/PhraseanetPHPUnitListener.class.inc
rename to tests/classes/PhraseanetPHPUnitListener.php
diff --git a/tests/PhraseanetWebTestCaseAbstract.class.inc b/tests/classes/PhraseanetWebTestCaseAbstract.php
similarity index 76%
rename from tests/PhraseanetWebTestCaseAbstract.class.inc
rename to tests/classes/PhraseanetWebTestCaseAbstract.php
index 649c35485c..3b464e3d4a 100644
--- a/tests/PhraseanetWebTestCaseAbstract.class.inc
+++ b/tests/classes/PhraseanetWebTestCaseAbstract.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 use Silex\WebTestCase;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/tests/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc b/tests/classes/PhraseanetWebTestCaseAuthenticatedAbstract.php
similarity index 98%
rename from tests/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc
rename to tests/classes/PhraseanetWebTestCaseAuthenticatedAbstract.php
index 0bdf314b7f..452a493c7a 100644
--- a/tests/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc
+++ b/tests/classes/PhraseanetWebTestCaseAuthenticatedAbstract.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 use Silex\WebTestCase;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/tests/Session/Authentication/Session_Authentication_GuestTest.php b/tests/classes/Session/Authentication/Session_Authentication_GuestTest.php
similarity index 87%
rename from tests/Session/Authentication/Session_Authentication_GuestTest.php
rename to tests/classes/Session/Authentication/Session_Authentication_GuestTest.php
index d905bf4f1f..b6516aa558 100644
--- a/tests/Session/Authentication/Session_Authentication_GuestTest.php
+++ b/tests/classes/Session/Authentication/Session_Authentication_GuestTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class Session_Authentication_GuestTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Session/Authentication/Session_Authentication_NativeTest.php b/tests/classes/Session/Authentication/Session_Authentication_NativeTest.php
similarity index 94%
rename from tests/Session/Authentication/Session_Authentication_NativeTest.php
rename to tests/classes/Session/Authentication/Session_Authentication_NativeTest.php
index 5564a93a2e..85acc50192 100644
--- a/tests/Session/Authentication/Session_Authentication_NativeTest.php
+++ b/tests/classes/Session/Authentication/Session_Authentication_NativeTest.php
@@ -2,8 +2,6 @@
 
 use Symfony\Component\HttpFoundation\Request;
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class Session_Authentication_NativeTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Session/Session_LoggerTest.php b/tests/classes/Session/Session_LoggerTest.php
similarity index 97%
rename from tests/Session/Session_LoggerTest.php
rename to tests/classes/Session/Session_LoggerTest.php
index 6ee2aab0c4..2cbcdba174 100644
--- a/tests/Session/Session_LoggerTest.php
+++ b/tests/classes/Session/Session_LoggerTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class Session_LoggerTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/Setup/Setup_ConstraintTest.php b/tests/classes/Setup/Setup_ConstraintTest.php
similarity index 94%
rename from tests/Setup/Setup_ConstraintTest.php
rename to tests/classes/Setup/Setup_ConstraintTest.php
index 5f9c9d1a22..9e63fcee13 100644
--- a/tests/Setup/Setup_ConstraintTest.php
+++ b/tests/classes/Setup/Setup_ConstraintTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class Setup_ConstraintTest extends PhraseanetPHPUnitAbstract
 {
     protected $object_non_blocker;
diff --git a/tests/Setup/Setup_UpgradeTest.php b/tests/classes/Setup/Setup_UpgradeTest.php
similarity index 97%
rename from tests/Setup/Setup_UpgradeTest.php
rename to tests/classes/Setup/Setup_UpgradeTest.php
index e89365d7ec..a375ca5aeb 100644
--- a/tests/Setup/Setup_UpgradeTest.php
+++ b/tests/classes/Setup/Setup_UpgradeTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class Setup_UpgradeTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/api/oauthv2/API_OAuth2_AuthCodeTest.php b/tests/classes/api/oauthv2/API_OAuth2_AuthCodeTest.php
similarity index 97%
rename from tests/api/oauthv2/API_OAuth2_AuthCodeTest.php
rename to tests/classes/api/oauthv2/API_OAuth2_AuthCodeTest.php
index 234a590f49..160af87772 100644
--- a/tests/api/oauthv2/API_OAuth2_AuthCodeTest.php
+++ b/tests/classes/api/oauthv2/API_OAuth2_AuthCodeTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class API_OAuth2_AuthCodeTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/api/oauthv2/API_OAuth2_RefreshTokenTest.php b/tests/classes/api/oauthv2/API_OAuth2_RefreshTokenTest.php
similarity index 97%
rename from tests/api/oauthv2/API_OAuth2_RefreshTokenTest.php
rename to tests/classes/api/oauthv2/API_OAuth2_RefreshTokenTest.php
index e460094092..0aae122a14 100644
--- a/tests/api/oauthv2/API_OAuth2_RefreshTokenTest.php
+++ b/tests/classes/api/oauthv2/API_OAuth2_RefreshTokenTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class API_OAuth2_RefreshTokenTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/api/oauthv2/api_oauthv2_AccountTest.php b/tests/classes/api/oauthv2/api_oauthv2_AccountTest.php
similarity index 96%
rename from tests/api/oauthv2/api_oauthv2_AccountTest.php
rename to tests/classes/api/oauthv2/api_oauthv2_AccountTest.php
index a2d96c2541..77dc66e78e 100644
--- a/tests/api/oauthv2/api_oauthv2_AccountTest.php
+++ b/tests/classes/api/oauthv2/api_oauthv2_AccountTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class API_OAuth2_AccountTest extends PhraseanetPHPUnitAbstract
 {
 
diff --git a/tests/api/oauthv2/api_oauthv2_ApplicationTest.php b/tests/classes/api/oauthv2/api_oauthv2_ApplicationTest.php
similarity index 98%
rename from tests/api/oauthv2/api_oauthv2_ApplicationTest.php
rename to tests/classes/api/oauthv2/api_oauthv2_ApplicationTest.php
index 7cfef76a69..cca5f713f7 100644
--- a/tests/api/oauthv2/api_oauthv2_ApplicationTest.php
+++ b/tests/classes/api/oauthv2/api_oauthv2_ApplicationTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class API_OAuth2_ApplicationTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/api/oauthv2/api_oauthv2_TokenTest.php b/tests/classes/api/oauthv2/api_oauthv2_TokenTest.php
similarity index 97%
rename from tests/api/oauthv2/api_oauthv2_TokenTest.php
rename to tests/classes/api/oauthv2/api_oauthv2_TokenTest.php
index 6ac55905b1..c6f1fcb5cc 100644
--- a/tests/api/oauthv2/api_oauthv2_TokenTest.php
+++ b/tests/classes/api/oauthv2/api_oauthv2_TokenTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class API_OAuth2_TokenTest extends PhraseanetPHPUnitAbstract
 {
 
diff --git a/tests/api/v1/api_v1_adapterTest.php b/tests/classes/api/v1/api_v1_adapterTest.php
similarity index 98%
rename from tests/api/v1/api_v1_adapterTest.php
rename to tests/classes/api/v1/api_v1_adapterTest.php
index f37edaed73..87b735b50f 100644
--- a/tests/api/v1/api_v1_adapterTest.php
+++ b/tests/classes/api/v1/api_v1_adapterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\Border\File as BorderFile;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -163,7 +161,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
-        $record = \record_adapter::createFromFile(BorderFile::buildFromPathfile(__DIR__ . '/../../testfiles/cestlafete.jpg', self::$DI['collection'], self::$DI['app']), self::$DI['app']);
+        $record = \record_adapter::createFromFile(BorderFile::buildFromPathfile(__DIR__ . '/../../../files/cestlafete.jpg', self::$DI['collection'], self::$DI['app']), self::$DI['app']);
 
         $request = new Request(array('record_type' => "image", 'search_type' => 0), array(), array(), array(), array(), array('HTTP_Accept' => 'application/json'));
         $result = $this->object->search_records($request);
@@ -260,7 +258,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $auth = new \Session_Authentication_None(self::$DI['user']);
         self::$DI['app']->openAccount($auth);
 
-        $record = \record_adapter::createFromFile(BorderFile::buildFromPathfile(__DIR__ . '/../../testfiles/cestlafete.jpg', self::$DI['collection'], self::$DI['app']), self::$DI['app']);
+        $record = \record_adapter::createFromFile(BorderFile::buildFromPathfile(__DIR__ . '/../../../files/cestlafete.jpg', self::$DI['collection'], self::$DI['app']), self::$DI['app']);
 
         $request = new Request(array('search_type' => 0), array(), array(), array(), array(), array('HTTP_Accept' => 'application/json'));
         $result = $this->object->search($request);
diff --git a/tests/api/v1/api_v1_resultTest.php b/tests/classes/api/v1/api_v1_resultTest.php
similarity index 99%
rename from tests/api/v1/api_v1_resultTest.php
rename to tests/classes/api/v1/api_v1_resultTest.php
index 936443a746..4ce9372790 100644
--- a/tests/api/v1/api_v1_resultTest.php
+++ b/tests/classes/api/v1/api_v1_resultTest.php
@@ -1,7 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-require_once __DIR__ . '/../../../vendor/alchemy/oauth2php/lib/OAuth2.php';
+require_once __DIR__ . '/../../../../vendor/alchemy/oauth2php/lib/OAuth2.php';
 
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/caption/caption_fieldTest.php b/tests/classes/caption/caption_fieldTest.php
similarity index 94%
rename from tests/caption/caption_fieldTest.php
rename to tests/classes/caption/caption_fieldTest.php
index ff6c44f98d..328d670f68 100644
--- a/tests/caption/caption_fieldTest.php
+++ b/tests/classes/caption/caption_fieldTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../lib/classes/caption/field.class.php';
-
 class caption_fieldTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/caption/caption_recordTest.php b/tests/classes/caption/caption_recordTest.php
similarity index 98%
rename from tests/caption/caption_recordTest.php
rename to tests/classes/caption/caption_recordTest.php
index 5b00b41c95..9c7f047073 100644
--- a/tests/caption/caption_recordTest.php
+++ b/tests/classes/caption/caption_recordTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class caption_recordTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/collectionTest.php b/tests/classes/collectionTest.php
similarity index 97%
rename from tests/collectionTest.php
rename to tests/classes/collectionTest.php
index 31647f7f33..11270e3114 100644
--- a/tests/collectionTest.php
+++ b/tests/classes/collectionTest.php
@@ -3,8 +3,6 @@
 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
 
-require_once __DIR__ . '/PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
@@ -87,7 +85,7 @@ class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
     public function testGet_record_amount()
     {
         self::$object->empty_collection();
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/testfiles/cestlafete.jpg'), self::$object);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), self::$object);
         record_adapter::createFromFile($file, self::$DI['app']);
         $this->assertTrue(self::$object->get_record_amount() === 1);
         self::$object->empty_collection();
@@ -134,7 +132,7 @@ class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     public function testGet_record_details()
     {
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/testfiles/cestlafete.jpg'), self::$object);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . '/../files/cestlafete.jpg'), self::$object);
         $record = record_adapter::createFromFile($file, self::$DI['app']);
         $details = self::$object->get_record_details();
 
@@ -154,7 +152,7 @@ class collectionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     public function testUpdate_logo()
     {
-        $pathfile = new \SplFileInfo(__DIR__ . '/testfiles/logocoll.gif');
+        $pathfile = new \SplFileInfo(__DIR__ . '/../files/logocoll.gif');
         self::$object->update_logo($pathfile);
         $this->assertEquals(file_get_contents($pathfile->getPathname()), self::$object->get_binary_minilogos());
     }
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_ContributorTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
index 6991a99b9c..a741d3146b 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_ContributorTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_CoverageTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
index d156b5689d..bc926532d7 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_CoverageTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_CreatorTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
index b56ef6a123..b24072a0fe 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_CreatorTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_DateTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_DateTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_DateTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_DateTest.php
index 644bf5d485..b0cab9b7e3 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_DateTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_DateTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_DateTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
index 77cfdc6864..5a26e31230 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_DescriptionTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_FormatTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_FormatTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_FormatTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_FormatTest.php
index e5cd82953e..184d1d359b 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_FormatTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_FormatTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_FormatTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
index 47f86f28b7..f502a675f8 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_IdentifierTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_LanguageTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
index 5a4d9f657b..1fffbaf9c5 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_LanguageTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_PublisherTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
index 17ef29b914..ab23303c9f 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_PublisherTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_RelationTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_RelationTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_RelationTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_RelationTest.php
index 6ff5f78698..b9da7d6d9b 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_RelationTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_RelationTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_RelationTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_RightsTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_RightsTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_RightsTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_RightsTest.php
index 7ca5628006..82b692ad1e 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_RightsTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_RightsTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_RightsTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_SourceTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_SourceTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_SourceTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_SourceTest.php
index 37aeffc0c7..94f86e224d 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_SourceTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_SourceTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_SourceTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_SubjectTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
index d5bf3385cc..237bc1eb79 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_SubjectTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_TitleTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_TitleTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_TitleTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_TitleTest.php
index f79b33ebaf..183b7adb92 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_TitleTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_TitleTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_TitleTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/Field/DCES/databox_Field_DCES_TypeTest.php b/tests/classes/databox/Field/DCES/databox_Field_DCES_TypeTest.php
similarity index 92%
rename from tests/databox/Field/DCES/databox_Field_DCES_TypeTest.php
rename to tests/classes/databox/Field/DCES/databox_Field_DCES_TypeTest.php
index da31979a83..08203b6a37 100644
--- a/tests/databox/Field/DCES/databox_Field_DCES_TypeTest.php
+++ b/tests/classes/databox/Field/DCES/databox_Field_DCES_TypeTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_Field_DCES_TypeTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/databox_fieldTest.php b/tests/classes/databox/databox_fieldTest.php
similarity index 99%
rename from tests/databox/databox_fieldTest.php
rename to tests/classes/databox/databox_fieldTest.php
index c407fc798b..5f1a931ecf 100644
--- a/tests/databox/databox_fieldTest.php
+++ b/tests/classes/databox/databox_fieldTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_fieldTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/databox_statusTest.php b/tests/classes/databox/databox_statusTest.php
similarity index 98%
rename from tests/databox/databox_statusTest.php
rename to tests/classes/databox/databox_statusTest.php
index fe025c9ff8..561a4d4e8b 100644
--- a/tests/databox/databox_statusTest.php
+++ b/tests/classes/databox/databox_statusTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class databox_statusTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/databox/databox_subdefTest.php b/tests/classes/databox/databox_subdefTest.php
similarity index 100%
rename from tests/databox/databox_subdefTest.php
rename to tests/classes/databox/databox_subdefTest.php
diff --git a/tests/databoxTest.php b/tests/classes/databoxTest.php
similarity index 95%
rename from tests/databoxTest.php
rename to tests/classes/databoxTest.php
index 074acc9d1c..cfbef7b664 100644
--- a/tests/databoxTest.php
+++ b/tests/classes/databoxTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 class databoxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
 {
     /**
@@ -34,6 +32,9 @@ class databoxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
         $newdom = $databox->get_dom_thesaurus();
         $this->assertNotEquals("20100101000000", $newdom->documentElement->getAttribute("modification_date"));
         $this->assertEquals($testValue, $newdom->documentElement->firstChild->getAttribute("value"));
+
+        $databox->unmount_databox();
+        $databox->delete();
     }
 
     /**
@@ -66,5 +67,8 @@ class databoxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
         $newdom = $databox->get_dom_cterms();
         $this->assertNotEquals("20100101000000", $newdom->documentElement->getAttribute("modification_date"));
         $this->assertEquals($testValue, $newdom->documentElement->firstChild->getAttribute("value"));
+
+        $databox->unmount_databox();
+        $databox->delete();
     }
 }
diff --git a/tests/geonamesTest.php b/tests/classes/geonamesTest.php
similarity index 97%
rename from tests/geonamesTest.php
rename to tests/classes/geonamesTest.php
index bc2575bebe..bab4ed5378 100644
--- a/tests/geonamesTest.php
+++ b/tests/classes/geonamesTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class geonamesTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/http/http_requestTest.php b/tests/classes/http/http_requestTest.php
similarity index 98%
rename from tests/http/http_requestTest.php
rename to tests/classes/http/http_requestTest.php
index 4e169b36b0..8dd55f678b 100644
--- a/tests/http/http_requestTest.php
+++ b/tests/classes/http/http_requestTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class http_requestTest extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/media/Permalink/media_Permalink_AdapterTest.php b/tests/classes/media/Permalink/media_Permalink_AdapterTest.php
similarity index 98%
rename from tests/media/Permalink/media_Permalink_AdapterTest.php
rename to tests/classes/media/Permalink/media_Permalink_AdapterTest.php
index 3f7e3150bd..7bea316ea8 100644
--- a/tests/media/Permalink/media_Permalink_AdapterTest.php
+++ b/tests/classes/media/Permalink/media_Permalink_AdapterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 class media_Permalink_AdapterTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/media/media_subdefTest.php b/tests/classes/media/media_subdefTest.php
similarity index 98%
rename from tests/media/media_subdefTest.php
rename to tests/classes/media/media_subdefTest.php
index df14157441..8f272c31d2 100644
--- a/tests/media/media_subdefTest.php
+++ b/tests/classes/media/media_subdefTest.php
@@ -2,8 +2,6 @@
 
 use Alchemy\Phrasea\Border\File;
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class media_subdefTest extends \PhraseanetPHPUnitAbstract
 {
     /**
@@ -33,7 +31,7 @@ class media_subdefTest extends \PhraseanetPHPUnitAbstract
     {
         parent::setUpBeforeClass();
 
-        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . "/../testfiles/iphone_pic.jpg"), self::$DI['collection']);
+        $file = new File(self::$DI['app'], self::$DI['app']['mediavorus']->guess(__DIR__ . "/../../files/iphone_pic.jpg"), self::$DI['collection']);
 
         self::$recordonbleu = record_adapter::createFromFile($file, self::$DI['app']);
         self::$recordonbleu->generate_subdefs(self::$recordonbleu->get_databox(), self::$DI['app']);
diff --git a/tests/module/console/module_console_aboutAuthorsTest.php b/tests/classes/module/console/module_console_aboutAuthorsTest.php
similarity index 83%
rename from tests/module/console/module_console_aboutAuthorsTest.php
rename to tests/classes/module/console/module_console_aboutAuthorsTest.php
index 81e65df478..f7b375265c 100644
--- a/tests/module/console/module_console_aboutAuthorsTest.php
+++ b/tests/classes/module/console/module_console_aboutAuthorsTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\CLI;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -25,7 +23,7 @@ class module_console_aboutAuthorsTest extends PHPUnit_Framework_TestCase
         $commandTester->execute(array('command' => $command->getName()));
 
         $this->assertEquals(
-            trim(file_get_contents(__DIR__ . '/../../../AUTHORS'))
+            trim(file_get_contents(__DIR__ . '/../../../../AUTHORS'))
             , trim($commandTester->getDisplay())
         );
     }
diff --git a/tests/module/console/module_console_aboutLicenseTest.php b/tests/classes/module/console/module_console_aboutLicenseTest.php
similarity index 83%
rename from tests/module/console/module_console_aboutLicenseTest.php
rename to tests/classes/module/console/module_console_aboutLicenseTest.php
index fee7d558da..098a594a26 100644
--- a/tests/module/console/module_console_aboutLicenseTest.php
+++ b/tests/classes/module/console/module_console_aboutLicenseTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\CLI;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -25,7 +23,7 @@ class module_console_aboutLicenseTest extends PHPUnit_Framework_TestCase
         $commandTester->execute(array('command' => $command->getName()));
 
         $this->assertEquals(
-            trim(file_get_contents(__DIR__ . '/../../../LICENSE'))
+            trim(file_get_contents(__DIR__ . '/../../../../LICENSE'))
             , trim($commandTester->getDisplay())
         );
     }
diff --git a/tests/module/console/module_console_schedulerStateTest.php b/tests/classes/module/console/module_console_schedulerStateTest.php
similarity index 93%
rename from tests/module/console/module_console_schedulerStateTest.php
rename to tests/classes/module/console/module_console_schedulerStateTest.php
index ba37d1aad3..c1463a7e93 100644
--- a/tests/module/console/module_console_schedulerStateTest.php
+++ b/tests/classes/module/console/module_console_schedulerStateTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\CLI;
 use Symfony\Component\Console\Tester\CommandTester;
 
diff --git a/tests/module/console/module_console_systemTemplateGeneratorTest.php b/tests/classes/module/console/module_console_systemTemplateGeneratorTest.php
similarity index 91%
rename from tests/module/console/module_console_systemTemplateGeneratorTest.php
rename to tests/classes/module/console/module_console_systemTemplateGeneratorTest.php
index c3868e9b02..fd0e36dec2 100644
--- a/tests/module/console/module_console_systemTemplateGeneratorTest.php
+++ b/tests/classes/module/console/module_console_systemTemplateGeneratorTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\CLI;
 use Symfony\Component\Console\Tester\CommandTester;
 
diff --git a/tests/module/console/module_console_taskStateTest.php b/tests/classes/module/console/module_console_taskStateTest.php
similarity index 96%
rename from tests/module/console/module_console_taskStateTest.php
rename to tests/classes/module/console/module_console_taskStateTest.php
index 168ad824d4..1d4b201deb 100644
--- a/tests/module/console/module_console_taskStateTest.php
+++ b/tests/classes/module/console/module_console_taskStateTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\CLI;
 use Symfony\Component\Console\Tester\CommandTester;
 
diff --git a/tests/module/console/module_console_tasklistTest.php b/tests/classes/module/console/module_console_tasklistTest.php
similarity index 92%
rename from tests/module/console/module_console_tasklistTest.php
rename to tests/classes/module/console/module_console_tasklistTest.php
index 9fd4b87339..afbfb229f6 100644
--- a/tests/module/console/module_console_tasklistTest.php
+++ b/tests/classes/module/console/module_console_tasklistTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../PhraseanetWebTestCaseAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\CLI;
 use Symfony\Component\Console\Tester\CommandTester;
 
diff --git a/tests/p4stringTest.php b/tests/classes/p4stringTest.php
similarity index 98%
rename from tests/p4stringTest.php
rename to tests/classes/p4stringTest.php
index 416e695385..56a8672427 100644
--- a/tests/p4stringTest.php
+++ b/tests/classes/p4stringTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class p4stringTest extends PhraseanetPHPUnitAbstract
 {
 
diff --git a/tests/randomTest.php b/tests/classes/randomTest.php
similarity index 98%
rename from tests/randomTest.php
rename to tests/classes/randomTest.php
index 4e8b8e6a64..39a5c4a174 100644
--- a/tests/randomTest.php
+++ b/tests/classes/randomTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class randomTest extends PhraseanetPHPUnitAbstract
 {
 
diff --git a/tests/record/adapterTest.php b/tests/classes/record/adapterTest.php
similarity index 99%
rename from tests/record/adapterTest.php
rename to tests/classes/record/adapterTest.php
index 196302c4c6..0f4c74f613 100644
--- a/tests/record/adapterTest.php
+++ b/tests/classes/record/adapterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 use Alchemy\Phrasea\Controller\RecordsRequest;
 use Doctrine\Common\Collections\ArrayCollection;
 
diff --git a/tests/registryTest.php b/tests/classes/registryTest.php
similarity index 98%
rename from tests/registryTest.php
rename to tests/classes/registryTest.php
index 65b33e262c..6d6fe340ed 100644
--- a/tests/registryTest.php
+++ b/tests/classes/registryTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class registryTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/report/activityTest.php b/tests/classes/report/activityTest.php
similarity index 98%
rename from tests/report/activityTest.php
rename to tests/classes/report/activityTest.php
index afc790e968..f579c80a53 100644
--- a/tests/report/activityTest.php
+++ b/tests/classes/report/activityTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class activityTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/addTest.php b/tests/classes/report/addTest.php
similarity index 98%
rename from tests/report/addTest.php
rename to tests/classes/report/addTest.php
index e32ef3df80..b56ad073ac 100644
--- a/tests/report/addTest.php
+++ b/tests/classes/report/addTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class addReportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/connexionReportTest.php b/tests/classes/report/connexionReportTest.php
similarity index 97%
rename from tests/report/connexionReportTest.php
rename to tests/classes/report/connexionReportTest.php
index e905336f45..13fcc8d4b5 100644
--- a/tests/report/connexionReportTest.php
+++ b/tests/classes/report/connexionReportTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class connexionReportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
@@ -25,7 +23,9 @@ class connexionReportTest extends PhraseanetPHPUnitAuthenticatedAbstract
             foreach ($colls as $coll) {
                 $rett[$coll->get_coll_id()] = $coll->get_coll_id();
             }
-            $this->ret[$databox->get_sbas_id()] = implode(',', $rett);
+            if (0 < count($rett)) {
+                $this->ret[$databox->get_sbas_id()] = implode(',', $rett);
+            }
         }
     }
 
@@ -103,6 +103,7 @@ class connexionReportTest extends PhraseanetPHPUnitAuthenticatedAbstract
         $this->assertLessThanOrEqual($this->report->getNbRecord(), count($report['result']));
 
         $nbPage = $this->report->getTotal() / $this->report->getNbRecord();
+        $nbPage = $nbPage < 1 ? 1 : $nbPage;
 
         if ($this->report->getTotal() > $this->report->getNbRecord())
             $this->assertTrue($report['display_nav']);
diff --git a/tests/report/dashboardTest.php b/tests/classes/report/dashboardTest.php
similarity index 98%
rename from tests/report/dashboardTest.php
rename to tests/classes/report/dashboardTest.php
index f7988d0462..5d5d4b8a05 100644
--- a/tests/report/dashboardTest.php
+++ b/tests/classes/report/dashboardTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class dashboardTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $dashboard;
diff --git a/tests/report/downloadReportTest.php b/tests/classes/report/downloadReportTest.php
similarity index 98%
rename from tests/report/downloadReportTest.php
rename to tests/classes/report/downloadReportTest.php
index 0fe9b356d8..475eeb968a 100644
--- a/tests/report/downloadReportTest.php
+++ b/tests/classes/report/downloadReportTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class downloadReportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/editTest.php b/tests/classes/report/editTest.php
similarity index 98%
rename from tests/report/editTest.php
rename to tests/classes/report/editTest.php
index 28f8268625..4135b2254d 100644
--- a/tests/report/editTest.php
+++ b/tests/classes/report/editTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class editTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/filterTest.php b/tests/classes/report/filterTest.php
similarity index 97%
rename from tests/report/filterTest.php
rename to tests/classes/report/filterTest.php
index b2c706946c..9b53cb176e 100644
--- a/tests/report/filterTest.php
+++ b/tests/classes/report/filterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class filterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/pushTest.php b/tests/classes/report/pushTest.php
similarity index 98%
rename from tests/report/pushTest.php
rename to tests/classes/report/pushTest.php
index 80ddbaaacf..81309d2dd5 100644
--- a/tests/report/pushTest.php
+++ b/tests/classes/report/pushTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class pushReportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/questionReportTest.php b/tests/classes/report/questionReportTest.php
similarity index 98%
rename from tests/report/questionReportTest.php
rename to tests/classes/report/questionReportTest.php
index b6446e3d20..fd51e35e77 100644
--- a/tests/report/questionReportTest.php
+++ b/tests/classes/report/questionReportTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class questionReportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/reportTest.php b/tests/classes/report/reportTest.php
similarity index 98%
rename from tests/report/reportTest.php
rename to tests/classes/report/reportTest.php
index 3053bc26a3..2e55173fd6 100644
--- a/tests/report/reportTest.php
+++ b/tests/classes/report/reportTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class reportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $ret;
diff --git a/tests/report/sqlActionTest.php b/tests/classes/report/sqlActionTest.php
similarity index 87%
rename from tests/report/sqlActionTest.php
rename to tests/classes/report/sqlActionTest.php
index a570f53b37..4c0cfa8ff9 100644
--- a/tests/report/sqlActionTest.php
+++ b/tests/classes/report/sqlActionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class sqlActionTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     protected $action;
diff --git a/tests/report/sqlFilterTest.php b/tests/classes/report/sqlFilterTest.php
similarity index 98%
rename from tests/report/sqlFilterTest.php
rename to tests/classes/report/sqlFilterTest.php
index 7fbb8b9ce7..f3b440be0d 100644
--- a/tests/report/sqlFilterTest.php
+++ b/tests/classes/report/sqlFilterTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class sqlFilterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     /**
diff --git a/tests/report/sqlTest.php b/tests/classes/report/sqlTest.php
similarity index 92%
rename from tests/report/sqlTest.php
rename to tests/classes/report/sqlTest.php
index afe2cea93f..5a1d74fa11 100644
--- a/tests/report/sqlTest.php
+++ b/tests/classes/report/sqlTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class sqlTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
 
diff --git a/tests/set/set_exportTest.php b/tests/classes/set/set_exportTest.php
similarity index 77%
rename from tests/set/set_exportTest.php
rename to tests/classes/set/set_exportTest.php
index 369610c79a..4b9ace5215 100644
--- a/tests/set/set_exportTest.php
+++ b/tests/classes/set/set_exportTest.php
@@ -1,12 +1,10 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAuthenticatedAbstract.class.inc';
-
 class set_exportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 {
     public function testStreamFileExportName()
     {
-        $response = \set_export::stream_file(self::$DI['app'], __DIR__ . '/../testfiles/HelloWorld.pdf', 'to1\/\àçÂto.jpg', 'application/pdf');
+        $response = \set_export::stream_file(self::$DI['app'], __DIR__ . '/../../files/HelloWorld.pdf', 'to1\/\àçÂto.jpg', 'application/pdf');
         $explode = explode(';', $response->headers->get('content-disposition'));
 
         $filenameData = explode('=', $explode[1]);
@@ -21,7 +19,7 @@ class set_exportTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     public function testStreamFilenotFound()
     {
-        $response = \set_export::stream_file(self::$DI['app'], __DIR__ . '/../testfiles/Unknown.pdf', 'to1\/\\o.jpg', 'application/pdf');
+        $response = \set_export::stream_file(self::$DI['app'], __DIR__ . '/../../files/Unknown.pdf', 'to1\/\\o.jpg', 'application/pdf');
 
         $this->assertEquals(404, $response->getStatusCode());
     }
diff --git a/tests/system/system_serverTest.php b/tests/classes/system/system_serverTest.php
similarity index 95%
rename from tests/system/system_serverTest.php
rename to tests/classes/system/system_serverTest.php
index 84a6eee989..6ba3379aeb 100644
--- a/tests/system/system_serverTest.php
+++ b/tests/classes/system/system_serverTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class system_serverTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/system/system_urlTest.php b/tests/classes/system/system_urlTest.php
similarity index 86%
rename from tests/system/system_urlTest.php
rename to tests/classes/system/system_urlTest.php
index 38d6191c71..565ca67f18 100644
--- a/tests/system/system_urlTest.php
+++ b/tests/classes/system/system_urlTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class system_urlTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/task/period/task_period_archiveTest.php b/tests/classes/task/period/task_period_archiveTest.php
similarity index 98%
rename from tests/task/period/task_period_archiveTest.php
rename to tests/classes/task/period/task_period_archiveTest.php
index a1c8746eb7..c550f01762 100644
--- a/tests/task/period/task_period_archiveTest.php
+++ b/tests/classes/task/period/task_period_archiveTest.php
@@ -1,9 +1,6 @@
 <?php
 
 use Alchemy\Phrasea\Application;
-
-require_once __DIR__ . '/../../PhraseanetPHPUnitAbstract.class.inc';
-
 use \Alchemy\Phrasea\Border\Manager;
 
 class task_period_archiveTest extends \PhraseanetPHPUnitAbstract
@@ -310,7 +307,7 @@ class task_period_archiveTest extends \PhraseanetPHPUnitAbstract
 
         $tmp = sys_get_temp_dir() . '/tmp' . time() . mt_rand(1000, 9999) . '.xml';
         $tmpFile = sys_get_temp_dir() . '/tmp' . time() . mt_rand(1000, 9999) . '.jpg';
-        copy(__DIR__ . '/../../testfiles/cestlafete.jpg', $tmpFile);
+        copy(__DIR__ . '/../../../files/cestlafete.jpg', $tmpFile);
 
         file_put_contents($tmp, $xml);
 
@@ -331,7 +328,7 @@ class task_period_archiveTest extends \PhraseanetPHPUnitAbstract
 
         $tmp = sys_get_temp_dir() . '/tmp' . time() . mt_rand(1000, 9999) . '.xml';
         $tmpFile = sys_get_temp_dir() . '/tmp' . time() . mt_rand(1000, 9999) . '.jpg';
-        copy(__DIR__ . '/../../testfiles/cestlafete.jpg', $tmpFile);
+        copy(__DIR__ . '/../../../files/cestlafete.jpg', $tmpFile);
 
         file_put_contents($tmp, $xml);
 
@@ -423,7 +420,7 @@ class task_period_archiveTest extends \PhraseanetPHPUnitAbstract
     public function testGetIndexByFieldName()
     {
         $meta_struct = self::$DI['collection']->get_databox()->get_meta_structure();
-        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../testfiles/test001.CR2');
+        $media = self::$DI['app']['mediavorus']->guess(__DIR__ . '/../../../files/test001.CR2');
 
         $bagByName = self::$object->getIndexByFieldNameTester($meta_struct, $media->getMetadatas());
 
diff --git a/tests/task/task_abstractTest.php b/tests/classes/task/task_abstractTest.php
similarity index 98%
rename from tests/task/task_abstractTest.php
rename to tests/classes/task/task_abstractTest.php
index 38f043dc2c..50c3904475 100644
--- a/tests/task/task_abstractTest.php
+++ b/tests/classes/task/task_abstractTest.php
@@ -2,8 +2,6 @@
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . '/../PhraseanetPHPUnitAbstract.class.inc';
-
 class task_abstractTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/thesaurusTest.php b/tests/classes/thesaurusTest.php
similarity index 86%
rename from tests/thesaurusTest.php
rename to tests/classes/thesaurusTest.php
index 28c9b009cd..44372636f2 100644
--- a/tests/thesaurusTest.php
+++ b/tests/classes/thesaurusTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class thesaurusTest extends PhraseanetPHPUnitAbstract
 {
 
diff --git a/tests/unicodeTest.php b/tests/classes/unicodeTest.php
similarity index 89%
rename from tests/unicodeTest.php
rename to tests/classes/unicodeTest.php
index 4708be5d99..dab9ba9ef0 100644
--- a/tests/unicodeTest.php
+++ b/tests/classes/unicodeTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class unicodeTest extends PhraseanetPHPUnitAbstract
 {
     /**
@@ -68,13 +66,13 @@ class unicodeTest extends PhraseanetPHPUnitAbstract
     {
         $reference = 'Un éléphant ça trompe énormément !';
 
-        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/testfiles/MacOSRoman.txt')));
-        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/testfiles/ISOLatin1.txt')));
-        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/testfiles/ISOLatin2.txt')));
-        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/testfiles/Latin5.txt')));
-        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/testfiles/UTF-8.txt')));
-        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/testfiles/WindowsLatin1.txt')));
-        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/testfiles/WindowsLatin2.txt')));
+        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/../files/MacOSRoman.txt')));
+        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/../files/ISOLatin1.txt')));
+        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/../files/ISOLatin2.txt')));
+        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/../files/Latin5.txt')));
+        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/../files/UTF-8.txt')));
+        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/../files/WindowsLatin1.txt')));
+        $this->assertEquals($reference, $this->object->toUTF8(file_get_contents(__DIR__ . '/../files/WindowsLatin2.txt')));
     }
 
     /**
diff --git a/tests/unitTestsTest.php b/tests/classes/unitTestsTest.php
similarity index 64%
rename from tests/unitTestsTest.php
rename to tests/classes/unitTestsTest.php
index 68e8a51126..6482a72a56 100644
--- a/tests/unitTestsTest.php
+++ b/tests/classes/unitTestsTest.php
@@ -1,12 +1,19 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class unitTestsTest extends PhraseanetPHPUnitAbstract
 {
 
     public function testFiles()
     {
+        $reserved = array(
+            "BoilerPlate.php",
+            "PhraseanetPHPUnitAbstract.php",
+            "PhraseanetWebTestCaseAbstract.php",
+            "PhraseanetPHPUnitAuthenticatedAbstract.php",
+            "PhraseanetWebTestCaseAuthenticatedAbstract.php",
+            "PhraseanetPHPUnitListener.php",
+        );
+
         $testDir = __DIR__ . '/';
         foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($testDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
             if (strpos($file, '/.svn/') !== false)
@@ -15,9 +22,7 @@ class unitTestsTest extends PhraseanetPHPUnitAbstract
                 continue;
             if (substr($file->getFilename(), -4) !== '.php')
                 continue;
-            if (substr($file->getFilename(), -9) === 'class.php')
-                continue;
-            if ($file->getFilename() === "BoilerPlate.php")
+            if (in_array($file->getFilename(), $reserved))
                 continue;
 
             $this->assertRegExp('/[a-zA-Z0-9-_\.]+Test.php/', $file->getPathname(), 'Verify that all tests files names');
diff --git a/tests/userTest.php b/tests/classes/userTest.php
similarity index 94%
rename from tests/userTest.php
rename to tests/classes/userTest.php
index 2b339aab42..44881eb0cb 100644
--- a/tests/userTest.php
+++ b/tests/classes/userTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class userTest extends PhraseanetPHPUnitAbstract
 {
 
diff --git a/tests/uuidTest.php b/tests/classes/uuidTest.php
similarity index 97%
rename from tests/uuidTest.php
rename to tests/classes/uuidTest.php
index dc082a29e8..55c3cd228d 100644
--- a/tests/uuidTest.php
+++ b/tests/classes/uuidTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/PhraseanetPHPUnitAbstract.class.inc';
-
 class uuidTest extends PhraseanetPHPUnitAbstract
 {
     /**
diff --git a/tests/testfiles/14082008057.mp4 b/tests/files/14082008057.mp4
similarity index 100%
rename from tests/testfiles/14082008057.mp4
rename to tests/files/14082008057.mp4
diff --git a/tests/testfiles/HelloWorld.pdf b/tests/files/HelloWorld.pdf
similarity index 100%
rename from tests/testfiles/HelloWorld.pdf
rename to tests/files/HelloWorld.pdf
diff --git a/tests/testfiles/ISOLatin1.txt b/tests/files/ISOLatin1.txt
similarity index 100%
rename from tests/testfiles/ISOLatin1.txt
rename to tests/files/ISOLatin1.txt
diff --git a/tests/testfiles/ISOLatin2.txt b/tests/files/ISOLatin2.txt
similarity index 100%
rename from tests/testfiles/ISOLatin2.txt
rename to tests/files/ISOLatin2.txt
diff --git a/tests/testfiles/Latin5.txt b/tests/files/Latin5.txt
similarity index 100%
rename from tests/testfiles/Latin5.txt
rename to tests/files/Latin5.txt
diff --git a/tests/testfiles/MacOSRoman.txt b/tests/files/MacOSRoman.txt
similarity index 100%
rename from tests/testfiles/MacOSRoman.txt
rename to tests/files/MacOSRoman.txt
diff --git a/tests/testfiles/UTF-8.txt b/tests/files/UTF-8.txt
similarity index 100%
rename from tests/testfiles/UTF-8.txt
rename to tests/files/UTF-8.txt
diff --git a/tests/testfiles/WindowsLatin1.txt b/tests/files/WindowsLatin1.txt
similarity index 100%
rename from tests/testfiles/WindowsLatin1.txt
rename to tests/files/WindowsLatin1.txt
diff --git a/tests/testfiles/WindowsLatin2.txt b/tests/files/WindowsLatin2.txt
similarity index 100%
rename from tests/testfiles/WindowsLatin2.txt
rename to tests/files/WindowsLatin2.txt
diff --git a/tests/testfiles/cestlafete.jpg b/tests/files/cestlafete.jpg
similarity index 100%
rename from tests/testfiles/cestlafete.jpg
rename to tests/files/cestlafete.jpg
diff --git a/tests/testfiles/extractfile.jpg b/tests/files/extractfile.jpg
similarity index 100%
rename from tests/testfiles/extractfile.jpg
rename to tests/files/extractfile.jpg
diff --git a/tests/testfiles/extractfile.xml b/tests/files/extractfile.xml
similarity index 100%
rename from tests/testfiles/extractfile.xml
rename to tests/files/extractfile.xml
diff --git a/tests/testfiles/heavy500.jpg b/tests/files/heavy500.jpg
similarity index 100%
rename from tests/testfiles/heavy500.jpg
rename to tests/files/heavy500.jpg
diff --git a/tests/testfiles/iphone_pic.jpg b/tests/files/iphone_pic.jpg
similarity index 100%
rename from tests/testfiles/iphone_pic.jpg
rename to tests/files/iphone_pic.jpg
diff --git a/tests/testfiles/logocoll.gif b/tests/files/logocoll.gif
similarity index 100%
rename from tests/testfiles/logocoll.gif
rename to tests/files/logocoll.gif
diff --git a/tests/testfiles/p4logo.jpg b/tests/files/p4logo.jpg
similarity index 100%
rename from tests/testfiles/p4logo.jpg
rename to tests/files/p4logo.jpg
diff --git a/tests/testfiles/recta_logo.gif b/tests/files/recta_logo.gif
similarity index 100%
rename from tests/testfiles/recta_logo.gif
rename to tests/files/recta_logo.gif
diff --git a/tests/testfiles/rectb_logo.gif b/tests/files/rectb_logo.gif
similarity index 100%
rename from tests/testfiles/rectb_logo.gif
rename to tests/files/rectb_logo.gif
diff --git a/tests/testfiles/test001.CR2 b/tests/files/test001.CR2
similarity index 100%
rename from tests/testfiles/test001.CR2
rename to tests/files/test001.CR2
diff --git a/tests/testfiles/test002.CR2 b/tests/files/test002.CR2
similarity index 100%
rename from tests/testfiles/test002.CR2
rename to tests/files/test002.CR2
diff --git a/tests/testfiles/test003.CR2 b/tests/files/test003.CR2
similarity index 100%
rename from tests/testfiles/test003.CR2
rename to tests/files/test003.CR2
diff --git a/tests/testfiles/test004.CR2 b/tests/files/test004.CR2
similarity index 100%
rename from tests/testfiles/test004.CR2
rename to tests/files/test004.CR2
diff --git a/tests/testfiles/test005.CR2 b/tests/files/test005.CR2
similarity index 100%
rename from tests/testfiles/test005.CR2
rename to tests/files/test005.CR2
diff --git a/tests/testfiles/test006.wav b/tests/files/test006.wav
similarity index 100%
rename from tests/testfiles/test006.wav
rename to tests/files/test006.wav
diff --git a/tests/testfiles/test007.ppt b/tests/files/test007.ppt
similarity index 100%
rename from tests/testfiles/test007.ppt
rename to tests/files/test007.ppt
diff --git a/tests/testfiles/test008.ai b/tests/files/test008.ai
similarity index 100%
rename from tests/testfiles/test008.ai
rename to tests/files/test008.ai
diff --git a/tests/testfiles/test009.TIFF b/tests/files/test009.TIFF
similarity index 100%
rename from tests/testfiles/test009.TIFF
rename to tests/files/test009.TIFF
diff --git a/tests/testfiles/test010.fla b/tests/files/test010.fla
similarity index 100%
rename from tests/testfiles/test010.fla
rename to tests/files/test010.fla
diff --git a/tests/testfiles/test011.swf b/tests/files/test011.swf
similarity index 100%
rename from tests/testfiles/test011.swf
rename to tests/files/test011.swf
diff --git a/tests/testfiles/test012.wav b/tests/files/test012.wav
similarity index 100%
rename from tests/testfiles/test012.wav
rename to tests/files/test012.wav
diff --git a/tests/testfiles/test013.ai b/tests/files/test013.ai
similarity index 100%
rename from tests/testfiles/test013.ai
rename to tests/files/test013.ai
diff --git a/tests/testfiles/test013.fla b/tests/files/test013.fla
similarity index 100%
rename from tests/testfiles/test013.fla
rename to tests/files/test013.fla
diff --git a/tests/testfiles/test014.swf b/tests/files/test014.swf
similarity index 100%
rename from tests/testfiles/test014.swf
rename to tests/files/test014.swf
diff --git a/tests/testfiles/test015.eps b/tests/files/test015.eps
similarity index 100%
rename from tests/testfiles/test015.eps
rename to tests/files/test015.eps
diff --git a/tests/testfiles/test016.ai b/tests/files/test016.ai
similarity index 100%
rename from tests/testfiles/test016.ai
rename to tests/files/test016.ai
diff --git a/tests/testfiles/test017.wav b/tests/files/test017.wav
similarity index 100%
rename from tests/testfiles/test017.wav
rename to tests/files/test017.wav
diff --git a/tests/testfiles/test018.TIFF b/tests/files/test018.TIFF
similarity index 100%
rename from tests/testfiles/test018.TIFF
rename to tests/files/test018.TIFF
diff --git a/tests/testfiles/test019.mp3 b/tests/files/test019.mp3
similarity index 100%
rename from tests/testfiles/test019.mp3
rename to tests/files/test019.mp3
diff --git a/tests/testfiles/test020.mp3 b/tests/files/test020.mp3
similarity index 100%
rename from tests/testfiles/test020.mp3
rename to tests/files/test020.mp3
diff --git a/tests/testfiles/test021.fla b/tests/files/test021.fla
similarity index 100%
rename from tests/testfiles/test021.fla
rename to tests/files/test021.fla
diff --git a/tests/testfiles/test022.swf b/tests/files/test022.swf
similarity index 100%
rename from tests/testfiles/test022.swf
rename to tests/files/test022.swf
diff --git a/tests/testfiles/test023.mp4 b/tests/files/test023.mp4
similarity index 100%
rename from tests/testfiles/test023.mp4
rename to tests/files/test023.mp4
diff --git a/tests/testfiles/test024.jpg b/tests/files/test024.jpg
similarity index 100%
rename from tests/testfiles/test024.jpg
rename to tests/files/test024.jpg
diff --git a/vendors.php b/vendors.php
index d52b75d5f6..73a95f5edb 100755
--- a/vendors.php
+++ b/vendors.php
@@ -24,9 +24,9 @@ if ( ! file_exists($composer)) {
     system('chmod +x ' . $composer);
 
     if (isset($argv[1]) && $argv[1] == '--no-dev') {
-        system($composer . ' install');
+        system($composer . ' install --optimize-autoloader');
     } else {
-        system($composer . ' install --dev');
+        system($composer . ' install --dev --optimize-autoloader');
     }
 }
 
@@ -37,9 +37,9 @@ if ( ! is_executable($composer)) {
 system($composer . ' self-update');
 
 if (isset($argv[1]) && $argv[1] == '--no-dev') {
-    system($composer . ' install');
+    system($composer . ' install --optimize-autoloader');
 } else {
-    system($composer . ' install --dev');
+    system($composer . ' install --dev --optimize-autoloader');
 }
 
 system('git submodule init');
diff --git a/www/api/index.php b/www/api/index.php
index efc5713278..7a04385e08 100644
--- a/www/api/index.php
+++ b/www/api/index.php
@@ -14,7 +14,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . '/../../lib/bootstrap.php';
+require_once __DIR__ . '/../../vendor/autoload.php';
 
 $app = require __DIR__ . '/../../lib/Alchemy/Phrasea/Application/ApiVersion.php';
 
diff --git a/www/api/oauthv2/index.php b/www/api/oauthv2/index.php
index d3337cbae9..845c9f59c8 100644
--- a/www/api/oauthv2/index.php
+++ b/www/api/oauthv2/index.php
@@ -15,7 +15,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 
 $app = require __DIR__ . '/../../../lib/Alchemy/Phrasea/Application/OAuth2.php';
 
diff --git a/www/api/v1/index.php b/www/api/v1/index.php
index 442730146a..7fb55d2c43 100644
--- a/www/api/v1/index.php
+++ b/www/api/v1/index.php
@@ -14,7 +14,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . '/../../../lib/bootstrap.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
 
 $app = require __DIR__ . '/../../../lib/Alchemy/Phrasea/Application/Api.php';
 
diff --git a/www/client/answer.php b/www/client/answer.php
index b7ae0675ec..52ae0de6ad 100644
--- a/www/client/answer.php
+++ b/www/client/answer.php
@@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 $request = Request::createFromGlobals();
diff --git a/www/client/baskets.php b/www/client/baskets.php
index cfa1d39031..a68de87e94 100644
--- a/www/client/baskets.php
+++ b/www/client/baskets.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/client/clientFeedBack.php b/www/client/clientFeedBack.php
index 990746952f..69b330b748 100644
--- a/www/client/clientFeedBack.php
+++ b/www/client/clientFeedBack.php
@@ -18,7 +18,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/client/index.php b/www/client/index.php
index 0d9d4ca019..b29c8c7a4b 100644
--- a/www/client/index.php
+++ b/www/client/index.php
@@ -15,7 +15,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $usr_id = $app['phraseanet.user']->get_id();
diff --git a/www/include/geonames.feedback.php b/www/include/geonames.feedback.php
index b48d5b9678..9febc29f4d 100644
--- a/www/include/geonames.feedback.php
+++ b/www/include/geonames.feedback.php
@@ -11,12 +11,8 @@
 
 use Alchemy\Phrasea\Application;
 
-/**
- *
- * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link        www.phraseanet.com
- */
-include(__DIR__ . '/../../lib/bootstrap.php');
+require __DIR__ . "/../../vendor/autoload.php";
+
 $app = new Application;
 $output = '';
 
diff --git a/www/index.php b/www/index.php
index e0820ece55..32aeeeb0dc 100644
--- a/www/index.php
+++ b/www/index.php
@@ -14,7 +14,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../lib/bootstrap.php";
+require_once __DIR__ . "/../vendor/autoload.php";
 
 $app = require __DIR__ . '/../lib/Alchemy/Phrasea/Application/Root.php';
 
diff --git a/www/report/ajax_chart.php b/www/report/ajax_chart.php
index e834a45696..4d544e4523 100644
--- a/www/report/ajax_chart.php
+++ b/www/report/ajax_chart.php
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 $request = http_request::getInstance();
diff --git a/www/report/ajax_info_dashboard.php b/www/report/ajax_info_dashboard.php
index e98c5bd3e0..b1e50827d2 100644
--- a/www/report/ajax_info_dashboard.php
+++ b/www/report/ajax_info_dashboard.php
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/report/ajax_liste_base.php b/www/report/ajax_liste_base.php
index 65cfae1b5d..4030ee2c5e 100644
--- a/www/report/ajax_liste_base.php
+++ b/www/report/ajax_liste_base.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $request = http_request::getInstance();
 $parm = $request->get_parms(
diff --git a/www/report/ajax_table_content.php b/www/report/ajax_table_content.php
index 88c73ac2d9..9cf7e72451 100644
--- a/www/report/ajax_table_content.php
+++ b/www/report/ajax_table_content.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 /* get all the post parameters from report.php's form */
 
diff --git a/www/report/charts/drawLinePlotWithLegend.php b/www/report/charts/drawLinePlotWithLegend.php
index 54ae2c8356..b365ad78b2 100644
--- a/www/report/charts/drawLinePlotWithLegend.php
+++ b/www/report/charts/drawLinePlotWithLegend.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once(__DIR__ . "/../../../lib/classes/graphik/Graph.class.php");
-require_once(__DIR__ . "/../../../lib/classes/graphik/LinePlot.class.php");
-require_once(__DIR__ . "/../../../lib/classes/http/request.class.php");
+require_once(__DIR__ . "/../../../lib/classes/graphik/Graph.php");
+require_once(__DIR__ . "/../../../lib/classes/graphik/LinePlot.php");
+require_once(__DIR__ . "/../../../lib/classes/http/request.php");
 
 $request = http_request::getInstance();
 $parm = $request->get_parms("value", 'legend', 'absc');
diff --git a/www/report/charts/draw_pie.php b/www/report/charts/draw_pie.php
index 5ac850c623..658dbba92a 100644
--- a/www/report/charts/draw_pie.php
+++ b/www/report/charts/draw_pie.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once(__DIR__ . "/../../../lib/classes/graphik/Graph.class.php");
-require_once(__DIR__ . "/../../../lib/classes/graphik/Pie.class.php");
-require_once(__DIR__ . "/../../../lib/classes/http/request.class.php");
+require_once(__DIR__ . "/../../../lib/classes/graphik/Graph.php");
+require_once(__DIR__ . "/../../../lib/classes/graphik/Pie.php");
+require_once(__DIR__ . "/../../../lib/classes/http/request.php");
 
 $request = http_request::getInstance();
 $parm = $request->get_parms("value", 'legend', 'title');
diff --git a/www/report/export_csv.php b/www/report/export_csv.php
index cb5733128d..40a6970b70 100644
--- a/www/report/export_csv.php
+++ b/www/report/export_csv.php
@@ -14,7 +14,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $request = http_request::getInstance();
 $parm = $request->get_parms('name', 'csv');
diff --git a/www/report/index.php b/www/report/index.php
index 9fc09f278b..c21f593c37 100644
--- a/www/report/index.php
+++ b/www/report/index.php
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/report/report.php b/www/report/report.php
index 756ac8913e..0c39fe1561 100644
--- a/www/report/report.php
+++ b/www/report/report.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 $request = http_request::getInstance();
diff --git a/www/report/tab.php b/www/report/tab.php
index a1773ae4b7..2b757afc48 100644
--- a/www/report/tab.php
+++ b/www/report/tab.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 /* get all the post parameters from report.php's form */
 
diff --git a/www/setup/installer.php b/www/setup/installer.php
index 812ccfc0fd..c154f73d9f 100644
--- a/www/setup/installer.php
+++ b/www/setup/installer.php
@@ -16,7 +16,7 @@
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . '/../../lib/bootstrap.php';
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = require __DIR__ . '/../../lib/Alchemy/Phrasea/Application/Setup.php';
 
diff --git a/www/thesaurus2/accept.php b/www/thesaurus2/accept.php
index b4d38bda58..aeda2ff268 100644
--- a/www/thesaurus2/accept.php
+++ b/www/thesaurus2/accept.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 
 $app = new Application();
diff --git a/www/thesaurus2/export_text.php b/www/thesaurus2/export_text.php
index 2b05cc5f3a..c43668f411 100644
--- a/www/thesaurus2/export_text.php
+++ b/www/thesaurus2/export_text.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/thesaurus2/export_text_dlg.php b/www/thesaurus2/export_text_dlg.php
index 19d3f877b0..4c77870793 100644
--- a/www/thesaurus2/export_text_dlg.php
+++ b/www/thesaurus2/export_text_dlg.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/export_topics.php b/www/thesaurus2/export_topics.php
index 4306131c30..5beade6ea6 100644
--- a/www/thesaurus2/export_topics.php
+++ b/www/thesaurus2/export_topics.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 
 $app = new Application();
diff --git a/www/thesaurus2/export_topics_dlg.php b/www/thesaurus2/export_topics_dlg.php
index ab37ec4662..4ce19a22f2 100644
--- a/www/thesaurus2/export_topics_dlg.php
+++ b/www/thesaurus2/export_topics_dlg.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/import.php b/www/thesaurus2/import.php
index 64fc4e1515..5aad2ad0a7 100644
--- a/www/thesaurus2/import.php
+++ b/www/thesaurus2/import.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/import_dlg.php b/www/thesaurus2/import_dlg.php
index db386e84fc..e4f25b2bc0 100644
--- a/www/thesaurus2/import_dlg.php
+++ b/www/thesaurus2/import_dlg.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 phrasea::headers(200, true);
 
diff --git a/www/thesaurus2/index.php b/www/thesaurus2/index.php
index de1e9098c5..4340762771 100644
--- a/www/thesaurus2/index.php
+++ b/www/thesaurus2/index.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/thesaurus2/linkfield.php b/www/thesaurus2/linkfield.php
index e094330caf..f5277244b7 100644
--- a/www/thesaurus2/linkfield.php
+++ b/www/thesaurus2/linkfield.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 phrasea::headers(200, true);
 $app = new Application();
diff --git a/www/thesaurus2/linkfield2.php b/www/thesaurus2/linkfield2.php
index f0cdbf93c2..bcaa4fea39 100644
--- a/www/thesaurus2/linkfield2.php
+++ b/www/thesaurus2/linkfield2.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/linkfield3.php b/www/thesaurus2/linkfield3.php
index 21adbe8857..7639073cae 100644
--- a/www/thesaurus2/linkfield3.php
+++ b/www/thesaurus2/linkfield3.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/loadth.php b/www/thesaurus2/loadth.php
index 8c2a7daa34..a3cccc7aef 100644
--- a/www/thesaurus2/loadth.php
+++ b/www/thesaurus2/loadth.php
@@ -15,7 +15,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . '/../../lib/bootstrap.php';
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 phrasea::headers();
 
diff --git a/www/thesaurus2/newsy_dlg.php b/www/thesaurus2/newsy_dlg.php
index 114c0b643c..3c11243e14 100644
--- a/www/thesaurus2/newsy_dlg.php
+++ b/www/thesaurus2/newsy_dlg.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/newterm.php b/www/thesaurus2/newterm.php
index c669a88f81..f70ccd1c84 100644
--- a/www/thesaurus2/newterm.php
+++ b/www/thesaurus2/newterm.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 
 $app = new Application();
diff --git a/www/thesaurus2/properties.php b/www/thesaurus2/properties.php
index 908cc55341..763c5a496c 100644
--- a/www/thesaurus2/properties.php
+++ b/www/thesaurus2/properties.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 require($app['phraseanet.registry']->get('GV_RootPath') . "www/thesaurus2/xmlhttp.php");
diff --git a/www/thesaurus2/replace.php b/www/thesaurus2/replace.php
index ec22ab5c68..df2a08005d 100644
--- a/www/thesaurus2/replace.php
+++ b/www/thesaurus2/replace.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 require($app['phraseanet.registry']->get('GV_RootPath') . "www/thesaurus2/xmlhttp.php");
diff --git a/www/thesaurus2/replace2.php b/www/thesaurus2/replace2.php
index 25fd37ff20..7255b15793 100644
--- a/www/thesaurus2/replace2.php
+++ b/www/thesaurus2/replace2.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 require($app['phraseanet.registry']->get('GV_RootPath') . "www/thesaurus2/xmlhttp.php");
diff --git a/www/thesaurus2/replace3.php b/www/thesaurus2/replace3.php
index b89f1e147d..60dd1f8937 100644
--- a/www/thesaurus2/replace3.php
+++ b/www/thesaurus2/replace3.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/rescan.php b/www/thesaurus2/rescan.php
index cb1a28d20a..e32b68abf0 100644
--- a/www/thesaurus2/rescan.php
+++ b/www/thesaurus2/rescan.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/rescan_dlg.php b/www/thesaurus2/rescan_dlg.php
index 01f07fb857..f2bd37dc04 100644
--- a/www/thesaurus2/rescan_dlg.php
+++ b/www/thesaurus2/rescan_dlg.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/search.php b/www/thesaurus2/search.php
index 30ef0c8cce..b15352cb28 100644
--- a/www/thesaurus2/search.php
+++ b/www/thesaurus2/search.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers(200, true);
 $app = new Application();
 
diff --git a/www/thesaurus2/thesaurus.php b/www/thesaurus2/thesaurus.php
index bbddd15a4a..5cab5176a9 100644
--- a/www/thesaurus2/thesaurus.php
+++ b/www/thesaurus2/thesaurus.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 phrasea::headers();
 $app = new Application();
 
diff --git a/www/thesaurus2/xmlhttp/accept.x.php b/www/thesaurus2/xmlhttp/accept.x.php
index b65eadaea5..8ab00d7afd 100644
--- a/www/thesaurus2/xmlhttp/accept.x.php
+++ b/www/thesaurus2/xmlhttp/accept.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 require("../xmlhttp.php");
diff --git a/www/thesaurus2/xmlhttp/acceptcandidates.x.php b/www/thesaurus2/xmlhttp/acceptcandidates.x.php
index 93516eddfc..9988f1dcc5 100644
--- a/www/thesaurus2/xmlhttp/acceptcandidates.x.php
+++ b/www/thesaurus2/xmlhttp/acceptcandidates.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/thesaurus2/xmlhttp/changesylng.x.php b/www/thesaurus2/xmlhttp/changesylng.x.php
index 5d9f368627..e8f746f4bc 100644
--- a/www/thesaurus2/xmlhttp/changesylng.x.php
+++ b/www/thesaurus2/xmlhttp/changesylng.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/thesaurus2/xmlhttp/changesypos.x.php b/www/thesaurus2/xmlhttp/changesypos.x.php
index 411a574681..15c4dcdd05 100644
--- a/www/thesaurus2/xmlhttp/changesypos.x.php
+++ b/www/thesaurus2/xmlhttp/changesypos.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 
 $app = new Application();
 
diff --git a/www/thesaurus2/xmlhttp/deletenohits.x.php b/www/thesaurus2/xmlhttp/deletenohits.x.php
index ce5b1d658b..959fcc339a 100644
--- a/www/thesaurus2/xmlhttp/deletenohits.x.php
+++ b/www/thesaurus2/xmlhttp/deletenohits.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/thesaurus2/xmlhttp/delsy.x.php b/www/thesaurus2/xmlhttp/delsy.x.php
index 5ef080e3d1..f943bf007c 100644
--- a/www/thesaurus2/xmlhttp/delsy.x.php
+++ b/www/thesaurus2/xmlhttp/delsy.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 require("../xmlhttp.php");
 
diff --git a/www/thesaurus2/xmlhttp/delts.x.php b/www/thesaurus2/xmlhttp/delts.x.php
index 51b3c3db6d..96963edf43 100644
--- a/www/thesaurus2/xmlhttp/delts.x.php
+++ b/www/thesaurus2/xmlhttp/delts.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/thesaurus2/xmlhttp/gethtmlbranch.x.php b/www/thesaurus2/xmlhttp/gethtmlbranch.x.php
index 75ab5152df..028eb8493c 100644
--- a/www/thesaurus2/xmlhttp/gethtmlbranch.x.php
+++ b/www/thesaurus2/xmlhttp/gethtmlbranch.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 
diff --git a/www/thesaurus2/xmlhttp/getsy.x.php b/www/thesaurus2/xmlhttp/getsy.x.php
index a8d880cf4a..fcf6c3eb59 100644
--- a/www/thesaurus2/xmlhttp/getsy.x.php
+++ b/www/thesaurus2/xmlhttp/getsy.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 
diff --git a/www/thesaurus2/xmlhttp/getterm.x.php b/www/thesaurus2/xmlhttp/getterm.x.php
index 8154c33858..37f0b4e937 100644
--- a/www/thesaurus2/xmlhttp/getterm.x.php
+++ b/www/thesaurus2/xmlhttp/getterm.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 
diff --git a/www/thesaurus2/xmlhttp/killterm.x.php b/www/thesaurus2/xmlhttp/killterm.x.php
index 5955d7a37b..9a4988a5c8 100644
--- a/www/thesaurus2/xmlhttp/killterm.x.php
+++ b/www/thesaurus2/xmlhttp/killterm.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 require("../xmlhttp.php");
 
diff --git a/www/thesaurus2/xmlhttp/newsy.x.php b/www/thesaurus2/xmlhttp/newsy.x.php
index 8424788d66..4d8509f19c 100644
--- a/www/thesaurus2/xmlhttp/newsy.x.php
+++ b/www/thesaurus2/xmlhttp/newsy.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 require("../xmlhttp.php");
diff --git a/www/thesaurus2/xmlhttp/newts.x.php b/www/thesaurus2/xmlhttp/newts.x.php
index 96a7b9caae..e5f9ee188f 100644
--- a/www/thesaurus2/xmlhttp/newts.x.php
+++ b/www/thesaurus2/xmlhttp/newts.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 
diff --git a/www/thesaurus2/xmlhttp/openbranches.x.php b/www/thesaurus2/xmlhttp/openbranches.x.php
index 4b30671321..8e851aeb6b 100644
--- a/www/thesaurus2/xmlhttp/openbranches.x.php
+++ b/www/thesaurus2/xmlhttp/openbranches.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 
diff --git a/www/thesaurus2/xmlhttp/reject.x.php b/www/thesaurus2/xmlhttp/reject.x.php
index edbc58d268..f4fe293c3d 100644
--- a/www/thesaurus2/xmlhttp/reject.x.php
+++ b/www/thesaurus2/xmlhttp/reject.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 require("../xmlhttp.php");
diff --git a/www/thesaurus2/xmlhttp/searchcandidate.x.php b/www/thesaurus2/xmlhttp/searchcandidate.x.php
index 5b784103d1..d9529d7abc 100644
--- a/www/thesaurus2/xmlhttp/searchcandidate.x.php
+++ b/www/thesaurus2/xmlhttp/searchcandidate.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/thesaurus2/xmlhttp/searchnohits.x.php b/www/thesaurus2/xmlhttp/searchnohits.x.php
index 6a198be82c..2e83f46ef3 100644
--- a/www/thesaurus2/xmlhttp/searchnohits.x.php
+++ b/www/thesaurus2/xmlhttp/searchnohits.x.php
@@ -11,7 +11,7 @@
 
 use Alchemy\Phrasea\Application;
 
-require_once __DIR__ . "/../../../lib/bootstrap.php";
+require_once __DIR__ . "/../../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/acceptcandidates.j.php b/www/xmlhttp/acceptcandidates.j.php
index 7bced0b867..5edcc58f82 100644
--- a/www/xmlhttp/acceptcandidates.j.php
+++ b/www/xmlhttp/acceptcandidates.j.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/checkcandidatetarget.j.php b/www/xmlhttp/checkcandidatetarget.j.php
index bdb129235b..878a374102 100644
--- a/www/xmlhttp/checkcandidatetarget.j.php
+++ b/www/xmlhttp/checkcandidatetarget.j.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/editing_presets.j.php b/www/xmlhttp/editing_presets.j.php
index 3c0c6c37fd..89a647d70d 100644
--- a/www/xmlhttp/editing_presets.j.php
+++ b/www/xmlhttp/editing_presets.j.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $app = new Application();
 $usr_id = $app['phraseanet.user']->get_id();
diff --git a/www/xmlhttp/getsy_prod.x.php b/www/xmlhttp/getsy_prod.x.php
index 9c4138db84..990e111692 100644
--- a/www/xmlhttp/getsy_prod.x.php
+++ b/www/xmlhttp/getsy_prod.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/getterm_prod.h.php b/www/xmlhttp/getterm_prod.h.php
index f016770f43..2725444388 100644
--- a/www/xmlhttp/getterm_prod.h.php
+++ b/www/xmlhttp/getterm_prod.h.php
@@ -15,7 +15,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/getterm_prod.x.php b/www/xmlhttp/getterm_prod.x.php
index 7a372fe4aa..799ffb50ed 100644
--- a/www/xmlhttp/getterm_prod.x.php
+++ b/www/xmlhttp/getterm_prod.x.php
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 $request = http_request::getInstance();
 $parm = $request->get_parms(
diff --git a/www/xmlhttp/openbranch_prod.j.php b/www/xmlhttp/openbranch_prod.j.php
index f1c038fa95..0f6f24bbed 100644
--- a/www/xmlhttp/openbranch_prod.j.php
+++ b/www/xmlhttp/openbranch_prod.j.php
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 $request = http_request::getInstance();
 $parm = $request->get_parms(
diff --git a/www/xmlhttp/openbranches_prod.h.php b/www/xmlhttp/openbranches_prod.h.php
index 01c4d47b15..97e792db24 100644
--- a/www/xmlhttp/openbranches_prod.h.php
+++ b/www/xmlhttp/openbranches_prod.h.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/openbranches_prod.x.php b/www/xmlhttp/openbranches_prod.x.php
index aa65ec593d..7e0aab3699 100644
--- a/www/xmlhttp/openbranches_prod.x.php
+++ b/www/xmlhttp/openbranches_prod.x.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/replacecandidate.j.php b/www/xmlhttp/replacecandidate.j.php
index fd7ee8c2a5..f34e811a85 100644
--- a/www/xmlhttp/replacecandidate.j.php
+++ b/www/xmlhttp/replacecandidate.j.php
@@ -16,7 +16,7 @@ use Alchemy\Phrasea\Application;
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 $app = new Application();
 
 $request = http_request::getInstance();
diff --git a/www/xmlhttp/search_th_term_prod.j.php b/www/xmlhttp/search_th_term_prod.j.php
index 1427880088..a2885c646e 100644
--- a/www/xmlhttp/search_th_term_prod.j.php
+++ b/www/xmlhttp/search_th_term_prod.j.php
@@ -17,7 +17,7 @@ use Alchemy\Phrasea\Application;
  * @link        www.phraseanet.com
  */
 
-require_once __DIR__ . "/../../lib/bootstrap.php";
+require_once __DIR__ . "/../../vendor/autoload.php";
 
 $request = http_request::getInstance();
 $parm = $request->get_parms(