Use new namespace
Remove old & unneeded files