[build] refactored build;