Refactored Mapping mechanism (issue #94), added courses namespace (issue 101companies/101wiki#199)