Refactoring od app and routes