Made namespaces singular and moved base classes into them.