Fix the default scope of classes
Merge pull request #349 from teroka/classes_scope

Fix the default scope of classes
Clarify class contexts further