Renames, structuring, testing Handshake