I think the creation of a GameObject class was great idea to start the refactoring of the current code!