Refactored namespace/directory structure