modified Demo and NetworkModule

allows EventHandler to be non-static inner class