Architectural edits

Architectural edits