Some major changes (largely organizational) to fix some issues with mixi...

...ng absolute and differential measurements