Refactoring - No routing.json & services.json file needed anymore