diff --git a/src/KeyKeeper/PasswordStore/IPassStoreDirectory.cs b/src/KeyKeeper/PasswordStore/IPassStoreDirectory.cs
index f290493..b5c5acc 100644
--- a/src/KeyKeeper/PasswordStore/IPassStoreDirectory.cs
+++ b/src/KeyKeeper/PasswordStore/IPassStoreDirectory.cs
@@ -2,6 +2,6 @@ using System.Collections.Generic;
 
 namespace KeyKeeper.PasswordStore;
 
-public interface IPassStoreDirectory : IEnumerable<IPassStoreEntry>
+public interface IPassStoreDirectory : IEnumerable<PassStoreEntry>
 {
 }
diff --git a/src/KeyKeeper/PasswordStore/PassStoreEntryGroup.cs b/src/KeyKeeper/PasswordStore/PassStoreEntryGroup.cs
new file mode 100644
index 0000000..24c810c
--- /dev/null
+++ b/src/KeyKeeper/PasswordStore/PassStoreEntryGroup.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using static KeyKeeper.PasswordStore.FileFormatConstants;
+
+namespace KeyKeeper.PasswordStore;
+
+public class PassStoreEntryGroup : PassStoreEntry, IPassStoreDirectory
+{
+    public byte GroupType { get; set; }
+    public Guid? CustomGroupSubtype { get; set; }
+    public List<PassStoreEntry> ChildEntries { get; set; }
+
+    public PassStoreEntryGroup(Guid id, DateTime createdAt, DateTime modifiedAt,
+                               Guid iconType, string name, byte groupType,
+                               List<PassStoreEntry>? children = null,
+                               Guid? customGroupSubtype = null)
+    {
+        Id = id;
+        CreationDate = createdAt;
+        ModificationDate = modifiedAt;
+        IconType = iconType;
+        Name = name;
+        GroupType = groupType;
+        if (GroupType == GROUP_TYPE_CUSTOM && customGroupSubtype == null)
+            throw new ArgumentNullException("custom group type");
+        CustomGroupSubtype = customGroupSubtype;
+
+        ChildEntries = children ?? new();
+    }
+
+    IEnumerator<PassStoreEntry> IEnumerable<PassStoreEntry>.GetEnumerator()
+    {
+        return ChildEntries.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return ChildEntries.GetEnumerator();
+    }
+
+    protected override byte[] InnerSerialize()
+    {
+        MemoryStream str = new();
+        str.WriteByte(ENTRY_GROUP_ID);
+
+        str.WriteByte(GroupType);
+        if (GroupType == GROUP_TYPE_CUSTOM)
+            str.Write(CustomGroupSubtype!.Value.ToByteArray());
+
+        BinaryWriter wr = new(str);
+        wr.Write7BitEncodedInt(ChildEntries.Count);
+        foreach (PassStoreEntry entry in ChildEntries)
+            entry.WriteToStream(str);
+
+        return str.ToArray();
+    }
+}
\ No newline at end of file