MDL-30085 Moved to lib/classes for support autoloading