* Move role types to a separate package * Make role type singular and remove _ from directory name * Add orguser methods to org service * Fix fake method
* Move role types to a separate package * Make role type singular and remove _ from directory name * Add orguser methods to org service * Fix fake method