[REFACTOR] refs #35787 @0.3 Refactored all the architecture

Code Review