Implement nested namespacing to improve structure & readability