Reorganize: move help methods to a separate role, reorder methods