Gah, forgot to move a few things in the namespace
Version bump