[Observe-commits] 09/29: Refacotr module entite