checkpoint - a lot of cleanup and renaming - ongoing