Fixing up namespaces, re-adding resources