Refactored app directories