diff --git a/plex/pmm/collections/4K_Movies_Collections.yml b/plex/pmm/collections/4KMovies/4K_Movies_Collections.yml
similarity index 100%
rename from plex/pmm/collections/4K_Movies_Collections.yml
rename to plex/pmm/collections/4KMovies/4K_Movies_Collections.yml
diff --git a/plex/pmm/collections/Movies_Collections.yml b/plex/pmm/collections/Movies/Movies_Collections.yml
similarity index 100%
rename from plex/pmm/collections/Movies_Collections.yml
rename to plex/pmm/collections/Movies/Movies_Collections.yml
diff --git a/plex/pmm/collections/Movies_Collections_In_Memoriam.yml b/plex/pmm/collections/Movies/Movies_Collections_In_Memoriam.yml
similarity index 100%
rename from plex/pmm/collections/Movies_Collections_In_Memoriam.yml
rename to plex/pmm/collections/Movies/Movies_Collections_In_Memoriam.yml
diff --git a/plex/pmm/collections/TV_Shows_Collections.yml b/plex/pmm/collections/TVShows/TV_Shows_Collections.yml
similarity index 100%
rename from plex/pmm/collections/TV_Shows_Collections.yml
rename to plex/pmm/collections/TVShows/TV_Shows_Collections.yml
diff --git a/plex/pmm/collections/TV_Shows_Collections_In_Memoriam.yml b/plex/pmm/collections/TVShows/TV_Shows_Collections_In_Memoriam.yml
similarity index 100%
rename from plex/pmm/collections/TV_Shows_Collections_In_Memoriam.yml
rename to plex/pmm/collections/TVShows/TV_Shows_Collections_In_Memoriam.yml
diff --git a/plex/pmm/collections/movies_collections_general.yml b/plex/pmm/collections/general/movies_collections_general.yml
similarity index 100%
rename from plex/pmm/collections/movies_collections_general.yml
rename to plex/pmm/collections/general/movies_collections_general.yml
diff --git a/plex/pmm/collections/shows_collections_general.yml b/plex/pmm/collections/general/shows_collections_general.yml
similarity index 100%
rename from plex/pmm/collections/shows_collections_general.yml
rename to plex/pmm/collections/general/shows_collections_general.yml
diff --git a/plex/pmm/playlists/movies_playlists_general.yml b/plex/pmm/playlists/general/movies_playlists_general.yml
similarity index 100%
rename from plex/pmm/playlists/movies_playlists_general.yml
rename to plex/pmm/playlists/general/movies_playlists_general.yml
diff --git a/plex/pmm/playlists/shows_playlists_general.yml b/plex/pmm/playlists/general/shows_playlists_general.yml
similarity index 100%
rename from plex/pmm/playlists/shows_playlists_general.yml
rename to plex/pmm/playlists/general/shows_playlists_general.yml