Move config into main