Move classes to fix autoloading