Refactor to prep resource loading for jars.
Merge remote-tracking branch 'origin/xian/resource-loader-refactor-for-jars'

* origin/xian/resource-loader-refactor-for-jars:
  Refactor to prep resource loading for jars.