More vigorous refactoring into OO architecture nearly complete