Fix regeneration, organize configs better