implemented pairing: todo@serverside: do not return own id
restructured some things, removed unnecessary things