Changed config layout so that aws config is held one level lower - to make room for new 'colour' field.