Moves headers to correct place