Adding namespace hierarchy

@chadbohannan-wf