Clean-up namespace.

Starting #7.