Revert "separated client- and server-code"

This reverts commit 9c2530a36d675efe535474d1bd313f24cdfca0e3.
separated client- and server-code