Refactoring the components and entities a lot.