Adapted file structure again to isolate TCPEventGenerator and akin