Architecture Update

Rearrange architecture to better represent proper build.