WIP
reorganising configs