client namespacing

almsot server too
resolve conflicts, i hope