minor cleanup of namespaces and folder names for better organization