Moved everything into a namespace