Refactor Build dependency & process