Final Architecture Rework