Refactored helper to use one script directory