Refactoring services and models into modules. Altering the module syntax