Refactor and extend resourcefolder package, and minor cleanup of images