This brings the chris architecture up to date with 2.5.

The patch is huge because files have been moved to prepare
for future subarchitechtures.