Switch to gfx-rs again
Improve ECS