Moved some classes to a diff namespace.