Solution architecture rebuilt
merge