Interim checkin working on the new structure.