diff --git a/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs b/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs
deleted file mode 100644
index cedf781ae..000000000
--- a/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using FilterLists.Data.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace FilterLists.Data.Contexts
-{
-    public interface IFilterListsDbContext
-    {
-        DbSet<FilterList> FilterLists { get; set; }
-        DbSet<Maintainer> Maintainers { get; set; }
-        DbSet<Language> Languages { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/FilterLists.Data/Contexts/FilterListsDbContext.cs b/src/FilterLists.Data/FilterListsDbContext.cs
similarity index 91%
rename from src/FilterLists.Data/Contexts/FilterListsDbContext.cs
rename to src/FilterLists.Data/FilterListsDbContext.cs
index 4cb574e30..55af9b2bc 100644
--- a/src/FilterLists.Data/Contexts/FilterListsDbContext.cs
+++ b/src/FilterLists.Data/FilterListsDbContext.cs
@@ -2,9 +2,9 @@
 using FilterLists.Data.EntityTypeConfigurations;
 using Microsoft.EntityFrameworkCore;
 
-namespace FilterLists.Data.Contexts
+namespace FilterLists.Data
 {
-    public class FilterListsDbContext : DbContext, IFilterListsDbContext
+    public class FilterListsDbContext : DbContext
     {
         public FilterListsDbContext(DbContextOptions options)
             : base(options)
@@ -19,11 +19,13 @@ public FilterListsDbContext(DbContextOptions options)
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.ApplyConfiguration(new FilterListTypeConfiguration());
-            modelBuilder.ApplyConfiguration(new FilterListLanguageTypeConfiguration());
-            modelBuilder.ApplyConfiguration(new FilterListSoftwareTypeConfiguration());
             modelBuilder.ApplyConfiguration(new MaintainerTypeConfiguration());
             modelBuilder.ApplyConfiguration(new LanguageTypeConfiguration());
             modelBuilder.ApplyConfiguration(new SoftwareTypeConfiguration());
+
+            modelBuilder.ApplyConfiguration(new FilterListLanguageTypeConfiguration());
+            modelBuilder.ApplyConfiguration(new FilterListSoftwareTypeConfiguration());
+
             base.OnModelCreating(modelBuilder);
         }
     }
diff --git a/src/FilterLists.Data/Repositories/Implementations/FilterListRepository.cs b/src/FilterLists.Data/Repositories/Implementations/FilterListRepository.cs
index 4f1503097..73baaf3ff 100644
--- a/src/FilterLists.Data/Repositories/Implementations/FilterListRepository.cs
+++ b/src/FilterLists.Data/Repositories/Implementations/FilterListRepository.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using FilterLists.Data.Contexts;
 using FilterLists.Data.Entities;
 using FilterLists.Data.Repositories.Contracts;
 
@@ -8,7 +7,7 @@ namespace FilterLists.Data.Repositories.Implementations
 {
     public class FilterListRepository : IFilterListRepository
     {
-        private readonly IFilterListsDbContext filterListsDbContext;
+        private readonly FilterListsDbContext filterListsDbContext;
 
         public FilterListRepository(FilterListsDbContext filterListsDbContext)
         {
diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index 944032645..f8f9c9f61 100644
--- a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -1,4 +1,4 @@
-using FilterLists.Data.Contexts;
+using FilterLists.Data;
 using FilterLists.Data.Repositories.Contracts;
 using FilterLists.Data.Repositories.Implementations;
 using FilterLists.Services.Contracts;