Refactored game object hierarchy