Clean namespace

based on #61

This is not to be merged but rather to be used to discuss different options. What do you think?

cc @mwhelan