patientsummary:  PS-17 and PS-18 - add in backwards compatibility with legacy version of the module, but make it optionally enabled based on a global property.  Also move a few files around into appropriate packages.