Fix from-existing.sh
Adjustments for modularisation