Reorg in prep for c# switch + unity