formatting/argument fixes
more namespace fixes

move ContextMenuFactory to separate file
adjust references as needed