arch refactor
Merge pull request #1 from hxtpoe/refactor

arch refactor