Feature/hp33220 a namespace refactor

Finished and checked