refactored: moved things to more sensible locations, refs #212 #10947