Restructuring to use namespacing.