Cleaning up the project structure with local commits≈