Reorganize build / run scripts