Chg Form wrappers and base classes restructure