Refactor the folder structure.