From 8f61c4d2d5b57c08f7b1883c4dba359c5013e3d1 Mon Sep 17 00:00:00 2001
From: Sebastian Krupinski <krupinski01@gmail.com>
Date: Sun, 28 Jun 2026 17:51:23 -0400
Subject: [PATCH] refactor: chrono objects

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
---
 .../Chrono/{Event => Entity}/EventObject.php  |  5 ++-
 shared/lib/Chrono/Entity/JournalObject.php    | 34 +++++++++++++++
 .../Entity/Property/AttachmentCollection.php  | 13 ++++++
 .../Entity/Property/AttachmentObject.php      | 14 +++++++
 .../Property}/EventAvailabilityTypes.php      |  2 +-
 .../Property}/EventCommonObject.php           |  6 +--
 .../EventLocationPhysicalCollection.php       |  2 +-
 .../Property}/EventLocationPhysicalObject.php |  2 +-
 .../EventLocationVirtualCollection.php        |  2 +-
 .../Property}/EventLocationVirtualObject.php  |  2 +-
 .../Property}/EventMutationCollection.php     |  2 +-
 .../Property}/EventMutationObject.php         |  2 +-
 .../EventNotificationAnchorTypes.php          |  2 +-
 .../Property}/EventNotificationCollection.php |  2 +-
 .../Property}/EventNotificationObject.php     |  2 +-
 .../Property}/EventNotificationPatterns.php   |  2 +-
 .../Property}/EventNotificationTypes.php      |  2 +-
 .../Property}/EventOccurrenceObject.php       |  2 +-
 .../Property}/EventOccurrencePatternTypes.php |  2 +-
 .../EventOccurrencePrecisionTypes.php         |  2 +-
 .../Property}/EventOrganizerObject.php        |  2 +-
 .../Property}/EventParticipantCollection.php  |  2 +-
 .../Property}/EventParticipantObject.php      |  2 +-
 .../Property}/EventParticipantRealm.php       |  2 +-
 .../EventParticipantRoleCollection.php        |  2 +-
 .../Property}/EventParticipantRoleTypes.php   |  2 +-
 .../Property}/EventParticipantStatusTypes.php |  2 +-
 .../Property}/EventParticipantTypes.php       |  2 +-
 .../Property}/EventSensitivityTypes.php       |  2 +-
 .../Entity/Property/JournalStatusTypes.php    | 11 +++++
 .../Property/JournalVisibilityTypes.php       | 11 +++++
 .../Chrono/Entity/Property/TagCollection.php  | 13 ++++++
 .../Entity/Property/TaskRecurrenceObject.php  | 18 ++++++++
 .../Entity/Property/TaskStatusTypes.php       | 12 ++++++
 .../Entity/Property/TaskSubtaskCollection.php | 13 ++++++
 .../Entity/Property/TaskSubtaskObject.php     | 13 ++++++
 shared/lib/Chrono/Entity/TaskObject.php       | 41 +++++++++++++++++++
 .../lib/Chrono/Event/EventTagCollection.php   | 20 ---------
 38 files changed, 224 insertions(+), 48 deletions(-)
 rename shared/lib/Chrono/{Event => Entity}/EventObject.php (77%)
 create mode 100644 shared/lib/Chrono/Entity/JournalObject.php
 create mode 100644 shared/lib/Chrono/Entity/Property/AttachmentCollection.php
 create mode 100644 shared/lib/Chrono/Entity/Property/AttachmentObject.php
 rename shared/lib/Chrono/{Event => Entity/Property}/EventAvailabilityTypes.php (86%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventCommonObject.php (93%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventLocationPhysicalCollection.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventLocationPhysicalObject.php (92%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventLocationVirtualCollection.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventLocationVirtualObject.php (92%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventMutationCollection.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventMutationObject.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventNotificationAnchorTypes.php (86%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventNotificationCollection.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventNotificationObject.php (94%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventNotificationPatterns.php (88%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventNotificationTypes.php (87%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventOccurrenceObject.php (96%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventOccurrencePatternTypes.php (87%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventOccurrencePrecisionTypes.php (90%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventOrganizerObject.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventParticipantCollection.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventParticipantObject.php (95%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventParticipantRealm.php (86%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventParticipantRoleCollection.php (91%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventParticipantRoleTypes.php (90%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventParticipantStatusTypes.php (89%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventParticipantTypes.php (89%)
 rename shared/lib/Chrono/{Event => Entity/Property}/EventSensitivityTypes.php (87%)
 create mode 100644 shared/lib/Chrono/Entity/Property/JournalStatusTypes.php
 create mode 100644 shared/lib/Chrono/Entity/Property/JournalVisibilityTypes.php
 create mode 100644 shared/lib/Chrono/Entity/Property/TagCollection.php
 create mode 100644 shared/lib/Chrono/Entity/Property/TaskRecurrenceObject.php
 create mode 100644 shared/lib/Chrono/Entity/Property/TaskStatusTypes.php
 create mode 100644 shared/lib/Chrono/Entity/Property/TaskSubtaskCollection.php
 create mode 100644 shared/lib/Chrono/Entity/Property/TaskSubtaskObject.php
 create mode 100644 shared/lib/Chrono/Entity/TaskObject.php
 delete mode 100644 shared/lib/Chrono/Event/EventTagCollection.php

diff --git a/shared/lib/Chrono/Event/EventObject.php b/shared/lib/Chrono/Entity/EventObject.php
similarity index 77%
rename from shared/lib/Chrono/Event/EventObject.php
rename to shared/lib/Chrono/Entity/EventObject.php
index 3e1f206..981952c 100644
--- a/shared/lib/Chrono/Event/EventObject.php
+++ b/shared/lib/Chrono/Entity/EventObject.php
@@ -7,9 +7,12 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity;
 
 use DateTimeInterface;
+use KTXF\Chrono\Entity\Property\EventCommonObject;
+use KTXF\Chrono\Entity\Property\EventMutationCollection;
+use KTXF\Chrono\Entity\Property\EventOccurrenceObject;
 
 class EventObject extends EventCommonObject {
 
diff --git a/shared/lib/Chrono/Entity/JournalObject.php b/shared/lib/Chrono/Entity/JournalObject.php
new file mode 100644
index 0000000..74c648d
--- /dev/null
+++ b/shared/lib/Chrono/Entity/JournalObject.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity;
+
+use DateTimeInterface;
+use KTXF\Chrono\Entity\Property\AttachmentCollection;
+use KTXF\Chrono\Entity\Property\JournalStatusTypes;
+use KTXF\Chrono\Entity\Property\JournalVisibilityTypes;
+use KTXF\Chrono\Entity\Property\TagCollection;
+use KTXF\Json\JsonSerializableObject;
+
+class JournalObject extends JsonSerializableObject {
+    public string $type = 'journal';
+    public int $version = 1;
+    public ?string $urid = null;
+    public ?DateTimeInterface $created = null;
+    public ?DateTimeInterface $modified = null;
+    public ?string $label = null;
+    public ?string $description = null;
+    public TagCollection $tags;
+    public ?string $content = null;
+    public ?DateTimeInterface $startsOn = null;
+    public ?DateTimeInterface $endsOn = null;
+    public ?JournalStatusTypes $status = null;
+    public ?JournalVisibilityTypes $visibility = null;
+    public AttachmentCollection $attachments;
+
+    public function __construct() {
+        $this->tags = new TagCollection();
+        $this->attachments = new AttachmentCollection();
+    }
+}
diff --git a/shared/lib/Chrono/Entity/Property/AttachmentCollection.php b/shared/lib/Chrono/Entity/Property/AttachmentCollection.php
new file mode 100644
index 0000000..9a07c88
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/AttachmentCollection.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+use KTXF\Json\JsonSerializableCollection;
+
+class AttachmentCollection extends JsonSerializableCollection {
+    public function __construct(array $data = []) {
+        parent::__construct($data, AttachmentObject::class, 'string');
+    }
+}
diff --git a/shared/lib/Chrono/Entity/Property/AttachmentObject.php b/shared/lib/Chrono/Entity/Property/AttachmentObject.php
new file mode 100644
index 0000000..8019664
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/AttachmentObject.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+use KTXF\Json\JsonSerializableObject;
+
+class AttachmentObject extends JsonSerializableObject {
+    public ?string $uri = null;
+    public ?string $type = null;
+    public ?string $label = null;
+    public ?int $priority = null;
+}
diff --git a/shared/lib/Chrono/Event/EventAvailabilityTypes.php b/shared/lib/Chrono/Entity/Property/EventAvailabilityTypes.php
similarity index 86%
rename from shared/lib/Chrono/Event/EventAvailabilityTypes.php
rename to shared/lib/Chrono/Entity/Property/EventAvailabilityTypes.php
index 8a5d6f7..122d0c8 100644
--- a/shared/lib/Chrono/Event/EventAvailabilityTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventAvailabilityTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventAvailabilityTypes: string {
 	case Free = 'free';
diff --git a/shared/lib/Chrono/Event/EventCommonObject.php b/shared/lib/Chrono/Entity/Property/EventCommonObject.php
similarity index 93%
rename from shared/lib/Chrono/Event/EventCommonObject.php
rename to shared/lib/Chrono/Entity/Property/EventCommonObject.php
index 0260e30..6b16752 100644
--- a/shared/lib/Chrono/Event/EventCommonObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventCommonObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use DateInterval;
 use DateTime;
@@ -33,7 +33,7 @@ class EventCommonObject extends JsonSerializableObject {
 	public EventSensitivityTypes|null $sensitivity = null;
 	public int|null $priority = null;
 	public string|null $color = null;
-	public EventTagCollection $tags;
+	public TagCollection $tags;
 	public EventOrganizerObject $organizer;
 	public EventParticipantCollection $participants;
 	public EventNotificationCollection $notifications;
@@ -44,7 +44,7 @@ class EventCommonObject extends JsonSerializableObject {
 		$this->locationsVirtual = new EventLocationVirtualCollection();
 		$this->notifications = new EventNotificationCollection();
 		$this->organizer = new EventOrganizerObject();
-		$this->tags = new EventTagCollection();
+		$this->tags = new TagCollection();
 	}
 
 }
diff --git a/shared/lib/Chrono/Event/EventLocationPhysicalCollection.php b/shared/lib/Chrono/Entity/Property/EventLocationPhysicalCollection.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventLocationPhysicalCollection.php
rename to shared/lib/Chrono/Entity/Property/EventLocationPhysicalCollection.php
index 59a9db8..5232453 100644
--- a/shared/lib/Chrono/Event/EventLocationPhysicalCollection.php
+++ b/shared/lib/Chrono/Entity/Property/EventLocationPhysicalCollection.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableCollection;
 
diff --git a/shared/lib/Chrono/Event/EventLocationPhysicalObject.php b/shared/lib/Chrono/Entity/Property/EventLocationPhysicalObject.php
similarity index 92%
rename from shared/lib/Chrono/Event/EventLocationPhysicalObject.php
rename to shared/lib/Chrono/Entity/Property/EventLocationPhysicalObject.php
index b6d1167..0eccdc6 100644
--- a/shared/lib/Chrono/Event/EventLocationPhysicalObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventLocationPhysicalObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableObject;
 
diff --git a/shared/lib/Chrono/Event/EventLocationVirtualCollection.php b/shared/lib/Chrono/Entity/Property/EventLocationVirtualCollection.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventLocationVirtualCollection.php
rename to shared/lib/Chrono/Entity/Property/EventLocationVirtualCollection.php
index 7565648..5916a90 100644
--- a/shared/lib/Chrono/Event/EventLocationVirtualCollection.php
+++ b/shared/lib/Chrono/Entity/Property/EventLocationVirtualCollection.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableCollection;
 
diff --git a/shared/lib/Chrono/Event/EventLocationVirtualObject.php b/shared/lib/Chrono/Entity/Property/EventLocationVirtualObject.php
similarity index 92%
rename from shared/lib/Chrono/Event/EventLocationVirtualObject.php
rename to shared/lib/Chrono/Entity/Property/EventLocationVirtualObject.php
index 9fe7624..95ab416 100644
--- a/shared/lib/Chrono/Event/EventLocationVirtualObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventLocationVirtualObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableObject;
 
diff --git a/shared/lib/Chrono/Event/EventMutationCollection.php b/shared/lib/Chrono/Entity/Property/EventMutationCollection.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventMutationCollection.php
rename to shared/lib/Chrono/Entity/Property/EventMutationCollection.php
index 4d581b7..bab1631 100644
--- a/shared/lib/Chrono/Event/EventMutationCollection.php
+++ b/shared/lib/Chrono/Entity/Property/EventMutationCollection.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableCollection;
 
diff --git a/shared/lib/Chrono/Event/EventMutationObject.php b/shared/lib/Chrono/Entity/Property/EventMutationObject.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventMutationObject.php
rename to shared/lib/Chrono/Entity/Property/EventMutationObject.php
index 6cf7c32..cba3839 100644
--- a/shared/lib/Chrono/Event/EventMutationObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventMutationObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use DateTime;
 use DateTimeImmutable;
diff --git a/shared/lib/Chrono/Event/EventNotificationAnchorTypes.php b/shared/lib/Chrono/Entity/Property/EventNotificationAnchorTypes.php
similarity index 86%
rename from shared/lib/Chrono/Event/EventNotificationAnchorTypes.php
rename to shared/lib/Chrono/Entity/Property/EventNotificationAnchorTypes.php
index f4dab63..501af5f 100644
--- a/shared/lib/Chrono/Event/EventNotificationAnchorTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventNotificationAnchorTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventNotificationAnchorTypes: string {
 	case Start = 'start';
diff --git a/shared/lib/Chrono/Event/EventNotificationCollection.php b/shared/lib/Chrono/Entity/Property/EventNotificationCollection.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventNotificationCollection.php
rename to shared/lib/Chrono/Entity/Property/EventNotificationCollection.php
index 817923e..6616958 100644
--- a/shared/lib/Chrono/Event/EventNotificationCollection.php
+++ b/shared/lib/Chrono/Entity/Property/EventNotificationCollection.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableCollection;
 
diff --git a/shared/lib/Chrono/Event/EventNotificationObject.php b/shared/lib/Chrono/Entity/Property/EventNotificationObject.php
similarity index 94%
rename from shared/lib/Chrono/Event/EventNotificationObject.php
rename to shared/lib/Chrono/Entity/Property/EventNotificationObject.php
index 0a5eb8f..f0bb169 100644
--- a/shared/lib/Chrono/Event/EventNotificationObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventNotificationObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use DateInterval;
 use DateTime;
diff --git a/shared/lib/Chrono/Event/EventNotificationPatterns.php b/shared/lib/Chrono/Entity/Property/EventNotificationPatterns.php
similarity index 88%
rename from shared/lib/Chrono/Event/EventNotificationPatterns.php
rename to shared/lib/Chrono/Entity/Property/EventNotificationPatterns.php
index 1d35632..a99b937 100644
--- a/shared/lib/Chrono/Event/EventNotificationPatterns.php
+++ b/shared/lib/Chrono/Entity/Property/EventNotificationPatterns.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventNotificationPatterns: string {
 	case Absolute = 'absolute';
diff --git a/shared/lib/Chrono/Event/EventNotificationTypes.php b/shared/lib/Chrono/Entity/Property/EventNotificationTypes.php
similarity index 87%
rename from shared/lib/Chrono/Event/EventNotificationTypes.php
rename to shared/lib/Chrono/Entity/Property/EventNotificationTypes.php
index 4ec49a7..729a213 100644
--- a/shared/lib/Chrono/Event/EventNotificationTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventNotificationTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventNotificationTypes: string {
 	case Visual = 'visual';
diff --git a/shared/lib/Chrono/Event/EventOccurrenceObject.php b/shared/lib/Chrono/Entity/Property/EventOccurrenceObject.php
similarity index 96%
rename from shared/lib/Chrono/Event/EventOccurrenceObject.php
rename to shared/lib/Chrono/Entity/Property/EventOccurrenceObject.php
index e367a9f..18c4764 100644
--- a/shared/lib/Chrono/Event/EventOccurrenceObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventOccurrenceObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use DateTime;
 use DateTimeImmutable;
diff --git a/shared/lib/Chrono/Event/EventOccurrencePatternTypes.php b/shared/lib/Chrono/Entity/Property/EventOccurrencePatternTypes.php
similarity index 87%
rename from shared/lib/Chrono/Event/EventOccurrencePatternTypes.php
rename to shared/lib/Chrono/Entity/Property/EventOccurrencePatternTypes.php
index 05e4dc5..1f10f82 100644
--- a/shared/lib/Chrono/Event/EventOccurrencePatternTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventOccurrencePatternTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventOccurrencePatternTypes: string {
 	case Absolute = 'absolute';
diff --git a/shared/lib/Chrono/Event/EventOccurrencePrecisionTypes.php b/shared/lib/Chrono/Entity/Property/EventOccurrencePrecisionTypes.php
similarity index 90%
rename from shared/lib/Chrono/Event/EventOccurrencePrecisionTypes.php
rename to shared/lib/Chrono/Entity/Property/EventOccurrencePrecisionTypes.php
index 3ccf3a4..6d04d23 100644
--- a/shared/lib/Chrono/Event/EventOccurrencePrecisionTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventOccurrencePrecisionTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventOccurrencePrecisionTypes: string {
 	case Yearly = 'yearly';
diff --git a/shared/lib/Chrono/Event/EventOrganizerObject.php b/shared/lib/Chrono/Entity/Property/EventOrganizerObject.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventOrganizerObject.php
rename to shared/lib/Chrono/Entity/Property/EventOrganizerObject.php
index 12f965b..0243cd6 100644
--- a/shared/lib/Chrono/Event/EventOrganizerObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventOrganizerObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableObject;
 
diff --git a/shared/lib/Chrono/Event/EventParticipantCollection.php b/shared/lib/Chrono/Entity/Property/EventParticipantCollection.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventParticipantCollection.php
rename to shared/lib/Chrono/Entity/Property/EventParticipantCollection.php
index c5b9031..4cedb20 100644
--- a/shared/lib/Chrono/Event/EventParticipantCollection.php
+++ b/shared/lib/Chrono/Entity/Property/EventParticipantCollection.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableCollection;
 
diff --git a/shared/lib/Chrono/Event/EventParticipantObject.php b/shared/lib/Chrono/Entity/Property/EventParticipantObject.php
similarity index 95%
rename from shared/lib/Chrono/Event/EventParticipantObject.php
rename to shared/lib/Chrono/Entity/Property/EventParticipantObject.php
index 353f83f..48047a5 100644
--- a/shared/lib/Chrono/Event/EventParticipantObject.php
+++ b/shared/lib/Chrono/Entity/Property/EventParticipantObject.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableObject;
 
diff --git a/shared/lib/Chrono/Event/EventParticipantRealm.php b/shared/lib/Chrono/Entity/Property/EventParticipantRealm.php
similarity index 86%
rename from shared/lib/Chrono/Event/EventParticipantRealm.php
rename to shared/lib/Chrono/Entity/Property/EventParticipantRealm.php
index 0c8a1ac..f00809e 100644
--- a/shared/lib/Chrono/Event/EventParticipantRealm.php
+++ b/shared/lib/Chrono/Entity/Property/EventParticipantRealm.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventParticipantRealm: string {
 	case Internal = 'I';
diff --git a/shared/lib/Chrono/Event/EventParticipantRoleCollection.php b/shared/lib/Chrono/Entity/Property/EventParticipantRoleCollection.php
similarity index 91%
rename from shared/lib/Chrono/Event/EventParticipantRoleCollection.php
rename to shared/lib/Chrono/Entity/Property/EventParticipantRoleCollection.php
index 2405108..af50472 100644
--- a/shared/lib/Chrono/Event/EventParticipantRoleCollection.php
+++ b/shared/lib/Chrono/Entity/Property/EventParticipantRoleCollection.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 use KTXF\Json\JsonSerializableCollection;
 
diff --git a/shared/lib/Chrono/Event/EventParticipantRoleTypes.php b/shared/lib/Chrono/Entity/Property/EventParticipantRoleTypes.php
similarity index 90%
rename from shared/lib/Chrono/Event/EventParticipantRoleTypes.php
rename to shared/lib/Chrono/Entity/Property/EventParticipantRoleTypes.php
index 7d3e70c..32d719f 100644
--- a/shared/lib/Chrono/Event/EventParticipantRoleTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventParticipantRoleTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventParticipantRoleTypes: string {
 	case Owner = 'owner';
diff --git a/shared/lib/Chrono/Event/EventParticipantStatusTypes.php b/shared/lib/Chrono/Entity/Property/EventParticipantStatusTypes.php
similarity index 89%
rename from shared/lib/Chrono/Event/EventParticipantStatusTypes.php
rename to shared/lib/Chrono/Entity/Property/EventParticipantStatusTypes.php
index 8925c9c..4d6fa3c 100644
--- a/shared/lib/Chrono/Event/EventParticipantStatusTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventParticipantStatusTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventParticipantStatusTypes: string {
 	case None = 'none';
diff --git a/shared/lib/Chrono/Event/EventParticipantTypes.php b/shared/lib/Chrono/Entity/Property/EventParticipantTypes.php
similarity index 89%
rename from shared/lib/Chrono/Event/EventParticipantTypes.php
rename to shared/lib/Chrono/Entity/Property/EventParticipantTypes.php
index 58e66d9..b24178a 100644
--- a/shared/lib/Chrono/Event/EventParticipantTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventParticipantTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventParticipantTypes: string {
 	case Unknown = 'unknown';
diff --git a/shared/lib/Chrono/Event/EventSensitivityTypes.php b/shared/lib/Chrono/Entity/Property/EventSensitivityTypes.php
similarity index 87%
rename from shared/lib/Chrono/Event/EventSensitivityTypes.php
rename to shared/lib/Chrono/Entity/Property/EventSensitivityTypes.php
index 55ca876..578eccf 100644
--- a/shared/lib/Chrono/Event/EventSensitivityTypes.php
+++ b/shared/lib/Chrono/Entity/Property/EventSensitivityTypes.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-namespace KTXF\Chrono\Event;
+namespace KTXF\Chrono\Entity\Property;
 
 enum EventSensitivityTypes: string {
 	case Public = 'public';
diff --git a/shared/lib/Chrono/Entity/Property/JournalStatusTypes.php b/shared/lib/Chrono/Entity/Property/JournalStatusTypes.php
new file mode 100644
index 0000000..bc2a8ec
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/JournalStatusTypes.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+enum JournalStatusTypes: string {
+    case Draft = 'draft';
+    case Final = 'final';
+    case Cancelled = 'cancelled';
+}
diff --git a/shared/lib/Chrono/Entity/Property/JournalVisibilityTypes.php b/shared/lib/Chrono/Entity/Property/JournalVisibilityTypes.php
new file mode 100644
index 0000000..d295d35
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/JournalVisibilityTypes.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+enum JournalVisibilityTypes: string {
+    case Public = 'public';
+    case Private = 'private';
+    case Confidential = 'confidential';
+}
diff --git a/shared/lib/Chrono/Entity/Property/TagCollection.php b/shared/lib/Chrono/Entity/Property/TagCollection.php
new file mode 100644
index 0000000..7e595e2
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/TagCollection.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+use KTXF\Json\JsonSerializableCollection;
+
+class TagCollection extends JsonSerializableCollection {
+    public function __construct(array $data = []) {
+        parent::__construct($data, 'string');
+    }
+}
diff --git a/shared/lib/Chrono/Entity/Property/TaskRecurrenceObject.php b/shared/lib/Chrono/Entity/Property/TaskRecurrenceObject.php
new file mode 100644
index 0000000..0095150
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/TaskRecurrenceObject.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+use DateTimeInterface;
+use KTXF\Json\JsonSerializableObject;
+
+class TaskRecurrenceObject extends JsonSerializableObject {
+    public ?string $frequency = null;
+    public ?int $interval = null;
+    public ?int $count = null;
+    public ?DateTimeInterface $until = null;
+    public array $byDay = [];
+    public array $byMonthDay = [];
+    public array $byMonth = [];
+}
diff --git a/shared/lib/Chrono/Entity/Property/TaskStatusTypes.php b/shared/lib/Chrono/Entity/Property/TaskStatusTypes.php
new file mode 100644
index 0000000..61f61ee
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/TaskStatusTypes.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+enum TaskStatusTypes: string {
+    case NeedsAction = 'needs-action';
+    case InProcess = 'in-process';
+    case Completed = 'completed';
+    case Cancelled = 'cancelled';
+}
diff --git a/shared/lib/Chrono/Entity/Property/TaskSubtaskCollection.php b/shared/lib/Chrono/Entity/Property/TaskSubtaskCollection.php
new file mode 100644
index 0000000..613b566
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/TaskSubtaskCollection.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+use KTXF\Json\JsonSerializableCollection;
+
+class TaskSubtaskCollection extends JsonSerializableCollection {
+    public function __construct(array $data = []) {
+        parent::__construct($data, TaskSubtaskObject::class, 'string');
+    }
+}
diff --git a/shared/lib/Chrono/Entity/Property/TaskSubtaskObject.php b/shared/lib/Chrono/Entity/Property/TaskSubtaskObject.php
new file mode 100644
index 0000000..7511f09
--- /dev/null
+++ b/shared/lib/Chrono/Entity/Property/TaskSubtaskObject.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity\Property;
+
+use KTXF\Json\JsonSerializableObject;
+
+class TaskSubtaskObject extends JsonSerializableObject {
+    public ?string $label = null;
+    public bool $completed = false;
+    public ?int $priority = null;
+}
diff --git a/shared/lib/Chrono/Entity/TaskObject.php b/shared/lib/Chrono/Entity/TaskObject.php
new file mode 100644
index 0000000..6a79fa7
--- /dev/null
+++ b/shared/lib/Chrono/Entity/TaskObject.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace KTXF\Chrono\Entity;
+
+use DateTimeInterface;
+use KTXF\Chrono\Entity\Property\AttachmentCollection;
+use KTXF\Chrono\Entity\Property\TagCollection;
+use KTXF\Chrono\Entity\Property\TaskRecurrenceObject;
+use KTXF\Chrono\Entity\Property\TaskStatusTypes;
+use KTXF\Chrono\Entity\Property\TaskSubtaskCollection;
+use KTXF\Json\JsonSerializableObject;
+
+class TaskObject extends JsonSerializableObject {
+    public string $type = 'task';
+    public int $version = 1;
+    public ?string $urid = null;
+    public ?DateTimeInterface $created = null;
+    public ?DateTimeInterface $modified = null;
+    public ?string $label = null;
+    public ?string $description = null;
+    public TagCollection $tags;
+    public ?DateTimeInterface $startsOn = null;
+    public ?DateTimeInterface $dueOn = null;
+    public ?DateTimeInterface $completedOn = null;
+    public ?TaskStatusTypes $status = null;
+    public ?int $priority = null;
+    public ?int $progress = null;
+    public ?string $color = null;
+    public ?TaskRecurrenceObject $recurrence = null;
+    public TaskSubtaskCollection $subtasks;
+    public AttachmentCollection $attachments;
+    public ?string $notes = null;
+
+    public function __construct() {
+        $this->tags = new TagCollection();
+        $this->subtasks = new TaskSubtaskCollection();
+        $this->attachments = new AttachmentCollection();
+    }
+}
diff --git a/shared/lib/Chrono/Event/EventTagCollection.php b/shared/lib/Chrono/Event/EventTagCollection.php
deleted file mode 100644
index d1ebcd4..0000000
--- a/shared/lib/Chrono/Event/EventTagCollection.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-FileCopyrightText: Sebastian Krupinski <krupinski01@gmail.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace KTXF\Chrono\Event;
-
-use KTXF\Json\JsonSerializableCollection;
-
-class EventTagCollection extends JsonSerializableCollection {
-
-	public function __construct(array $data = []) {
-		parent::__construct($data, 'string');
-	}
-	
-}