Restructured the architecture.