Game code is nowe separated into appropriate files.
Fixed merge.