move cloud settings into their own 'CLOUD' namespace