script improved - not need to create folders, double make avoided