Factored out BasicGame class from main class and WAVComponent interface
and Battery class
Merge remote-tracking branch 'origin/setup' into setup