Added raw resources, moved existing resources