Folder structure refactoring.