renamed classes and added the udp part of the task