Folder structure refactoring