Finish namespacing classes