configs for 2 new generators
simplified package structure