Refactor/back to single app folder