Rename the class and make it to a "allrounder" class.
Add the variant for files.
Add/rename classes for the autoload.