Moved logging into its own namespace

* Code cleanup