Re-org of codebase.
WIP commit
Make common classes ABCHasTraits.