Extract traits into separate files, avoid problems with the class autoloader