Refactorized folder structure