Clean up and rename project