Refactored namespaces to reflect new directory structure