move resources to bundle
Merge branch 'fix_resource_conflict'