New namespace

Also ran full cleanup