Lots of renaming and reorganization for the manual