Build system refactor
Build system refactor