bringing back client, seperating to two folders
removing old services