Total reorganization so that I can finally find stuff where it makes sense.  I'm up for a revert if you don't agree.  I'm just trying to be consistent.
Merge pull request #217 from Clashnia/hqm

Total reorganization so that I can finally find stuff where it makes sen...