Updated and simplified packets
Updated and simplified server