Use modules as namespace not constants

This should fix #2