Moved classes into relevant namespaces