Added namespaces

Added namespaces, to tidy up class space :-)