defs
defs cleanup
Major cleanup & class re-organization