New directory structure for namespacing.