rearranging namespacing and autoinclude