Game demo: improve architecture in a more OOP fashion