diff --git a/db/db.go b/db/db.go
index 691eaa11..85c76baa 100644
--- a/db/db.go
+++ b/db/db.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/deluan/navidrome/conf"
-	_ "github.com/deluan/navidrome/db/migration"
+	_ "github.com/deluan/navidrome/db/migrations"
 	"github.com/deluan/navidrome/log"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/pressly/goose"
diff --git a/db/migration/20200130083147_create_schema.go b/db/migrations/20200130083147_create_schema.go
similarity index 99%
rename from db/migration/20200130083147_create_schema.go
rename to db/migrations/20200130083147_create_schema.go
index 56babb34..953a871f 100644
--- a/db/migration/20200130083147_create_schema.go
+++ b/db/migrations/20200130083147_create_schema.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200131183653_standardize_item_type.go b/db/migrations/20200131183653_standardize_item_type.go
similarity index 98%
rename from db/migration/20200131183653_standardize_item_type.go
rename to db/migrations/20200131183653_standardize_item_type.go
index db936cb6..c46dda3b 100644
--- a/db/migration/20200131183653_standardize_item_type.go
+++ b/db/migrations/20200131183653_standardize_item_type.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200208222418_add_defaults_to_annotations.go b/db/migrations/20200208222418_add_defaults_to_annotations.go
similarity index 98%
rename from db/migration/20200208222418_add_defaults_to_annotations.go
rename to db/migrations/20200208222418_add_defaults_to_annotations.go
index 70191d49..83a8f0d6 100644
--- a/db/migration/20200208222418_add_defaults_to_annotations.go
+++ b/db/migrations/20200208222418_add_defaults_to_annotations.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200220143731_change_duration_to_float.go b/db/migrations/20200220143731_change_duration_to_float.go
similarity index 99%
rename from db/migration/20200220143731_change_duration_to_float.go
rename to db/migrations/20200220143731_change_duration_to_float.go
index 288a792b..07954cfc 100644
--- a/db/migration/20200220143731_change_duration_to_float.go
+++ b/db/migrations/20200220143731_change_duration_to_float.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200310171621_enable_search_by_albumartist.go b/db/migrations/20200310171621_enable_search_by_albumartist.go
similarity index 94%
rename from db/migration/20200310171621_enable_search_by_albumartist.go
rename to db/migrations/20200310171621_enable_search_by_albumartist.go
index bdfc91d5..e7965c9e 100644
--- a/db/migration/20200310171621_enable_search_by_albumartist.go
+++ b/db/migrations/20200310171621_enable_search_by_albumartist.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200310181627_add_transcoding_and_player_tables.go b/db/migrations/20200310181627_add_transcoding_and_player_tables.go
similarity index 98%
rename from db/migration/20200310181627_add_transcoding_and_player_tables.go
rename to db/migrations/20200310181627_add_transcoding_and_player_tables.go
index 744eec3b..c40a482f 100644
--- a/db/migration/20200310181627_add_transcoding_and_player_tables.go
+++ b/db/migrations/20200310181627_add_transcoding_and_player_tables.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200319211049_merge_search_into_main_tables.go b/db/migrations/20200319211049_merge_search_into_main_tables.go
similarity index 97%
rename from db/migration/20200319211049_merge_search_into_main_tables.go
rename to db/migrations/20200319211049_merge_search_into_main_tables.go
index 8e33063d..72edbdb6 100644
--- a/db/migration/20200319211049_merge_search_into_main_tables.go
+++ b/db/migrations/20200319211049_merge_search_into_main_tables.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200325185135_add_album_artist_id.go b/db/migrations/20200325185135_add_album_artist_id.go
similarity index 97%
rename from db/migration/20200325185135_add_album_artist_id.go
rename to db/migrations/20200325185135_add_album_artist_id.go
index 213494ba..bdb07a85 100644
--- a/db/migration/20200325185135_add_album_artist_id.go
+++ b/db/migrations/20200325185135_add_album_artist_id.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200326090707_fix_album_artists_importing.go b/db/migrations/20200326090707_fix_album_artists_importing.go
similarity index 94%
rename from db/migration/20200326090707_fix_album_artists_importing.go
rename to db/migrations/20200326090707_fix_album_artists_importing.go
index 0608dbee..9f63c3cd 100644
--- a/db/migration/20200326090707_fix_album_artists_importing.go
+++ b/db/migrations/20200326090707_fix_album_artists_importing.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200327193744_add_year_range_to_album.go b/db/migrations/20200327193744_add_year_range_to_album.go
similarity index 99%
rename from db/migration/20200327193744_add_year_range_to_album.go
rename to db/migrations/20200327193744_add_year_range_to_album.go
index 5f201ece..0b849589 100644
--- a/db/migration/20200327193744_add_year_range_to_album.go
+++ b/db/migrations/20200327193744_add_year_range_to_album.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200404214704_add_indexes.go b/db/migrations/20200404214704_add_indexes.go
similarity index 96%
rename from db/migration/20200404214704_add_indexes.go
rename to db/migrations/20200404214704_add_indexes.go
index 6fb141e6..d0047370 100644
--- a/db/migration/20200404214704_add_indexes.go
+++ b/db/migrations/20200404214704_add_indexes.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200409002249_enable_search_by_tracks_artists.go b/db/migrations/20200409002249_enable_search_by_tracks_artists.go
similarity index 95%
rename from db/migration/20200409002249_enable_search_by_tracks_artists.go
rename to db/migrations/20200409002249_enable_search_by_tracks_artists.go
index 7b67c6f2..503291b8 100644
--- a/db/migration/20200409002249_enable_search_by_tracks_artists.go
+++ b/db/migrations/20200409002249_enable_search_by_tracks_artists.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200411164603_add_created_and_updated_fields_to_playlists.go b/db/migrations/20200411164603_add_created_and_updated_fields_to_playlists.go
similarity index 95%
rename from db/migration/20200411164603_add_created_and_updated_fields_to_playlists.go
rename to db/migrations/20200411164603_add_created_and_updated_fields_to_playlists.go
index 0ccfa08f..8afe541f 100644
--- a/db/migration/20200411164603_add_created_and_updated_fields_to_playlists.go
+++ b/db/migrations/20200411164603_add_created_and_updated_fields_to_playlists.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200418110522_reindex_to_fix_album_years.go b/db/migrations/20200418110522_reindex_to_fix_album_years.go
similarity index 94%
rename from db/migration/20200418110522_reindex_to_fix_album_years.go
rename to db/migrations/20200418110522_reindex_to_fix_album_years.go
index f1c23d31..e9a542a1 100644
--- a/db/migration/20200418110522_reindex_to_fix_album_years.go
+++ b/db/migrations/20200418110522_reindex_to_fix_album_years.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200419222708_reindex_to_change_full_text_search.go b/db/migrations/20200419222708_reindex_to_change_full_text_search.go
similarity index 94%
rename from db/migration/20200419222708_reindex_to_change_full_text_search.go
rename to db/migrations/20200419222708_reindex_to_change_full_text_search.go
index e713f696..55b41aa9 100644
--- a/db/migration/20200419222708_reindex_to_change_full_text_search.go
+++ b/db/migrations/20200419222708_reindex_to_change_full_text_search.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200423204116_add_sort_fields.go b/db/migrations/20200423204116_add_sort_fields.go
similarity index 98%
rename from db/migration/20200423204116_add_sort_fields.go
rename to db/migrations/20200423204116_add_sort_fields.go
index 08632598..d20c399e 100644
--- a/db/migration/20200423204116_add_sort_fields.go
+++ b/db/migrations/20200423204116_add_sort_fields.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200508093059_add_artist_song_count.go b/db/migrations/20200508093059_add_artist_song_count.go
similarity index 96%
rename from db/migration/20200508093059_add_artist_song_count.go
rename to db/migrations/20200508093059_add_artist_song_count.go
index 29d2f0ed..56c1e683 100644
--- a/db/migration/20200508093059_add_artist_song_count.go
+++ b/db/migrations/20200508093059_add_artist_song_count.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200512104202_add_disc_subtitle.go b/db/migrations/20200512104202_add_disc_subtitle.go
similarity index 96%
rename from db/migration/20200512104202_add_disc_subtitle.go
rename to db/migrations/20200512104202_add_disc_subtitle.go
index eeed3582..cba8817b 100644
--- a/db/migration/20200512104202_add_disc_subtitle.go
+++ b/db/migrations/20200512104202_add_disc_subtitle.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200516140647_add_playlist_tracks_table.go b/db/migrations/20200516140647_add_playlist_tracks_table.go
similarity index 99%
rename from db/migration/20200516140647_add_playlist_tracks_table.go
rename to db/migrations/20200516140647_add_playlist_tracks_table.go
index 6cbdebe7..b7df89fb 100644
--- a/db/migration/20200516140647_add_playlist_tracks_table.go
+++ b/db/migrations/20200516140647_add_playlist_tracks_table.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200608153717_referential_integrity.go b/db/migrations/20200608153717_referential_integrity.go
similarity index 99%
rename from db/migration/20200608153717_referential_integrity.go
rename to db/migrations/20200608153717_referential_integrity.go
index 2ac551b7..3e42c061 100644
--- a/db/migration/20200608153717_referential_integrity.go
+++ b/db/migrations/20200608153717_referential_integrity.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200706231659_add_default_transcodings.go b/db/migrations/20200706231659_add_default_transcodings.go
similarity index 97%
rename from db/migration/20200706231659_add_default_transcodings.go
rename to db/migrations/20200706231659_add_default_transcodings.go
index 574c8a8e..3c5c2d4e 100644
--- a/db/migration/20200706231659_add_default_transcodings.go
+++ b/db/migrations/20200706231659_add_default_transcodings.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200710211442_add_playlist_path.go b/db/migrations/20200710211442_add_playlist_path.go
similarity index 95%
rename from db/migration/20200710211442_add_playlist_path.go
rename to db/migrations/20200710211442_add_playlist_path.go
index 7249a325..e2ee0225 100644
--- a/db/migration/20200710211442_add_playlist_path.go
+++ b/db/migrations/20200710211442_add_playlist_path.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200731095603_create_play_queues_table.go b/db/migrations/20200731095603_create_play_queues_table.go
similarity index 97%
rename from db/migration/20200731095603_create_play_queues_table.go
rename to db/migrations/20200731095603_create_play_queues_table.go
index db7f641f..4d299afd 100644
--- a/db/migration/20200731095603_create_play_queues_table.go
+++ b/db/migrations/20200731095603_create_play_queues_table.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/20200801101355_create_bookmark_table.go b/db/migrations/20200801101355_create_bookmark_table.go
similarity index 98%
rename from db/migration/20200801101355_create_bookmark_table.go
rename to db/migrations/20200801101355_create_bookmark_table.go
index 3f41f18a..e8091bc1 100644
--- a/db/migration/20200801101355_create_bookmark_table.go
+++ b/db/migrations/20200801101355_create_bookmark_table.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"
diff --git a/db/migration/migration.go b/db/migrations/migration.go
similarity index 98%
rename from db/migration/migration.go
rename to db/migrations/migration.go
index 2c185f54..71af0669 100644
--- a/db/migration/migration.go
+++ b/db/migrations/migration.go
@@ -1,4 +1,4 @@
-package migration
+package migrations
 
 import (
 	"database/sql"