Fix namespacing with respect to directory structure