fix: initial namespace refact