Added GameOver handling
Refactored to packages properly