Move and fix up
Fixup resources