Moved classes to correct namespaces.