updated organization and added namespaces