Fix problem with underscores in script folder names (Issue #156)
Still need to update relevant scripts.