improve build componentization
4 files changed