More shuffling around of the structure to match WAR building.