[xinyu] project struct rebase
[xinyu] modular