Refactored app into multiple parts