Switching to Entity Component System