restructured namespacing and forms