Object/Entity/Actor refactoring.