Rename project and cleanup