Rename u_def to update_def and move it to def.cf.  Remove duplicate classes

Simple refactoring, please review