Lots of cleanup and fix cgit path.