Migration to xbmcswift2