file structure changed, add_method changed to class method