More refactoring.

- New namespaces to allow multiple games.