Refactoring app: div app to multi modules