Change namespacing and add wrapper elements