Added OnItemMovedListener, removed old implementation