Modifiying "struct map" so that there are now separate header and