Changed structure a bit, with new namespaces