Revert: Updated build tools to a single project (72f0ac7d994cbd9fbb9ae5a63ca8274867ce1db6)