pre Max 7 branch re-org

cleaned up organization and some minor renaming to consolidate and
simplify