Moved the entity and utils to modules