Reorganised packages
Modified menu, game, and opponent regarding last discussions