Clean services and routes
Merge branch 'feature/routes' into develop