fixing the namespaces and re-ording struts