Move some generation arrays to dynamic allocation
Change of plan - revert stuff, rename default to classic