Add namespaces, closes #2.