Moved thread entity into same class as others.