Moving the header code