diff --git a/plugin.video.catchuptvandmore/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from plugin.video.catchuptvandmore/LICENSE.txt
rename to LICENSE.txt
diff --git a/plugin.video.catchuptvandmore/addon.py b/addon.py
similarity index 100%
rename from plugin.video.catchuptvandmore/addon.py
rename to addon.py
diff --git a/plugin.video.catchuptvandmore/addon.xml b/addon.xml
similarity index 100%
rename from plugin.video.catchuptvandmore/addon.xml
rename to addon.xml
diff --git a/plugin.video.catchuptvandmore/fanart.jpg b/fanart.jpg
similarity index 100%
rename from plugin.video.catchuptvandmore/fanart.jpg
rename to fanart.jpg
diff --git a/plugin.video.catchuptvandmore/icon.png b/icon.png
similarity index 100%
rename from plugin.video.catchuptvandmore/icon.png
rename to icon.png
diff --git a/plugin.video.catchuptvandmore/resources/__init__.py b/resources/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/__init__.py
rename to resources/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/language/resource.language.en_gb/strings.po
rename to resources/language/resource.language.en_gb/strings.po
diff --git a/plugin.video.catchuptvandmore/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/language/resource.language.fr_fr/strings.po
rename to resources/language/resource.language.fr_fr/strings.po
diff --git a/plugin.video.catchuptvandmore/resources/language/resource.language.he_il/strings.po b/resources/language/resource.language.he_il/strings.po
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/language/resource.language.he_il/strings.po
rename to resources/language/resource.language.he_il/strings.po
diff --git a/plugin.video.catchuptvandmore/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/language/resource.language.nl_nl/strings.po
rename to resources/language/resource.language.nl_nl/strings.po
diff --git a/plugin.video.catchuptvandmore/resources/lib/__init__.py b/resources/lib/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/__init__.py
rename to resources/lib/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/addon_utils.py b/resources/lib/addon_utils.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/addon_utils.py
rename to resources/lib/addon_utils.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/__init__.py b/resources/lib/channels/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/__init__.py
rename to resources/lib/channels/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/__init__.py b/resources/lib/channels/be/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/__init__.py
rename to resources/lib/channels/be/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/abbe.py b/resources/lib/channels/be/abbe.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/abbe.py
rename to resources/lib/channels/be/abbe.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/actv.py b/resources/lib/channels/be/actv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/actv.py
rename to resources/lib/channels/be/actv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/atv.py b/resources/lib/channels/be/atv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/atv.py
rename to resources/lib/channels/be/atv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/brf.py b/resources/lib/channels/be/brf.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/brf.py
rename to resources/lib/channels/be/brf.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/bruzz.py b/resources/lib/channels/be/bruzz.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/bruzz.py
rename to resources/lib/channels/be/bruzz.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/bx1.py b/resources/lib/channels/be/bx1.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/bx1.py
rename to resources/lib/channels/be/bx1.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/canalc.py b/resources/lib/channels/be/canalc.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/canalc.py
rename to resources/lib/channels/be/canalc.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/focuswtv.py b/resources/lib/channels/be/focuswtv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/focuswtv.py
rename to resources/lib/channels/be/focuswtv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/ln24.py b/resources/lib/channels/be/ln24.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/ln24.py
rename to resources/lib/channels/be/ln24.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/nrjhitstvbe.py b/resources/lib/channels/be/nrjhitstvbe.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/nrjhitstvbe.py
rename to resources/lib/channels/be/nrjhitstvbe.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/robtv.py b/resources/lib/channels/be/robtv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/robtv.py
rename to resources/lib/channels/be/robtv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/rtbf.py b/resources/lib/channels/be/rtbf.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/rtbf.py
rename to resources/lib/channels/be/rtbf.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/rtc.py b/resources/lib/channels/be/rtc.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/rtc.py
rename to resources/lib/channels/be/rtc.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/rtlplaybe.py b/resources/lib/channels/be/rtlplaybe.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/rtlplaybe.py
rename to resources/lib/channels/be/rtlplaybe.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/telemb.py b/resources/lib/channels/be/telemb.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/telemb.py
rename to resources/lib/channels/be/telemb.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/telesambre.py b/resources/lib/channels/be/telesambre.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/telesambre.py
rename to resources/lib/channels/be/telesambre.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/tvcom.py b/resources/lib/channels/be/tvcom.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/tvcom.py
rename to resources/lib/channels/be/tvcom.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/tvl.py b/resources/lib/channels/be/tvl.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/tvl.py
rename to resources/lib/channels/be/tvl.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/tvlux.py b/resources/lib/channels/be/tvlux.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/tvlux.py
rename to resources/lib/channels/be/tvlux.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/tvoost.py b/resources/lib/channels/be/tvoost.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/tvoost.py
rename to resources/lib/channels/be/tvoost.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/be/vrt.py b/resources/lib/channels/be/vrt.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/be/vrt.py
rename to resources/lib/channels/be/vrt.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/__init__.py b/resources/lib/channels/ca/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/__init__.py
rename to resources/lib/channels/ca/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/cbc.py b/resources/lib/channels/ca/cbc.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/cbc.py
rename to resources/lib/channels/ca/cbc.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/icitele.py b/resources/lib/channels/ca/icitele.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/icitele.py
rename to resources/lib/channels/ca/icitele.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/icitoutv.py b/resources/lib/channels/ca/icitoutv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/icitoutv.py
rename to resources/lib/channels/ca/icitoutv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/noovo.py b/resources/lib/channels/ca/noovo.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/noovo.py
rename to resources/lib/channels/ca/noovo.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/ntvca.py b/resources/lib/channels/ca/ntvca.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/ntvca.py
rename to resources/lib/channels/ca/ntvca.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/telemag.py b/resources/lib/channels/ca/telemag.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/telemag.py
rename to resources/lib/channels/ca/telemag.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/telequebec.py b/resources/lib/channels/ca/telequebec.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/telequebec.py
rename to resources/lib/channels/ca/telequebec.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/tv5unis.py b/resources/lib/channels/ca/tv5unis.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/tv5unis.py
rename to resources/lib/channels/ca/tv5unis.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ca/tva.py b/resources/lib/channels/ca/tva.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ca/tva.py
rename to resources/lib/channels/ca/tva.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/__init__.py b/resources/lib/channels/ch/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/__init__.py
rename to resources/lib/channels/ch/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/becurioustv.py b/resources/lib/channels/ch/becurioustv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/becurioustv.py
rename to resources/lib/channels/ch/becurioustv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/lemanbleu.py b/resources/lib/channels/ch/lemanbleu.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/lemanbleu.py
rename to resources/lib/channels/ch/lemanbleu.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/rougetv.py b/resources/lib/channels/ch/rougetv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/rougetv.py
rename to resources/lib/channels/ch/rougetv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/srgssr.py b/resources/lib/channels/ch/srgssr.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/srgssr.py
rename to resources/lib/channels/ch/srgssr.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/telem1.py b/resources/lib/channels/ch/telem1.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/telem1.py
rename to resources/lib/channels/ch/telem1.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/teleticino.py b/resources/lib/channels/ch/teleticino.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/teleticino.py
rename to resources/lib/channels/ch/teleticino.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/ch/tvm3.py b/resources/lib/channels/ch/tvm3.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/ch/tvm3.py
rename to resources/lib/channels/ch/tvm3.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/cm/__init__.py b/resources/lib/channels/cm/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/cm/__init__.py
rename to resources/lib/channels/cm/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/cm/crtv.py b/resources/lib/channels/cm/crtv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/cm/crtv.py
rename to resources/lib/channels/cm/crtv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/cn/__init__.py b/resources/lib/channels/cn/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/cn/__init__.py
rename to resources/lib/channels/cn/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/cn/cctv.py b/resources/lib/channels/cn/cctv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/cn/cctv.py
rename to resources/lib/channels/cn/cctv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/es/__init__.py b/resources/lib/channels/es/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/es/__init__.py
rename to resources/lib/channels/es/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/es/atresplayer.py b/resources/lib/channels/es/atresplayer.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/es/atresplayer.py
rename to resources/lib/channels/es/atresplayer.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/es/mitele.py b/resources/lib/channels/es/mitele.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/es/mitele.py
rename to resources/lib/channels/es/mitele.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/es/paramountchannel_es.py b/resources/lib/channels/es/paramountchannel_es.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/es/paramountchannel_es.py
rename to resources/lib/channels/es/paramountchannel_es.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/es/realmadridtv.py b/resources/lib/channels/es/realmadridtv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/es/realmadridtv.py
rename to resources/lib/channels/es/realmadridtv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/es/rtve.py b/resources/lib/channels/es/rtve.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/es/rtve.py
rename to resources/lib/channels/es/rtve.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/es/trece.py b/resources/lib/channels/es/trece.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/es/trece.py
rename to resources/lib/channels/es/trece.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/et/__init__.py b/resources/lib/channels/et/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/et/__init__.py
rename to resources/lib/channels/et/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/et/video2b.py b/resources/lib/channels/et/video2b.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/et/video2b.py
rename to resources/lib/channels/et/video2b.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/01net.py b/resources/lib/channels/fr/01net.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/01net.py
rename to resources/lib/channels/fr/01net.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/6play.py b/resources/lib/channels/fr/6play.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/6play.py
rename to resources/lib/channels/fr/6play.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/__init__.py b/resources/lib/channels/fr/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/__init__.py
rename to resources/lib/channels/fr/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/abweb.py b/resources/lib/channels/fr/abweb.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/abweb.py
rename to resources/lib/channels/fr/abweb.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/alsace20.py b/resources/lib/channels/fr/alsace20.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/alsace20.py
rename to resources/lib/channels/fr/alsace20.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/antennereunion.py b/resources/lib/channels/fr/antennereunion.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/antennereunion.py
rename to resources/lib/channels/fr/antennereunion.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/azurtv.py b/resources/lib/channels/fr/azurtv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/azurtv.py
rename to resources/lib/channels/fr/azurtv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/bfmregion.py b/resources/lib/channels/fr/bfmregion.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/bfmregion.py
rename to resources/lib/channels/fr/bfmregion.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/bfmtv.py b/resources/lib/channels/fr/bfmtv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/bfmtv.py
rename to resources/lib/channels/fr/bfmtv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/biptv.py b/resources/lib/channels/fr/biptv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/biptv.py
rename to resources/lib/channels/fr/biptv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/bsmart.py b/resources/lib/channels/fr/bsmart.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/bsmart.py
rename to resources/lib/channels/fr/bsmart.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/caledonia.py b/resources/lib/channels/fr/caledonia.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/caledonia.py
rename to resources/lib/channels/fr/caledonia.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/canal10.py b/resources/lib/channels/fr/canal10.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/canal10.py
rename to resources/lib/channels/fr/canal10.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/cnews.py b/resources/lib/channels/fr/cnews.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/cnews.py
rename to resources/lib/channels/fr/cnews.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/dicitv.py b/resources/lib/channels/fr/dicitv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/dicitv.py
rename to resources/lib/channels/fr/dicitv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/equidia.py b/resources/lib/channels/fr/equidia.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/equidia.py
rename to resources/lib/channels/fr/equidia.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/europe1.py b/resources/lib/channels/fr/europe1.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/europe1.py
rename to resources/lib/channels/fr/europe1.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/france3regions.py b/resources/lib/channels/fr/france3regions.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/france3regions.py
rename to resources/lib/channels/fr/france3regions.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/franceinfo.py b/resources/lib/channels/fr/franceinfo.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/franceinfo.py
rename to resources/lib/channels/fr/franceinfo.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/franceinter.py b/resources/lib/channels/fr/franceinter.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/franceinter.py
rename to resources/lib/channels/fr/franceinter.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/francetv.py b/resources/lib/channels/fr/francetv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/francetv.py
rename to resources/lib/channels/fr/francetv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/francetvsport.py b/resources/lib/channels/fr/francetvsport.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/francetvsport.py
rename to resources/lib/channels/fr/francetvsport.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/gameone.py b/resources/lib/channels/fr/gameone.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/gameone.py
rename to resources/lib/channels/fr/gameone.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/gong.py b/resources/lib/channels/fr/gong.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/gong.py
rename to resources/lib/channels/fr/gong.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/idf1.py b/resources/lib/channels/fr/idf1.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/idf1.py
rename to resources/lib/channels/fr/idf1.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/j_one.py b/resources/lib/channels/fr/j_one.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/j_one.py
rename to resources/lib/channels/fr/j_one.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/jack.py b/resources/lib/channels/fr/jack.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/jack.py
rename to resources/lib/channels/fr/jack.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/kto.py b/resources/lib/channels/fr/kto.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/kto.py
rename to resources/lib/channels/fr/kto.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/la_1ere.py b/resources/lib/channels/fr/la_1ere.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/la_1ere.py
rename to resources/lib/channels/fr/la_1ere.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/lachainemeteo.py b/resources/lib/channels/fr/lachainemeteo.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/lachainemeteo.py
rename to resources/lib/channels/fr/lachainemeteo.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/lachainenormande.py b/resources/lib/channels/fr/lachainenormande.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/lachainenormande.py
rename to resources/lib/channels/fr/lachainenormande.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/lci.py b/resources/lib/channels/fr/lci.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/lci.py
rename to resources/lib/channels/fr/lci.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/lcp.py b/resources/lib/channels/fr/lcp.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/lcp.py
rename to resources/lib/channels/fr/lcp.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/lequipe.py b/resources/lib/channels/fr/lequipe.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/lequipe.py
rename to resources/lib/channels/fr/lequipe.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/lumni.py b/resources/lib/channels/fr/lumni.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/lumni.py
rename to resources/lib/channels/fr/lumni.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/luxetv.py b/resources/lib/channels/fr/luxetv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/luxetv.py
rename to resources/lib/channels/fr/luxetv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/mblivetv.py b/resources/lib/channels/fr/mblivetv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/mblivetv.py
rename to resources/lib/channels/fr/mblivetv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/mtv_fr.py b/resources/lib/channels/fr/mtv_fr.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/mtv_fr.py
rename to resources/lib/channels/fr/mtv_fr.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/mycanal.py b/resources/lib/channels/fr/mycanal.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/mycanal.py
rename to resources/lib/channels/fr/mycanal.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/mytf1.py b/resources/lib/channels/fr/mytf1.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/mytf1.py
rename to resources/lib/channels/fr/mytf1.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/nrj.py b/resources/lib/channels/fr/nrj.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/nrj.py
rename to resources/lib/channels/fr/nrj.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/ouatchtv.py b/resources/lib/channels/fr/ouatchtv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/ouatchtv.py
rename to resources/lib/channels/fr/ouatchtv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/paramountchannel_fr.py b/resources/lib/channels/fr/paramountchannel_fr.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/paramountchannel_fr.py
rename to resources/lib/channels/fr/paramountchannel_fr.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/publicsenat.py b/resources/lib/channels/fr/publicsenat.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/publicsenat.py
rename to resources/lib/channels/fr/publicsenat.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/rmc.py b/resources/lib/channels/fr/rmc.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/rmc.py
rename to resources/lib/channels/fr/rmc.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/rtl.py b/resources/lib/channels/fr/rtl.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/rtl.py
rename to resources/lib/channels/fr/rtl.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/sportenfrance.py b/resources/lib/channels/fr/sportenfrance.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/sportenfrance.py
rename to resources/lib/channels/fr/sportenfrance.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tebeo.py b/resources/lib/channels/fr/tebeo.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tebeo.py
rename to resources/lib/channels/fr/tebeo.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/telegrenoble.py b/resources/lib/channels/fr/telegrenoble.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/telegrenoble.py
rename to resources/lib/channels/fr/telegrenoble.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/telenantes.py b/resources/lib/channels/fr/telenantes.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/telenantes.py
rename to resources/lib/channels/fr/telenantes.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tf1thematiques.py b/resources/lib/channels/fr/tf1thematiques.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tf1thematiques.py
rename to resources/lib/channels/fr/tf1thematiques.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tl7.py b/resources/lib/channels/fr/tl7.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tl7.py
rename to resources/lib/channels/fr/tl7.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tlc.py b/resources/lib/channels/fr/tlc.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tlc.py
rename to resources/lib/channels/fr/tlc.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tv7bordeaux.py b/resources/lib/channels/fr/tv7bordeaux.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tv7bordeaux.py
rename to resources/lib/channels/fr/tv7bordeaux.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tv8montblanc.py b/resources/lib/channels/fr/tv8montblanc.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tv8montblanc.py
rename to resources/lib/channels/fr/tv8montblanc.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tvpifr.py b/resources/lib/channels/fr/tvpifr.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tvpifr.py
rename to resources/lib/channels/fr/tvpifr.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tvr.py b/resources/lib/channels/fr/tvr.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tvr.py
rename to resources/lib/channels/fr/tvr.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tvt.py b/resources/lib/channels/fr/tvt.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tvt.py
rename to resources/lib/channels/fr/tvt.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/tvvendee.py b/resources/lib/channels/fr/tvvendee.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/tvvendee.py
rename to resources/lib/channels/fr/tvvendee.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/via.py b/resources/lib/channels/fr/via.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/via.py
rename to resources/lib/channels/fr/via.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/fr/weo.py b/resources/lib/channels/fr/weo.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/fr/weo.py
rename to resources/lib/channels/fr/weo.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/it/__init__.py b/resources/lib/channels/it/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/it/__init__.py
rename to resources/lib/channels/it/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/it/la7.py b/resources/lib/channels/it/la7.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/it/la7.py
rename to resources/lib/channels/it/la7.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/it/paramountchannel_it.py b/resources/lib/channels/it/paramountchannel_it.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/it/paramountchannel_it.py
rename to resources/lib/channels/it/paramountchannel_it.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/it/raiplay.py b/resources/lib/channels/it/raiplay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/it/raiplay.py
rename to resources/lib/channels/it/raiplay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/__init__.py b/resources/lib/channels/jp/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/__init__.py
rename to resources/lib/channels/jp/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/japanetshoppingdx.py b/resources/lib/channels/jp/japanetshoppingdx.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/japanetshoppingdx.py
rename to resources/lib/channels/jp/japanetshoppingdx.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/nhklifestyle.py b/resources/lib/channels/jp/nhklifestyle.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/nhklifestyle.py
rename to resources/lib/channels/jp/nhklifestyle.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/nhknews.py b/resources/lib/channels/jp/nhknews.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/nhknews.py
rename to resources/lib/channels/jp/nhknews.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/ntvnews24.py b/resources/lib/channels/jp/ntvnews24.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/ntvnews24.py
rename to resources/lib/channels/jp/ntvnews24.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/tbsnews.py b/resources/lib/channels/jp/tbsnews.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/tbsnews.py
rename to resources/lib/channels/jp/tbsnews.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/tver.py b/resources/lib/channels/jp/tver.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/tver.py
rename to resources/lib/channels/jp/tver.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/jp/weathernewsjp.py b/resources/lib/channels/jp/weathernewsjp.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/jp/weathernewsjp.py
rename to resources/lib/channels/jp/weathernewsjp.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/nl/__init__.py b/resources/lib/channels/nl/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/nl/__init__.py
rename to resources/lib/channels/nl/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/nl/at5.py b/resources/lib/channels/nl/at5.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/nl/at5.py
rename to resources/lib/channels/nl/at5.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/nl/npo.py b/resources/lib/channels/nl/npo.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/nl/npo.py
rename to resources/lib/channels/nl/npo.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/pl/__init__.py b/resources/lib/channels/pl/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/pl/__init__.py
rename to resources/lib/channels/pl/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/pl/tvp.py b/resources/lib/channels/pl/tvp.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/pl/tvp.py
rename to resources/lib/channels/pl/tvp.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/si/__init__.py b/resources/lib/channels/si/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/si/__init__.py
rename to resources/lib/channels/si/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/si/rtvslo.py b/resources/lib/channels/si/rtvslo.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/si/rtvslo.py
rename to resources/lib/channels/si/rtvslo.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/tn/__init__.py b/resources/lib/channels/tn/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/tn/__init__.py
rename to resources/lib/channels/tn/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/tn/nessma.py b/resources/lib/channels/tn/nessma.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/tn/nessma.py
rename to resources/lib/channels/tn/nessma.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/tn/watania.py b/resources/lib/channels/tn/watania.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/tn/watania.py
rename to resources/lib/channels/tn/watania.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/__init__.py b/resources/lib/channels/uk/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/__init__.py
rename to resources/lib/channels/uk/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/blaze.py b/resources/lib/channels/uk/blaze.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/blaze.py
rename to resources/lib/channels/uk/blaze.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/boxplus.py b/resources/lib/channels/uk/boxplus.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/boxplus.py
rename to resources/lib/channels/uk/boxplus.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/discoveryplus.py b/resources/lib/channels/uk/discoveryplus.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/discoveryplus.py
rename to resources/lib/channels/uk/discoveryplus.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/my5.py b/resources/lib/channels/uk/my5.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/my5.py
rename to resources/lib/channels/uk/my5.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/sky.py b/resources/lib/channels/uk/sky.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/sky.py
rename to resources/lib/channels/uk/sky.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/stv.py b/resources/lib/channels/uk/stv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/stv.py
rename to resources/lib/channels/uk/stv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/uklocaltv.py b/resources/lib/channels/uk/uklocaltv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/uklocaltv.py
rename to resources/lib/channels/uk/uklocaltv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/uk/uktvplay.py b/resources/lib/channels/uk/uktvplay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/uk/uktvplay.py
rename to resources/lib/channels/uk/uktvplay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/us/__init__.py b/resources/lib/channels/us/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/us/__init__.py
rename to resources/lib/channels/us/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/us/abcnews.py b/resources/lib/channels/us/abcnews.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/us/abcnews.py
rename to resources/lib/channels/us/abcnews.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/us/cbsnews.py b/resources/lib/channels/us/cbsnews.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/us/cbsnews.py
rename to resources/lib/channels/us/cbsnews.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/us/nycmedia.py b/resources/lib/channels/us/nycmedia.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/us/nycmedia.py
rename to resources/lib/channels/us/nycmedia.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/us/pbskids.py b/resources/lib/channels/us/pbskids.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/us/pbskids.py
rename to resources/lib/channels/us/pbskids.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/us/tbd.py b/resources/lib/channels/us/tbd.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/us/tbd.py
rename to resources/lib/channels/us/tbd.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/__init__.py b/resources/lib/channels/wo/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/__init__.py
rename to resources/lib/channels/wo/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/africa24.py b/resources/lib/channels/wo/africa24.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/africa24.py
rename to resources/lib/channels/wo/africa24.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/afriquemedia.py b/resources/lib/channels/wo/afriquemedia.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/afriquemedia.py
rename to resources/lib/channels/wo/afriquemedia.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/arirang.py b/resources/lib/channels/wo/arirang.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/arirang.py
rename to resources/lib/channels/wo/arirang.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/arte.py b/resources/lib/channels/wo/arte.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/arte.py
rename to resources/lib/channels/wo/arte.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/beinsports.py b/resources/lib/channels/wo/beinsports.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/beinsports.py
rename to resources/lib/channels/wo/beinsports.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/bvn.py b/resources/lib/channels/wo/bvn.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/bvn.py
rename to resources/lib/channels/wo/bvn.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/cgtn.py b/resources/lib/channels/wo/cgtn.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/cgtn.py
rename to resources/lib/channels/wo/cgtn.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/channelnewsasia.py b/resources/lib/channels/wo/channelnewsasia.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/channelnewsasia.py
rename to resources/lib/channels/wo/channelnewsasia.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/dw.py b/resources/lib/channels/wo/dw.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/dw.py
rename to resources/lib/channels/wo/dw.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/euronews.py b/resources/lib/channels/wo/euronews.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/euronews.py
rename to resources/lib/channels/wo/euronews.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/france24.py b/resources/lib/channels/wo/france24.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/france24.py
rename to resources/lib/channels/wo/france24.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/icirdi.py b/resources/lib/channels/wo/icirdi.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/icirdi.py
rename to resources/lib/channels/wo/icirdi.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/icitelevision.py b/resources/lib/channels/wo/icitelevision.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/icitelevision.py
rename to resources/lib/channels/wo/icitelevision.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/nhkworld.py b/resources/lib/channels/wo/nhkworld.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/nhkworld.py
rename to resources/lib/channels/wo/nhkworld.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/qvc.py b/resources/lib/channels/wo/qvc.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/qvc.py
rename to resources/lib/channels/wo/qvc.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/rt.py b/resources/lib/channels/wo/rt.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/rt.py
rename to resources/lib/channels/wo/rt.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/tivi5monde.py b/resources/lib/channels/wo/tivi5monde.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/tivi5monde.py
rename to resources/lib/channels/wo/tivi5monde.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/tv5monde.py b/resources/lib/channels/wo/tv5monde.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/tv5monde.py
rename to resources/lib/channels/wo/tv5monde.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/tv5mondeafrique.py b/resources/lib/channels/wo/tv5mondeafrique.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/tv5mondeafrique.py
rename to resources/lib/channels/wo/tv5mondeafrique.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/channels/wo/tv5mondeplus.py b/resources/lib/channels/wo/tv5mondeplus.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/channels/wo/tv5mondeplus.py
rename to resources/lib/channels/wo/tv5mondeplus.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/download.py b/resources/lib/download.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/download.py
rename to resources/lib/download.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/favourites.py b/resources/lib/favourites.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/favourites.py
rename to resources/lib/favourites.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/iptvmanager.py b/resources/lib/iptvmanager.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/iptvmanager.py
rename to resources/lib/iptvmanager.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/kodi_utils.py b/resources/lib/kodi_utils.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/kodi_utils.py
rename to resources/lib/kodi_utils.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/log_uploader.py b/resources/lib/log_uploader.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/log_uploader.py
rename to resources/lib/log_uploader.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/main.py b/resources/lib/main.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/main.py
rename to resources/lib/main.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/mem_storage.py b/resources/lib/mem_storage.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/mem_storage.py
rename to resources/lib/mem_storage.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/menu_utils.py b/resources/lib/menu_utils.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/menu_utils.py
rename to resources/lib/menu_utils.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/openvpn.py b/resources/lib/openvpn.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/openvpn.py
rename to resources/lib/openvpn.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/py_utils.py b/resources/lib/py_utils.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/py_utils.py
rename to resources/lib/py_utils.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/resolver_proxy.py b/resources/lib/resolver_proxy.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/resolver_proxy.py
rename to resources/lib/resolver_proxy.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/__init__.py b/resources/lib/skeletons/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/__init__.py
rename to resources/lib/skeletons/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/be_live.py b/resources/lib/skeletons/be_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/be_live.py
rename to resources/lib/skeletons/be_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/be_replay.py b/resources/lib/skeletons/be_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/be_replay.py
rename to resources/lib/skeletons/be_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/ca_live.py b/resources/lib/skeletons/ca_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/ca_live.py
rename to resources/lib/skeletons/ca_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/ca_replay.py b/resources/lib/skeletons/ca_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/ca_replay.py
rename to resources/lib/skeletons/ca_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/ch_live.py b/resources/lib/skeletons/ch_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/ch_live.py
rename to resources/lib/skeletons/ch_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/ch_replay.py b/resources/lib/skeletons/ch_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/ch_replay.py
rename to resources/lib/skeletons/ch_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/cm_live.py b/resources/lib/skeletons/cm_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/cm_live.py
rename to resources/lib/skeletons/cm_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/cm_replay.py b/resources/lib/skeletons/cm_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/cm_replay.py
rename to resources/lib/skeletons/cm_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/cn_live.py b/resources/lib/skeletons/cn_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/cn_live.py
rename to resources/lib/skeletons/cn_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/cn_replay.py b/resources/lib/skeletons/cn_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/cn_replay.py
rename to resources/lib/skeletons/cn_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/es_live.py b/resources/lib/skeletons/es_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/es_live.py
rename to resources/lib/skeletons/es_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/es_replay.py b/resources/lib/skeletons/es_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/es_replay.py
rename to resources/lib/skeletons/es_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/et_live.py b/resources/lib/skeletons/et_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/et_live.py
rename to resources/lib/skeletons/et_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/fr_live.py b/resources/lib/skeletons/fr_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/fr_live.py
rename to resources/lib/skeletons/fr_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/fr_replay.py b/resources/lib/skeletons/fr_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/fr_replay.py
rename to resources/lib/skeletons/fr_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/it_live.py b/resources/lib/skeletons/it_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/it_live.py
rename to resources/lib/skeletons/it_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/it_replay.py b/resources/lib/skeletons/it_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/it_replay.py
rename to resources/lib/skeletons/it_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/jp_live.py b/resources/lib/skeletons/jp_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/jp_live.py
rename to resources/lib/skeletons/jp_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/jp_replay.py b/resources/lib/skeletons/jp_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/jp_replay.py
rename to resources/lib/skeletons/jp_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/live_tv.py b/resources/lib/skeletons/live_tv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/live_tv.py
rename to resources/lib/skeletons/live_tv.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/nl_live.py b/resources/lib/skeletons/nl_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/nl_live.py
rename to resources/lib/skeletons/nl_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/nl_replay.py b/resources/lib/skeletons/nl_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/nl_replay.py
rename to resources/lib/skeletons/nl_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/pl_live.py b/resources/lib/skeletons/pl_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/pl_live.py
rename to resources/lib/skeletons/pl_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/replay.py b/resources/lib/skeletons/replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/replay.py
rename to resources/lib/skeletons/replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/root.py b/resources/lib/skeletons/root.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/root.py
rename to resources/lib/skeletons/root.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/si_live.py b/resources/lib/skeletons/si_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/si_live.py
rename to resources/lib/skeletons/si_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/tn_live.py b/resources/lib/skeletons/tn_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/tn_live.py
rename to resources/lib/skeletons/tn_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/tn_replay.py b/resources/lib/skeletons/tn_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/tn_replay.py
rename to resources/lib/skeletons/tn_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/uk_live.py b/resources/lib/skeletons/uk_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/uk_live.py
rename to resources/lib/skeletons/uk_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/uk_replay.py b/resources/lib/skeletons/uk_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/uk_replay.py
rename to resources/lib/skeletons/uk_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/us_live.py b/resources/lib/skeletons/us_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/us_live.py
rename to resources/lib/skeletons/us_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/us_replay.py b/resources/lib/skeletons/us_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/us_replay.py
rename to resources/lib/skeletons/us_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/websites.py b/resources/lib/skeletons/websites.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/websites.py
rename to resources/lib/skeletons/websites.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/wo_live.py b/resources/lib/skeletons/wo_live.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/wo_live.py
rename to resources/lib/skeletons/wo_live.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/skeletons/wo_replay.py b/resources/lib/skeletons/wo_replay.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/skeletons/wo_replay.py
rename to resources/lib/skeletons/wo_replay.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/vpn.py b/resources/lib/vpn.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/vpn.py
rename to resources/lib/vpn.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/web_utils.py b/resources/lib/web_utils.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/web_utils.py
rename to resources/lib/web_utils.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/30millionsdamis.py b/resources/lib/websites/30millionsdamis.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/30millionsdamis.py
rename to resources/lib/websites/30millionsdamis.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/__init__.py b/resources/lib/websites/__init__.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/__init__.py
rename to resources/lib/websites/__init__.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/allocine.py b/resources/lib/websites/allocine.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/allocine.py
rename to resources/lib/websites/allocine.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/autoplus.py b/resources/lib/websites/autoplus.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/autoplus.py
rename to resources/lib/websites/autoplus.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/culturepub.py b/resources/lib/websites/culturepub.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/culturepub.py
rename to resources/lib/websites/culturepub.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/elle.py b/resources/lib/websites/elle.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/elle.py
rename to resources/lib/websites/elle.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/fosdem.py b/resources/lib/websites/fosdem.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/fosdem.py
rename to resources/lib/websites/fosdem.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/ina.py b/resources/lib/websites/ina.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/ina.py
rename to resources/lib/websites/ina.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/lesargonautes.py b/resources/lib/websites/lesargonautes.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/lesargonautes.py
rename to resources/lib/websites/lesargonautes.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/marmiton.py b/resources/lib/websites/marmiton.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/marmiton.py
rename to resources/lib/websites/marmiton.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/nationalfff.py b/resources/lib/websites/nationalfff.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/nationalfff.py
rename to resources/lib/websites/nationalfff.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/nfb.py b/resources/lib/websites/nfb.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/nfb.py
rename to resources/lib/websites/nfb.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/noob.py b/resources/lib/websites/noob.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/noob.py
rename to resources/lib/websites/noob.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/notrehistoirech.py b/resources/lib/websites/notrehistoirech.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/notrehistoirech.py
rename to resources/lib/websites/notrehistoirech.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/nytimes.py b/resources/lib/websites/nytimes.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/nytimes.py
rename to resources/lib/websites/nytimes.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/onf.py b/resources/lib/websites/onf.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/onf.py
rename to resources/lib/websites/onf.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/philharmoniedeparis.py b/resources/lib/websites/philharmoniedeparis.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/philharmoniedeparis.py
rename to resources/lib/websites/philharmoniedeparis.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/taratata.py b/resources/lib/websites/taratata.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/taratata.py
rename to resources/lib/websites/taratata.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/websites/tetesaclaques.py b/resources/lib/websites/tetesaclaques.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/websites/tetesaclaques.py
rename to resources/lib/websites/tetesaclaques.py
diff --git a/plugin.video.catchuptvandmore/resources/lib/xmltv.py b/resources/lib/xmltv.py
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/lib/xmltv.py
rename to resources/lib/xmltv.py
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_all.m3u b/resources/m3u/live_tv_all.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_all.m3u
rename to resources/m3u/live_tv_all.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_be.m3u b/resources/m3u/live_tv_be.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_be.m3u
rename to resources/m3u/live_tv_be.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_ca.m3u b/resources/m3u/live_tv_ca.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_ca.m3u
rename to resources/m3u/live_tv_ca.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_ch.m3u b/resources/m3u/live_tv_ch.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_ch.m3u
rename to resources/m3u/live_tv_ch.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_cm.m3u b/resources/m3u/live_tv_cm.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_cm.m3u
rename to resources/m3u/live_tv_cm.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_cn.m3u b/resources/m3u/live_tv_cn.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_cn.m3u
rename to resources/m3u/live_tv_cn.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_es.m3u b/resources/m3u/live_tv_es.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_es.m3u
rename to resources/m3u/live_tv_es.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_et.m3u b/resources/m3u/live_tv_et.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_et.m3u
rename to resources/m3u/live_tv_et.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_fr.m3u b/resources/m3u/live_tv_fr.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_fr.m3u
rename to resources/m3u/live_tv_fr.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_it.m3u b/resources/m3u/live_tv_it.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_it.m3u
rename to resources/m3u/live_tv_it.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_jp.m3u b/resources/m3u/live_tv_jp.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_jp.m3u
rename to resources/m3u/live_tv_jp.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_nl.m3u b/resources/m3u/live_tv_nl.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_nl.m3u
rename to resources/m3u/live_tv_nl.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_pl.m3u b/resources/m3u/live_tv_pl.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_pl.m3u
rename to resources/m3u/live_tv_pl.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_si.m3u b/resources/m3u/live_tv_si.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_si.m3u
rename to resources/m3u/live_tv_si.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_tn.m3u b/resources/m3u/live_tv_tn.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_tn.m3u
rename to resources/m3u/live_tv_tn.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_uk.m3u b/resources/m3u/live_tv_uk.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_uk.m3u
rename to resources/m3u/live_tv_uk.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_us.m3u b/resources/m3u/live_tv_us.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_us.m3u
rename to resources/m3u/live_tv_us.m3u
diff --git a/plugin.video.catchuptvandmore/resources/m3u/live_tv_wo.m3u b/resources/m3u/live_tv_wo.m3u
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/m3u/live_tv_wo.m3u
rename to resources/m3u/live_tv_wo.m3u
diff --git a/plugin.video.catchuptvandmore/resources/screenshots/screenshot-01.jpg b/resources/screenshots/screenshot-01.jpg
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/screenshots/screenshot-01.jpg
rename to resources/screenshots/screenshot-01.jpg
diff --git a/plugin.video.catchuptvandmore/resources/screenshots/screenshot-02.jpg b/resources/screenshots/screenshot-02.jpg
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/screenshots/screenshot-02.jpg
rename to resources/screenshots/screenshot-02.jpg
diff --git a/plugin.video.catchuptvandmore/resources/screenshots/screenshot-03.jpg b/resources/screenshots/screenshot-03.jpg
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/screenshots/screenshot-03.jpg
rename to resources/screenshots/screenshot-03.jpg
diff --git a/plugin.video.catchuptvandmore/resources/screenshots/screenshot-04.jpg b/resources/screenshots/screenshot-04.jpg
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/screenshots/screenshot-04.jpg
rename to resources/screenshots/screenshot-04.jpg
diff --git a/plugin.video.catchuptvandmore/resources/screenshots/screenshot-05.jpg b/resources/screenshots/screenshot-05.jpg
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/screenshots/screenshot-05.jpg
rename to resources/screenshots/screenshot-05.jpg
diff --git a/plugin.video.catchuptvandmore/resources/settings.xml b/resources/settings.xml
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/settings.xml
rename to resources/settings.xml
diff --git a/plugin.video.catchuptvandmore/resources/skins/default/1080i/script-loguploader-main.xml b/resources/skins/default/1080i/script-loguploader-main.xml
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/skins/default/1080i/script-loguploader-main.xml
rename to resources/skins/default/1080i/script-loguploader-main.xml
diff --git a/plugin.video.catchuptvandmore/resources/skins/default/1080i/script-loguploader-view.xml b/resources/skins/default/1080i/script-loguploader-view.xml
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/skins/default/1080i/script-loguploader-view.xml
rename to resources/skins/default/1080i/script-loguploader-view.xml
diff --git a/plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-black.png b/resources/skins/default/media/loguploader-black.png
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-black.png
rename to resources/skins/default/media/loguploader-black.png
diff --git a/plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-dialog-bg.png b/resources/skins/default/media/loguploader-dialog-bg.png
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-dialog-bg.png
rename to resources/skins/default/media/loguploader-dialog-bg.png
diff --git a/plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-dialogbutton-fo.png b/resources/skins/default/media/loguploader-dialogbutton-fo.png
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-dialogbutton-fo.png
rename to resources/skins/default/media/loguploader-dialogbutton-fo.png
diff --git a/plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-dialogbutton-nofo.png b/resources/skins/default/media/loguploader-dialogbutton-nofo.png
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-dialogbutton-nofo.png
rename to resources/skins/default/media/loguploader-dialogbutton-nofo.png
diff --git a/plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-white.png b/resources/skins/default/media/loguploader-white.png
similarity index 100%
rename from plugin.video.catchuptvandmore/resources/skins/default/media/loguploader-white.png
rename to resources/skins/default/media/loguploader-white.png
diff --git a/plugin.video.catchuptvandmore/service.py b/service.py
similarity index 100%
rename from plugin.video.catchuptvandmore/service.py
rename to service.py