diff --git a/net/server/internal/model_tag.go b/net/server/internal/model_tag.go
deleted file mode 100644
index c4d931a6..00000000
--- a/net/server/internal/model_tag.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type Tag struct {
-
-	TagId string `json:"tagId"`
-
-	CardId string `json:"cardId,omitempty"`
-
-	Revision int64 `json:"revision"`
-
-	Type_ string `json:"type"`
-
-	Data string `json:"data"`
-
-	Created int32 `json:"created"`
-}
diff --git a/net/server/internal/model_topic.go b/net/server/internal/model_topic.go
deleted file mode 100644
index f6be7462..00000000
--- a/net/server/internal/model_topic.go
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type Topic struct {
-
-	TopicId string `json:"topicId"`
-
-	TopicRevision int64 `json:"topicRevision"`
-
-	Type_ string `json:"type"`
-
-	Data string `json:"data"`
-
-	Created int32 `json:"created"`
-
-	Modified int32 `json:"modified"`
-
-	Status string `json:"status"`
-
-	TagCount int32 `json:"tagCount"`
-
-	TagUpdate int32 `json:"tagUpdate,omitempty"`
-
-	TagRevision int64 `json:"tagRevision"`
-}
diff --git a/net/server/internal/model_topic_id_assets_body.go b/net/server/internal/model_topic_id_assets_body.go
deleted file mode 100644
index f23b9ddb..00000000
--- a/net/server/internal/model_topic_id_assets_body.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-import (
-	"os"
-)
-
-type TopicIdAssetsBody struct {
-
-	FileName **os.File `json:"fileName,omitempty"`
-}
diff --git a/net/server/internal/model_topic_id_subject_body.go b/net/server/internal/model_topic_id_subject_body.go
deleted file mode 100644
index f210ccb9..00000000
--- a/net/server/internal/model_topic_id_subject_body.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type TopicIdSubjectBody struct {
-
-	Type_ string `json:"type"`
-
-	Data string `json:"data"`
-}
diff --git a/net/server/internal/model_topic_id_tags_body.go b/net/server/internal/model_topic_id_tags_body.go
deleted file mode 100644
index eb734e4c..00000000
--- a/net/server/internal/model_topic_id_tags_body.go
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type TopicIdTagsBody struct {
-
-	Type_ string `json:"type"`
-
-	Data string `json:"data"`
-}
diff --git a/net/server/internal/model_tunnel.go b/net/server/internal/model_tunnel.go
deleted file mode 100644
index fbdd1ce4..00000000
--- a/net/server/internal/model_tunnel.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * DataBag
- *
- * DataBag provides storage for decentralized identity based self-hosting apps. It is intended to support sharing of personal data and hosting group conversations. 
- *
- * API version: 0.0.1
- * Contact: roland.osborne@gmail.com
- * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
- */
-package databag
-
-type Tunnel struct {
-
-	CardId string `json:"cardId"`
-
-	Type_ string `json:"type"`
-
-	Data string `json:"data,omitempty"`
-}
diff --git a/net/server/internal/models.go b/net/server/internal/models.go
index 9f6c6b0f..7e2bb0fc 100644
--- a/net/server/internal/models.go
+++ b/net/server/internal/models.go
@@ -133,6 +133,17 @@ type DataMessage struct {
 	Signature string `json:"signature"`
 }
 
+type Dialogue struct {
+	DialogueId string `json:"dialogueId"`
+	DialogueRevison int64 `json:"dialogueRevison,omitempty"`
+	Type_ string `json:"type"`
+	Data string `json:"data"`
+	Created int32 `json:"created"`
+	Active bool `json:"active"`
+	InsightRevision int64 `json:"insightRevision,omitempty"`
+	Insights []DialogueInsights `json:"insights"`
+}
+
 type DialogueIdSubjectBody struct {
 	Type_ string `json:"type"`
 	Data string `json:"data"`
@@ -253,3 +264,44 @@ type ShareGroupsBody struct {
 	Data string `json:"data"`
 }
 
+type Tag struct {
+	TagId string `json:"tagId"`
+	CardId string `json:"cardId,omitempty"`
+	Revision int64 `json:"revision"`
+	Type_ string `json:"type"`
+	Data string `json:"data"`
+	Created int32 `json:"created"`
+}
+
+type Topic struct {
+	TopicId string `json:"topicId"`
+	TopicRevision int64 `json:"topicRevision"`
+	Type_ string `json:"type"`
+	Data string `json:"data"`
+	Created int32 `json:"created"`
+	Modified int32 `json:"modified"`
+	Status string `json:"status"`
+	TagCount int32 `json:"tagCount"`
+	TagUpdate int32 `json:"tagUpdate,omitempty"`
+	TagRevision int64 `json:"tagRevision"`
+}
+
+type TopicIdAssetsBody struct {
+	FileName **os.File `json:"fileName,omitempty"`
+}
+
+type TopicIdSubjectBody struct {
+	Type_ string `json:"type"`
+	Data string `json:"data"`
+}
+
+type TopicIdTagsBody struct {
+	Type_ string `json:"type"`
+	Data string `json:"data"`
+}
+
+type Tunnel struct {
+	CardId string `json:"cardId"`
+	Type_ string `json:"type"`
+	Data string `json:"data,omitempty"`
+}