re-orged and fixes in preinst files