Got rid of silly class namespacing