Architectural changes and solution re-organization