fix resource folder
Merge branch 'master' into module_renaming
using assembly id again