Game model restructured, data gen scripts updated to reflect change