Add moves: abilities: types: headers and fix spacing
Change types to use genmap approach