Move some classes for autoloader