Small organizational changes, updated rbdoc