Restructuring headers.
Initial add of vector headers.