Namespace changes

* Making sure the modules are in the Addon namespace