Move CurrentItem to misc package