SHDP-396 Reorganize build