Refactor game inject

..only Part I so far