Updated Client/Server classes, renamed main package