diff --git a/src/Core/Models/Table/Folder.cs b/src/Core/Models/Table/Folder.cs
new file mode 100644
index 0000000000..cdfedff4b2
--- /dev/null
+++ b/src/Core/Models/Table/Folder.cs
@@ -0,0 +1,19 @@
+using System;
+using Bit.Core.Utilities;
+
+namespace Bit.Core.Models.Table
+{
+    public class Folder : IDataObject<Guid>
+    {
+        public Guid Id { get; set; }
+        public Guid UserId { get; set; }
+        public string Name { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
+    }
+}
diff --git a/src/Core/Repositories/IFolderRepository.cs b/src/Core/Repositories/IFolderRepository.cs
new file mode 100644
index 0000000000..9b48d971bd
--- /dev/null
+++ b/src/Core/Repositories/IFolderRepository.cs
@@ -0,0 +1,9 @@
+using System;
+using Bit.Core.Models.Table;
+
+namespace Bit.Core.Repositories
+{
+    public interface IFolderRepository : IRepository<Folder, Guid>
+    {
+    }
+}
diff --git a/src/Core/Repositories/SqlServer/FolderRepository.cs b/src/Core/Repositories/SqlServer/FolderRepository.cs
new file mode 100644
index 0000000000..839c605c6b
--- /dev/null
+++ b/src/Core/Repositories/SqlServer/FolderRepository.cs
@@ -0,0 +1,16 @@
+using System;
+using Bit.Core.Models.Table;
+
+namespace Bit.Core.Repositories.SqlServer
+{
+    public class FolderRepository : Repository<Folder, Guid>, IFolderRepository
+    {
+        public FolderRepository(GlobalSettings globalSettings)
+            : this(globalSettings.SqlServer.ConnectionString)
+        { }
+
+        public FolderRepository(string connectionString)
+            : base(connectionString)
+        { }
+    }
+}