Minor reorganization.
Added specs to ensure we can operate on policies at the role and circle level.