refactoring
refactor packages
make normal endGame method