Fix and move core resources
Fixed installed resources
Merge branch 'development'