Add main
Moving namespaces around