Moved underscore files.
Merge branch 'hotfix/underscore'