Initial work on adapting to the use of namespaces

Enabling the extension does not work yet, i need to investigate that