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