restructuring roles and permissions