rebuild structure, more separate configs