GameComponent refactoring & adaptations (not yet compiling!)