Moved around some classes to avoid Namespace problems