saving content in branch before refactoring and reducing master
First round of reductions and refactoring
Changes not strictly confined to OuterFace development.