[Olena-patches] 550: Move some abstract classes below entries into internal.