Fix and move core resources