Refactoring folder structure