Game Component Refactoring