Replace Method file by Class (closes #4098)