Don't put resource in root directory.
Merge branch 'master' into core