fixed config organization