Move struct definition to Types header