Changes structure of conf file

* Should mostly work now