Folder structure refactored