untangle entity and controller