Cleaning up the organization of the project's metadata