Various changes in the scripts including renaming some to create a more
clear organisation, Tim Taminiau