Client can add listeners. Server can add namespaced listeners.
rename package
re-indent