Using Namespaces now!

* Minor changes