Rearranging sections
Moving some things from basic-conf to init.