Fiix javadoc
Refactor resource loader