Work on namespaces

- lot of work...
- not yet completed...