minor riorganization of build scripts