Resolves #3, everything is now in namespaces