Rework resouce loading, update package.json