Refractoring of the overal code structure (Mainly regarding network
handlers)