refactor the module (again)

[mbroadst]

For some reason auto-merging was a nightmare on the existing refactor branch, so I just cherry-picked the commits into this one - nothing new here