Refactoring seperating current and former code. GroupClient/Server are still unchanged and unfinished