master
move header to reduce circular dependencies
Clean up BuildFiles under CondFormats/
first round of dependency cleanups