Changed namespace naming.
Added some sort of client handling, not tested yet.