Changed data type naming & structure to more closely resemble PGN.