diff --git a/streams/channels/ad.m3u b/channels/ad.m3u
similarity index 100%
rename from streams/channels/ad.m3u
rename to channels/ad.m3u
diff --git a/streams/channels/ae.m3u~master b/channels/ae.m3u~master
similarity index 100%
rename from streams/channels/ae.m3u~master
rename to channels/ae.m3u~master
diff --git a/streams/channels/af.m3u b/channels/af.m3u
similarity index 100%
rename from streams/channels/af.m3u
rename to channels/af.m3u
diff --git a/streams/channels/ag.m3u b/channels/ag.m3u
similarity index 100%
rename from streams/channels/ag.m3u
rename to channels/ag.m3u
diff --git a/streams/channels/al.m3u~master b/channels/al.m3u~master
similarity index 100%
rename from streams/channels/al.m3u~master
rename to channels/al.m3u~master
diff --git a/streams/channels/am.m3u~master b/channels/am.m3u~master
similarity index 100%
rename from streams/channels/am.m3u~master
rename to channels/am.m3u~master
diff --git a/streams/channels/ao.m3u b/channels/ao.m3u
similarity index 100%
rename from streams/channels/ao.m3u
rename to channels/ao.m3u
diff --git a/streams/channels/ar.m3u~master b/channels/ar.m3u~master
similarity index 100%
rename from streams/channels/ar.m3u~master
rename to channels/ar.m3u~master
diff --git a/streams/channels/at.m3u~master b/channels/at.m3u~master
similarity index 100%
rename from streams/channels/at.m3u~master
rename to channels/at.m3u~master
diff --git a/streams/channels/at_samsung.m3u b/channels/at_samsung.m3u
similarity index 100%
rename from streams/channels/at_samsung.m3u
rename to channels/at_samsung.m3u
diff --git a/streams/channels/au.m3u~master b/channels/au.m3u~master
similarity index 100%
rename from streams/channels/au.m3u~master
rename to channels/au.m3u~master
diff --git a/streams/channels/au_samsung.m3u b/channels/au_samsung.m3u
similarity index 100%
rename from streams/channels/au_samsung.m3u
rename to channels/au_samsung.m3u
diff --git a/streams/channels/aw.m3u~master b/channels/aw.m3u~master
similarity index 100%
rename from streams/channels/aw.m3u~master
rename to channels/aw.m3u~master
diff --git a/streams/channels/az.m3u~master b/channels/az.m3u~master
similarity index 100%
rename from streams/channels/az.m3u~master
rename to channels/az.m3u~master
diff --git a/streams/channels/ba.m3u~master b/channels/ba.m3u~master
similarity index 100%
rename from streams/channels/ba.m3u~master
rename to channels/ba.m3u~master
diff --git a/streams/channels/bb.m3u b/channels/bb.m3u
similarity index 100%
rename from streams/channels/bb.m3u
rename to channels/bb.m3u
diff --git a/streams/channels/bd.m3u b/channels/bd.m3u
similarity index 100%
rename from streams/channels/bd.m3u
rename to channels/bd.m3u
diff --git a/streams/channels/bd_jagobd.m3u~master b/channels/bd_jagobd.m3u~master
similarity index 100%
rename from streams/channels/bd_jagobd.m3u~master
rename to channels/bd_jagobd.m3u~master
diff --git a/streams/channels/be.m3u~master b/channels/be.m3u~master
similarity index 100%
rename from streams/channels/be.m3u~master
rename to channels/be.m3u~master
diff --git a/streams/channels/be_samsung.m3u~master b/channels/be_samsung.m3u~master
similarity index 100%
rename from streams/channels/be_samsung.m3u~master
rename to channels/be_samsung.m3u~master
diff --git a/streams/channels/bf.m3u b/channels/bf.m3u
similarity index 100%
rename from streams/channels/bf.m3u
rename to channels/bf.m3u
diff --git a/streams/channels/bg.m3u~master b/channels/bg.m3u~master
similarity index 100%
rename from streams/channels/bg.m3u~master
rename to channels/bg.m3u~master
diff --git a/streams/channels/bh.m3u b/channels/bh.m3u
similarity index 100%
rename from streams/channels/bh.m3u
rename to channels/bh.m3u
diff --git a/streams/channels/bj.m3u~master b/channels/bj.m3u~master
similarity index 100%
rename from streams/channels/bj.m3u~master
rename to channels/bj.m3u~master
diff --git a/streams/channels/bn.m3u b/channels/bn.m3u
similarity index 100%
rename from streams/channels/bn.m3u
rename to channels/bn.m3u
diff --git a/streams/channels/bo.m3u~master b/channels/bo.m3u~master
similarity index 100%
rename from streams/channels/bo.m3u~master
rename to channels/bo.m3u~master
diff --git a/streams/channels/br.m3u~master b/channels/br.m3u~master
similarity index 100%
rename from streams/channels/br.m3u~master
rename to channels/br.m3u~master
diff --git a/streams/channels/br_pluto.m3u b/channels/br_pluto.m3u
similarity index 100%
rename from streams/channels/br_pluto.m3u
rename to channels/br_pluto.m3u
diff --git a/streams/channels/br_samsung.m3u b/channels/br_samsung.m3u
similarity index 100%
rename from streams/channels/br_samsung.m3u
rename to channels/br_samsung.m3u
diff --git a/streams/channels/bs.m3u~master b/channels/bs.m3u~master
similarity index 100%
rename from streams/channels/bs.m3u~master
rename to channels/bs.m3u~master
diff --git a/streams/channels/by.m3u~master b/channels/by.m3u~master
similarity index 100%
rename from streams/channels/by.m3u~master
rename to channels/by.m3u~master
diff --git a/streams/channels/by_sluhay.m3u b/channels/by_sluhay.m3u
similarity index 100%
rename from streams/channels/by_sluhay.m3u
rename to channels/by_sluhay.m3u
diff --git a/streams/channels/ca.m3u~master b/channels/ca.m3u~master
similarity index 100%
rename from streams/channels/ca.m3u~master
rename to channels/ca.m3u~master
diff --git a/streams/channels/ca_samsung.m3u b/channels/ca_samsung.m3u
similarity index 100%
rename from streams/channels/ca_samsung.m3u
rename to channels/ca_samsung.m3u
diff --git a/streams/channels/ca_stingray.m3u b/channels/ca_stingray.m3u
similarity index 100%
rename from streams/channels/ca_stingray.m3u
rename to channels/ca_stingray.m3u
diff --git a/streams/channels/cd.m3u~master b/channels/cd.m3u~master
similarity index 100%
rename from streams/channels/cd.m3u~master
rename to channels/cd.m3u~master
diff --git a/streams/channels/cg.m3u b/channels/cg.m3u
similarity index 100%
rename from streams/channels/cg.m3u
rename to channels/cg.m3u
diff --git a/streams/channels/ch.m3u~master b/channels/ch.m3u~master
similarity index 100%
rename from streams/channels/ch.m3u~master
rename to channels/ch.m3u~master
diff --git a/streams/channels/ch_samsung.m3u b/channels/ch_samsung.m3u
similarity index 100%
rename from streams/channels/ch_samsung.m3u
rename to channels/ch_samsung.m3u
diff --git a/streams/channels/ci.m3u b/channels/ci.m3u
similarity index 100%
rename from streams/channels/ci.m3u
rename to channels/ci.m3u
diff --git a/streams/channels/cl.m3u~master b/channels/cl.m3u~master
similarity index 100%
rename from streams/channels/cl.m3u~master
rename to channels/cl.m3u~master
diff --git a/streams/channels/cm.m3u b/channels/cm.m3u
similarity index 100%
rename from streams/channels/cm.m3u
rename to channels/cm.m3u
diff --git a/streams/channels/cn.m3u~master b/channels/cn.m3u~master
similarity index 100%
rename from streams/channels/cn.m3u~master
rename to channels/cn.m3u~master
diff --git a/streams/channels/co.m3u~master b/channels/co.m3u~master
similarity index 100%
rename from streams/channels/co.m3u~master
rename to channels/co.m3u~master
diff --git a/streams/channels/cr.m3u~master b/channels/cr.m3u~master
similarity index 100%
rename from streams/channels/cr.m3u~master
rename to channels/cr.m3u~master
diff --git a/streams/channels/cu.m3u~master b/channels/cu.m3u~master
similarity index 100%
rename from streams/channels/cu.m3u~master
rename to channels/cu.m3u~master
diff --git a/streams/channels/cw.m3u~master b/channels/cw.m3u~master
similarity index 100%
rename from streams/channels/cw.m3u~master
rename to channels/cw.m3u~master
diff --git a/streams/channels/cy.m3u~master b/channels/cy.m3u~master
similarity index 100%
rename from streams/channels/cy.m3u~master
rename to channels/cy.m3u~master
diff --git a/streams/channels/cz.m3u~master b/channels/cz.m3u~master
similarity index 100%
rename from streams/channels/cz.m3u~master
rename to channels/cz.m3u~master
diff --git a/streams/channels/de.m3u~master b/channels/de.m3u~master
similarity index 100%
rename from streams/channels/de.m3u~master
rename to channels/de.m3u~master
diff --git a/streams/channels/de_samsung.m3u b/channels/de_samsung.m3u
similarity index 100%
rename from streams/channels/de_samsung.m3u
rename to channels/de_samsung.m3u
diff --git a/streams/channels/dk.m3u b/channels/dk.m3u
similarity index 100%
rename from streams/channels/dk.m3u
rename to channels/dk.m3u
diff --git a/streams/channels/dk_samsung.m3u b/channels/dk_samsung.m3u
similarity index 100%
rename from streams/channels/dk_samsung.m3u
rename to channels/dk_samsung.m3u
diff --git a/streams/channels/do.m3u~master b/channels/do.m3u~master
similarity index 100%
rename from streams/channels/do.m3u~master
rename to channels/do.m3u~master
diff --git a/streams/channels/dz.m3u b/channels/dz.m3u
similarity index 100%
rename from streams/channels/dz.m3u
rename to channels/dz.m3u
diff --git a/streams/channels/ec.m3u~master b/channels/ec.m3u~master
similarity index 100%
rename from streams/channels/ec.m3u~master
rename to channels/ec.m3u~master
diff --git a/streams/channels/ee.m3u b/channels/ee.m3u
similarity index 100%
rename from streams/channels/ee.m3u
rename to channels/ee.m3u
diff --git a/streams/channels/eg.m3u~master b/channels/eg.m3u~master
similarity index 100%
rename from streams/channels/eg.m3u~master
rename to channels/eg.m3u~master
diff --git a/streams/channels/es.m3u~master b/channels/es.m3u~master
similarity index 100%
rename from streams/channels/es.m3u~master
rename to channels/es.m3u~master
diff --git a/streams/channels/es_rakuten.m3u b/channels/es_rakuten.m3u
similarity index 100%
rename from streams/channels/es_rakuten.m3u
rename to channels/es_rakuten.m3u
diff --git a/streams/channels/es_samsung.m3u b/channels/es_samsung.m3u
similarity index 100%
rename from streams/channels/es_samsung.m3u
rename to channels/es_samsung.m3u
diff --git a/streams/channels/et.m3u b/channels/et.m3u
similarity index 100%
rename from streams/channels/et.m3u
rename to channels/et.m3u
diff --git a/streams/channels/fi.m3u~master b/channels/fi.m3u~master
similarity index 100%
rename from streams/channels/fi.m3u~master
rename to channels/fi.m3u~master
diff --git a/streams/channels/fi_samsung.m3u b/channels/fi_samsung.m3u
similarity index 100%
rename from streams/channels/fi_samsung.m3u
rename to channels/fi_samsung.m3u
diff --git a/streams/channels/fj.m3u b/channels/fj.m3u
similarity index 100%
rename from streams/channels/fj.m3u
rename to channels/fj.m3u
diff --git a/streams/channels/fo.m3u b/channels/fo.m3u
similarity index 100%
rename from streams/channels/fo.m3u
rename to channels/fo.m3u
diff --git a/streams/channels/fr.m3u~master b/channels/fr.m3u~master
similarity index 100%
rename from streams/channels/fr.m3u~master
rename to channels/fr.m3u~master
diff --git a/streams/channels/fr_samsung.m3u b/channels/fr_samsung.m3u
similarity index 100%
rename from streams/channels/fr_samsung.m3u
rename to channels/fr_samsung.m3u
diff --git a/streams/channels/ge.m3u b/channels/ge.m3u
similarity index 100%
rename from streams/channels/ge.m3u
rename to channels/ge.m3u
diff --git a/streams/channels/gh.m3u b/channels/gh.m3u
similarity index 100%
rename from streams/channels/gh.m3u
rename to channels/gh.m3u
diff --git a/streams/channels/gl.m3u b/channels/gl.m3u
similarity index 100%
rename from streams/channels/gl.m3u
rename to channels/gl.m3u
diff --git a/streams/channels/gm.m3u b/channels/gm.m3u
similarity index 100%
rename from streams/channels/gm.m3u
rename to channels/gm.m3u
diff --git a/streams/channels/gn.m3u b/channels/gn.m3u
similarity index 100%
rename from streams/channels/gn.m3u
rename to channels/gn.m3u
diff --git a/streams/channels/gp.m3u b/channels/gp.m3u
similarity index 100%
rename from streams/channels/gp.m3u
rename to channels/gp.m3u
diff --git a/streams/channels/gq.m3u b/channels/gq.m3u
similarity index 100%
rename from streams/channels/gq.m3u
rename to channels/gq.m3u
diff --git a/streams/channels/gr.m3u~master b/channels/gr.m3u~master
similarity index 100%
rename from streams/channels/gr.m3u~master
rename to channels/gr.m3u~master
diff --git a/streams/channels/gt.m3u b/channels/gt.m3u
similarity index 100%
rename from streams/channels/gt.m3u
rename to channels/gt.m3u
diff --git a/streams/channels/hk.m3u~master b/channels/hk.m3u~master
similarity index 100%
rename from streams/channels/hk.m3u~master
rename to channels/hk.m3u~master
diff --git a/streams/channels/hn.m3u~master b/channels/hn.m3u~master
similarity index 100%
rename from streams/channels/hn.m3u~master
rename to channels/hn.m3u~master
diff --git a/streams/channels/hr.m3u b/channels/hr.m3u
similarity index 100%
rename from streams/channels/hr.m3u
rename to channels/hr.m3u
diff --git a/streams/channels/ht.m3u b/channels/ht.m3u
similarity index 100%
rename from streams/channels/ht.m3u
rename to channels/ht.m3u
diff --git a/streams/channels/hu.m3u~master b/channels/hu.m3u~master
similarity index 100%
rename from streams/channels/hu.m3u~master
rename to channels/hu.m3u~master
diff --git a/streams/channels/id.m3u~master b/channels/id.m3u~master
similarity index 100%
rename from streams/channels/id.m3u~master
rename to channels/id.m3u~master
diff --git a/streams/channels/ie.m3u b/channels/ie.m3u
similarity index 100%
rename from streams/channels/ie.m3u
rename to channels/ie.m3u
diff --git a/streams/channels/ie_samsung.m3u b/channels/ie_samsung.m3u
similarity index 100%
rename from streams/channels/ie_samsung.m3u
rename to channels/ie_samsung.m3u
diff --git a/streams/channels/il.m3u~master b/channels/il.m3u~master
similarity index 100%
rename from streams/channels/il.m3u~master
rename to channels/il.m3u~master
diff --git a/streams/channels/in.m3u~master b/channels/in.m3u~master
similarity index 100%
rename from streams/channels/in.m3u~master
rename to channels/in.m3u~master
diff --git a/streams/channels/in_samsung.m3u b/channels/in_samsung.m3u
similarity index 100%
rename from streams/channels/in_samsung.m3u
rename to channels/in_samsung.m3u
diff --git a/streams/channels/iq.m3u~master b/channels/iq.m3u~master
similarity index 100%
rename from streams/channels/iq.m3u~master
rename to channels/iq.m3u~master
diff --git a/streams/channels/ir.m3u~master b/channels/ir.m3u~master
similarity index 100%
rename from streams/channels/ir.m3u~master
rename to channels/ir.m3u~master
diff --git a/streams/channels/ir_telewebion.m3u~master b/channels/ir_telewebion.m3u~master
similarity index 100%
rename from streams/channels/ir_telewebion.m3u~master
rename to channels/ir_telewebion.m3u~master
diff --git a/streams/channels/is.m3u b/channels/is.m3u
similarity index 100%
rename from streams/channels/is.m3u
rename to channels/is.m3u
diff --git a/streams/channels/it.m3u~master b/channels/it.m3u~master
similarity index 100%
rename from streams/channels/it.m3u~master
rename to channels/it.m3u~master
diff --git a/streams/channels/it_samsung.m3u b/channels/it_samsung.m3u
similarity index 100%
rename from streams/channels/it_samsung.m3u
rename to channels/it_samsung.m3u
diff --git a/streams/channels/jm.m3u b/channels/jm.m3u
similarity index 100%
rename from streams/channels/jm.m3u
rename to channels/jm.m3u
diff --git a/streams/channels/jo.m3u~master b/channels/jo.m3u~master
similarity index 100%
rename from streams/channels/jo.m3u~master
rename to channels/jo.m3u~master
diff --git a/streams/channels/jp.m3u~master b/channels/jp.m3u~master
similarity index 100%
rename from streams/channels/jp.m3u~master
rename to channels/jp.m3u~master
diff --git a/streams/channels/ke.m3u~master b/channels/ke.m3u~master
similarity index 100%
rename from streams/channels/ke.m3u~master
rename to channels/ke.m3u~master
diff --git a/streams/channels/kg.m3u b/channels/kg.m3u
similarity index 100%
rename from streams/channels/kg.m3u
rename to channels/kg.m3u
diff --git a/streams/channels/kh.m3u b/channels/kh.m3u
similarity index 100%
rename from streams/channels/kh.m3u
rename to channels/kh.m3u
diff --git a/streams/channels/kp.m3u b/channels/kp.m3u
similarity index 100%
rename from streams/channels/kp.m3u
rename to channels/kp.m3u
diff --git a/streams/channels/kr.m3u~master b/channels/kr.m3u~master
similarity index 100%
rename from streams/channels/kr.m3u~master
rename to channels/kr.m3u~master
diff --git a/streams/channels/kw.m3u~master b/channels/kw.m3u~master
similarity index 100%
rename from streams/channels/kw.m3u~master
rename to channels/kw.m3u~master
diff --git a/streams/channels/kz.m3u b/channels/kz.m3u
similarity index 100%
rename from streams/channels/kz.m3u
rename to channels/kz.m3u
diff --git a/streams/channels/la.m3u b/channels/la.m3u
similarity index 100%
rename from streams/channels/la.m3u
rename to channels/la.m3u
diff --git a/streams/channels/lb.m3u~master b/channels/lb.m3u~master
similarity index 100%
rename from streams/channels/lb.m3u~master
rename to channels/lb.m3u~master
diff --git a/streams/channels/li.m3u b/channels/li.m3u
similarity index 100%
rename from streams/channels/li.m3u
rename to channels/li.m3u
diff --git a/streams/channels/lk.m3u b/channels/lk.m3u
similarity index 100%
rename from streams/channels/lk.m3u
rename to channels/lk.m3u
diff --git a/streams/channels/lt.m3u b/channels/lt.m3u
similarity index 100%
rename from streams/channels/lt.m3u
rename to channels/lt.m3u
diff --git a/streams/channels/lu.m3u b/channels/lu.m3u
similarity index 100%
rename from streams/channels/lu.m3u
rename to channels/lu.m3u
diff --git a/streams/channels/lu_samsung.m3u b/channels/lu_samsung.m3u
similarity index 100%
rename from streams/channels/lu_samsung.m3u
rename to channels/lu_samsung.m3u
diff --git a/streams/channels/lv.m3u b/channels/lv.m3u
similarity index 100%
rename from streams/channels/lv.m3u
rename to channels/lv.m3u
diff --git a/streams/channels/ly.m3u b/channels/ly.m3u
similarity index 100%
rename from streams/channels/ly.m3u
rename to channels/ly.m3u
diff --git a/streams/channels/ma.m3u~master b/channels/ma.m3u~master
similarity index 100%
rename from streams/channels/ma.m3u~master
rename to channels/ma.m3u~master
diff --git a/streams/channels/mc.m3u b/channels/mc.m3u
similarity index 100%
rename from streams/channels/mc.m3u
rename to channels/mc.m3u
diff --git a/streams/channels/md.m3u b/channels/md.m3u
similarity index 100%
rename from streams/channels/md.m3u
rename to channels/md.m3u
diff --git a/streams/channels/me.m3u b/channels/me.m3u
similarity index 100%
rename from streams/channels/me.m3u
rename to channels/me.m3u
diff --git a/streams/channels/mk.m3u b/channels/mk.m3u
similarity index 100%
rename from streams/channels/mk.m3u
rename to channels/mk.m3u
diff --git a/streams/channels/ml.m3u b/channels/ml.m3u
similarity index 100%
rename from streams/channels/ml.m3u
rename to channels/ml.m3u
diff --git a/streams/channels/mm.m3u~master b/channels/mm.m3u~master
similarity index 100%
rename from streams/channels/mm.m3u~master
rename to channels/mm.m3u~master
diff --git a/streams/channels/mn.m3u b/channels/mn.m3u
similarity index 100%
rename from streams/channels/mn.m3u
rename to channels/mn.m3u
diff --git a/streams/channels/mo.m3u b/channels/mo.m3u
similarity index 100%
rename from streams/channels/mo.m3u
rename to channels/mo.m3u
diff --git a/streams/channels/mq.m3u b/channels/mq.m3u
similarity index 100%
rename from streams/channels/mq.m3u
rename to channels/mq.m3u
diff --git a/streams/channels/mt.m3u b/channels/mt.m3u
similarity index 100%
rename from streams/channels/mt.m3u
rename to channels/mt.m3u
diff --git a/streams/channels/mv.m3u b/channels/mv.m3u
similarity index 100%
rename from streams/channels/mv.m3u
rename to channels/mv.m3u
diff --git a/streams/channels/mw.m3u b/channels/mw.m3u
similarity index 100%
rename from streams/channels/mw.m3u
rename to channels/mw.m3u
diff --git a/streams/channels/mx.m3u~master b/channels/mx.m3u~master
similarity index 100%
rename from streams/channels/mx.m3u~master
rename to channels/mx.m3u~master
diff --git a/streams/channels/mx_samsung.m3u b/channels/mx_samsung.m3u
similarity index 100%
rename from streams/channels/mx_samsung.m3u
rename to channels/mx_samsung.m3u
diff --git a/streams/channels/my.m3u~master b/channels/my.m3u~master
similarity index 100%
rename from streams/channels/my.m3u~master
rename to channels/my.m3u~master
diff --git a/streams/channels/mz.m3u b/channels/mz.m3u
similarity index 100%
rename from streams/channels/mz.m3u
rename to channels/mz.m3u
diff --git a/streams/channels/ne.m3u b/channels/ne.m3u
similarity index 100%
rename from streams/channels/ne.m3u
rename to channels/ne.m3u
diff --git a/streams/channels/ng.m3u~master b/channels/ng.m3u~master
similarity index 100%
rename from streams/channels/ng.m3u~master
rename to channels/ng.m3u~master
diff --git a/streams/channels/ni.m3u b/channels/ni.m3u
similarity index 100%
rename from streams/channels/ni.m3u
rename to channels/ni.m3u
diff --git a/streams/channels/nl.m3u~master b/channels/nl.m3u~master
similarity index 100%
rename from streams/channels/nl.m3u~master
rename to channels/nl.m3u~master
diff --git a/streams/channels/nl_samsung.m3u b/channels/nl_samsung.m3u
similarity index 100%
rename from streams/channels/nl_samsung.m3u
rename to channels/nl_samsung.m3u
diff --git a/streams/channels/no.m3u b/channels/no.m3u
similarity index 100%
rename from streams/channels/no.m3u
rename to channels/no.m3u
diff --git a/streams/channels/no_samsung.m3u b/channels/no_samsung.m3u
similarity index 100%
rename from streams/channels/no_samsung.m3u
rename to channels/no_samsung.m3u
diff --git a/streams/channels/np.m3u b/channels/np.m3u
similarity index 100%
rename from streams/channels/np.m3u
rename to channels/np.m3u
diff --git a/streams/channels/nz.m3u~master b/channels/nz.m3u~master
similarity index 100%
rename from streams/channels/nz.m3u~master
rename to channels/nz.m3u~master
diff --git a/streams/channels/om.m3u~master b/channels/om.m3u~master
similarity index 100%
rename from streams/channels/om.m3u~master
rename to channels/om.m3u~master
diff --git a/streams/channels/pa.m3u~master b/channels/pa.m3u~master
similarity index 100%
rename from streams/channels/pa.m3u~master
rename to channels/pa.m3u~master
diff --git a/streams/channels/pe.m3u~master b/channels/pe.m3u~master
similarity index 100%
rename from streams/channels/pe.m3u~master
rename to channels/pe.m3u~master
diff --git a/streams/channels/pf.m3u b/channels/pf.m3u
similarity index 100%
rename from streams/channels/pf.m3u
rename to channels/pf.m3u
diff --git a/streams/channels/ph.m3u b/channels/ph.m3u
similarity index 100%
rename from streams/channels/ph.m3u
rename to channels/ph.m3u
diff --git a/streams/channels/pk.m3u b/channels/pk.m3u
similarity index 100%
rename from streams/channels/pk.m3u
rename to channels/pk.m3u
diff --git a/streams/channels/pl.m3u b/channels/pl.m3u
similarity index 100%
rename from streams/channels/pl.m3u
rename to channels/pl.m3u
diff --git a/streams/channels/pr.m3u~master b/channels/pr.m3u~master
similarity index 100%
rename from streams/channels/pr.m3u~master
rename to channels/pr.m3u~master
diff --git a/streams/channels/ps.m3u b/channels/ps.m3u
similarity index 100%
rename from streams/channels/ps.m3u
rename to channels/ps.m3u
diff --git a/streams/channels/pt.m3u b/channels/pt.m3u
similarity index 100%
rename from streams/channels/pt.m3u
rename to channels/pt.m3u
diff --git a/streams/channels/pt_samsung.m3u b/channels/pt_samsung.m3u
similarity index 100%
rename from streams/channels/pt_samsung.m3u
rename to channels/pt_samsung.m3u
diff --git a/streams/channels/py.m3u b/channels/py.m3u
similarity index 100%
rename from streams/channels/py.m3u
rename to channels/py.m3u
diff --git a/streams/channels/qa.m3u~master b/channels/qa.m3u~master
similarity index 100%
rename from streams/channels/qa.m3u~master
rename to channels/qa.m3u~master
diff --git a/streams/channels/ro.m3u~master b/channels/ro.m3u~master
similarity index 100%
rename from streams/channels/ro.m3u~master
rename to channels/ro.m3u~master
diff --git a/streams/channels/rs.m3u b/channels/rs.m3u
similarity index 100%
rename from streams/channels/rs.m3u
rename to channels/rs.m3u
diff --git a/streams/channels/ru.m3u~master b/channels/ru.m3u~master
similarity index 100%
rename from streams/channels/ru.m3u~master
rename to channels/ru.m3u~master
diff --git a/streams/channels/ru_catcast.m3u~master b/channels/ru_catcast.m3u~master
similarity index 100%
rename from streams/channels/ru_catcast.m3u~master
rename to channels/ru_catcast.m3u~master
diff --git a/streams/channels/ru_okkotv.m3u b/channels/ru_okkotv.m3u
similarity index 100%
rename from streams/channels/ru_okkotv.m3u
rename to channels/ru_okkotv.m3u
diff --git a/streams/channels/rw.m3u b/channels/rw.m3u
similarity index 100%
rename from streams/channels/rw.m3u
rename to channels/rw.m3u
diff --git a/streams/channels/sa.m3u~master b/channels/sa.m3u~master
similarity index 100%
rename from streams/channels/sa.m3u~master
rename to channels/sa.m3u~master
diff --git a/streams/channels/sd.m3u b/channels/sd.m3u
similarity index 100%
rename from streams/channels/sd.m3u
rename to channels/sd.m3u
diff --git a/streams/channels/se.m3u b/channels/se.m3u
similarity index 100%
rename from streams/channels/se.m3u
rename to channels/se.m3u
diff --git a/streams/channels/se_samsung.m3u b/channels/se_samsung.m3u
similarity index 100%
rename from streams/channels/se_samsung.m3u
rename to channels/se_samsung.m3u
diff --git a/streams/channels/sg.m3u b/channels/sg.m3u
similarity index 100%
rename from streams/channels/sg.m3u
rename to channels/sg.m3u
diff --git a/streams/channels/si.m3u b/channels/si.m3u
similarity index 100%
rename from streams/channels/si.m3u
rename to channels/si.m3u
diff --git a/streams/channels/sk.m3u b/channels/sk.m3u
similarity index 100%
rename from streams/channels/sk.m3u
rename to channels/sk.m3u
diff --git a/streams/channels/sl.m3u b/channels/sl.m3u
similarity index 100%
rename from streams/channels/sl.m3u
rename to channels/sl.m3u
diff --git a/streams/channels/sm.m3u b/channels/sm.m3u
similarity index 100%
rename from streams/channels/sm.m3u
rename to channels/sm.m3u
diff --git a/streams/channels/sn.m3u b/channels/sn.m3u
similarity index 100%
rename from streams/channels/sn.m3u
rename to channels/sn.m3u
diff --git a/streams/channels/so.m3u b/channels/so.m3u
similarity index 100%
rename from streams/channels/so.m3u
rename to channels/so.m3u
diff --git a/streams/channels/sv.m3u~master b/channels/sv.m3u~master
similarity index 100%
rename from streams/channels/sv.m3u~master
rename to channels/sv.m3u~master
diff --git a/streams/channels/sy.m3u b/channels/sy.m3u
similarity index 100%
rename from streams/channels/sy.m3u
rename to channels/sy.m3u
diff --git a/streams/channels/th.m3u~master b/channels/th.m3u~master
similarity index 100%
rename from streams/channels/th.m3u~master
rename to channels/th.m3u~master
diff --git a/streams/channels/tj.m3u b/channels/tj.m3u
similarity index 100%
rename from streams/channels/tj.m3u
rename to channels/tj.m3u
diff --git a/streams/channels/tm.m3u~master b/channels/tm.m3u~master
similarity index 100%
rename from streams/channels/tm.m3u~master
rename to channels/tm.m3u~master
diff --git a/streams/channels/tn.m3u b/channels/tn.m3u
similarity index 100%
rename from streams/channels/tn.m3u
rename to channels/tn.m3u
diff --git a/streams/channels/tr.m3u~master b/channels/tr.m3u~master
similarity index 100%
rename from streams/channels/tr.m3u~master
rename to channels/tr.m3u~master
diff --git a/streams/channels/tt.m3u b/channels/tt.m3u
similarity index 100%
rename from streams/channels/tt.m3u
rename to channels/tt.m3u
diff --git a/streams/channels/tw.m3u~master b/channels/tw.m3u~master
similarity index 100%
rename from streams/channels/tw.m3u~master
rename to channels/tw.m3u~master
diff --git a/streams/channels/tz.m3u b/channels/tz.m3u
similarity index 100%
rename from streams/channels/tz.m3u
rename to channels/tz.m3u
diff --git a/streams/channels/ua.m3u~master b/channels/ua.m3u~master
similarity index 100%
rename from streams/channels/ua.m3u~master
rename to channels/ua.m3u~master
diff --git a/streams/channels/ug.m3u b/channels/ug.m3u
similarity index 100%
rename from streams/channels/ug.m3u
rename to channels/ug.m3u
diff --git a/streams/channels/uk.m3u~master b/channels/uk.m3u~master
similarity index 100%
rename from streams/channels/uk.m3u~master
rename to channels/uk.m3u~master
diff --git a/streams/channels/uk_samsung.m3u b/channels/uk_samsung.m3u
similarity index 100%
rename from streams/channels/uk_samsung.m3u
rename to channels/uk_samsung.m3u
diff --git a/streams/channels/uk_sportstribal.m3u b/channels/uk_sportstribal.m3u
similarity index 100%
rename from streams/channels/uk_sportstribal.m3u
rename to channels/uk_sportstribal.m3u
diff --git a/streams/channels/unsorted.m3u~master b/channels/unsorted.m3u~master
similarity index 100%
rename from streams/channels/unsorted.m3u~master
rename to channels/unsorted.m3u~master
diff --git a/streams/channels/us.m3u~master b/channels/us.m3u~master
similarity index 100%
rename from streams/channels/us.m3u~master
rename to channels/us.m3u~master
diff --git a/streams/channels/us_adultiptv.m3u b/channels/us_adultiptv.m3u
similarity index 100%
rename from streams/channels/us_adultiptv.m3u
rename to channels/us_adultiptv.m3u
diff --git a/streams/channels/us_adultswim.m3u b/channels/us_adultswim.m3u
similarity index 100%
rename from streams/channels/us_adultswim.m3u
rename to channels/us_adultswim.m3u
diff --git a/streams/channels/us_bumblebee.m3u~master b/channels/us_bumblebee.m3u~master
similarity index 100%
rename from streams/channels/us_bumblebee.m3u~master
rename to channels/us_bumblebee.m3u~master
diff --git a/streams/channels/us_distro.m3u b/channels/us_distro.m3u
similarity index 100%
rename from streams/channels/us_distro.m3u
rename to channels/us_distro.m3u
diff --git a/streams/channels/us_filmon.m3u b/channels/us_filmon.m3u
similarity index 100%
rename from streams/channels/us_filmon.m3u
rename to channels/us_filmon.m3u
diff --git a/streams/channels/us_fubo.m3u b/channels/us_fubo.m3u
similarity index 100%
rename from streams/channels/us_fubo.m3u
rename to channels/us_fubo.m3u
diff --git a/streams/channels/us_glewedtv.m3u b/channels/us_glewedtv.m3u
similarity index 100%
rename from streams/channels/us_glewedtv.m3u
rename to channels/us_glewedtv.m3u
diff --git a/streams/channels/us_imdbtv.m3u b/channels/us_imdbtv.m3u
similarity index 100%
rename from streams/channels/us_imdbtv.m3u
rename to channels/us_imdbtv.m3u
diff --git a/streams/channels/us_klowdtv.m3u b/channels/us_klowdtv.m3u
similarity index 100%
rename from streams/channels/us_klowdtv.m3u
rename to channels/us_klowdtv.m3u
diff --git a/streams/channels/us_localbtv.m3u b/channels/us_localbtv.m3u
similarity index 100%
rename from streams/channels/us_localbtv.m3u
rename to channels/us_localbtv.m3u
diff --git a/streams/channels/us_pbs.m3u b/channels/us_pbs.m3u
similarity index 100%
rename from streams/channels/us_pbs.m3u
rename to channels/us_pbs.m3u
diff --git a/streams/channels/us_plex.m3u~master b/channels/us_plex.m3u~master
similarity index 100%
rename from streams/channels/us_plex.m3u~master
rename to channels/us_plex.m3u~master
diff --git a/streams/channels/us_pluto.m3u b/channels/us_pluto.m3u
similarity index 100%
rename from streams/channels/us_pluto.m3u
rename to channels/us_pluto.m3u
diff --git a/streams/channels/us_redbox.m3u b/channels/us_redbox.m3u
similarity index 100%
rename from streams/channels/us_redbox.m3u
rename to channels/us_redbox.m3u
diff --git a/streams/channels/us_redtraffic.m3u b/channels/us_redtraffic.m3u
similarity index 100%
rename from streams/channels/us_redtraffic.m3u
rename to channels/us_redtraffic.m3u
diff --git a/streams/channels/us_roku.m3u~master b/channels/us_roku.m3u~master
similarity index 100%
rename from streams/channels/us_roku.m3u~master
rename to channels/us_roku.m3u~master
diff --git a/streams/channels/us_samsung.m3u b/channels/us_samsung.m3u
similarity index 100%
rename from streams/channels/us_samsung.m3u
rename to channels/us_samsung.m3u
diff --git a/streams/channels/us_ssh101.m3u b/channels/us_ssh101.m3u
similarity index 100%
rename from streams/channels/us_ssh101.m3u
rename to channels/us_ssh101.m3u
diff --git a/streams/channels/us_stirr.m3u~master b/channels/us_stirr.m3u~master
similarity index 100%
rename from streams/channels/us_stirr.m3u~master
rename to channels/us_stirr.m3u~master
diff --git a/streams/channels/us_tcl.m3u b/channels/us_tcl.m3u
similarity index 100%
rename from streams/channels/us_tcl.m3u
rename to channels/us_tcl.m3u
diff --git a/streams/channels/us_tubi.m3u~master b/channels/us_tubi.m3u~master
similarity index 100%
rename from streams/channels/us_tubi.m3u~master
rename to channels/us_tubi.m3u~master
diff --git a/streams/channels/us_vizio.m3u~master b/channels/us_vizio.m3u~master
similarity index 100%
rename from streams/channels/us_vizio.m3u~master
rename to channels/us_vizio.m3u~master
diff --git a/streams/channels/us_xumo.m3u~master b/channels/us_xumo.m3u~master
similarity index 100%
rename from streams/channels/us_xumo.m3u~master
rename to channels/us_xumo.m3u~master
diff --git a/streams/channels/uy.m3u b/channels/uy.m3u
similarity index 100%
rename from streams/channels/uy.m3u
rename to channels/uy.m3u
diff --git a/streams/channels/uz.m3u b/channels/uz.m3u
similarity index 100%
rename from streams/channels/uz.m3u
rename to channels/uz.m3u
diff --git a/streams/channels/va.m3u b/channels/va.m3u
similarity index 100%
rename from streams/channels/va.m3u
rename to channels/va.m3u
diff --git a/streams/channels/ve.m3u~master b/channels/ve.m3u~master
similarity index 100%
rename from streams/channels/ve.m3u~master
rename to channels/ve.m3u~master
diff --git a/streams/channels/vn.m3u~master b/channels/vn.m3u~master
similarity index 100%
rename from streams/channels/vn.m3u~master
rename to channels/vn.m3u~master
diff --git a/streams/channels/vn_fptplay.m3u b/channels/vn_fptplay.m3u
similarity index 100%
rename from streams/channels/vn_fptplay.m3u
rename to channels/vn_fptplay.m3u
diff --git a/streams/channels/xk.m3u b/channels/xk.m3u
similarity index 100%
rename from streams/channels/xk.m3u
rename to channels/xk.m3u
diff --git a/streams/channels/ye.m3u b/channels/ye.m3u
similarity index 100%
rename from streams/channels/ye.m3u
rename to channels/ye.m3u
diff --git a/streams/channels/zm.m3u b/channels/zm.m3u
similarity index 100%
rename from streams/channels/zm.m3u
rename to channels/zm.m3u