Entity/component refactoring almost done