Convert handshake handler modules to classess
Update docs