use class instead of method files (closes #4102)