clean up and reorganize the project