Namespacing -- first steps

More to be done
Delete files