Merge pull request #89 from nhart/6.x

move externally refenced files to module
re-name function to avoid conflict