Move map headers out

Nearly below 100k lines again.