Moved classes for better namespaces