feat: split server and client

Merged Jure requested to merge split_server_and_client into master

Merge request reports