More Refactoring to ECS