Domain: New top level 'game'
Move controller to subdirectory
Merge remote-tracking branch 'origin/master'