Refactor the file structure of the project