Cleanup selector organization scopes

Refer to issue #8 for more information