Rearrange conf setup