adjust the architecture

adjust the architecture