Revert: Changed paths according to upstream changes
Details: https://github.com/xbmc/xbmc/pull/5956