Refactored app folders