diff --git a/state/liquidsoap/playlists/events/Halloween.m3u b/state/playlists/events/Halloween.m3u
similarity index 100%
rename from state/liquidsoap/playlists/events/Halloween.m3u
rename to state/playlists/events/Halloween.m3u
diff --git a/state/liquidsoap/playlists/normal/Daniel/Dan - awesome.m3u b/state/playlists/normal/Daniel/Dan - awesome.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Daniel/Dan - awesome.m3u
rename to state/playlists/normal/Daniel/Dan - awesome.m3u
diff --git a/state/liquidsoap/playlists/normal/Daniel/Dan - dontstarve1.m3u b/state/playlists/normal/Daniel/Dan - dontstarve1.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Daniel/Dan - dontstarve1.m3u
rename to state/playlists/normal/Daniel/Dan - dontstarve1.m3u
diff --git a/state/liquidsoap/playlists/normal/Daniel/Dan - dubstepthingies.m3u b/state/playlists/normal/Daniel/Dan - dubstepthingies.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Daniel/Dan - dubstepthingies.m3u
rename to state/playlists/normal/Daniel/Dan - dubstepthingies.m3u
diff --git a/state/liquidsoap/playlists/normal/Daniel/Dan - electronicrealmusic.m3u b/state/playlists/normal/Daniel/Dan - electronicrealmusic.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Daniel/Dan - electronicrealmusic.m3u
rename to state/playlists/normal/Daniel/Dan - electronicrealmusic.m3u
diff --git a/state/liquidsoap/playlists/normal/Joakim/AlternativeJoa.m3u b/state/playlists/normal/Joakim/AlternativeJoa.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Joakim/AlternativeJoa.m3u
rename to state/playlists/normal/Joakim/AlternativeJoa.m3u
diff --git a/state/liquidsoap/playlists/normal/Joakim/JoakimDiverse.m3u b/state/playlists/normal/Joakim/JoakimDiverse.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Joakim/JoakimDiverse.m3u
rename to state/playlists/normal/Joakim/JoakimDiverse.m3u
diff --git a/state/liquidsoap/playlists/normal/Joakim/JoakimRemixes.m3u b/state/playlists/normal/Joakim/JoakimRemixes.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Joakim/JoakimRemixes.m3u
rename to state/playlists/normal/Joakim/JoakimRemixes.m3u
diff --git a/state/liquidsoap/playlists/normal/Musicals.m3u b/state/playlists/normal/Musicals.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Musicals.m3u
rename to state/playlists/normal/Musicals.m3u
diff --git a/state/liquidsoap/playlists/normal/Soundtracks.m3u b/state/playlists/normal/Soundtracks.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/Soundtracks.m3u
rename to state/playlists/normal/Soundtracks.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/ArianaGrande.m3u b/state/playlists/normal/artists/ArianaGrande.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/ArianaGrande.m3u
rename to state/playlists/normal/artists/ArianaGrande.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/AstridS.m3u b/state/playlists/normal/artists/AstridS.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/AstridS.m3u
rename to state/playlists/normal/artists/AstridS.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/Coldplay.m3u b/state/playlists/normal/artists/Coldplay.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/Coldplay.m3u
rename to state/playlists/normal/artists/Coldplay.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/DemiLovato.m3u b/state/playlists/normal/artists/DemiLovato.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/DemiLovato.m3u
rename to state/playlists/normal/artists/DemiLovato.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/KatyPerry.m3u b/state/playlists/normal/artists/KatyPerry.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/KatyPerry.m3u
rename to state/playlists/normal/artists/KatyPerry.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/SelenaGomez.m3u b/state/playlists/normal/artists/SelenaGomez.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/SelenaGomez.m3u
rename to state/playlists/normal/artists/SelenaGomez.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/ShawnMendes.m3u b/state/playlists/normal/artists/ShawnMendes.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/ShawnMendes.m3u
rename to state/playlists/normal/artists/ShawnMendes.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/TaylorSwift.m3u b/state/playlists/normal/artists/TaylorSwift.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/TaylorSwift.m3u
rename to state/playlists/normal/artists/TaylorSwift.m3u
diff --git a/state/liquidsoap/playlists/normal/artists/ZaraLarsson.m3u b/state/playlists/normal/artists/ZaraLarsson.m3u
similarity index 100%
rename from state/liquidsoap/playlists/normal/artists/ZaraLarsson.m3u
rename to state/playlists/normal/artists/ZaraLarsson.m3u