Renaming classes + documentation