Reorganized the architecture chapter