Move Sort related helpers and events to correct packages (#13334)

Change-Id: I3aa86364b61d42f971c4fca2b4c4895ddae870c4