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