diff --git a/sites/andorradifusio.ad.config.js b/sites/andorradifusio.ad/andorradifusio.ad.config.js
similarity index 100%
rename from sites/andorradifusio.ad.config.js
rename to sites/andorradifusio.ad/andorradifusio.ad.config.js
diff --git a/sites/andorradifusio.ad_ad.channels.xml b/sites/andorradifusio.ad/andorradifusio.ad_ad.channels.xml
similarity index 100%
rename from sites/andorradifusio.ad_ad.channels.xml
rename to sites/andorradifusio.ad/andorradifusio.ad_ad.channels.xml
diff --git a/sites/arianaafgtv.com.config.js b/sites/arianaafgtv.com/arianaafgtv.com.config.js
similarity index 100%
rename from sites/arianaafgtv.com.config.js
rename to sites/arianaafgtv.com/arianaafgtv.com.config.js
diff --git a/sites/arianaafgtv.com_af.channels.xml b/sites/arianaafgtv.com/arianaafgtv.com_af.channels.xml
similarity index 100%
rename from sites/arianaafgtv.com_af.channels.xml
rename to sites/arianaafgtv.com/arianaafgtv.com_af.channels.xml
diff --git a/sites/arianatelevision.com.config.js b/sites/arianatelevision.com/arianatelevision.com.config.js
similarity index 100%
rename from sites/arianatelevision.com.config.js
rename to sites/arianatelevision.com/arianatelevision.com.config.js
diff --git a/sites/arianatelevision.com_af.channels.xml b/sites/arianatelevision.com/arianatelevision.com_af.channels.xml
similarity index 100%
rename from sites/arianatelevision.com_af.channels.xml
rename to sites/arianatelevision.com/arianatelevision.com_af.channels.xml
diff --git a/sites/astro.com.my.config.js b/sites/astro.com.my/astro.com.my.config.js
similarity index 100%
rename from sites/astro.com.my.config.js
rename to sites/astro.com.my/astro.com.my.config.js
diff --git a/sites/astro.com.my_my.channels.xml b/sites/astro.com.my/astro.com.my_my.channels.xml
similarity index 100%
rename from sites/astro.com.my_my.channels.xml
rename to sites/astro.com.my/astro.com.my_my.channels.xml
diff --git a/sites/comteco.com.bo.config.js b/sites/comteco.com.bo/comteco.com.bo.config.js
similarity index 100%
rename from sites/comteco.com.bo.config.js
rename to sites/comteco.com.bo/comteco.com.bo.config.js
diff --git a/sites/comteco.com.bo_bo.channels.xml b/sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
similarity index 100%
rename from sites/comteco.com.bo_bo.channels.xml
rename to sites/comteco.com.bo/comteco.com.bo_bo.channels.xml
diff --git a/sites/cosmote.gr.config.js b/sites/cosmote.gr/cosmote.gr.config.js
similarity index 100%
rename from sites/cosmote.gr.config.js
rename to sites/cosmote.gr/cosmote.gr.config.js
diff --git a/sites/cosmote.gr_gr.channels.xml b/sites/cosmote.gr/cosmote.gr_gr.channels.xml
similarity index 100%
rename from sites/cosmote.gr_gr.channels.xml
rename to sites/cosmote.gr/cosmote.gr_gr.channels.xml
diff --git a/sites/digiturk.com.tr.config.js b/sites/digiturk.com.tr/digiturk.com.tr.config.js
similarity index 100%
rename from sites/digiturk.com.tr.config.js
rename to sites/digiturk.com.tr/digiturk.com.tr.config.js
diff --git a/sites/digiturk.com.tr_tr.channels.xml b/sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
similarity index 100%
rename from sites/digiturk.com.tr_tr.channels.xml
rename to sites/digiturk.com.tr/digiturk.com.tr_tr.channels.xml
diff --git a/sites/dstv.com.config.js b/sites/dstv.com/dstv.com.config.js
similarity index 100%
rename from sites/dstv.com.config.js
rename to sites/dstv.com/dstv.com.config.js
diff --git a/sites/dstv.com_ao.channels.xml b/sites/dstv.com/dstv.com_ao.channels.xml
similarity index 100%
rename from sites/dstv.com_ao.channels.xml
rename to sites/dstv.com/dstv.com_ao.channels.xml
diff --git a/sites/dstv.com_bj.channels.xml b/sites/dstv.com/dstv.com_bj.channels.xml
similarity index 100%
rename from sites/dstv.com_bj.channels.xml
rename to sites/dstv.com/dstv.com_bj.channels.xml
diff --git a/sites/dstv.com_bw.channels.xml b/sites/dstv.com/dstv.com_bw.channels.xml
similarity index 100%
rename from sites/dstv.com_bw.channels.xml
rename to sites/dstv.com/dstv.com_bw.channels.xml
diff --git a/sites/dstv.com_ke.channels.xml b/sites/dstv.com/dstv.com_ke.channels.xml
similarity index 100%
rename from sites/dstv.com_ke.channels.xml
rename to sites/dstv.com/dstv.com_ke.channels.xml
diff --git a/sites/elcinema.com.config.js b/sites/elcinema.com/elcinema.com.config.js
similarity index 100%
rename from sites/elcinema.com.config.js
rename to sites/elcinema.com/elcinema.com.config.js
diff --git a/sites/elcinema.com_eg.channels.xml b/sites/elcinema.com/elcinema.com_eg.channels.xml
similarity index 100%
rename from sites/elcinema.com_eg.channels.xml
rename to sites/elcinema.com/elcinema.com_eg.channels.xml
diff --git a/sites/guidatv.sky.it.config.js b/sites/guidatv.sky.it/guidatv.sky.it.config.js
similarity index 100%
rename from sites/guidatv.sky.it.config.js
rename to sites/guidatv.sky.it/guidatv.sky.it.config.js
diff --git a/sites/guidatv.sky.it_it.channels.xml b/sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
similarity index 100%
rename from sites/guidatv.sky.it_it.channels.xml
rename to sites/guidatv.sky.it/guidatv.sky.it_it.channels.xml
diff --git a/sites/hd-plus.de.config.js b/sites/hd-plus.de/hd-plus.de.config.js
similarity index 100%
rename from sites/hd-plus.de.config.js
rename to sites/hd-plus.de/hd-plus.de.config.js
diff --git a/sites/hd-plus.de_de.channels.xml b/sites/hd-plus.de/hd-plus.de_de.channels.xml
similarity index 100%
rename from sites/hd-plus.de_de.channels.xml
rename to sites/hd-plus.de/hd-plus.de_de.channels.xml
diff --git a/sites/m.tv.sms.cz.config.js b/sites/m.tv.sms.cz/m.tv.sms.cz.config.js
similarity index 100%
rename from sites/m.tv.sms.cz.config.js
rename to sites/m.tv.sms.cz/m.tv.sms.cz.config.js
diff --git a/sites/m.tv.sms.cz_cz.channels.xml b/sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
similarity index 100%
rename from sites/m.tv.sms.cz_cz.channels.xml
rename to sites/m.tv.sms.cz/m.tv.sms.cz_cz.channels.xml
diff --git a/sites/maxtv.hrvatskitelekom.hr.config.js b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.config.js
similarity index 100%
rename from sites/maxtv.hrvatskitelekom.hr.config.js
rename to sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr.config.js
diff --git a/sites/maxtv.hrvatskitelekom.hr_hr.channels.xml b/sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
similarity index 100%
rename from sites/maxtv.hrvatskitelekom.hr_hr.channels.xml
rename to sites/maxtv.hrvatskitelekom.hr/maxtv.hrvatskitelekom.hr_hr.channels.xml
diff --git a/sites/mediaset.it.config.js b/sites/mediaset.it/mediaset.it.config.js
similarity index 100%
rename from sites/mediaset.it.config.js
rename to sites/mediaset.it/mediaset.it.config.js
diff --git a/sites/mediaset.it_it.channels.xml b/sites/mediaset.it/mediaset.it_it.channels.xml
similarity index 100%
rename from sites/mediaset.it_it.channels.xml
rename to sites/mediaset.it/mediaset.it_it.channels.xml
diff --git a/sites/meo.pt.config.js b/sites/meo.pt/meo.pt.config.js
similarity index 100%
rename from sites/meo.pt.config.js
rename to sites/meo.pt/meo.pt.config.js
diff --git a/sites/meo.pt_pt.channels.xml b/sites/meo.pt/meo.pt_pt.channels.xml
similarity index 100%
rename from sites/meo.pt_pt.channels.xml
rename to sites/meo.pt/meo.pt_pt.channels.xml
diff --git a/sites/mi.tv.config.js b/sites/mi.tv/mi.tv.config.js
similarity index 100%
rename from sites/mi.tv.config.js
rename to sites/mi.tv/mi.tv.config.js
diff --git a/sites/mi.tv_ar.channels.xml b/sites/mi.tv/mi.tv_ar.channels.xml
similarity index 100%
rename from sites/mi.tv_ar.channels.xml
rename to sites/mi.tv/mi.tv_ar.channels.xml
diff --git a/sites/mi.tv_br.channels.xml b/sites/mi.tv/mi.tv_br.channels.xml
similarity index 100%
rename from sites/mi.tv_br.channels.xml
rename to sites/mi.tv/mi.tv_br.channels.xml
diff --git a/sites/mi.tv_cl.channels.xml b/sites/mi.tv/mi.tv_cl.channels.xml
similarity index 100%
rename from sites/mi.tv_cl.channels.xml
rename to sites/mi.tv/mi.tv_cl.channels.xml
diff --git a/sites/mi.tv_co.channels.xml b/sites/mi.tv/mi.tv_co.channels.xml
similarity index 100%
rename from sites/mi.tv_co.channels.xml
rename to sites/mi.tv/mi.tv_co.channels.xml
diff --git a/sites/mi.tv_gt.channels.xml b/sites/mi.tv/mi.tv_gt.channels.xml
similarity index 100%
rename from sites/mi.tv_gt.channels.xml
rename to sites/mi.tv/mi.tv_gt.channels.xml
diff --git a/sites/mi.tv_hn.channels.xml b/sites/mi.tv/mi.tv_hn.channels.xml
similarity index 100%
rename from sites/mi.tv_hn.channels.xml
rename to sites/mi.tv/mi.tv_hn.channels.xml
diff --git a/sites/mi.tv_mx.channels.xml b/sites/mi.tv/mi.tv_mx.channels.xml
similarity index 100%
rename from sites/mi.tv_mx.channels.xml
rename to sites/mi.tv/mi.tv_mx.channels.xml
diff --git a/sites/mi.tv_pe.channels.xml b/sites/mi.tv/mi.tv_pe.channels.xml
similarity index 100%
rename from sites/mi.tv_pe.channels.xml
rename to sites/mi.tv/mi.tv_pe.channels.xml
diff --git a/sites/mi.tv_sv.channels.xml b/sites/mi.tv/mi.tv_sv.channels.xml
similarity index 100%
rename from sites/mi.tv_sv.channels.xml
rename to sites/mi.tv/mi.tv_sv.channels.xml
diff --git a/sites/mncvision.id.config.js b/sites/mncvision.id/mncvision.id.config.js
similarity index 100%
rename from sites/mncvision.id.config.js
rename to sites/mncvision.id/mncvision.id.config.js
diff --git a/sites/mncvision.id_id.channels.xml b/sites/mncvision.id/mncvision.id_id.channels.xml
similarity index 100%
rename from sites/mncvision.id_id.channels.xml
rename to sites/mncvision.id/mncvision.id_id.channels.xml
diff --git a/sites/ontvtonight.com.config.js b/sites/ontvtonight.com/ontvtonight.com.config.js
similarity index 100%
rename from sites/ontvtonight.com.config.js
rename to sites/ontvtonight.com/ontvtonight.com.config.js
diff --git a/sites/ontvtonight.com_au.channels.xml b/sites/ontvtonight.com/ontvtonight.com_au.channels.xml
similarity index 100%
rename from sites/ontvtonight.com_au.channels.xml
rename to sites/ontvtonight.com/ontvtonight.com_au.channels.xml
diff --git a/sites/ontvtonight.com_ie.channels.xml b/sites/ontvtonight.com/ontvtonight.com_ie.channels.xml
similarity index 100%
rename from sites/ontvtonight.com_ie.channels.xml
rename to sites/ontvtonight.com/ontvtonight.com_ie.channels.xml
diff --git a/sites/ontvtonight.com_uk.channels.xml b/sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
similarity index 100%
rename from sites/ontvtonight.com_uk.channels.xml
rename to sites/ontvtonight.com/ontvtonight.com_uk.channels.xml
diff --git a/sites/ontvtonight.com_us.channels.xml b/sites/ontvtonight.com/ontvtonight.com_us.channels.xml
similarity index 100%
rename from sites/ontvtonight.com_us.channels.xml
rename to sites/ontvtonight.com/ontvtonight.com_us.channels.xml
diff --git a/sites/programacion-tv.elpais.com.config.js b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.config.js
similarity index 100%
rename from sites/programacion-tv.elpais.com.config.js
rename to sites/programacion-tv.elpais.com/programacion-tv.elpais.com.config.js
diff --git a/sites/programacion-tv.elpais.com_es.channels.xml b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
similarity index 100%
rename from sites/programacion-tv.elpais.com_es.channels.xml
rename to sites/programacion-tv.elpais.com/programacion-tv.elpais.com_es.channels.xml
diff --git a/sites/programetv.ro.config.js b/sites/programetv.ro/programetv.ro.config.js
similarity index 100%
rename from sites/programetv.ro.config.js
rename to sites/programetv.ro/programetv.ro.config.js
diff --git a/sites/programetv.ro_ro.channels.xml b/sites/programetv.ro/programetv.ro_ro.channels.xml
similarity index 100%
rename from sites/programetv.ro_ro.channels.xml
rename to sites/programetv.ro/programetv.ro_ro.channels.xml
diff --git a/sites/programme-tv.net.config.js b/sites/programme-tv.net/programme-tv.net.config.js
similarity index 100%
rename from sites/programme-tv.net.config.js
rename to sites/programme-tv.net/programme-tv.net.config.js
diff --git a/sites/programme-tv.net_fr.channels.xml b/sites/programme-tv.net/programme-tv.net_fr.channels.xml
similarity index 100%
rename from sites/programme-tv.net_fr.channels.xml
rename to sites/programme-tv.net/programme-tv.net_fr.channels.xml
diff --git a/sites/programtv.onet.pl.config.js b/sites/programtv.onet.pl/programtv.onet.pl.config.js
similarity index 100%
rename from sites/programtv.onet.pl.config.js
rename to sites/programtv.onet.pl/programtv.onet.pl.config.js
diff --git a/sites/programtv.onet.pl_pl.channels.xml b/sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
similarity index 100%
rename from sites/programtv.onet.pl_pl.channels.xml
rename to sites/programtv.onet.pl/programtv.onet.pl_pl.channels.xml
diff --git a/sites/rev.bs.config.js b/sites/rev.bs/rev.bs.config.js
similarity index 100%
rename from sites/rev.bs.config.js
rename to sites/rev.bs/rev.bs.config.js
diff --git a/sites/rev.bs_bs.channels.xml b/sites/rev.bs/rev.bs_bs.channels.xml
similarity index 100%
rename from sites/rev.bs_bs.channels.xml
rename to sites/rev.bs/rev.bs_bs.channels.xml
diff --git a/sites/telkussa.fi.config.js b/sites/telkussa.fi/telkussa.fi.config.js
similarity index 100%
rename from sites/telkussa.fi.config.js
rename to sites/telkussa.fi/telkussa.fi.config.js
diff --git a/sites/telkussa.fi_fi.channels.xml b/sites/telkussa.fi/telkussa.fi_fi.channels.xml
similarity index 100%
rename from sites/telkussa.fi_fi.channels.xml
rename to sites/telkussa.fi/telkussa.fi_fi.channels.xml
diff --git a/sites/tv.cctv.com.config.js b/sites/tv.cctv.com/tv.cctv.com.config.js
similarity index 100%
rename from sites/tv.cctv.com.config.js
rename to sites/tv.cctv.com/tv.cctv.com.config.js
diff --git a/sites/tv.cctv.com_cn.channels.xml b/sites/tv.cctv.com/tv.cctv.com_cn.channels.xml
similarity index 100%
rename from sites/tv.cctv.com_cn.channels.xml
rename to sites/tv.cctv.com/tv.cctv.com_cn.channels.xml
diff --git a/sites/tv.lv.config.js b/sites/tv.lv/tv.lv.config.js
similarity index 100%
rename from sites/tv.lv.config.js
rename to sites/tv.lv/tv.lv.config.js
diff --git a/sites/tv.lv_lv.channels.xml b/sites/tv.lv/tv.lv_lv.channels.xml
similarity index 100%
rename from sites/tv.lv_lv.channels.xml
rename to sites/tv.lv/tv.lv_lv.channels.xml
diff --git a/sites/tv.mail.ru.config.js b/sites/tv.mail.ru/tv.mail.ru.config.js
similarity index 100%
rename from sites/tv.mail.ru.config.js
rename to sites/tv.mail.ru/tv.mail.ru.config.js
diff --git a/sites/tv.mail.ru_am.channels.xml b/sites/tv.mail.ru/tv.mail.ru_am.channels.xml
similarity index 100%
rename from sites/tv.mail.ru_am.channels.xml
rename to sites/tv.mail.ru/tv.mail.ru_am.channels.xml
diff --git a/sites/tv.mail.ru_az.channels.xml b/sites/tv.mail.ru/tv.mail.ru_az.channels.xml
similarity index 100%
rename from sites/tv.mail.ru_az.channels.xml
rename to sites/tv.mail.ru/tv.mail.ru_az.channels.xml
diff --git a/sites/tv.mail.ru_by.channels.xml b/sites/tv.mail.ru/tv.mail.ru_by.channels.xml
similarity index 100%
rename from sites/tv.mail.ru_by.channels.xml
rename to sites/tv.mail.ru/tv.mail.ru_by.channels.xml
diff --git a/sites/tv.yandex.ru.config.js b/sites/tv.yandex.ru/tv.yandex.ru.config.js
similarity index 100%
rename from sites/tv.yandex.ru.config.js
rename to sites/tv.yandex.ru/tv.yandex.ru.config.js
diff --git a/sites/tv.yandex.ru_kz.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru_kz.channels.xml
similarity index 100%
rename from sites/tv.yandex.ru_kz.channels.xml
rename to sites/tv.yandex.ru/tv.yandex.ru_kz.channels.xml
diff --git a/sites/tv.yandex.ru_ru.channels.xml b/sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
similarity index 100%
rename from sites/tv.yandex.ru_ru.channels.xml
rename to sites/tv.yandex.ru/tv.yandex.ru_ru.channels.xml
diff --git a/sites/tvgid.ua.config.js b/sites/tvgid.ua/tvgid.ua.config.js
similarity index 100%
rename from sites/tvgid.ua.config.js
rename to sites/tvgid.ua/tvgid.ua.config.js
diff --git a/sites/tvgid.ua_ua.channels.xml b/sites/tvgid.ua/tvgid.ua_ua.channels.xml
similarity index 100%
rename from sites/tvgid.ua_ua.channels.xml
rename to sites/tvgid.ua/tvgid.ua_ua.channels.xml
diff --git a/sites/tvguide.com.config.js b/sites/tvguide.com/tvguide.com.config.js
similarity index 100%
rename from sites/tvguide.com.config.js
rename to sites/tvguide.com/tvguide.com.config.js
diff --git a/sites/tvguide.com_us.channels.xml b/sites/tvguide.com/tvguide.com_us.channels.xml
similarity index 100%
rename from sites/tvguide.com_us.channels.xml
rename to sites/tvguide.com/tvguide.com_us.channels.xml
diff --git a/sites/tvprofil.com.config.js b/sites/tvprofil.com/tvprofil.com.config.js
similarity index 100%
rename from sites/tvprofil.com.config.js
rename to sites/tvprofil.com/tvprofil.com.config.js
diff --git a/sites/tvprofil.com_al.channels.xml b/sites/tvprofil.com/tvprofil.com_al.channels.xml
similarity index 100%
rename from sites/tvprofil.com_al.channels.xml
rename to sites/tvprofil.com/tvprofil.com_al.channels.xml
diff --git a/sites/tvprofil.com_ba.channels.xml b/sites/tvprofil.com/tvprofil.com_ba.channels.xml
similarity index 100%
rename from sites/tvprofil.com_ba.channels.xml
rename to sites/tvprofil.com/tvprofil.com_ba.channels.xml
diff --git a/sites/tvprofil.com_bg.channels.xml b/sites/tvprofil.com/tvprofil.com_bg.channels.xml
similarity index 100%
rename from sites/tvprofil.com_bg.channels.xml
rename to sites/tvprofil.com/tvprofil.com_bg.channels.xml
diff --git a/sites/tvprofil.com_cz.channels.xml b/sites/tvprofil.com/tvprofil.com_cz.channels.xml
similarity index 100%
rename from sites/tvprofil.com_cz.channels.xml
rename to sites/tvprofil.com/tvprofil.com_cz.channels.xml
diff --git a/sites/tvprofil.com_de.channels.xml b/sites/tvprofil.com/tvprofil.com_de.channels.xml
similarity index 100%
rename from sites/tvprofil.com_de.channels.xml
rename to sites/tvprofil.com/tvprofil.com_de.channels.xml
diff --git a/sites/tvprofil.com_hu.channels.xml b/sites/tvprofil.com/tvprofil.com_hu.channels.xml
similarity index 100%
rename from sites/tvprofil.com_hu.channels.xml
rename to sites/tvprofil.com/tvprofil.com_hu.channels.xml
diff --git a/sites/tvprofil.com_me.channels.xml b/sites/tvprofil.com/tvprofil.com_me.channels.xml
similarity index 100%
rename from sites/tvprofil.com_me.channels.xml
rename to sites/tvprofil.com/tvprofil.com_me.channels.xml
diff --git a/sites/tvprofil.com_mk.channels.xml b/sites/tvprofil.com/tvprofil.com_mk.channels.xml
similarity index 100%
rename from sites/tvprofil.com_mk.channels.xml
rename to sites/tvprofil.com/tvprofil.com_mk.channels.xml
diff --git a/sites/tvprofil.com_rs.channels.xml b/sites/tvprofil.com/tvprofil.com_rs.channels.xml
similarity index 100%
rename from sites/tvprofil.com_rs.channels.xml
rename to sites/tvprofil.com/tvprofil.com_rs.channels.xml
diff --git a/sites/tvprofil.com_si.channels.xml b/sites/tvprofil.com/tvprofil.com_si.channels.xml
similarity index 100%
rename from sites/tvprofil.com_si.channels.xml
rename to sites/tvprofil.com/tvprofil.com_si.channels.xml
diff --git a/sites/tvtv.us.config.js b/sites/tvtv.us/tvtv.us.config.js
similarity index 100%
rename from sites/tvtv.us.config.js
rename to sites/tvtv.us/tvtv.us.config.js
diff --git a/sites/tvtv.us_ca.channels.xml b/sites/tvtv.us/tvtv.us_ca.channels.xml
similarity index 100%
rename from sites/tvtv.us_ca.channels.xml
rename to sites/tvtv.us/tvtv.us_ca.channels.xml
diff --git a/sites/tvtv.us_us.channels.xml b/sites/tvtv.us/tvtv.us_us.channels.xml
similarity index 100%
rename from sites/tvtv.us_us.channels.xml
rename to sites/tvtv.us/tvtv.us_us.channels.xml
diff --git a/sites/vidio.com.config.js b/sites/vidio.com/vidio.com.config.js
similarity index 100%
rename from sites/vidio.com.config.js
rename to sites/vidio.com/vidio.com.config.js
diff --git a/sites/vidio.com_id.channels.xml b/sites/vidio.com/vidio.com_id.channels.xml
similarity index 100%
rename from sites/vidio.com_id.channels.xml
rename to sites/vidio.com/vidio.com_id.channels.xml
diff --git a/sites/zap.co.ao.config.js b/sites/zap.co.ao/zap.co.ao.config.js
similarity index 100%
rename from sites/zap.co.ao.config.js
rename to sites/zap.co.ao/zap.co.ao.config.js
diff --git a/sites/zap.co.ao_ao.channels.xml b/sites/zap.co.ao/zap.co.ao_ao.channels.xml
similarity index 100%
rename from sites/zap.co.ao_ao.channels.xml
rename to sites/zap.co.ao/zap.co.ao_ao.channels.xml
diff --git a/sites/znbc.co.zm.config.js b/sites/znbc.co.zm/znbc.co.zm.config.js
similarity index 100%
rename from sites/znbc.co.zm.config.js
rename to sites/znbc.co.zm/znbc.co.zm.config.js
diff --git a/sites/znbc.co.zm_zm.channels.xml b/sites/znbc.co.zm/znbc.co.zm_zm.channels.xml
similarity index 100%
rename from sites/znbc.co.zm_zm.channels.xml
rename to sites/znbc.co.zm/znbc.co.zm_zm.channels.xml