reorganize build