Moved the files out of handshake dir