Refactor
Large refactoring for network code
Merge branch 'kluster_events'