Restructured namespaces for resources.
Refactored namespaces to reflect new file structure.