move Scope fields into definition of Scope
Merge pull request #22 from edx/feature/straz/scope

move Scope fields into definition of Scope