Finalized moving client and server in own dirs, made everything working again