Last touches on reorganizing namespaces