Refactoring main app module into seperate modules.