diff --git a/Movies_Relocate.groovy b/Movies_Relocate.groovy
index 61b211e..4ac387b 100755
--- a/Movies_Relocate.groovy
+++ b/Movies_Relocate.groovy
@@ -1,7 +1,8 @@
 {
 def only_relocate=true
-//def relocationFrom="Pelis_esp/"
+def relocationFrom="Pelis_Retro/"
 @movies/init_relocate.groovy
+@common/validations.groovy
 @common/classification.groovy
 @movies/root_folders.groovy
 @movies/folder_file.groovy
diff --git a/common/classification.groovy b/common/classification.groovy
index bf16360..e09a461 100755
--- a/common/classification.groovy
+++ b/common/classification.groovy
@@ -22,10 +22,13 @@ def tieneFamiliar = genres.any{ it =~ /Familia|Family/}
 def esDocu = genres.any{ it =~ /Documental|Documentary|Reality/} && !(localize.English.n =~ /Jackass/)
 //Anime ---------- (Animacion encara no es pot perquè depen del infantil)
 def esAnime = false
-if (tieneAnimacion && prodCountries.contains("JP") && (!llengu.isEmpty() ? llengu.contains('jpn') : true)) {
+if (tieneAnimacion && llenguaOriginal=='ja') {
 	esAnime = (numPaises==1 || anime || pais=="JP") 
 	&& ["nemo"].any{!localize.English.n.toLowerCase().contains(it)}
 }
+//musica
+def esMusica = genres.any{ it =~ /Música|Music/}
+
 tipoYaSeteado = esDocu || esAnime
 
 //***** familiar vs infantil ****
@@ -113,9 +116,24 @@ if (!tipoYaSeteado && llenguaOriginal=~/es|spa/) {
 //asiaticas
 def asiatica = false
 if (!tipoYaSeteado) {
-	def paisesIntersec=0
 	def languajAsia = isMovie ? ["zh", "cn", "ko", "th", "vi", "ja", "id", "hi", "tl", "bo", "te"]
 	: ["zho", "cn", "kor", "tha", "vie", "jpn", "ind", "hin", "tgl", "bod"]
 	asiatica = languajAsia.contains(llenguaOriginal)
 	tipoYaSeteado = tipoYaSeteado || asiatica
 }
+
+def muslim = false
+//mohameds
+if (!tipoYaSeteado) {
+	def languajMohamed = ["ar", "tr", "ur"]
+	muslim = languajMohamed.contains(llenguaOriginal)
+	tipoYaSeteado = tipoYaSeteado || muslim
+}
+
+def eslavo = false
+//mohameds
+if (!tipoYaSeteado) {
+	def languajEslavo = ["pl", "ru", "uk", "be", "cs", "sk", "sl", "hr", "bs", "mk", "sr", "bg", "me"]
+	eslavo = languajEslavo.contains(llenguaOriginal)
+	tipoYaSeteado = tipoYaSeteado || eslavo
+}
\ No newline at end of file
diff --git a/common/validations.groovy b/common/validations.groovy
index 6e14ecf..4ccb57c 100755
--- a/common/validations.groovy
+++ b/common/validations.groovy
@@ -2,7 +2,7 @@
 if (ext==~/jpg|nfo|png|url/) {
 	return fn
 }
-else if (ext!="mkv" && ext!="avi" && ext!="mp4") {
+else if (ext!="mkv" && ext!="avi" && ext!="mp4" && ext!="mpg") {
 	throw new Exception("[formato_fichero_noestarndar]")
 }
 //video problems
diff --git a/common/video.groovy b/common/video.groovy
index 2b26e2a..9643e06 100755
--- a/common/video.groovy
+++ b/common/video.groovy
@@ -35,10 +35,10 @@
 	
 	if (formato_distribucion=='WEB-DL') {
 		def plataforma = fn.find( //coge el contenido que encaja
-			/(?i)\bAMZN?\b|\bNF\b|\bHBO\b|\bHBO.?MAX\b|\bHMAX\b|\bHULU\b|\bA3P\b|\bDPLY\b|\bSTARZ\b|\bFILMIN\b|\bFLMN\b|\bNETFLIX\b|\bDSN.?\b|\bDSP+?\b|\bRTVE\b|\bFLIXOL.\b|(?<!\w)M\+(?!\w)|\bSKYSHO\b/ )
+			/(?i)\bAMZN?\b|\bNF\b|\bHBO\b|\bHBO.?MAX\b|\bHMAX\b|\bHULU\b|\bA3P\b|\bDPLY\b|\bSTARZ\b|\bFILMIN\b|\bFLMN\b|\bNETFLIX\b|\bDSN.?\b|\bDSP+?\b|\bRTVE\b|\bFLIXOL.\b|(?<!\w)M\+(?!\w)|\bSKYSHO\b|\bAPTV\b|\bATVP\b/ )
 		if (plataforma!=null) {
 			plataforma = plataforma.toUpperCase()
-				.replace("MVPLUS","MV+").replace("DSNY","DSN+")
+				.replace("MVPLUS","MV+").replace("DSNY","DSN+").replace("ATVP","APTV+")
 		}
 		formato_distribucion = formato_distribucion+(plataforma!=null?(' '+plataforma):'')
 	}
diff --git a/movies/folder_file.groovy b/movies/folder_file.groovy
index 0cbfa79..54c3a6e 100755
--- a/movies/folder_file.groovy
+++ b/movies/folder_file.groovy
@@ -1,30 +1,34 @@
 //////////////////////////////////////////////
+def subfolder = folder.toString().contains('2stay') ? "stay/" : "main/"
 	//tria
-if (esDocu) ruta = ruta_docu + "main/"
-else if (esAnime) ruta = ruta_anime + "main/"
-else if (infantil) ruta = ruta_infantil + "main/"
-else if (esAnimacion) ruta = ruta_animacion + "main/"
-else if (catalana) ruta = ruta_cat + "main/"
+if (esDocu) ruta = ruta_docu + subfolder
+else if (esAnime) ruta = ruta_anime + subfolder
+else if (infantil) ruta = ruta_infantil + subfolder
+else if (esAnimacion) ruta = ruta_animacion + subfolder
+else if (catalana) ruta = ruta_cat + subfolder
 else if (espanyola) {
-	ruta = ruta_esp + "main/"
+	ruta = ruta_esp + subfolder
 	/*if (notSure) ruta += "to_observe/"
 	else if (y>2000) ruta += "sXXI/"
 	else ruta += "sXX/"*/
-} else if (latina) ruta = ruta_latina + "main/"
-else if (asiatica) ruta = ruta_asiaticas + "main/"
-else if (esFamiliar && y>1960) ruta = ruta_familiar + "main/"
+} else if (latina) ruta = ruta_latina + subfolder
+else if (asiatica) ruta = ruta_asiaticas + subfolder
+else if (muslim) ruta = ruta_muslim + subfolder
+else if (eslavo) ruta = ruta_eslavo + subfolder
+else if (esFamiliar && y>1960) ruta = ruta_familiar + subfolder
+else if (esMusica) ruta = ruta_concerts
 else if (y<1980) {
-	ruta = ruta_classic + "main/"
+	ruta = ruta_classic + subfolder
 	/*if (y>1970) ruta += "70s/"
 	else ruta += "old/"*/
 } else if (y<2000) {
-	ruta = ruta_retro + "main/"
+	ruta = ruta_retro + subfolder
 	/*if (y>=1990) ruta += "90s/"
 	else ruta += "80s/"*/
 }
 if (ruta==ruta2000) {
-	if (y>=2021) ruta = ruta_estrenos + "main/"// + "20s/"
-	else ruta += "main/"
+	if (y>=2021) ruta = ruta_estrenos + subfolder// + "20s/"
+	else ruta += subfolder
 	/*else if (y>=2010) ruta += "2010-2020/"
 	else ruta += "2000-2010/"*/
 } 
diff --git a/movies/root_folders.groovy b/movies/root_folders.groovy
index d1861eb..d33d230 100755
--- a/movies/root_folders.groovy
+++ b/movies/root_folders.groovy
@@ -1,5 +1,6 @@
 /** RUTAS **/
 def root = {try {hardlink} catch (err) {false}}() ? '/data/media/movies/' : '/pelis/'
+def root_live = '/data/media/live/'
 def ruta2000 = root+"Pelis_2000/"
 def ruta = ruta2000
 def ruta_docu = root+"Documentales/"
@@ -14,6 +15,9 @@ def ruta_retro = root+"Pelis_Retro/"
 def ruta_estrenos = root+"Pelis_NewAge/"
 def ruta_classic = root+"Pelis_Classic/"
 def ruta_asiaticas = root+"Pelis_Asia/"
+def ruta_muslim = root+"Pelis_Muslim/"
+def ruta_eslavo = root+"Pelis_Eslavo/"
+def ruta_concerts = root_live+"concerts/"
 def rutaKO = root+"error/"
 /**********/
 
diff --git a/series/root_folders.groovy b/series/root_folders.groovy
index 50e60fe..ce352da 100755
--- a/series/root_folders.groovy
+++ b/series/root_folders.groovy
@@ -1,17 +1,19 @@
 def root = {try {hardlink} catch (err) {false}}() ? '/data/media/tv/' : '/series/'
+def tostay = folder.toString().contains('stay/')
+def subfolder = tostay ? "stay/" : "main/"
 
-def rutaSeries = root+ 'Series/new/'
-def ruta_docu = root+'Series_Docu/main/'
-def ruta_animacion = root+'Series_Animacio/main/'
-def ruta_anime = root+'Series_Anime/main/'
-def ruta_asia = root+'Series_Asia/main/'
-def ruta_antiguas = root+'Series_Retro/main/'
-def ruta_esp = root+'Series_Hispano/main/'
-def ruta_cat = root+'Series_Catala/main/'
-def ruta_latina = root+'Series_lat/main/'
-def ruta_teen = root+'Series_familiar/main/'
-def ruta_infantil = root+'Series_Infantil/main/'
-def ruta_programastv = root+'programas_tv/main/'
+def rutaSeries = root+ 'Series/' + (tostay ? 'stay/' : 'new/')
+def ruta_docu = root+'Series_Docu/' + subfolder
+def ruta_animacion = root+'Series_Animacio/' + subfolder
+def ruta_anime = root+'Series_Anime/' + subfolder
+def ruta_asia = root+'Series_Asia/' + subfolder
+def ruta_antiguas = root+'Series_Retro/' + subfolder
+def ruta_esp = root+'Series_Hispano/' + subfolder
+def ruta_cat = root+'Series_Catala/' + subfolder
+def ruta_latina = root+'Series_lat/' + subfolder
+def ruta_teen = root+'Series_familiar/' + subfolder
+def ruta_infantil = root+'Series_Infantil/' + subfolder
+def ruta_programastv = root+'programas_tv/' + subfolder
 
 def rutaKO = root+'error/'
 def ruta = rutaSeries