Refactored code - made app and app-layers modules.