diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
index e5f59e486..7145f2d6b 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
@@ -17,7 +17,7 @@ public class Query : IRequest<IEnumerable<LanguageVm>>
         {
         }
 
-        public class Handler : IRequestHandler<Query, IEnumerable<LanguageVm>>
+        internal class Handler : IRequestHandler<Query, IEnumerable<LanguageVm>>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -40,7 +40,7 @@ public async Task<IEnumerable<LanguageVm>> Handle(
             }
         }
 
-        public class LanguageVmProfile : Profile
+        internal class LanguageVmProfile : Profile
         {
             public LanguageVmProfile()
             {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
index 0ec56b8bf..b19cdc706 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
@@ -18,7 +18,7 @@ public class Query : IRequest<IEnumerable<LicenseVm>>
         {
         }
 
-        public class Handler : IRequestHandler<Query, IEnumerable<LicenseVm>>
+        internal class Handler : IRequestHandler<Query, IEnumerable<LicenseVm>>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -40,7 +40,7 @@ public async Task<IEnumerable<LicenseVm>> Handle(
             }
         }
 
-        public class LicenseVmProfile : Profile
+        internal class LicenseVmProfile : Profile
         {
             public LicenseVmProfile()
             {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
index 79870f246..409a9a7ea 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
@@ -23,7 +23,7 @@ public Query(int id)
             public int Id { get; }
         }
 
-        public class Handler : IRequestHandler<Query, ListDetailsVm>
+        internal class Handler : IRequestHandler<Query, ListDetailsVm>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -44,7 +44,7 @@ public async Task<ListDetailsVm> Handle(
             }
         }
 
-        public class ListDetailsVmProfile : Profile
+        internal class ListDetailsVmProfile : Profile
         {
             public ListDetailsVmProfile()
             {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
index c4d723e5a..f0adc8aac 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
@@ -18,7 +18,7 @@ public class Query : IRequest<IEnumerable<ListVm>>
         {
         }
 
-        public class Handler : IRequestHandler<Query, IEnumerable<ListVm>>
+        internal class Handler : IRequestHandler<Query, IEnumerable<ListVm>>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -40,7 +40,7 @@ public async Task<IEnumerable<ListVm>> Handle(
             }
         }
 
-        public class ListVmProfile : Profile
+        internal class ListVmProfile : Profile
         {
             public ListVmProfile()
             {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
index 94a39d5b9..1d3ea5470 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
@@ -18,7 +18,7 @@ public class Query : IRequest<IEnumerable<MaintainerVm>>
         {
         }
 
-        public class Handler : IRequestHandler<Query, IEnumerable<MaintainerVm>>
+        internal class Handler : IRequestHandler<Query, IEnumerable<MaintainerVm>>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -40,7 +40,7 @@ public async Task<IEnumerable<MaintainerVm>> Handle(
             }
         }
 
-        public class MaintainerVmProfile : Profile
+        internal class MaintainerVmProfile : Profile
         {
             public MaintainerVmProfile()
             {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
index e8b2feeed..d5d34a413 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
@@ -18,7 +18,7 @@ public class Query : IRequest<IEnumerable<SoftwareVm>>
         {
         }
 
-        public class Handler : IRequestHandler<Query, IEnumerable<SoftwareVm>>
+        internal class Handler : IRequestHandler<Query, IEnumerable<SoftwareVm>>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -40,7 +40,7 @@ public async Task<IEnumerable<SoftwareVm>> Handle(
             }
         }
 
-        public class SoftwareVmProfile : Profile
+        internal class SoftwareVmProfile : Profile
         {
             public SoftwareVmProfile()
             {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
index b5aa12e4c..8b40e5c34 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
@@ -18,7 +18,7 @@ public class Query : IRequest<IEnumerable<SyntaxVm>>
         {
         }
 
-        public class Handler : IRequestHandler<Query, IEnumerable<SyntaxVm>>
+        internal class Handler : IRequestHandler<Query, IEnumerable<SyntaxVm>>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -40,7 +40,7 @@ public async Task<IEnumerable<SyntaxVm>> Handle(
             }
         }
 
-        public class SyntaxVmProfile : Profile
+        internal class SyntaxVmProfile : Profile
         {
             public SyntaxVmProfile()
             {
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
index 610e3cf62..7f4142645 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
@@ -17,7 +17,7 @@ public class Query : IRequest<IEnumerable<TagVm>>
         {
         }
 
-        public class Handler : IRequestHandler<Query, IEnumerable<TagVm>>
+        internal class Handler : IRequestHandler<Query, IEnumerable<TagVm>>
         {
             private readonly IQueryContext _context;
             private readonly IMapper _mapper;
@@ -39,7 +39,7 @@ public async Task<IEnumerable<TagVm>> Handle(
             }
         }
 
-        public class TagVmProfile : Profile
+        internal class TagVmProfile : Profile
         {
             public TagVmProfile()
             {