clean up include structure
replace list of namespaces with a single nodestore for all namespaces