improve build componentization
3 files changed