1. Fix pvp message issue
2. Definitize some messages
3. Simplify project structure