moved AutoCat subclasses to separate files