Fixes and reorganising configs