diff --git a/Oqtane.Server/Repository/AliasRepository.cs b/Oqtane.Server/Repository/AliasRepository.cs
index e7dbd1c6..38b9925a 100644
--- a/Oqtane.Server/Repository/AliasRepository.cs
+++ b/Oqtane.Server/Repository/AliasRepository.cs
@@ -8,6 +8,17 @@ using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IAliasRepository
+    {
+        IEnumerable<Alias> GetAliases();
+        Alias AddAlias(Alias alias);
+        Alias UpdateAlias(Alias alias);
+        Alias GetAlias(int aliasId);
+        Alias GetAlias(int aliasId, bool tracking);
+        Alias GetAlias(string url);
+        void DeleteAlias(int aliasId);
+    }
+
     public class AliasRepository : IAliasRepository
     {
         private MasterDBContext _db;
diff --git a/Oqtane.Server/Repository/Interfaces/IDBContextDependencies.cs b/Oqtane.Server/Repository/Context/IDBContextDependencies.cs
similarity index 100%
rename from Oqtane.Server/Repository/Interfaces/IDBContextDependencies.cs
rename to Oqtane.Server/Repository/Context/IDBContextDependencies.cs
diff --git a/Oqtane.Server/Repository/FileRepository.cs b/Oqtane.Server/Repository/FileRepository.cs
index fedbdc6e..def51519 100644
--- a/Oqtane.Server/Repository/FileRepository.cs
+++ b/Oqtane.Server/Repository/FileRepository.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
-using Oqtane.Extensions;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Shared;
@@ -10,6 +9,21 @@ using File = Oqtane.Models.File;
 
 namespace Oqtane.Repository
 {
+    public interface IFileRepository
+    {
+        IEnumerable<File> GetFiles(int folderId);
+        IEnumerable<File> GetFiles(int folderId, bool tracking);
+        File AddFile(File file);
+        File UpdateFile(File file);
+        File GetFile(int fileId);
+        File GetFile(int fileId, bool tracking);
+        File GetFile(int folderId, string fileName);
+        File GetFile(int siteId, string folderPath, string fileName);
+        void DeleteFile(int fileId);
+        string GetFilePath(int fileId);
+        string GetFilePath(File file);
+    }
+
     public class FileRepository : IFileRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/FolderRepository.cs b/Oqtane.Server/Repository/FolderRepository.cs
index c4dfb8ed..d00a6a7c 100644
--- a/Oqtane.Server/Repository/FolderRepository.cs
+++ b/Oqtane.Server/Repository/FolderRepository.cs
@@ -2,13 +2,25 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
-using Oqtane.Extensions;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IFolderRepository
+    {
+        IEnumerable<Folder> GetFolders(int siteId);
+        Folder AddFolder(Folder folder);
+        Folder UpdateFolder(Folder folder);
+        Folder GetFolder(int folderId);
+        Folder GetFolder(int folderId, bool tracking);
+        Folder GetFolder(int siteId, string path);
+        void DeleteFolder(int folderId);
+        string GetFolderPath(int folderId);
+        string GetFolderPath(Folder folder);
+    }
+
     public class FolderRepository : IFolderRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs b/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
deleted file mode 100644
index 81a42d68..00000000
--- a/Oqtane.Server/Repository/Interfaces/IAliasRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IAliasRepository
-    {
-        IEnumerable<Alias> GetAliases();
-        Alias AddAlias(Alias alias);
-        Alias UpdateAlias(Alias alias);
-        Alias GetAlias(int aliasId);
-        Alias GetAlias(int aliasId, bool tracking);
-        Alias GetAlias(string url);
-        void DeleteAlias(int aliasId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs b/Oqtane.Server/Repository/Interfaces/IFileRepository.cs
deleted file mode 100644
index 214b03d8..00000000
--- a/Oqtane.Server/Repository/Interfaces/IFileRepository.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IFileRepository
-    {
-        IEnumerable<File> GetFiles(int folderId);
-        IEnumerable<File> GetFiles(int folderId, bool tracking);
-        File AddFile(File file);
-        File UpdateFile(File file);
-        File GetFile(int fileId);
-        File GetFile(int fileId, bool tracking);
-        File GetFile(int folderId, string fileName);
-        File GetFile(int siteId, string folderPath, string fileName);
-        void DeleteFile(int fileId);
-        string GetFilePath(int fileId);
-        string GetFilePath(File file);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs b/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs
deleted file mode 100644
index dba914a7..00000000
--- a/Oqtane.Server/Repository/Interfaces/IFolderRepository.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IFolderRepository
-    {
-        IEnumerable<Folder> GetFolders(int siteId);
-        Folder AddFolder(Folder folder);
-        Folder UpdateFolder(Folder folder);
-        Folder GetFolder(int folderId);
-        Folder GetFolder(int folderId, bool tracking);
-        Folder GetFolder(int siteId, string path);
-        void DeleteFolder(int folderId);
-        string GetFolderPath(int folderId);
-        string GetFolderPath(Folder folder);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs
deleted file mode 100644
index 2c092e7a..00000000
--- a/Oqtane.Server/Repository/Interfaces/IJobLogRepository.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IJobLogRepository
-    {
-        IEnumerable<JobLog> GetJobLogs();
-        IEnumerable<JobLog> GetJobLogs(int jobId);
-        JobLog AddJobLog(JobLog jobLog);
-        JobLog UpdateJobLog(JobLog jobLog);
-        JobLog GetJobLog(int jobLogId);
-        void DeleteJobLog(int jobLogId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs b/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
deleted file mode 100644
index e45b0231..00000000
--- a/Oqtane.Server/Repository/Interfaces/IJobRepository.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IJobRepository
-    {
-        IEnumerable<Job> GetJobs();
-        Job AddJob(Job job);
-        Job UpdateJob(Job job);
-        Job GetJob(int jobId);
-        Job GetJob(int jobId, bool tracking);
-        void DeleteJob(int jobId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ILanguageRepository.cs b/Oqtane.Server/Repository/Interfaces/ILanguageRepository.cs
deleted file mode 100644
index 14619121..00000000
--- a/Oqtane.Server/Repository/Interfaces/ILanguageRepository.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface ILanguageRepository
-    {
-        IEnumerable<Language> GetLanguages(int siteId);
-
-        Language AddLanguage(Language language);
-
-        void UpdateLanguage(Language language);
-
-        Language GetLanguage(int languageId);
-
-        void DeleteLanguage(int languageId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs b/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
deleted file mode 100644
index 918785f2..00000000
--- a/Oqtane.Server/Repository/Interfaces/ILogRepository.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface ILogRepository
-    {
-        IEnumerable<Log> GetLogs(int siteId, string level, string function, int rows);
-        Log GetLog(int logId);
-        void AddLog(Log log);
-        int DeleteLogs(int siteId, int age);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
deleted file mode 100644
index eb4f45d9..00000000
--- a/Oqtane.Server/Repository/Interfaces/IModuleDefinitionRepository.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IModuleDefinitionRepository
-    {
-        IEnumerable<ModuleDefinition> GetModuleDefinitions();
-        IEnumerable<ModuleDefinition> GetModuleDefinitions(int siteId);
-        ModuleDefinition GetModuleDefinition(int moduleDefinitionId, int siteId);
-        void UpdateModuleDefinition(ModuleDefinition moduleDefinition);
-        void DeleteModuleDefinition(int moduleDefinitionId);
-        ModuleDefinition FilterModuleDefinition(ModuleDefinition moduleDefinition);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
deleted file mode 100644
index 08923ecd..00000000
--- a/Oqtane.Server/Repository/Interfaces/IModuleRepository.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IModuleRepository
-    {
-        IEnumerable<Module> GetModules(int siteId);
-        Module AddModule(Module module);
-        Module UpdateModule(Module module);
-        Module GetModule(int moduleId);
-        Module GetModule(int moduleId, bool tracking);
-        void DeleteModule(int moduleId);
-        string ExportModule(int moduleId);
-        bool ImportModule(int moduleId, string content);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs b/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs
deleted file mode 100644
index 948d7b53..00000000
--- a/Oqtane.Server/Repository/Interfaces/INotificationRepository.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface INotificationRepository
-    {
-        IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId);
-        IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId, int count, bool isRead);
-        int GetNotificationCount(int siteId, int fromUserId, int toUserId, bool isRead);
-        Notification AddNotification(Notification notification);
-        Notification UpdateNotification(Notification notification);
-        Notification GetNotification(int notificationId);
-        Notification GetNotification(int notificationId, bool tracking);
-        void DeleteNotification(int notificationId);
-        int DeleteNotifications(int siteId, int age);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
deleted file mode 100644
index a3ac66e5..00000000
--- a/Oqtane.Server/Repository/Interfaces/IPageModuleRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IPageModuleRepository
-    {
-        IEnumerable<PageModule> GetPageModules(int siteId);
-        PageModule AddPageModule(PageModule pageModule);
-        PageModule UpdatePageModule(PageModule pageModule);
-        PageModule GetPageModule(int pageModuleId);
-        PageModule GetPageModule(int pageModuleId, bool tracking);
-        PageModule GetPageModule(int pageId, int moduleId);
-        void DeletePageModule(int pageModuleId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs b/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
deleted file mode 100644
index 12caca4c..00000000
--- a/Oqtane.Server/Repository/Interfaces/IPageRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IPageRepository
-    {
-        IEnumerable<Page> GetPages(int siteId);
-        Page AddPage(Page page);
-        Page UpdatePage(Page page);
-        Page GetPage(int pageId);
-        Page GetPage(int pageId, bool tracking);
-        Page GetPage(string path, int siteId);
-        void DeletePage(int pageId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs b/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs
deleted file mode 100644
index a3dc7358..00000000
--- a/Oqtane.Server/Repository/Interfaces/IPermissionRepository.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using System.Security.Policy;
-using Oqtane.Models;
-
-// ReSharper disable once CheckNamespace
-namespace Oqtane.Repository
-{
-    public interface IPermissionRepository
-{
-        IEnumerable<Permission> GetPermissions(int siteId, string entityName);
-        IEnumerable<Permission> GetPermissions(int siteId, string entityName, string permissionName);
-        IEnumerable<Permission> GetPermissions(int siteId, string entityName, int entityId);
-        IEnumerable<Permission> GetPermissions(int siteId, string entityName, int entityId, string permissionName);             
-        Permission AddPermission(Permission permission);
-        Permission UpdatePermission(Permission permission);
-        void UpdatePermissions(int siteId, string entityName, int entityId, List<Permission> permissions);
-        Permission GetPermission(int permissionId);
-        void DeletePermission(int permissionId);
-        void DeletePermissions(int siteId, string entityName, int entityId);
-     }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs b/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
deleted file mode 100644
index 95405c96..00000000
--- a/Oqtane.Server/Repository/Interfaces/IProfileRepository.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IProfileRepository
-    {
-        IEnumerable<Profile> GetProfiles(int siteId);
-        Profile AddProfile(Profile profile);
-        Profile UpdateProfile(Profile profile);
-        Profile GetProfile(int profileId);
-        Profile GetProfile(int profileId, bool tracking);
-        void DeleteProfile(int profileId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
deleted file mode 100644
index 1b2ea0e4..00000000
--- a/Oqtane.Server/Repository/Interfaces/IRoleRepository.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IRoleRepository
-    {
-        IEnumerable<Role> GetRoles(int siteId);
-        IEnumerable<Role> GetRoles(int siteId, bool includeGlobalRoles);
-        Role AddRole(Role role);
-        Role UpdateRole(Role role);
-        Role GetRole(int roleId);
-        Role GetRole(int roleId, bool tracking);
-        void DeleteRole(int roleId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ISearchContentRepository.cs b/Oqtane.Server/Repository/Interfaces/ISearchContentRepository.cs
deleted file mode 100644
index 022c8012..00000000
--- a/Oqtane.Server/Repository/Interfaces/ISearchContentRepository.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface ISearchContentRepository
-    {
-        Task<IEnumerable<SearchContent>> GetSearchContentsAsync(SearchQuery searchQuery);
-        SearchContent AddSearchContent(SearchContent searchContent);
-        void DeleteSearchContent(int searchContentId);
-        void DeleteSearchContent(string entityName, string entryId);
-        void DeleteSearchContent(string uniqueKey);
-        void DeleteAllSearchContent(int siteId);
-
-        SearchWord GetSearchWord(string word);
-        SearchWord AddSearchWord(SearchWord searchWord);
-
-        IEnumerable<SearchContentWord> GetSearchContentWords(int searchContentId);
-        SearchContentWord AddSearchContentWord(SearchContentWord searchContentWord);
-        SearchContentWord UpdateSearchContentWord(SearchContentWord searchContentWord);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
deleted file mode 100644
index 7315f633..00000000
--- a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-using Oqtane.Shared;
-
-namespace Oqtane.Repository
-{
-    public interface ISettingRepository
-    {
-        IEnumerable<Setting> GetSettings(string entityName);
-        IEnumerable<Setting> GetSettings(string entityName, int entityId);
-        IEnumerable<Setting> GetSettings(string entityName1, int entityId1, string entityName2, int entityId2);
-        Setting AddSetting(Setting setting);
-        Setting UpdateSetting(Setting setting);
-        Setting GetSetting(string entityName, int settingId);
-        Setting GetSetting(string entityName, int entityId, string settingName);
-        void DeleteSetting(string entityName, int settingId);
-        void DeleteSettings(string entityName, int entityId);
-        string GetSettingValue(IEnumerable<Setting> settings, string settingName, string defaultValue);
-        string GetSettingValue(string entityName, int entityId, string settingName, string defaultValue);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
deleted file mode 100644
index 3ef66893..00000000
--- a/Oqtane.Server/Repository/Interfaces/ISiteRepository.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface ISiteRepository
-    {
-        IEnumerable<Site> GetSites();
-        Site AddSite(Site site);
-        Site UpdateSite(Site site);
-        Site GetSite(int siteId);
-        Site GetSite(int siteId, bool tracking);
-        void DeleteSite(int siteId);
-
-        void InitializeSite(Alias alias);
-        void CreatePages(Site site, List<PageTemplate> pageTemplates, Alias alias);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs b/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs
deleted file mode 100644
index 659226ff..00000000
--- a/Oqtane.Server/Repository/Interfaces/ISiteTemplateRepository.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface ISiteTemplateRepository
-    {
-        IEnumerable<SiteTemplate> GetSiteTemplates();
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs b/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs
deleted file mode 100644
index d4d87201..00000000
--- a/Oqtane.Server/Repository/Interfaces/ISqlRepository.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Data;
-using System.Reflection;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface ISqlRepository
-    {
-        void ExecuteScript(Tenant tenant, string script);
-
-        bool ExecuteScript(string connectionString, string databaseType, Assembly assembly, string filename);
-
-        bool ExecuteScript(Tenant tenant, Assembly assembly, string filename);
-
-        int ExecuteNonQuery(Tenant tenant, string query);
-
-        int ExecuteNonQuery(string connectionString, string databaseType, string query);
-
-        IDataReader ExecuteReader(Tenant tenant, string query);
-
-        IDataReader ExecuteReader(string DBType, string DBConnectionString, string query);
-
-        string GetScriptFromAssembly(Assembly assembly, string fileName);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs b/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs
deleted file mode 100644
index 5993eb63..00000000
--- a/Oqtane.Server/Repository/Interfaces/ITenantRepository.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface ITenantRepository
-    {
-        IEnumerable<Tenant> GetTenants();
-        Tenant AddTenant(Tenant tenant);
-        Tenant UpdateTenant(Tenant tenant);
-        Tenant GetTenant(int tenantId);
-        void DeleteTenant(int tenantId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs b/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs
deleted file mode 100644
index bc3a48eb..00000000
--- a/Oqtane.Server/Repository/Interfaces/ITenantResolver.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    // class deprecated and replaced by ITenantManager
-    public interface ITenantResolver
-    {
-        Alias GetAlias();
-        Tenant GetTenant();
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs b/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs
deleted file mode 100644
index b8d98aee..00000000
--- a/Oqtane.Server/Repository/Interfaces/IThemeRepository.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IThemeRepository
-    {
-        IEnumerable<Theme> GetThemes();
-        Theme GetTheme(int themeId, int siteId);
-        void UpdateTheme(Theme theme);
-        void DeleteTheme(int themeId);
-        List<Theme> FilterThemes(List<Theme> themes);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IUrlMappingRepository.cs b/Oqtane.Server/Repository/Interfaces/IUrlMappingRepository.cs
deleted file mode 100644
index ca056484..00000000
--- a/Oqtane.Server/Repository/Interfaces/IUrlMappingRepository.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IUrlMappingRepository
-    {
-        IEnumerable<UrlMapping> GetUrlMappings(int siteId, bool isMapped);
-        UrlMapping AddUrlMapping(UrlMapping urlMapping);
-        UrlMapping UpdateUrlMapping(UrlMapping urlMapping);
-        UrlMapping GetUrlMapping(int urlMappingId);
-        UrlMapping GetUrlMapping(int urlMappingId, bool tracking);
-        UrlMapping GetUrlMapping(int siteId, string url);
-        void DeleteUrlMapping(int urlMappingId);
-        int DeleteUrlMappings(int siteId, int age);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
deleted file mode 100644
index 89ed4204..00000000
--- a/Oqtane.Server/Repository/Interfaces/IUserRepository.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IUserRepository
-    {
-        IEnumerable<User> GetUsers();
-        User AddUser(User user);
-        User UpdateUser(User user);
-        User GetUser(int userId);
-        User GetUser(int userId, bool tracking);
-        User GetUser(string username);
-        User GetUser(string username, string email);
-        void DeleteUser(int userId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs b/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
deleted file mode 100644
index 7db22b4e..00000000
--- a/Oqtane.Server/Repository/Interfaces/IUserRoleRepository.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IUserRoleRepository
-    {
-        IEnumerable<UserRole> GetUserRoles(int siteId);
-        IEnumerable<UserRole> GetUserRoles(int userId, int siteId);
-        IEnumerable<UserRole> GetUserRoles(string roleName, int siteId);
-        UserRole AddUserRole(UserRole userRole);
-        UserRole UpdateUserRole(UserRole userRole);
-        UserRole GetUserRole(int userRoleId);
-        UserRole GetUserRole(int userRoleId, bool tracking);
-        UserRole GetUserRole(int userId, int roleId);
-        UserRole GetUserRole(int userId, int roleId, bool tracking);
-        void DeleteUserRole(int userRoleId);
-        void DeleteUserRoles(int userId);
-    }
-}
diff --git a/Oqtane.Server/Repository/Interfaces/IVisitorRepository.cs b/Oqtane.Server/Repository/Interfaces/IVisitorRepository.cs
deleted file mode 100644
index 9100e0b8..00000000
--- a/Oqtane.Server/Repository/Interfaces/IVisitorRepository.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Oqtane.Models;
-
-namespace Oqtane.Repository
-{
-    public interface IVisitorRepository
-    {
-        IEnumerable<Visitor> GetVisitors(int siteId, DateTime fromDate);
-        Visitor AddVisitor(Visitor visitor);
-        Visitor UpdateVisitor(Visitor visitor);
-        Visitor GetVisitor(int visitorId);
-        Visitor GetVisitor(int siteId, string IPAddress);
-        void DeleteVisitor(int visitorId);
-        int DeleteVisitors(int siteId, int age);
-    }
-}
diff --git a/Oqtane.Server/Repository/JobLogRepository.cs b/Oqtane.Server/Repository/JobLogRepository.cs
index ee234c27..523ac356 100644
--- a/Oqtane.Server/Repository/JobLogRepository.cs
+++ b/Oqtane.Server/Repository/JobLogRepository.cs
@@ -5,6 +5,16 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface IJobLogRepository
+    {
+        IEnumerable<JobLog> GetJobLogs();
+        IEnumerable<JobLog> GetJobLogs(int jobId);
+        JobLog AddJobLog(JobLog jobLog);
+        JobLog UpdateJobLog(JobLog jobLog);
+        JobLog GetJobLog(int jobLogId);
+        void DeleteJobLog(int jobLogId);
+    }
+
     public class JobLogRepository : IJobLogRepository
     {
         private MasterDBContext _db;
diff --git a/Oqtane.Server/Repository/JobRepository.cs b/Oqtane.Server/Repository/JobRepository.cs
index 6d56c5c3..823bdcc8 100644
--- a/Oqtane.Server/Repository/JobRepository.cs
+++ b/Oqtane.Server/Repository/JobRepository.cs
@@ -7,6 +7,16 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface IJobRepository
+    {
+        IEnumerable<Job> GetJobs();
+        Job AddJob(Job job);
+        Job UpdateJob(Job job);
+        Job GetJob(int jobId);
+        Job GetJob(int jobId, bool tracking);
+        void DeleteJob(int jobId);
+    }
+
     public class JobRepository : IJobRepository
     {
         private MasterDBContext _db;
diff --git a/Oqtane.Server/Repository/LanguageRepository.cs b/Oqtane.Server/Repository/LanguageRepository.cs
index f31a61eb..f074c9a1 100644
--- a/Oqtane.Server/Repository/LanguageRepository.cs
+++ b/Oqtane.Server/Repository/LanguageRepository.cs
@@ -5,6 +5,15 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface ILanguageRepository
+    {
+        IEnumerable<Language> GetLanguages(int siteId);
+        Language AddLanguage(Language language);
+        void UpdateLanguage(Language language);
+        Language GetLanguage(int languageId);
+        void DeleteLanguage(int languageId);
+    }
+
     public class LanguageRepository : ILanguageRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/LogRepository.cs b/Oqtane.Server/Repository/LogRepository.cs
index 12f43a21..f41e0d97 100644
--- a/Oqtane.Server/Repository/LogRepository.cs
+++ b/Oqtane.Server/Repository/LogRepository.cs
@@ -6,6 +6,14 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface ILogRepository
+    {
+        IEnumerable<Log> GetLogs(int siteId, string level, string function, int rows);
+        Log GetLog(int logId);
+        void AddLog(Log log);
+        int DeleteLogs(int siteId, int age);
+    }
+
     public class LogRepository : ILogRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index 204578e4..b073f5d5 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -13,6 +13,16 @@ using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IModuleDefinitionRepository
+    {
+        IEnumerable<ModuleDefinition> GetModuleDefinitions();
+        IEnumerable<ModuleDefinition> GetModuleDefinitions(int siteId);
+        ModuleDefinition GetModuleDefinition(int moduleDefinitionId, int siteId);
+        void UpdateModuleDefinition(ModuleDefinition moduleDefinition);
+        void DeleteModuleDefinition(int moduleDefinitionId);
+        ModuleDefinition FilterModuleDefinition(ModuleDefinition moduleDefinition);
+    }
+
     public class ModuleDefinitionRepository : IModuleDefinitionRepository
     {
         private MasterDBContext _db;
diff --git a/Oqtane.Server/Repository/ModuleRepository.cs b/Oqtane.Server/Repository/ModuleRepository.cs
index 5885ae9c..18cbd05f 100644
--- a/Oqtane.Server/Repository/ModuleRepository.cs
+++ b/Oqtane.Server/Repository/ModuleRepository.cs
@@ -4,7 +4,6 @@ using System.Linq;
 using System.Text.Json;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Modules;
 using Oqtane.Shared;
@@ -12,6 +11,18 @@ using Module = Oqtane.Models.Module;
 
 namespace Oqtane.Repository
 {
+    public interface IModuleRepository
+    {
+        IEnumerable<Module> GetModules(int siteId);
+        Module AddModule(Module module);
+        Module UpdateModule(Module module);
+        Module GetModule(int moduleId);
+        Module GetModule(int moduleId, bool tracking);
+        void DeleteModule(int moduleId);
+        string ExportModule(int moduleId);
+        bool ImportModule(int moduleId, string content);
+    }
+
     public class ModuleRepository : IModuleRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/NotificationRepository.cs b/Oqtane.Server/Repository/NotificationRepository.cs
index b4603f29..1c20faee 100644
--- a/Oqtane.Server/Repository/NotificationRepository.cs
+++ b/Oqtane.Server/Repository/NotificationRepository.cs
@@ -6,6 +6,19 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface INotificationRepository
+    {
+        IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId);
+        IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId, int count, bool isRead);
+        int GetNotificationCount(int siteId, int fromUserId, int toUserId, bool isRead);
+        Notification AddNotification(Notification notification);
+        Notification UpdateNotification(Notification notification);
+        Notification GetNotification(int notificationId);
+        Notification GetNotification(int notificationId, bool tracking);
+        void DeleteNotification(int notificationId);
+        int DeleteNotifications(int siteId, int age);
+    }
+
     public class NotificationRepository : INotificationRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/PageModuleRepository.cs b/Oqtane.Server/Repository/PageModuleRepository.cs
index a6f81b69..239a9a67 100644
--- a/Oqtane.Server/Repository/PageModuleRepository.cs
+++ b/Oqtane.Server/Repository/PageModuleRepository.cs
@@ -1,13 +1,22 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Microsoft.EntityFrameworkCore;
-using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IPageModuleRepository
+    {
+        IEnumerable<PageModule> GetPageModules(int siteId);
+        PageModule AddPageModule(PageModule pageModule);
+        PageModule UpdatePageModule(PageModule pageModule);
+        PageModule GetPageModule(int pageModuleId);
+        PageModule GetPageModule(int pageModuleId, bool tracking);
+        PageModule GetPageModule(int pageId, int moduleId);
+        void DeletePageModule(int pageModuleId);
+    }
+
     public class PageModuleRepository : IPageModuleRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/PageRepository.cs b/Oqtane.Server/Repository/PageRepository.cs
index f400226f..5f99c150 100644
--- a/Oqtane.Server/Repository/PageRepository.cs
+++ b/Oqtane.Server/Repository/PageRepository.cs
@@ -2,12 +2,22 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
-using Oqtane.Extensions;
 using Oqtane.Models;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IPageRepository
+    {
+        IEnumerable<Page> GetPages(int siteId);
+        Page AddPage(Page page);
+        Page UpdatePage(Page page);
+        Page GetPage(int pageId);
+        Page GetPage(int pageId, bool tracking);
+        Page GetPage(string path, int siteId);
+        void DeletePage(int pageId);
+    }
+
     public class PageRepository : IPageRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/PermissionRepository.cs b/Oqtane.Server/Repository/PermissionRepository.cs
index 1a3b0395..b4f7530d 100644
--- a/Oqtane.Server/Repository/PermissionRepository.cs
+++ b/Oqtane.Server/Repository/PermissionRepository.cs
@@ -8,6 +8,20 @@ using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IPermissionRepository
+    {
+        IEnumerable<Permission> GetPermissions(int siteId, string entityName);
+        IEnumerable<Permission> GetPermissions(int siteId, string entityName, string permissionName);
+        IEnumerable<Permission> GetPermissions(int siteId, string entityName, int entityId);
+        IEnumerable<Permission> GetPermissions(int siteId, string entityName, int entityId, string permissionName);
+        Permission AddPermission(Permission permission);
+        Permission UpdatePermission(Permission permission);
+        void UpdatePermissions(int siteId, string entityName, int entityId, List<Permission> permissions);
+        Permission GetPermission(int permissionId);
+        void DeletePermission(int permissionId);
+        void DeletePermissions(int siteId, string entityName, int entityId);
+    }
+
     public class PermissionRepository : IPermissionRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/ProfileRepository.cs b/Oqtane.Server/Repository/ProfileRepository.cs
index 8e0b895a..b5749951 100644
--- a/Oqtane.Server/Repository/ProfileRepository.cs
+++ b/Oqtane.Server/Repository/ProfileRepository.cs
@@ -5,6 +5,15 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface IProfileRepository
+    {
+        IEnumerable<Profile> GetProfiles(int siteId);
+        Profile AddProfile(Profile profile);
+        Profile UpdateProfile(Profile profile);
+        Profile GetProfile(int profileId);
+        Profile GetProfile(int profileId, bool tracking);
+        void DeleteProfile(int profileId);
+    }
     public class ProfileRepository : IProfileRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/RoleRepository.cs b/Oqtane.Server/Repository/RoleRepository.cs
index 3d16eb35..05de9047 100644
--- a/Oqtane.Server/Repository/RoleRepository.cs
+++ b/Oqtane.Server/Repository/RoleRepository.cs
@@ -2,11 +2,20 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
-using Oqtane.Modules.Admin.Users;
-using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IRoleRepository
+    {
+        IEnumerable<Role> GetRoles(int siteId);
+        IEnumerable<Role> GetRoles(int siteId, bool includeGlobalRoles);
+        Role AddRole(Role role);
+        Role UpdateRole(Role role);
+        Role GetRole(int roleId);
+        Role GetRole(int roleId, bool tracking);
+        void DeleteRole(int roleId);
+    }
+
     public class RoleRepository : IRoleRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/SearchContentRepository.cs b/Oqtane.Server/Repository/SearchContentRepository.cs
index 5aa214ae..cb2eeee9 100644
--- a/Oqtane.Server/Repository/SearchContentRepository.cs
+++ b/Oqtane.Server/Repository/SearchContentRepository.cs
@@ -1,17 +1,31 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Oqtane.Extensions;
-using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface ISearchContentRepository
+    {
+        Task<IEnumerable<SearchContent>> GetSearchContentsAsync(SearchQuery searchQuery);
+        SearchContent AddSearchContent(SearchContent searchContent);
+        void DeleteSearchContent(int searchContentId);
+        void DeleteSearchContent(string entityName, string entryId);
+        void DeleteSearchContent(string uniqueKey);
+        void DeleteAllSearchContent(int siteId);
+
+        SearchWord GetSearchWord(string word);
+        SearchWord AddSearchWord(SearchWord searchWord);
+
+        IEnumerable<SearchContentWord> GetSearchContentWords(int searchContentId);
+        SearchContentWord AddSearchContentWord(SearchContentWord searchContentWord);
+        SearchContentWord UpdateSearchContentWord(SearchContentWord searchContentWord);
+    }
+
     public class SearchContentRepository : ISearchContentRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs
index 16a33811..13c48819 100644
--- a/Oqtane.Server/Repository/SettingRepository.cs
+++ b/Oqtane.Server/Repository/SettingRepository.cs
@@ -8,6 +8,21 @@ using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface ISettingRepository
+    {
+        IEnumerable<Setting> GetSettings(string entityName);
+        IEnumerable<Setting> GetSettings(string entityName, int entityId);
+        IEnumerable<Setting> GetSettings(string entityName1, int entityId1, string entityName2, int entityId2);
+        Setting AddSetting(Setting setting);
+        Setting UpdateSetting(Setting setting);
+        Setting GetSetting(string entityName, int settingId);
+        Setting GetSetting(string entityName, int entityId, string settingName);
+        void DeleteSetting(string entityName, int settingId);
+        void DeleteSettings(string entityName, int entityId);
+        string GetSettingValue(IEnumerable<Setting> settings, string settingName, string defaultValue);
+        string GetSettingValue(string entityName, int entityId, string settingName, string defaultValue);
+    }
+
     public class SettingRepository : ISettingRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _tenantContextFactory;
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 48620ead..530c536c 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -9,12 +9,24 @@ using Oqtane.Enums;
 using Oqtane.Infrastructure;
 using Oqtane.Models;
 using Oqtane.Modules;
-using Oqtane.Modules.Admin.Modules;
 using Oqtane.Shared;
 using Module = Oqtane.Models.Module;
 
 namespace Oqtane.Repository
 {
+    public interface ISiteRepository
+    {
+        IEnumerable<Site> GetSites();
+        Site AddSite(Site site);
+        Site UpdateSite(Site site);
+        Site GetSite(int siteId);
+        Site GetSite(int siteId, bool tracking);
+        void DeleteSite(int siteId);
+
+        void InitializeSite(Alias alias);
+        void CreatePages(Site site, List<PageTemplate> pageTemplates, Alias alias);
+    }
+
     public class SiteRepository : ISiteRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _factory;
diff --git a/Oqtane.Server/Repository/SiteTemplateRepository.cs b/Oqtane.Server/Repository/SiteTemplateRepository.cs
index db16600c..fc327e6d 100644
--- a/Oqtane.Server/Repository/SiteTemplateRepository.cs
+++ b/Oqtane.Server/Repository/SiteTemplateRepository.cs
@@ -9,6 +9,11 @@ using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface ISiteTemplateRepository
+    {
+        IEnumerable<SiteTemplate> GetSiteTemplates();
+    }
+
     public class SiteTemplateRepository : ISiteTemplateRepository
     {
         private readonly IServiceProvider _serviceProvider;
diff --git a/Oqtane.Server/Repository/SqlRepository.cs b/Oqtane.Server/Repository/SqlRepository.cs
index a4689fcf..30102eea 100644
--- a/Oqtane.Server/Repository/SqlRepository.cs
+++ b/Oqtane.Server/Repository/SqlRepository.cs
@@ -12,6 +12,25 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface ISqlRepository
+    {
+        void ExecuteScript(Tenant tenant, string script);
+
+        bool ExecuteScript(string connectionString, string databaseType, Assembly assembly, string filename);
+
+        bool ExecuteScript(Tenant tenant, Assembly assembly, string filename);
+
+        int ExecuteNonQuery(Tenant tenant, string query);
+
+        int ExecuteNonQuery(string connectionString, string databaseType, string query);
+
+        IDataReader ExecuteReader(Tenant tenant, string query);
+
+        IDataReader ExecuteReader(string DBType, string DBConnectionString, string query);
+
+        string GetScriptFromAssembly(Assembly assembly, string fileName);
+    }
+
     public class SqlRepository : ISqlRepository
     {
         private IConfigurationRoot _config;
diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs
index 25687f48..d5b83117 100644
--- a/Oqtane.Server/Repository/TenantRepository.cs
+++ b/Oqtane.Server/Repository/TenantRepository.cs
@@ -8,6 +8,14 @@ using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface ITenantRepository
+    {
+        IEnumerable<Tenant> GetTenants();
+        Tenant AddTenant(Tenant tenant);
+        Tenant UpdateTenant(Tenant tenant);
+        Tenant GetTenant(int tenantId);
+        void DeleteTenant(int tenantId);
+    }
     public class TenantRepository : ITenantRepository
     {
         private MasterDBContext _db;
diff --git a/Oqtane.Server/Repository/TenantResolver.cs b/Oqtane.Server/Repository/TenantResolver.cs
index 793006d3..f678a586 100644
--- a/Oqtane.Server/Repository/TenantResolver.cs
+++ b/Oqtane.Server/Repository/TenantResolver.cs
@@ -4,6 +4,12 @@ using Oqtane.Models;
 namespace Oqtane.Repository
 {
     // class deprecated and replaced by ITenantManager
+    public interface ITenantResolver
+    {
+        Alias GetAlias();
+        Tenant GetTenant();
+    }
+
     public class TenantResolver : ITenantResolver
     {
         private readonly ITenantManager _tenantManager;
diff --git a/Oqtane.Server/Repository/ThemeRepository.cs b/Oqtane.Server/Repository/ThemeRepository.cs
index fd010b8c..56331a37 100644
--- a/Oqtane.Server/Repository/ThemeRepository.cs
+++ b/Oqtane.Server/Repository/ThemeRepository.cs
@@ -4,7 +4,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Reflection.Metadata;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using Oqtane.Infrastructure;
@@ -14,6 +13,15 @@ using Oqtane.Themes;
 
 namespace Oqtane.Repository
 {
+    public interface IThemeRepository
+    {
+        IEnumerable<Theme> GetThemes();
+        Theme GetTheme(int themeId, int siteId);
+        void UpdateTheme(Theme theme);
+        void DeleteTheme(int themeId);
+        List<Theme> FilterThemes(List<Theme> themes);
+    }
+
     public class ThemeRepository : IThemeRepository
     {
         private MasterDBContext _db;
diff --git a/Oqtane.Server/Repository/UrlMappingRepository.cs b/Oqtane.Server/Repository/UrlMappingRepository.cs
index 82f747da..9c2efbb6 100644
--- a/Oqtane.Server/Repository/UrlMappingRepository.cs
+++ b/Oqtane.Server/Repository/UrlMappingRepository.cs
@@ -6,6 +6,18 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface IUrlMappingRepository
+    {
+        IEnumerable<UrlMapping> GetUrlMappings(int siteId, bool isMapped);
+        UrlMapping AddUrlMapping(UrlMapping urlMapping);
+        UrlMapping UpdateUrlMapping(UrlMapping urlMapping);
+        UrlMapping GetUrlMapping(int urlMappingId);
+        UrlMapping GetUrlMapping(int urlMappingId, bool tracking);
+        UrlMapping GetUrlMapping(int siteId, string url);
+        void DeleteUrlMapping(int urlMappingId);
+        int DeleteUrlMappings(int siteId, int age);
+    }
+
     public class UrlMappingRepository : IUrlMappingRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/UserRepository.cs b/Oqtane.Server/Repository/UserRepository.cs
index 4858e7c3..b9f3c7df 100644
--- a/Oqtane.Server/Repository/UserRepository.cs
+++ b/Oqtane.Server/Repository/UserRepository.cs
@@ -2,11 +2,22 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
-using Oqtane.Modules.Admin.Users;
 using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IUserRepository
+    {
+        IEnumerable<User> GetUsers();
+        User AddUser(User user);
+        User UpdateUser(User user);
+        User GetUser(int userId);
+        User GetUser(int userId, bool tracking);
+        User GetUser(string username);
+        User GetUser(string username, string email);
+        void DeleteUser(int userId);
+    }
+
     public class UserRepository : IUserRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/UserRoleRepository.cs b/Oqtane.Server/Repository/UserRoleRepository.cs
index 6956a20d..9c6a6256 100644
--- a/Oqtane.Server/Repository/UserRoleRepository.cs
+++ b/Oqtane.Server/Repository/UserRoleRepository.cs
@@ -10,6 +10,21 @@ using Oqtane.Shared;
 
 namespace Oqtane.Repository
 {
+    public interface IUserRoleRepository
+    {
+        IEnumerable<UserRole> GetUserRoles(int siteId);
+        IEnumerable<UserRole> GetUserRoles(int userId, int siteId);
+        IEnumerable<UserRole> GetUserRoles(string roleName, int siteId);
+        UserRole AddUserRole(UserRole userRole);
+        UserRole UpdateUserRole(UserRole userRole);
+        UserRole GetUserRole(int userRoleId);
+        UserRole GetUserRole(int userRoleId, bool tracking);
+        UserRole GetUserRole(int userId, int roleId);
+        UserRole GetUserRole(int userId, int roleId, bool tracking);
+        void DeleteUserRole(int userRoleId);
+        void DeleteUserRoles(int userId);
+    }
+
     public class UserRoleRepository : IUserRoleRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
diff --git a/Oqtane.Server/Repository/VisitorRepository.cs b/Oqtane.Server/Repository/VisitorRepository.cs
index d3583079..f18bd62a 100644
--- a/Oqtane.Server/Repository/VisitorRepository.cs
+++ b/Oqtane.Server/Repository/VisitorRepository.cs
@@ -6,6 +6,17 @@ using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
+    public interface IVisitorRepository
+    {
+        IEnumerable<Visitor> GetVisitors(int siteId, DateTime fromDate);
+        Visitor AddVisitor(Visitor visitor);
+        Visitor UpdateVisitor(Visitor visitor);
+        Visitor GetVisitor(int visitorId);
+        Visitor GetVisitor(int siteId, string IPAddress);
+        void DeleteVisitor(int visitorId);
+        int DeleteVisitors(int siteId, int age);
+    }
+
     public class VisitorRepository : IVisitorRepository
     {
         private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;