[build] Refactoring