Ensure scrip is neutral

Remove all references to folder names etc and make script neutral