Refactor Entity System completo