scripts and sources changed to meet package needs