Folder structure refactored.