Refactoring the structure of scripts in spfe-config