Reorganizing refactoring

Tests + refactoring on the routes, apps, etc...
To be continued ;)