Reorganize user defined class methods