reorg of game factory stuff