[TASK] Switch to namespaces

WIP, more to come.