Groundwork for splitting requirements into separately loadable objects and new JSON layout
Fixed a rebase problem that git didn't catch