Merged Scope and ScopeType files