Updates architecture

Enhances the architecture to match N-Tier architecture pattern.