Moved record mapping into its own package. Added header mapping.