Documentation, renaming classes, fun times