Assign roles to organizations
Refactor Spaces