Change to repo structure given new xbmc crash scenario...