Some major changes (largely organizational) to fix some issues with mixing absolute and differential measurements