comment out old code
move lockbox and peer files into account
p2p-relay-server test fix #29