Major refactoring to support new thoughts on plugin layout and the beginnings of logging