Merge config wip
Just move them to two different files