DEV: Begin move to namespace