Move resources to naarad/src/resources, Update diff & report to use new location, additional items per feedback