Restructuring to use namespacing (cont)