adding separate pkgs for client, server, common