Pushing up changes for today - Reorganized architecture.