diff --git a/modules/webapp/src/main/elm/Comp/AddressForm.elm b/modules/webapp/src/main/elm/Comp/AddressForm.elm
index 287ddf78..e8b2fd61 100644
--- a/modules/webapp/src/main/elm/Comp/AddressForm.elm
+++ b/modules/webapp/src/main/elm/Comp/AddressForm.elm
@@ -14,7 +14,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.AddressFormComp exposing (Texts)
+import Messages.Comp.AddressForm exposing (Texts)
 import Styles as S
 import Util.List
 
diff --git a/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm b/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm
index 37db3a0c..10b9920e 100644
--- a/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm
+++ b/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm
@@ -15,7 +15,7 @@ import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
-import Messages.AttachmentMetaComp exposing (Texts)
+import Messages.Comp.AttachmentMeta exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Time
diff --git a/modules/webapp/src/main/elm/Comp/CalEventInput.elm b/modules/webapp/src/main/elm/Comp/CalEventInput.elm
index dfa1c319..a38db6be 100644
--- a/modules/webapp/src/main/elm/Comp/CalEventInput.elm
+++ b/modules/webapp/src/main/elm/Comp/CalEventInput.elm
@@ -17,7 +17,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
 import Http
-import Messages.CalEventInputComp exposing (Texts)
+import Messages.Comp.CalEventInput exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm
index 7f6e58de..53c9ac7a 100644
--- a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm
@@ -16,7 +16,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Http
-import Messages.ChangePasswordFormComp exposing (Texts)
+import Messages.Comp.ChangePasswordForm exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm b/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm
index 0333c81a..9c7d17bc 100644
--- a/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm
@@ -24,7 +24,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
 import Markdown
-import Messages.ClassifierSettingsFormComp exposing (Texts)
+import Messages.Comp.ClassifierSettingsForm exposing (Texts)
 import Styles as S
 import Util.Tag
 
diff --git a/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm b/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm
index 3d11b69b..9620f594 100644
--- a/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm
@@ -23,7 +23,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onCheck, onClick, onInput)
 import Http
-import Messages.CollectiveSettingsFormComp exposing (Texts)
+import Messages.Comp.CollectiveSettingsForm exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
index f5a6d835..30843bf3 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm
@@ -25,7 +25,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
 import Http
-import Messages.CustomFieldFormComp exposing (Texts)
+import Messages.Comp.CustomFieldForm exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm b/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm
index c9e5b107..5183ac00 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm
@@ -22,7 +22,7 @@ import DatePicker exposing (DatePicker)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
-import Messages.CustomFieldInputComp exposing (Texts)
+import Messages.Comp.CustomFieldInput exposing (Texts)
 import Styles as S
 import Util.Maybe
 
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm b/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm
index c9fa672f..37965d9f 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm
@@ -18,7 +18,7 @@ import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
-import Messages.CustomFieldManageComp exposing (Texts)
+import Messages.Comp.CustomFieldManage exposing (Texts)
 import Styles as S
 import Util.CustomField
 
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm b/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm
index 9fe2dcf4..51dbf2d4 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm
@@ -29,7 +29,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Http
-import Messages.CustomFieldMultiInputComp exposing (Texts)
+import Messages.Comp.CustomFieldMultiInput exposing (Texts)
 import Styles as S
 import Util.CustomField
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm b/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm
index 7e16efdc..cb51674f 100644
--- a/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm
+++ b/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm
@@ -11,7 +11,7 @@ import Api.Model.CustomField exposing (CustomField)
 import Comp.Basic as B
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.CustomFieldTableComp exposing (Texts)
+import Messages.Comp.CustomFieldTable exposing (Texts)
 import Styles as S
 import Util.Time
 
diff --git a/modules/webapp/src/main/elm/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Comp/DetailEdit.elm
index 1ceaeadf..a57770d7 100644
--- a/modules/webapp/src/main/elm/Comp/DetailEdit.elm
+++ b/modules/webapp/src/main/elm/Comp/DetailEdit.elm
@@ -47,7 +47,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Http
-import Messages.DetailEditComp exposing (Texts)
+import Messages.Comp.DetailEdit exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/Dropzone.elm b/modules/webapp/src/main/elm/Comp/Dropzone.elm
index 32c96740..527d4471 100644
--- a/modules/webapp/src/main/elm/Comp/Dropzone.elm
+++ b/modules/webapp/src/main/elm/Comp/Dropzone.elm
@@ -18,7 +18,7 @@ import File.Select
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (..)
-import Messages.DropzoneComp exposing (Texts)
+import Messages.Comp.Dropzone exposing (Texts)
 import Styles as S
 import Util.Html exposing (onDragEnter, onDragLeave, onDragOver, onDropFiles)
 
diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm
index 96c17354..83bc04a1 100644
--- a/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm
@@ -21,7 +21,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.EmailSettingsFormComp exposing (Texts)
+import Messages.Comp.EmailSettingsForm exposing (Texts)
 import Styles as S
 import Util.Maybe
 
diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm
index 1452268f..4e8d0c70 100644
--- a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm
@@ -21,7 +21,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
-import Messages.EmailSettingsManageComp exposing (Texts)
+import Messages.Comp.EmailSettingsManage exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm
index 52707781..40a39446 100644
--- a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm
+++ b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm
@@ -11,7 +11,7 @@ import Api.Model.EmailSettings exposing (EmailSettings)
 import Comp.Basic as B
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.EmailSettingsTableComp exposing (Texts)
+import Messages.Comp.EmailSettingsTable exposing (Texts)
 import Styles as S
 
 
diff --git a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm
index 79461883..48448844 100644
--- a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm
+++ b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm
@@ -17,7 +17,7 @@ import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.EquipmentFormComp exposing (Texts)
+import Messages.Comp.EquipmentForm exposing (Texts)
 import Styles as S
 import Util.Maybe
 
diff --git a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
index e10f8af1..67976ee9 100644
--- a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
+++ b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm
@@ -20,7 +20,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onSubmit)
 import Http
-import Messages.EquipmentManageComp exposing (Texts)
+import Messages.Comp.EquipmentManage exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm
index 948fc0dc..be77e921 100644
--- a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm
+++ b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm
@@ -12,7 +12,7 @@ import Data.EquipmentUse
 import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.EquipmentTableComp exposing (Texts)
+import Messages.Comp.EquipmentTable exposing (Texts)
 import Styles as S
 
 
diff --git a/modules/webapp/src/main/elm/Comp/FolderDetail.elm b/modules/webapp/src/main/elm/Comp/FolderDetail.elm
index 438d53c0..1d134020 100644
--- a/modules/webapp/src/main/elm/Comp/FolderDetail.elm
+++ b/modules/webapp/src/main/elm/Comp/FolderDetail.elm
@@ -24,7 +24,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
 import Http
-import Messages.FolderDetailComp exposing (Texts)
+import Messages.Comp.FolderDetail exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/FolderManage.elm b/modules/webapp/src/main/elm/Comp/FolderManage.elm
index 083b0a72..1264cb5c 100644
--- a/modules/webapp/src/main/elm/Comp/FolderManage.elm
+++ b/modules/webapp/src/main/elm/Comp/FolderManage.elm
@@ -20,7 +20,7 @@ import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
-import Messages.FolderManageComp exposing (Texts)
+import Messages.Comp.FolderManage exposing (Texts)
 import Styles as S
 
 
diff --git a/modules/webapp/src/main/elm/Comp/FolderTable.elm b/modules/webapp/src/main/elm/Comp/FolderTable.elm
index 6e620303..8b41c823 100644
--- a/modules/webapp/src/main/elm/Comp/FolderTable.elm
+++ b/modules/webapp/src/main/elm/Comp/FolderTable.elm
@@ -11,7 +11,7 @@ import Api.Model.FolderItem exposing (FolderItem)
 import Comp.Basic as B
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.FolderTableComp exposing (Texts)
+import Messages.Comp.FolderTable exposing (Texts)
 import Styles as S
 import Util.Time
 
diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm
index a47db36c..cea5546b 100644
--- a/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm
@@ -21,7 +21,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.ImapSettingsFormComp exposing (Texts)
+import Messages.Comp.ImapSettingsForm exposing (Texts)
 import Styles as S
 import Util.Maybe
 
diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm
index 09ea6112..146898ef 100644
--- a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm
@@ -21,7 +21,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
-import Messages.ImapSettingsManageComp exposing (Texts)
+import Messages.Comp.ImapSettingsManage exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm
index 2ae6c551..436b4377 100644
--- a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm
+++ b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm
@@ -11,7 +11,7 @@ import Api.Model.ImapSettings exposing (ImapSettings)
 import Comp.Basic as B
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.ImapSettingsTableComp exposing (Texts)
+import Messages.Comp.ImapSettingsTable exposing (Texts)
 import Styles as S
 
 
diff --git a/modules/webapp/src/main/elm/Comp/ItemCard.elm b/modules/webapp/src/main/elm/Comp/ItemCard.elm
index 0e18bd73..709bdf67 100644
--- a/modules/webapp/src/main/elm/Comp/ItemCard.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemCard.elm
@@ -23,7 +23,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Markdown
-import Messages.ItemCardComp exposing (Texts)
+import Messages.Comp.ItemCard exposing (Texts)
 import Page exposing (Page(..))
 import Set exposing (Set)
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Comp/ItemCardList.elm
index 19f8a59d..0894d711 100644
--- a/modules/webapp/src/main/elm/Comp/ItemCardList.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemCardList.elm
@@ -22,7 +22,7 @@ import Data.UiSettings exposing (UiSettings)
 import Dict exposing (Dict)
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.ItemCardListComp exposing (Texts)
+import Messages.Comp.ItemCardList exposing (Texts)
 import Page exposing (Page(..))
 import Styles as S
 import Util.ItemDragDrop as DD
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
index f35f37ea..89f354ad 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail.elm
@@ -13,7 +13,7 @@ import Data.Flags exposing (Flags)
 import Data.ItemNav exposing (ItemNav)
 import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
-import Messages.ItemDetailComp exposing (Texts)
+import Messages.Comp.ItemDetail exposing (Texts)
 import Page exposing (Page(..))
 
 
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm
index 73cf872c..5c6e9c25 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm
@@ -8,7 +8,7 @@ import File exposing (File)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.ItemDetail.AddFilesForm exposing (Texts)
+import Messages.Comp.ItemDetail.AddFilesForm exposing (Texts)
 import Set
 import Styles as S
 import Util.File exposing (makeFileId)
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
index bed67bad..bc43f7fe 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm
@@ -25,7 +25,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
 import Markdown
-import Messages.EditFormComp exposing (Texts)
+import Messages.Comp.ItemDetail.EditForm exposing (Texts)
 import Page exposing (Page(..))
 import Set exposing (Set)
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm
index 1d1ef6cd..69016724 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm
@@ -15,7 +15,7 @@ import Data.Icons as Icons
 import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.ItemInfoHeaderComp exposing (Texts)
+import Messages.Comp.ItemDetail.ItemInfoHeader exposing (Texts)
 import Page exposing (Page(..))
 import Styles as S
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
index 99076884..d6972c65 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm
@@ -39,7 +39,7 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
 import Http
 import Markdown
-import Messages.MultiEditMenuComp exposing (Texts)
+import Messages.Comp.ItemDetail.MultiEditMenu exposing (Texts)
 import Page exposing (Page(..))
 import Set exposing (Set)
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm
index 48dfd20d..76ad0851 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm
@@ -12,7 +12,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Markdown
-import Messages.NotesComp exposing (Texts)
+import Messages.Comp.ItemDetail.Notes exposing (Texts)
 import Page exposing (Page(..))
 import Styles as S
 import Util.String
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm
index e22b5f90..f9ca4e58 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm
@@ -18,7 +18,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
 import Html5.DragDrop as DD
-import Messages.SingleAttachmentComp exposing (Texts)
+import Messages.Comp.ItemDetail.SingleAttachment exposing (Texts)
 import Page exposing (Page(..))
 import Styles as S
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm
index 31a3dbc7..8b1a5e77 100644
--- a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm
@@ -23,7 +23,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.ItemDetailComp exposing (Texts)
+import Messages.Comp.ItemDetail exposing (Texts)
 import Page exposing (Page(..))
 import Styles as S
 import Util.Time
diff --git a/modules/webapp/src/main/elm/Comp/ItemMail.elm b/modules/webapp/src/main/elm/Comp/ItemMail.elm
index a656a42e..01309ec4 100644
--- a/modules/webapp/src/main/elm/Comp/ItemMail.elm
+++ b/modules/webapp/src/main/elm/Comp/ItemMail.elm
@@ -23,7 +23,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
 import Http
-import Messages.ItemMailComp exposing (Texts)
+import Messages.Comp.ItemMail exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/NotificationForm.elm b/modules/webapp/src/main/elm/Comp/NotificationForm.elm
index 3422c17c..f73d7eca 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationForm.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationForm.elm
@@ -31,7 +31,7 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
 import Http
 import Markdown
-import Messages.NotificationFormComp exposing (Texts)
+import Messages.Comp.NotificationForm exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/NotificationList.elm b/modules/webapp/src/main/elm/Comp/NotificationList.elm
index 4ff25f98..48011b6b 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationList.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationList.elm
@@ -11,7 +11,7 @@ import Api.Model.NotificationSettings exposing (NotificationSettings)
 import Comp.Basic as B
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.NotificationTableComp exposing (Texts)
+import Messages.Comp.NotificationTable exposing (Texts)
 import Styles as S
 import Util.Html
 
diff --git a/modules/webapp/src/main/elm/Comp/NotificationManage.elm b/modules/webapp/src/main/elm/Comp/NotificationManage.elm
index 903d8717..4d7631ff 100644
--- a/modules/webapp/src/main/elm/Comp/NotificationManage.elm
+++ b/modules/webapp/src/main/elm/Comp/NotificationManage.elm
@@ -18,7 +18,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
-import Messages.NotificationManageComp exposing (Texts)
+import Messages.Comp.NotificationManage exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/OrgForm.elm b/modules/webapp/src/main/elm/Comp/OrgForm.elm
index ad869984..2c77bfe1 100644
--- a/modules/webapp/src/main/elm/Comp/OrgForm.elm
+++ b/modules/webapp/src/main/elm/Comp/OrgForm.elm
@@ -20,7 +20,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.OrgFormComp exposing (Texts)
+import Messages.Comp.OrgForm exposing (Texts)
 import Styles as S
 import Util.Maybe
 
diff --git a/modules/webapp/src/main/elm/Comp/OrgManage.elm b/modules/webapp/src/main/elm/Comp/OrgManage.elm
index 38c01908..44c62299 100644
--- a/modules/webapp/src/main/elm/Comp/OrgManage.elm
+++ b/modules/webapp/src/main/elm/Comp/OrgManage.elm
@@ -21,7 +21,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onSubmit)
 import Http
-import Messages.OrgManageComp exposing (Texts)
+import Messages.Comp.OrgManage exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/OrgTable.elm b/modules/webapp/src/main/elm/Comp/OrgTable.elm
index 4234351c..3db5b21c 100644
--- a/modules/webapp/src/main/elm/Comp/OrgTable.elm
+++ b/modules/webapp/src/main/elm/Comp/OrgTable.elm
@@ -12,7 +12,7 @@ import Data.Flags exposing (Flags)
 import Data.OrgUse
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.OrgTableComp exposing (Texts)
+import Messages.Comp.OrgTable exposing (Texts)
 import Styles as S
 import Util.Address
 import Util.Contact
diff --git a/modules/webapp/src/main/elm/Comp/PersonForm.elm b/modules/webapp/src/main/elm/Comp/PersonForm.elm
index 1503f027..f0006af5 100644
--- a/modules/webapp/src/main/elm/Comp/PersonForm.elm
+++ b/modules/webapp/src/main/elm/Comp/PersonForm.elm
@@ -22,7 +22,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.PersonFormComp exposing (Texts)
+import Messages.Comp.PersonForm exposing (Texts)
 import Styles as S
 
 
diff --git a/modules/webapp/src/main/elm/Comp/PersonManage.elm b/modules/webapp/src/main/elm/Comp/PersonManage.elm
index 257cd2b4..c27e7d25 100644
--- a/modules/webapp/src/main/elm/Comp/PersonManage.elm
+++ b/modules/webapp/src/main/elm/Comp/PersonManage.elm
@@ -22,7 +22,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onSubmit)
 import Http
-import Messages.PersonManageComp exposing (Texts)
+import Messages.Comp.PersonManage exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/PersonTable.elm b/modules/webapp/src/main/elm/Comp/PersonTable.elm
index 0cf7002b..1e7e14c8 100644
--- a/modules/webapp/src/main/elm/Comp/PersonTable.elm
+++ b/modules/webapp/src/main/elm/Comp/PersonTable.elm
@@ -12,7 +12,7 @@ import Data.Flags exposing (Flags)
 import Data.PersonUse
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.PersonTableComp exposing (Texts)
+import Messages.Comp.PersonTable exposing (Texts)
 import Styles as S
 import Util.Contact
 
diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
index 74236f85..244cc827 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm
@@ -39,8 +39,8 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (onCheck, onClick, onInput)
 import Http
 import Markdown
-import Messages.LanguageData
-import Messages.ScanMailboxFormComp exposing (Texts)
+import Messages.Comp.ScanMailboxForm exposing (Texts)
+import Messages.Data.Language
 import Set exposing (Set)
 import Styles as S
 import Util.Folder exposing (mkFolderOption)
@@ -1040,7 +1040,7 @@ viewMetadata2 texts flags settings model =
             }
 
         languageCfg =
-            { display = Messages.LanguageData.gb
+            { display = Messages.Data.Language.gb
             , icon = \_ -> Nothing
             , style = DS.mainStyleWith "flex-grow mr-2"
             }
diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm
index 07d2b8d0..fd6d3d12 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm
@@ -11,7 +11,7 @@ import Api.Model.ScanMailboxSettings exposing (ScanMailboxSettings)
 import Comp.Basic as B
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.ScanMailboxTableComp exposing (Texts)
+import Messages.Comp.ScanMailboxTable exposing (Texts)
 import Styles as S
 import Util.Html
 
diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm
index 72000d6f..ef6d5e0a 100644
--- a/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm
+++ b/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm
@@ -18,7 +18,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Http
-import Messages.ScanMailboxManageComp exposing (Texts)
+import Messages.Comp.ScanMailboxManage exposing (Texts)
 import Styles as S
 import Util.Http
 
diff --git a/modules/webapp/src/main/elm/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Comp/SearchMenu.elm
index 7e9ac390..00176bda 100644
--- a/modules/webapp/src/main/elm/Comp/SearchMenu.elm
+++ b/modules/webapp/src/main/elm/Comp/SearchMenu.elm
@@ -44,7 +44,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
 import Http
-import Messages.SearchMenuComp exposing (Texts)
+import Messages.Comp.SearchMenu exposing (Texts)
 import Set exposing (Set)
 import Styles as S
 import Util.Html exposing (KeyCode(..))
diff --git a/modules/webapp/src/main/elm/Comp/SearchStatsView.elm b/modules/webapp/src/main/elm/Comp/SearchStatsView.elm
index 861680eb..4e2d36a8 100644
--- a/modules/webapp/src/main/elm/Comp/SearchStatsView.elm
+++ b/modules/webapp/src/main/elm/Comp/SearchStatsView.elm
@@ -11,7 +11,7 @@ import Data.Icons as Icons
 import Data.Money
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.SearchStatsViewComp exposing (Texts)
+import Messages.Comp.SearchStatsView exposing (Texts)
 import Styles as S
 
 
diff --git a/modules/webapp/src/main/elm/Comp/SentMails.elm b/modules/webapp/src/main/elm/Comp/SentMails.elm
index bf846162..612223f6 100644
--- a/modules/webapp/src/main/elm/Comp/SentMails.elm
+++ b/modules/webapp/src/main/elm/Comp/SentMails.elm
@@ -13,7 +13,7 @@ import Comp.Basic as B
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.SentMailsComp exposing (Texts)
+import Messages.Comp.SentMails exposing (Texts)
 import Styles as S
 import Util.Time
 
diff --git a/modules/webapp/src/main/elm/Comp/SourceForm.elm b/modules/webapp/src/main/elm/Comp/SourceForm.elm
index 3a63a4d9..76a31b3a 100644
--- a/modules/webapp/src/main/elm/Comp/SourceForm.elm
+++ b/modules/webapp/src/main/elm/Comp/SourceForm.elm
@@ -28,7 +28,7 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (onCheck, onInput)
 import Http
 import Markdown
-import Messages.SourceFormComp exposing (Texts)
+import Messages.Comp.SourceForm exposing (Texts)
 import Styles as S
 import Util.Folder exposing (mkFolderOption)
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/SourceManage.elm b/modules/webapp/src/main/elm/Comp/SourceManage.elm
index e3044782..abd4ed82 100644
--- a/modules/webapp/src/main/elm/Comp/SourceManage.elm
+++ b/modules/webapp/src/main/elm/Comp/SourceManage.elm
@@ -21,7 +21,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onSubmit)
 import Http
-import Messages.SourceManageComp exposing (Texts)
+import Messages.Comp.SourceManage exposing (Texts)
 import Ports
 import QRCode
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Comp/SourceTable.elm b/modules/webapp/src/main/elm/Comp/SourceTable.elm
index 6aa4f53c..7d6dd6c9 100644
--- a/modules/webapp/src/main/elm/Comp/SourceTable.elm
+++ b/modules/webapp/src/main/elm/Comp/SourceTable.elm
@@ -12,7 +12,7 @@ import Data.Flags exposing (Flags)
 import Data.Priority
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.SourceTableComp exposing (Texts)
+import Messages.Comp.SourceTable exposing (Texts)
 import Styles as S
 import Util.Html
 
diff --git a/modules/webapp/src/main/elm/Comp/TagForm.elm b/modules/webapp/src/main/elm/Comp/TagForm.elm
index d0f921cc..af351a9d 100644
--- a/modules/webapp/src/main/elm/Comp/TagForm.elm
+++ b/modules/webapp/src/main/elm/Comp/TagForm.elm
@@ -16,7 +16,7 @@ import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.TagFormComp exposing (Texts)
+import Messages.Comp.TagForm exposing (Texts)
 import Styles as S
 import Util.Maybe
 
diff --git a/modules/webapp/src/main/elm/Comp/TagManage.elm b/modules/webapp/src/main/elm/Comp/TagManage.elm
index 617038a0..aef1957b 100644
--- a/modules/webapp/src/main/elm/Comp/TagManage.elm
+++ b/modules/webapp/src/main/elm/Comp/TagManage.elm
@@ -20,7 +20,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onSubmit)
 import Http
-import Messages.TagManageComp exposing (Texts)
+import Messages.Comp.TagManage exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/TagSelect.elm b/modules/webapp/src/main/elm/Comp/TagSelect.elm
index 579b4c6d..79bd149a 100644
--- a/modules/webapp/src/main/elm/Comp/TagSelect.elm
+++ b/modules/webapp/src/main/elm/Comp/TagSelect.elm
@@ -26,7 +26,7 @@ import Dict exposing (Dict)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
-import Messages.TagSelectComp exposing (Texts)
+import Messages.Comp.TagSelect exposing (Texts)
 import Set
 import Simple.Fuzzy
 import String as S
diff --git a/modules/webapp/src/main/elm/Comp/TagTable.elm b/modules/webapp/src/main/elm/Comp/TagTable.elm
index b8c089a6..6a77aaac 100644
--- a/modules/webapp/src/main/elm/Comp/TagTable.elm
+++ b/modules/webapp/src/main/elm/Comp/TagTable.elm
@@ -11,7 +11,7 @@ import Comp.Basic as B
 import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.TagTableComp exposing (Texts)
+import Messages.Comp.TagTable exposing (Texts)
 import Styles as S
 
 
diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm
index 23e9cf48..49eb7973 100644
--- a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm
+++ b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm
@@ -29,7 +29,7 @@ import Html.Events exposing (onClick, onInput)
 import Http
 import Markdown
 import Messages
-import Messages.UiSettingsFormComp exposing (Texts)
+import Messages.Comp.UiSettingsForm exposing (Texts)
 import Set exposing (Set)
 import Styles as S
 import UiLanguage exposing (UiLanguage)
diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
index 1e8cfd7a..c1e60230 100644
--- a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
+++ b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm
@@ -14,7 +14,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.UiSettingsManageComp exposing (Texts)
+import Messages.Comp.UiSettingsManage exposing (Texts)
 import Ports
 import Styles as S
 
diff --git a/modules/webapp/src/main/elm/Comp/UserForm.elm b/modules/webapp/src/main/elm/Comp/UserForm.elm
index 8d33f651..93351ecd 100644
--- a/modules/webapp/src/main/elm/Comp/UserForm.elm
+++ b/modules/webapp/src/main/elm/Comp/UserForm.elm
@@ -19,7 +19,7 @@ import Data.UserState exposing (UserState)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onInput)
-import Messages.UserFormComp exposing (Texts)
+import Messages.Comp.UserForm exposing (Texts)
 import Styles as S
 import Util.Maybe
 
diff --git a/modules/webapp/src/main/elm/Comp/UserManage.elm b/modules/webapp/src/main/elm/Comp/UserManage.elm
index 70519b5e..553111e1 100644
--- a/modules/webapp/src/main/elm/Comp/UserManage.elm
+++ b/modules/webapp/src/main/elm/Comp/UserManage.elm
@@ -21,7 +21,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onSubmit)
 import Http
-import Messages.UserManageComp exposing (Texts)
+import Messages.Comp.UserManage exposing (Texts)
 import Styles as S
 import Util.Http
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Comp/UserTable.elm b/modules/webapp/src/main/elm/Comp/UserTable.elm
index a5209be1..b30ee285 100644
--- a/modules/webapp/src/main/elm/Comp/UserTable.elm
+++ b/modules/webapp/src/main/elm/Comp/UserTable.elm
@@ -11,7 +11,7 @@ import Comp.Basic as B
 import Data.Flags exposing (Flags)
 import Html exposing (..)
 import Html.Attributes exposing (..)
-import Messages.UserTableComp exposing (Texts)
+import Messages.Comp.UserTable exposing (Texts)
 import Styles as S
 import Util.Time exposing (formatDateTime)
 
diff --git a/modules/webapp/src/main/elm/Messages.elm b/modules/webapp/src/main/elm/Messages.elm
index 5b9d80ba..d69c99ba 100644
--- a/modules/webapp/src/main/elm/Messages.elm
+++ b/modules/webapp/src/main/elm/Messages.elm
@@ -6,16 +6,16 @@ module Messages exposing
     )
 
 import Messages.App
-import Messages.CollectiveSettingsPage
-import Messages.HomePage
-import Messages.ItemDetailPage
-import Messages.LoginPage
-import Messages.ManageDataPage
-import Messages.NewInvitePage
-import Messages.QueuePage
-import Messages.RegisterPage
-import Messages.UploadPage
-import Messages.UserSettingsPage
+import Messages.Page.CollectiveSettings
+import Messages.Page.Home
+import Messages.Page.ItemDetail
+import Messages.Page.Login
+import Messages.Page.ManageData
+import Messages.Page.NewInvite
+import Messages.Page.Queue
+import Messages.Page.Register
+import Messages.Page.Upload
+import Messages.Page.UserSettings
 import UiLanguage exposing (UiLanguage(..))
 
 
@@ -27,16 +27,16 @@ type alias Messages =
     , label : String
     , flagIcon : String
     , app : Messages.App.Texts
-    , collectiveSettings : Messages.CollectiveSettingsPage.Texts
-    , login : Messages.LoginPage.Texts
-    , register : Messages.RegisterPage.Texts
-    , newInvite : Messages.NewInvitePage.Texts
-    , upload : Messages.UploadPage.Texts
-    , itemDetail : Messages.ItemDetailPage.Texts
-    , queue : Messages.QueuePage.Texts
-    , userSettings : Messages.UserSettingsPage.Texts
-    , manageData : Messages.ManageDataPage.Texts
-    , home : Messages.HomePage.Texts
+    , collectiveSettings : Messages.Page.CollectiveSettings.Texts
+    , login : Messages.Page.Login.Texts
+    , register : Messages.Page.Register.Texts
+    , newInvite : Messages.Page.NewInvite.Texts
+    , upload : Messages.Page.Upload.Texts
+    , itemDetail : Messages.Page.ItemDetail.Texts
+    , queue : Messages.Page.Queue.Texts
+    , userSettings : Messages.Page.UserSettings.Texts
+    , manageData : Messages.Page.ManageData.Texts
+    , home : Messages.Page.Home.Texts
     }
 
 
@@ -90,16 +90,16 @@ gb =
     , label = "English"
     , flagIcon = "flag-icon flag-icon-gb"
     , app = Messages.App.gb
-    , collectiveSettings = Messages.CollectiveSettingsPage.gb
-    , login = Messages.LoginPage.gb
-    , register = Messages.RegisterPage.gb
-    , newInvite = Messages.NewInvitePage.gb
-    , upload = Messages.UploadPage.gb
-    , itemDetail = Messages.ItemDetailPage.gb
-    , queue = Messages.QueuePage.gb
-    , userSettings = Messages.UserSettingsPage.gb
-    , manageData = Messages.ManageDataPage.gb
-    , home = Messages.HomePage.gb
+    , collectiveSettings = Messages.Page.CollectiveSettings.gb
+    , login = Messages.Page.Login.gb
+    , register = Messages.Page.Register.gb
+    , newInvite = Messages.Page.NewInvite.gb
+    , upload = Messages.Page.Upload.gb
+    , itemDetail = Messages.Page.ItemDetail.gb
+    , queue = Messages.Page.Queue.gb
+    , userSettings = Messages.Page.UserSettings.gb
+    , manageData = Messages.Page.ManageData.gb
+    , home = Messages.Page.Home.gb
     }
 
 
@@ -110,14 +110,14 @@ de =
     , label = "Deutsch"
     , flagIcon = "flag-icon flag-icon-de"
     , app = Messages.App.de
-    , collectiveSettings = Messages.CollectiveSettingsPage.de
-    , login = Messages.LoginPage.de
-    , register = Messages.RegisterPage.de
-    , newInvite = Messages.NewInvitePage.de
-    , upload = Messages.UploadPage.de
-    , itemDetail = Messages.ItemDetailPage.de
-    , queue = Messages.QueuePage.de
-    , userSettings = Messages.UserSettingsPage.de
-    , manageData = Messages.ManageDataPage.de
-    , home = Messages.HomePage.de
+    , collectiveSettings = Messages.Page.CollectiveSettings.de
+    , login = Messages.Page.Login.de
+    , register = Messages.Page.Register.de
+    , newInvite = Messages.Page.NewInvite.de
+    , upload = Messages.Page.Upload.de
+    , itemDetail = Messages.Page.ItemDetail.de
+    , queue = Messages.Page.Queue.de
+    , userSettings = Messages.Page.UserSettings.de
+    , manageData = Messages.Page.ManageData.de
+    , home = Messages.Page.Home.de
     }
diff --git a/modules/webapp/src/main/elm/Messages/AddressFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm
similarity index 86%
rename from modules/webapp/src/main/elm/Messages/AddressFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm
index 60bcf5a7..42c0bf5d 100644
--- a/modules/webapp/src/main/elm/Messages/AddressFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm
@@ -1,4 +1,4 @@
-module Messages.AddressFormComp exposing (..)
+module Messages.Comp.AddressForm exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/AttachmentMetaComp.elm b/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm
similarity index 94%
rename from modules/webapp/src/main/elm/Messages/AttachmentMetaComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm
index 73c47b01..463dab6b 100644
--- a/modules/webapp/src/main/elm/Messages/AttachmentMetaComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm
@@ -1,4 +1,4 @@
-module Messages.AttachmentMetaComp exposing (..)
+module Messages.Comp.AttachmentMeta exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/CalEventInputComp.elm b/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm
similarity index 90%
rename from modules/webapp/src/main/elm/Messages/CalEventInputComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm
index 16f67534..f648dcc2 100644
--- a/modules/webapp/src/main/elm/Messages/CalEventInputComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm
@@ -1,4 +1,4 @@
-module Messages.CalEventInputComp exposing (..)
+module Messages.Comp.CalEventInput exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/ChangePasswordFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm
similarity index 91%
rename from modules/webapp/src/main/elm/Messages/ChangePasswordFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm
index 3a6d9696..acbe8004 100644
--- a/modules/webapp/src/main/elm/Messages/ChangePasswordFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm
@@ -1,4 +1,4 @@
-module Messages.ChangePasswordFormComp exposing (..)
+module Messages.Comp.ChangePasswordForm exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/ClassifierSettingsFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm
similarity index 83%
rename from modules/webapp/src/main/elm/Messages/ClassifierSettingsFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm
index b342742a..dd649bbb 100644
--- a/modules/webapp/src/main/elm/Messages/ClassifierSettingsFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm
@@ -1,10 +1,10 @@
-module Messages.ClassifierSettingsFormComp exposing (..)
+module Messages.Comp.ClassifierSettingsForm exposing (..)
 
-import Messages.CalEventInputComp
+import Messages.Comp.CalEventInput
 
 
 type alias Texts =
-    { calEventInput : Messages.CalEventInputComp.Texts
+    { calEventInput : Messages.Comp.CalEventInput.Texts
     , autoTaggingText : String
     , blacklistOrWhitelist : String
     , whitelistLabel : String
@@ -17,7 +17,7 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { calEventInput = Messages.CalEventInputComp.gb
+    { calEventInput = Messages.Comp.CalEventInput.gb
     , autoTaggingText =
         """
 
diff --git a/modules/webapp/src/main/elm/Messages/CollectiveSettingsFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm
similarity index 81%
rename from modules/webapp/src/main/elm/Messages/CollectiveSettingsFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm
index a00e604e..c4e0d741 100644
--- a/modules/webapp/src/main/elm/Messages/CollectiveSettingsFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm
@@ -1,12 +1,12 @@
-module Messages.CollectiveSettingsFormComp exposing (..)
+module Messages.Comp.CollectiveSettingsForm exposing (..)
 
 import Data.Language exposing (Language)
-import Messages.ClassifierSettingsFormComp
-import Messages.LanguageData
+import Messages.Comp.ClassifierSettingsForm
+import Messages.Data.Language
 
 
 type alias Texts =
-    { classifierSettingsForm : Messages.ClassifierSettingsFormComp.Texts
+    { classifierSettingsForm : Messages.Comp.ClassifierSettingsForm.Texts
     , save : String
     , saveSettings : String
     , documentLanguage : String
@@ -25,7 +25,7 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { classifierSettingsForm = Messages.ClassifierSettingsFormComp.gb
+    { classifierSettingsForm = Messages.Comp.ClassifierSettingsForm.gb
     , save = "Save"
     , saveSettings = "Save Settings"
     , documentLanguage = "Document Language"
@@ -42,5 +42,5 @@ gb =
             ++ "You must type OK before clicking the button to avoid accidental re-indexing."
     , autoTagging = "Auto-Tagging"
     , startNow = "Start now"
-    , languageLabel = Messages.LanguageData.gb
+    , languageLabel = Messages.Data.Language.gb
     }
diff --git a/modules/webapp/src/main/elm/Messages/CustomFieldFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm
similarity index 90%
rename from modules/webapp/src/main/elm/Messages/CustomFieldFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm
index 9d536715..27977ab3 100644
--- a/modules/webapp/src/main/elm/Messages/CustomFieldFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm
@@ -1,8 +1,8 @@
-module Messages.CustomFieldFormComp exposing (..)
+module Messages.Comp.CustomFieldForm exposing (..)
 
 import Data.CustomFieldType exposing (CustomFieldType)
 import Messages.Basics
-import Messages.CustomFieldTypeData
+import Messages.Data.CustomFieldType
 
 
 type alias Texts =
@@ -25,7 +25,7 @@ gb : Texts
 gb =
     { basics = Messages.Basics.gb
     , reallyDeleteField = "Really delete this custom field?"
-    , fieldTypeLabel = Messages.CustomFieldTypeData.gb
+    , fieldTypeLabel = Messages.Data.CustomFieldType.gb
     , createCustomField = "Create a new custom field."
     , modifyTypeWarning =
         "Note that changing the format may "
diff --git a/modules/webapp/src/main/elm/Messages/CustomFieldInputComp.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm
similarity index 87%
rename from modules/webapp/src/main/elm/Messages/CustomFieldInputComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm
index 63d9982c..905c0dff 100644
--- a/modules/webapp/src/main/elm/Messages/CustomFieldInputComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm
@@ -1,4 +1,4 @@
-module Messages.CustomFieldInputComp exposing (..)
+module Messages.Comp.CustomFieldInput exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm
new file mode 100644
index 00000000..123b6a05
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm
@@ -0,0 +1,24 @@
+module Messages.Comp.CustomFieldManage exposing (..)
+
+import Messages.Basics
+import Messages.Comp.CustomFieldForm
+import Messages.Comp.CustomFieldTable
+
+
+type alias Texts =
+    { basics : Messages.Basics.Texts
+    , fieldForm : Messages.Comp.CustomFieldForm.Texts
+    , fieldTable : Messages.Comp.CustomFieldTable.Texts
+    , addCustomField : String
+    , newCustomField : String
+    }
+
+
+gb : Texts
+gb =
+    { basics = Messages.Basics.gb
+    , fieldForm = Messages.Comp.CustomFieldForm.gb
+    , fieldTable = Messages.Comp.CustomFieldTable.gb
+    , addCustomField = "Add a new custom field"
+    , newCustomField = "New custom field"
+    }
diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm
new file mode 100644
index 00000000..59e5bc25
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm
@@ -0,0 +1,14 @@
+module Messages.Comp.CustomFieldMultiInput exposing (..)
+
+import Messages.Comp.CustomFieldInput
+
+
+type alias Texts =
+    { customFieldInput : Messages.Comp.CustomFieldInput.Texts
+    }
+
+
+gb : Texts
+gb =
+    { customFieldInput = Messages.Comp.CustomFieldInput.gb
+    }
diff --git a/modules/webapp/src/main/elm/Messages/CustomFieldTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm
similarity index 85%
rename from modules/webapp/src/main/elm/Messages/CustomFieldTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm
index a3f66c68..30745c89 100644
--- a/modules/webapp/src/main/elm/Messages/CustomFieldTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm
@@ -1,4 +1,4 @@
-module Messages.CustomFieldTableComp exposing (..)
+module Messages.Comp.CustomFieldTable exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm
new file mode 100644
index 00000000..e73bd47f
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm
@@ -0,0 +1,29 @@
+module Messages.Comp.DetailEdit exposing (..)
+
+import Messages.Basics
+import Messages.Comp.CustomFieldForm
+import Messages.Comp.EquipmentForm
+import Messages.Comp.OrgForm
+import Messages.Comp.PersonForm
+import Messages.Comp.TagForm
+
+
+type alias Texts =
+    { basics : Messages.Basics.Texts
+    , tagForm : Messages.Comp.TagForm.Texts
+    , personForm : Messages.Comp.PersonForm.Texts
+    , orgForm : Messages.Comp.OrgForm.Texts
+    , equipmentForm : Messages.Comp.EquipmentForm.Texts
+    , customFieldForm : Messages.Comp.CustomFieldForm.Texts
+    }
+
+
+gb : Texts
+gb =
+    { basics = Messages.Basics.gb
+    , tagForm = Messages.Comp.TagForm.gb
+    , personForm = Messages.Comp.PersonForm.gb
+    , orgForm = Messages.Comp.OrgForm.gb
+    , equipmentForm = Messages.Comp.EquipmentForm.gb
+    , customFieldForm = Messages.Comp.CustomFieldForm.gb
+    }
diff --git a/modules/webapp/src/main/elm/Messages/DropzoneComp.elm b/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm
similarity index 89%
rename from modules/webapp/src/main/elm/Messages/DropzoneComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm
index f7d1f9bd..d1f17580 100644
--- a/modules/webapp/src/main/elm/Messages/DropzoneComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm
@@ -1,4 +1,4 @@
-module Messages.DropzoneComp exposing (..)
+module Messages.Comp.Dropzone exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/EmailSettingsFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm
similarity index 91%
rename from modules/webapp/src/main/elm/Messages/EmailSettingsFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm
index 1b971a48..b9ad0cd7 100644
--- a/modules/webapp/src/main/elm/Messages/EmailSettingsFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm
@@ -1,7 +1,7 @@
-module Messages.EmailSettingsFormComp exposing (..)
+module Messages.Comp.EmailSettingsForm exposing (..)
 
 import Data.SSLType exposing (SSLType)
-import Messages.SSLTypeData
+import Messages.Data.SSLType
 
 
 type alias Texts =
@@ -27,7 +27,7 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { sslTypeLabel = Messages.SSLTypeData.gb
+    { sslTypeLabel = Messages.Data.SSLType.gb
     , name = "Name"
     , connectionPlaceholder = "Connection name, e.g. 'gmail.com'"
     , connectionNameInfo = "The connection name must not contain whitespace or special characters."
diff --git a/modules/webapp/src/main/elm/Messages/EmailSettingsManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm
similarity index 56%
rename from modules/webapp/src/main/elm/Messages/EmailSettingsManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm
index 2fba48f2..a72c0531 100644
--- a/modules/webapp/src/main/elm/Messages/EmailSettingsManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm
@@ -1,14 +1,14 @@
-module Messages.EmailSettingsManageComp exposing (..)
+module Messages.Comp.EmailSettingsManage exposing (..)
 
 import Messages.Basics
-import Messages.EmailSettingsFormComp
-import Messages.EmailSettingsTableComp
+import Messages.Comp.EmailSettingsForm
+import Messages.Comp.EmailSettingsTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , settingsForm : Messages.EmailSettingsFormComp.Texts
-    , settingsTable : Messages.EmailSettingsTableComp.Texts
+    , settingsForm : Messages.Comp.EmailSettingsForm.Texts
+    , settingsTable : Messages.Comp.EmailSettingsTable.Texts
     , newSettings : String
     , addNewSmtpSettings : String
     , reallyDeleteConnection : String
@@ -19,8 +19,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , settingsForm = Messages.EmailSettingsFormComp.gb
-    , settingsTable = Messages.EmailSettingsTableComp.gb
+    , settingsForm = Messages.Comp.EmailSettingsForm.gb
+    , settingsTable = Messages.Comp.EmailSettingsTable.gb
     , newSettings = "New Settings"
     , addNewSmtpSettings = "Add new SMTP settings"
     , reallyDeleteConnection = "Really delete these connection?"
diff --git a/modules/webapp/src/main/elm/Messages/EmailSettingsTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm
similarity index 77%
rename from modules/webapp/src/main/elm/Messages/EmailSettingsTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm
index 49a8ef51..ca82df7b 100644
--- a/modules/webapp/src/main/elm/Messages/EmailSettingsTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm
@@ -1,4 +1,4 @@
-module Messages.EmailSettingsTableComp exposing (..)
+module Messages.Comp.EmailSettingsTable exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/EquipmentFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm
similarity index 51%
rename from modules/webapp/src/main/elm/Messages/EquipmentFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm
index e5df50d0..a7c7d954 100644
--- a/modules/webapp/src/main/elm/Messages/EquipmentFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm
@@ -1,7 +1,7 @@
-module Messages.EquipmentFormComp exposing (..)
+module Messages.Comp.EquipmentForm exposing (..)
 
 import Data.EquipmentUse exposing (EquipmentUse)
-import Messages.EquipmentUseData
+import Messages.Data.EquipmentUse
 
 
 type alias Texts =
@@ -11,5 +11,5 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { equipmentUseLabel = Messages.EquipmentUseData.gb
+    { equipmentUseLabel = Messages.Data.EquipmentUse.gb
     }
diff --git a/modules/webapp/src/main/elm/Messages/EquipmentManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm
similarity index 58%
rename from modules/webapp/src/main/elm/Messages/EquipmentManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm
index 75c344a2..c6aab13b 100644
--- a/modules/webapp/src/main/elm/Messages/EquipmentManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm
@@ -1,14 +1,14 @@
-module Messages.EquipmentManageComp exposing (..)
+module Messages.Comp.EquipmentManage exposing (..)
 
 import Messages.Basics
-import Messages.EquipmentFormComp
-import Messages.EquipmentTableComp
+import Messages.Comp.EquipmentForm
+import Messages.Comp.EquipmentTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , equipmentTable : Messages.EquipmentTableComp.Texts
-    , equipmentForm : Messages.EquipmentFormComp.Texts
+    , equipmentTable : Messages.Comp.EquipmentTable.Texts
+    , equipmentForm : Messages.Comp.EquipmentForm.Texts
     , createNewEquipment : String
     , newEquipment : String
     , reallyDeleteEquipment : String
@@ -19,8 +19,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , equipmentTable = Messages.EquipmentTableComp.gb
-    , equipmentForm = Messages.EquipmentFormComp.gb
+    , equipmentTable = Messages.Comp.EquipmentTable.gb
+    , equipmentForm = Messages.Comp.EquipmentForm.gb
     , createNewEquipment = "Create a new equipment"
     , newEquipment = "New Equipment"
     , reallyDeleteEquipment = "Really delete this equipment?"
diff --git a/modules/webapp/src/main/elm/Messages/EquipmentTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm
similarity index 61%
rename from modules/webapp/src/main/elm/Messages/EquipmentTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm
index 83dd5288..82e64b44 100644
--- a/modules/webapp/src/main/elm/Messages/EquipmentTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm
@@ -1,7 +1,7 @@
-module Messages.EquipmentTableComp exposing (..)
+module Messages.Comp.EquipmentTable exposing (..)
 
 import Data.EquipmentUse exposing (EquipmentUse)
-import Messages.EquipmentUseData
+import Messages.Data.EquipmentUse
 
 
 type alias Texts =
@@ -15,5 +15,5 @@ gb : Texts
 gb =
     { name = "Name"
     , use = "Use"
-    , equipmentUseLabel = Messages.EquipmentUseData.gb
+    , equipmentUseLabel = Messages.Data.EquipmentUse.gb
     }
diff --git a/modules/webapp/src/main/elm/Messages/FolderDetailComp.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm
similarity index 95%
rename from modules/webapp/src/main/elm/Messages/FolderDetailComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm
index 4714acaf..9b5c1d2d 100644
--- a/modules/webapp/src/main/elm/Messages/FolderDetailComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm
@@ -1,4 +1,4 @@
-module Messages.FolderDetailComp exposing (..)
+module Messages.Comp.FolderDetail exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/FolderManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm
similarity index 53%
rename from modules/webapp/src/main/elm/Messages/FolderManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm
index d3d43785..c1912da4 100644
--- a/modules/webapp/src/main/elm/Messages/FolderManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm
@@ -1,14 +1,14 @@
-module Messages.FolderManageComp exposing (..)
+module Messages.Comp.FolderManage exposing (..)
 
 import Messages.Basics
-import Messages.FolderDetailComp
-import Messages.FolderTableComp
+import Messages.Comp.FolderDetail
+import Messages.Comp.FolderTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , folderDetail : Messages.FolderDetailComp.Texts
-    , folderTable : Messages.FolderTableComp.Texts
+    , folderDetail : Messages.Comp.FolderDetail.Texts
+    , folderTable : Messages.Comp.FolderTable.Texts
     , showOwningFoldersOnly : String
     , createNewFolder : String
     , newFolder : String
@@ -18,8 +18,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , folderDetail = Messages.FolderDetailComp.gb
-    , folderTable = Messages.FolderTableComp.gb
+    , folderDetail = Messages.Comp.FolderDetail.gb
+    , folderTable = Messages.Comp.FolderTable.gb
     , showOwningFoldersOnly = "Show owning folders only"
     , createNewFolder = "Create a new folder"
     , newFolder = "New Folder"
diff --git a/modules/webapp/src/main/elm/Messages/FolderTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm
similarity index 83%
rename from modules/webapp/src/main/elm/Messages/FolderTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm
index e1cfc6ce..4982736f 100644
--- a/modules/webapp/src/main/elm/Messages/FolderTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm
@@ -1,4 +1,4 @@
-module Messages.FolderTableComp exposing (..)
+module Messages.Comp.FolderTable exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/ImapSettingsFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm
similarity index 90%
rename from modules/webapp/src/main/elm/Messages/ImapSettingsFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm
index 9c2ae4be..069dfcc2 100644
--- a/modules/webapp/src/main/elm/Messages/ImapSettingsFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm
@@ -1,7 +1,7 @@
-module Messages.ImapSettingsFormComp exposing (..)
+module Messages.Comp.ImapSettingsForm exposing (..)
 
 import Data.SSLType exposing (SSLType)
-import Messages.SSLTypeData
+import Messages.Data.SSLType
 
 
 type alias Texts =
@@ -25,7 +25,7 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { sslTypeLabel = Messages.SSLTypeData.gb
+    { sslTypeLabel = Messages.Data.SSLType.gb
     , name = "Name"
     , connectionNamePlaceholder = "Connection name, e.g. 'gmail.com'"
     , connectionNameInfo = "The connection name must not contain whitespace or special characters."
diff --git a/modules/webapp/src/main/elm/Messages/ImapSettingsManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm
similarity index 58%
rename from modules/webapp/src/main/elm/Messages/ImapSettingsManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm
index 77bd5cd2..296228e0 100644
--- a/modules/webapp/src/main/elm/Messages/ImapSettingsManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm
@@ -1,14 +1,14 @@
-module Messages.ImapSettingsManageComp exposing (..)
+module Messages.Comp.ImapSettingsManage exposing (..)
 
 import Messages.Basics
-import Messages.ImapSettingsFormComp
-import Messages.ImapSettingsTableComp
+import Messages.Comp.ImapSettingsForm
+import Messages.Comp.ImapSettingsTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , imapForm : Messages.ImapSettingsFormComp.Texts
-    , imapTable : Messages.ImapSettingsTableComp.Texts
+    , imapForm : Messages.Comp.ImapSettingsForm.Texts
+    , imapTable : Messages.Comp.ImapSettingsTable.Texts
     , addNewImapSettings : String
     , newSettings : String
     , reallyDeleteSettings : String
@@ -19,8 +19,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , imapForm = Messages.ImapSettingsFormComp.gb
-    , imapTable = Messages.ImapSettingsTableComp.gb
+    , imapForm = Messages.Comp.ImapSettingsForm.gb
+    , imapTable = Messages.Comp.ImapSettingsTable.gb
     , addNewImapSettings = "Add new IMAP settings"
     , newSettings = "New Settings"
     , reallyDeleteSettings = "Really delete this mail-box connection?"
diff --git a/modules/webapp/src/main/elm/Messages/ImapSettingsTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm
similarity index 73%
rename from modules/webapp/src/main/elm/Messages/ImapSettingsTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm
index 4f758bb6..f2f4c4ac 100644
--- a/modules/webapp/src/main/elm/Messages/ImapSettingsTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm
@@ -1,4 +1,4 @@
-module Messages.ImapSettingsTableComp exposing (..)
+module Messages.Comp.ImapSettingsTable exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/ItemCardComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm
similarity index 68%
rename from modules/webapp/src/main/elm/Messages/ItemCardComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm
index e83dc466..b5ba78b7 100644
--- a/modules/webapp/src/main/elm/Messages/ItemCardComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm
@@ -1,4 +1,4 @@
-module Messages.ItemCardComp exposing (..)
+module Messages.Comp.ItemCard exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm
new file mode 100644
index 00000000..9cb13cb0
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm
@@ -0,0 +1,14 @@
+module Messages.Comp.ItemCardList exposing (..)
+
+import Messages.Comp.ItemCard
+
+
+type alias Texts =
+    { itemCard : Messages.Comp.ItemCard.Texts
+    }
+
+
+gb : Texts
+gb =
+    { itemCard = Messages.Comp.ItemCard.gb
+    }
diff --git a/modules/webapp/src/main/elm/Messages/ItemDetailComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm
similarity index 52%
rename from modules/webapp/src/main/elm/Messages/ItemDetailComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm
index d3e64c2c..dbd62f5d 100644
--- a/modules/webapp/src/main/elm/Messages/ItemDetailComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm
@@ -1,22 +1,22 @@
-module Messages.ItemDetailComp exposing (..)
+module Messages.Comp.ItemDetail exposing (..)
 
-import Messages.DetailEditComp
-import Messages.ItemDetail.AddFilesForm
-import Messages.ItemInfoHeaderComp
-import Messages.ItemMailComp
-import Messages.NotesComp
-import Messages.SentMailsComp
-import Messages.SingleAttachmentComp
+import Messages.Comp.DetailEdit
+import Messages.Comp.ItemDetail.AddFilesForm
+import Messages.Comp.ItemDetail.ItemInfoHeader
+import Messages.Comp.ItemDetail.Notes
+import Messages.Comp.ItemDetail.SingleAttachment
+import Messages.Comp.ItemMail
+import Messages.Comp.SentMails
 
 
 type alias Texts =
-    { addFilesForm : Messages.ItemDetail.AddFilesForm.Texts
-    , itemInfoHeader : Messages.ItemInfoHeaderComp.Texts
-    , singleAttachment : Messages.SingleAttachmentComp.Texts
-    , sentMails : Messages.SentMailsComp.Texts
-    , notes : Messages.NotesComp.Texts
-    , itemMail : Messages.ItemMailComp.Texts
-    , detailEdit : Messages.DetailEditComp.Texts
+    { addFilesForm : Messages.Comp.ItemDetail.AddFilesForm.Texts
+    , itemInfoHeader : Messages.Comp.ItemDetail.ItemInfoHeader.Texts
+    , singleAttachment : Messages.Comp.ItemDetail.SingleAttachment.Texts
+    , sentMails : Messages.Comp.SentMails.Texts
+    , notes : Messages.Comp.ItemDetail.Notes.Texts
+    , itemMail : Messages.Comp.ItemMail.Texts
+    , detailEdit : Messages.Comp.DetailEdit.Texts
     , key : String
     , backToSearchResults : String
     , previousItem : String
@@ -39,13 +39,13 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { addFilesForm = Messages.ItemDetail.AddFilesForm.gb
-    , itemInfoHeader = Messages.ItemInfoHeaderComp.gb
-    , singleAttachment = Messages.SingleAttachmentComp.gb
-    , sentMails = Messages.SentMailsComp.gb
-    , notes = Messages.NotesComp.gb
-    , itemMail = Messages.ItemMailComp.gb
-    , detailEdit = Messages.DetailEditComp.gb
+    { addFilesForm = Messages.Comp.ItemDetail.AddFilesForm.gb
+    , itemInfoHeader = Messages.Comp.ItemDetail.ItemInfoHeader.gb
+    , singleAttachment = Messages.Comp.ItemDetail.SingleAttachment.gb
+    , sentMails = Messages.Comp.SentMails.gb
+    , notes = Messages.Comp.ItemDetail.Notes.gb
+    , itemMail = Messages.Comp.ItemMail.gb
+    , detailEdit = Messages.Comp.DetailEdit.gb
     , key = "Key"
     , backToSearchResults = "Back to search results"
     , previousItem = "Previous item."
diff --git a/modules/webapp/src/main/elm/Messages/ItemDetail/AddFilesForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm
similarity index 74%
rename from modules/webapp/src/main/elm/Messages/ItemDetail/AddFilesForm.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm
index 66e18079..a1908411 100644
--- a/modules/webapp/src/main/elm/Messages/ItemDetail/AddFilesForm.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm
@@ -1,11 +1,11 @@
-module Messages.ItemDetail.AddFilesForm exposing (..)
+module Messages.Comp.ItemDetail.AddFilesForm exposing (..)
 
 import Messages.Basics
-import Messages.DropzoneComp
+import Messages.Comp.Dropzone
 
 
 type alias Texts =
-    { dropzone : Messages.DropzoneComp.Texts
+    { dropzone : Messages.Comp.Dropzone.Texts
     , basics : Messages.Basics.Texts
     , addMoreFilesToItem : String
     , reset : String
@@ -16,7 +16,7 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { dropzone = Messages.DropzoneComp.gb
+    { dropzone = Messages.Comp.Dropzone.gb
     , basics = Messages.Basics.gb
     , addMoreFilesToItem = "Add more files to this item"
     , reset = "Reset"
diff --git a/modules/webapp/src/main/elm/Messages/EditFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm
similarity index 89%
rename from modules/webapp/src/main/elm/Messages/EditFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm
index 9b0b085e..b215a40c 100644
--- a/modules/webapp/src/main/elm/Messages/EditFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm
@@ -1,12 +1,12 @@
-module Messages.EditFormComp exposing (..)
+module Messages.Comp.ItemDetail.EditForm exposing (..)
 
 import Messages.Basics
-import Messages.CustomFieldMultiInputComp
+import Messages.Comp.CustomFieldMultiInput
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , customFieldInput : Messages.CustomFieldMultiInputComp.Texts
+    , customFieldInput : Messages.Comp.CustomFieldMultiInput.Texts
     , createNewCustomField : String
     , chooseDirection : String
     , selectPlaceholder : String
@@ -36,7 +36,7 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , customFieldInput = Messages.CustomFieldMultiInputComp.gb
+    , customFieldInput = Messages.Comp.CustomFieldMultiInput.gb
     , createNewCustomField = "Create new custom field"
     , chooseDirection = "Choose a direction…"
     , selectPlaceholder = "Select…"
diff --git a/modules/webapp/src/main/elm/Messages/ItemInfoHeaderComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm
similarity index 86%
rename from modules/webapp/src/main/elm/Messages/ItemInfoHeaderComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm
index 3f09358f..b330a77d 100644
--- a/modules/webapp/src/main/elm/Messages/ItemInfoHeaderComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm
@@ -1,4 +1,4 @@
-module Messages.ItemInfoHeaderComp exposing (..)
+module Messages.Comp.ItemDetail.ItemInfoHeader exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/MultiEditMenuComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm
similarity index 88%
rename from modules/webapp/src/main/elm/Messages/MultiEditMenuComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm
index 38920dbc..1f9bf3c1 100644
--- a/modules/webapp/src/main/elm/Messages/MultiEditMenuComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm
@@ -1,12 +1,12 @@
-module Messages.MultiEditMenuComp exposing (..)
+module Messages.Comp.ItemDetail.MultiEditMenu exposing (..)
 
 import Messages.Basics
-import Messages.CustomFieldMultiInputComp
+import Messages.Comp.CustomFieldMultiInput
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , customFieldMultiInput : Messages.CustomFieldMultiInputComp.Texts
+    , customFieldMultiInput : Messages.Comp.CustomFieldMultiInput.Texts
     , tagModeAddInfo : String
     , tagModeRemoveInfo : String
     , tagModeReplaceInfo : String
@@ -34,7 +34,7 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , customFieldMultiInput = Messages.CustomFieldMultiInputComp.gb
+    , customFieldMultiInput = Messages.Comp.CustomFieldMultiInput.gb
     , tagModeAddInfo = "Tags chosen here are *added* to all selected items."
     , tagModeRemoveInfo = "Tags chosen here are *removed* from all selected items."
     , tagModeReplaceInfo = "Tags chosen here *replace* those on selected items."
diff --git a/modules/webapp/src/main/elm/Messages/NotesComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm
similarity index 85%
rename from modules/webapp/src/main/elm/Messages/NotesComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm
index 8ab60e8a..de92e57e 100644
--- a/modules/webapp/src/main/elm/Messages/NotesComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm
@@ -1,4 +1,4 @@
-module Messages.NotesComp exposing (..)
+module Messages.Comp.ItemDetail.Notes exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/SingleAttachmentComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm
similarity index 78%
rename from modules/webapp/src/main/elm/Messages/SingleAttachmentComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm
index 40aca0e9..f785b748 100644
--- a/modules/webapp/src/main/elm/Messages/SingleAttachmentComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm
@@ -1,10 +1,10 @@
-module Messages.SingleAttachmentComp exposing (..)
+module Messages.Comp.ItemDetail.SingleAttachment exposing (..)
 
-import Messages.AttachmentMetaComp
+import Messages.Comp.AttachmentMeta
 
 
 type alias Texts =
-    { attachmentMeta : Messages.AttachmentMetaComp.Texts
+    { attachmentMeta : Messages.Comp.AttachmentMeta.Texts
     , noName : String
     , openFileInNewTab : String
     , downloadFile : String
@@ -20,7 +20,7 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { attachmentMeta = Messages.AttachmentMetaComp.gb
+    { attachmentMeta = Messages.Comp.AttachmentMeta.gb
     , noName = "No name"
     , openFileInNewTab = "Open file in new tab"
     , downloadFile = "Download file"
diff --git a/modules/webapp/src/main/elm/Messages/ItemMailComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm
similarity index 93%
rename from modules/webapp/src/main/elm/Messages/ItemMailComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm
index 4ebfc3b0..f154aa1a 100644
--- a/modules/webapp/src/main/elm/Messages/ItemMailComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm
@@ -1,4 +1,4 @@
-module Messages.ItemMailComp exposing (..)
+module Messages.Comp.ItemMail exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/NotificationFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm
similarity index 92%
rename from modules/webapp/src/main/elm/Messages/NotificationFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm
index 40360189..74894b16 100644
--- a/modules/webapp/src/main/elm/Messages/NotificationFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm
@@ -1,12 +1,12 @@
-module Messages.NotificationFormComp exposing (..)
+module Messages.Comp.NotificationForm exposing (..)
 
 import Messages.Basics
-import Messages.CalEventInputComp
+import Messages.Comp.CalEventInput
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , calEventInput : Messages.CalEventInputComp.Texts
+    , calEventInput : Messages.Comp.CalEventInput.Texts
     , reallyDeleteTask : String
     , startOnce : String
     , startTaskNow : String
@@ -36,7 +36,7 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , calEventInput = Messages.CalEventInputComp.gb
+    , calEventInput = Messages.Comp.CalEventInput.gb
     , reallyDeleteTask = "Really delete this notification task?"
     , startOnce = "Start Once"
     , startTaskNow = "Start this task now"
diff --git a/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm
new file mode 100644
index 00000000..b766598d
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm
@@ -0,0 +1,24 @@
+module Messages.Comp.NotificationManage exposing (..)
+
+import Messages.Basics
+import Messages.Comp.NotificationForm
+import Messages.Comp.NotificationTable
+
+
+type alias Texts =
+    { basics : Messages.Basics.Texts
+    , notificationForm : Messages.Comp.NotificationForm.Texts
+    , notificationTable : Messages.Comp.NotificationTable.Texts
+    , newTask : String
+    , createNewTask : String
+    }
+
+
+gb : Texts
+gb =
+    { basics = Messages.Basics.gb
+    , notificationForm = Messages.Comp.NotificationForm.gb
+    , notificationTable = Messages.Comp.NotificationTable.gb
+    , newTask = "New Task"
+    , createNewTask = "Create a new notification task"
+    }
diff --git a/modules/webapp/src/main/elm/Messages/NotificationTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm
similarity index 83%
rename from modules/webapp/src/main/elm/Messages/NotificationTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm
index c6c259a8..acea92ed 100644
--- a/modules/webapp/src/main/elm/Messages/NotificationTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm
@@ -1,4 +1,4 @@
-module Messages.NotificationTableComp exposing (..)
+module Messages.Comp.NotificationTable exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/OrgFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm
similarity index 66%
rename from modules/webapp/src/main/elm/Messages/OrgFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm
index 72e4ec17..13d5241f 100644
--- a/modules/webapp/src/main/elm/Messages/OrgFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm
@@ -1,14 +1,14 @@
-module Messages.OrgFormComp exposing (..)
+module Messages.Comp.OrgForm exposing (..)
 
 import Data.ContactType exposing (ContactType)
 import Data.OrgUse exposing (OrgUse)
-import Messages.AddressFormComp
-import Messages.ContactTypeData
-import Messages.OrgUseData
+import Messages.Comp.AddressForm
+import Messages.Data.ContactType
+import Messages.Data.OrgUse
 
 
 type alias Texts =
-    { addressForm : Messages.AddressFormComp.Texts
+    { addressForm : Messages.Comp.AddressForm.Texts
     , orgUseLabel : OrgUse -> String
     , name : String
     , shortName : String
@@ -24,8 +24,8 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { addressForm = Messages.AddressFormComp.gb
-    , orgUseLabel = Messages.OrgUseData.gb
+    { addressForm = Messages.Comp.AddressForm.gb
+    , orgUseLabel = Messages.Data.OrgUse.gb
     , name = "Name"
     , shortName = "Short Name"
     , use = "Use"
@@ -33,6 +33,6 @@ gb =
     , dontUseForSuggestions = "Do not use for suggestions."
     , address = "Address"
     , contacts = "Contacts"
-    , contactTypeLabel = Messages.ContactTypeData.gb
+    , contactTypeLabel = Messages.Data.ContactType.gb
     , notes = "Notes"
     }
diff --git a/modules/webapp/src/main/elm/Messages/OrgManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm
similarity index 63%
rename from modules/webapp/src/main/elm/Messages/OrgManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm
index 20c6424e..a0474c8b 100644
--- a/modules/webapp/src/main/elm/Messages/OrgManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm
@@ -1,14 +1,14 @@
-module Messages.OrgManageComp exposing (..)
+module Messages.Comp.OrgManage exposing (..)
 
 import Messages.Basics
-import Messages.OrgFormComp
-import Messages.OrgTableComp
+import Messages.Comp.OrgForm
+import Messages.Comp.OrgTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , orgForm : Messages.OrgFormComp.Texts
-    , orgTable : Messages.OrgTableComp.Texts
+    , orgForm : Messages.Comp.OrgForm.Texts
+    , orgTable : Messages.Comp.OrgTable.Texts
     , newOrganization : String
     , createNewOrganization : String
     , reallyDeleteOrg : String
@@ -19,8 +19,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , orgForm = Messages.OrgFormComp.gb
-    , orgTable = Messages.OrgTableComp.gb
+    , orgForm = Messages.Comp.OrgForm.gb
+    , orgTable = Messages.Comp.OrgTable.gb
     , newOrganization = "New Organization"
     , createNewOrganization = "Create a new organization"
     , reallyDeleteOrg = "Really delete this organization?"
diff --git a/modules/webapp/src/main/elm/Messages/OrgTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm
similarity index 75%
rename from modules/webapp/src/main/elm/Messages/OrgTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm
index 5a7fae3d..361c1903 100644
--- a/modules/webapp/src/main/elm/Messages/OrgTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm
@@ -1,8 +1,8 @@
-module Messages.OrgTableComp exposing (..)
+module Messages.Comp.OrgTable exposing (..)
 
 import Data.OrgUse exposing (OrgUse)
 import Messages.Basics
-import Messages.OrgUseData
+import Messages.Data.OrgUse
 
 
 type alias Texts =
@@ -20,5 +20,5 @@ gb =
     , name = "Name"
     , address = "Address"
     , contact = "Contact"
-    , orgUseLabel = Messages.OrgUseData.gb
+    , orgUseLabel = Messages.Data.OrgUse.gb
     }
diff --git a/modules/webapp/src/main/elm/Messages/PersonFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm
similarity index 74%
rename from modules/webapp/src/main/elm/Messages/PersonFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm
index 54f8b612..53cedf43 100644
--- a/modules/webapp/src/main/elm/Messages/PersonFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm
@@ -1,14 +1,14 @@
-module Messages.PersonFormComp exposing (..)
+module Messages.Comp.PersonForm exposing (..)
 
 import Data.ContactType exposing (ContactType)
 import Data.PersonUse exposing (PersonUse)
-import Messages.AddressFormComp
-import Messages.ContactTypeData
-import Messages.PersonUseData
+import Messages.Comp.AddressForm
+import Messages.Data.ContactType
+import Messages.Data.PersonUse
 
 
 type alias Texts =
-    { addressForm : Messages.AddressFormComp.Texts
+    { addressForm : Messages.Comp.AddressForm.Texts
     , personUseLabel : PersonUse -> String
     , name : String
     , useOfPerson : String
@@ -27,8 +27,8 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { addressForm = Messages.AddressFormComp.gb
-    , personUseLabel = Messages.PersonUseData.gb
+    { addressForm = Messages.Comp.AddressForm.gb
+    , personUseLabel = Messages.Data.PersonUse.gb
     , name = "Name"
     , useOfPerson = "Use of this person"
     , useAsConcerningOnly = "Use as concerning person only"
@@ -39,6 +39,6 @@ gb =
     , chooseAnOrg = "Choose an organization"
     , address = "Address"
     , contacts = "Contacts"
-    , contactTypeLabel = Messages.ContactTypeData.gb
+    , contactTypeLabel = Messages.Data.ContactType.gb
     , notes = "Notes"
     }
diff --git a/modules/webapp/src/main/elm/Messages/PersonManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm
similarity index 58%
rename from modules/webapp/src/main/elm/Messages/PersonManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm
index d72a23de..f32a4540 100644
--- a/modules/webapp/src/main/elm/Messages/PersonManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm
@@ -1,14 +1,14 @@
-module Messages.PersonManageComp exposing (..)
+module Messages.Comp.PersonManage exposing (..)
 
 import Messages.Basics
-import Messages.PersonFormComp
-import Messages.PersonTableComp
+import Messages.Comp.PersonForm
+import Messages.Comp.PersonTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , personForm : Messages.PersonFormComp.Texts
-    , personTable : Messages.PersonTableComp.Texts
+    , personForm : Messages.Comp.PersonForm.Texts
+    , personTable : Messages.Comp.PersonTable.Texts
     , newPerson : String
     , createNewPerson : String
     , reallyDeletePerson : String
@@ -19,8 +19,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , personForm = Messages.PersonFormComp.gb
-    , personTable = Messages.PersonTableComp.gb
+    , personForm = Messages.Comp.PersonForm.gb
+    , personTable = Messages.Comp.PersonTable.gb
     , newPerson = "New Person"
     , createNewPerson = "Create a new person"
     , reallyDeletePerson = "Really delete this person?"
diff --git a/modules/webapp/src/main/elm/Messages/PersonTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm
similarity index 74%
rename from modules/webapp/src/main/elm/Messages/PersonTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm
index b87f5920..8d10a81d 100644
--- a/modules/webapp/src/main/elm/Messages/PersonTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm
@@ -1,8 +1,8 @@
-module Messages.PersonTableComp exposing (..)
+module Messages.Comp.PersonTable exposing (..)
 
 import Data.PersonUse exposing (PersonUse)
 import Messages.Basics
-import Messages.PersonUseData
+import Messages.Data.PersonUse
 
 
 type alias Texts =
@@ -20,5 +20,5 @@ gb =
     , name = "Name"
     , address = "Address"
     , contact = "Contact"
-    , personUseLabel = Messages.PersonUseData.gb
+    , personUseLabel = Messages.Data.PersonUse.gb
     }
diff --git a/modules/webapp/src/main/elm/Messages/ScanMailboxFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
similarity index 96%
rename from modules/webapp/src/main/elm/Messages/ScanMailboxFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
index 4972896c..c5c298b1 100644
--- a/modules/webapp/src/main/elm/Messages/ScanMailboxFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm
@@ -1,12 +1,12 @@
-module Messages.ScanMailboxFormComp exposing (..)
+module Messages.Comp.ScanMailboxForm exposing (..)
 
 import Messages.Basics
-import Messages.CalEventInputComp
+import Messages.Comp.CalEventInput
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , calEventInput : Messages.CalEventInputComp.Texts
+    , calEventInput : Messages.Comp.CalEventInput.Texts
     , reallyDeleteTask : String
     , startOnce : String
     , startNow : String
@@ -60,7 +60,7 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , calEventInput = Messages.CalEventInputComp.gb
+    , calEventInput = Messages.Comp.CalEventInput.gb
     , reallyDeleteTask = "Really delete this scan mailbox task?"
     , startOnce = "Start Once"
     , startNow = "Start this task now"
diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm
new file mode 100644
index 00000000..8803cc22
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm
@@ -0,0 +1,24 @@
+module Messages.Comp.ScanMailboxManage exposing (..)
+
+import Messages.Basics
+import Messages.Comp.ScanMailboxForm
+import Messages.Comp.ScanMailboxTable
+
+
+type alias Texts =
+    { basics : Messages.Basics.Texts
+    , form : Messages.Comp.ScanMailboxForm.Texts
+    , table : Messages.Comp.ScanMailboxTable.Texts
+    , newTask : String
+    , createNewTask : String
+    }
+
+
+gb : Texts
+gb =
+    { basics = Messages.Basics.gb
+    , form = Messages.Comp.ScanMailboxForm.gb
+    , table = Messages.Comp.ScanMailboxTable.gb
+    , newTask = "New Task"
+    , createNewTask = "Create a new scan mailbox task"
+    }
diff --git a/modules/webapp/src/main/elm/Messages/ScanMailboxTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm
similarity index 84%
rename from modules/webapp/src/main/elm/Messages/ScanMailboxTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm
index 7fd6638c..48dd9cc2 100644
--- a/modules/webapp/src/main/elm/Messages/ScanMailboxTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm
@@ -1,4 +1,4 @@
-module Messages.ScanMailboxTableComp exposing (..)
+module Messages.Comp.ScanMailboxTable exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/SearchMenuComp.elm b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm
similarity index 86%
rename from modules/webapp/src/main/elm/Messages/SearchMenuComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm
index 92119a90..5eb7f4de 100644
--- a/modules/webapp/src/main/elm/Messages/SearchMenuComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm
@@ -1,14 +1,14 @@
-module Messages.SearchMenuComp exposing (..)
+module Messages.Comp.SearchMenu exposing (..)
 
 import Messages.Basics
-import Messages.CustomFieldMultiInputComp
-import Messages.TagSelectComp
+import Messages.Comp.CustomFieldMultiInput
+import Messages.Comp.TagSelect
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , customFieldMultiInput : Messages.CustomFieldMultiInputComp.Texts
-    , tagSelect : Messages.TagSelectComp.Texts
+    , customFieldMultiInput : Messages.Comp.CustomFieldMultiInput.Texts
+    , tagSelect : Messages.Comp.TagSelect.Texts
     , chooseDirection : String
     , choosePerson : String
     , chooseEquipment : String
@@ -45,8 +45,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , customFieldMultiInput = Messages.CustomFieldMultiInputComp.gb
-    , tagSelect = Messages.TagSelectComp.gb
+    , customFieldMultiInput = Messages.Comp.CustomFieldMultiInput.gb
+    , tagSelect = Messages.Comp.TagSelect.gb
     , chooseDirection = "Choose a direction…"
     , choosePerson = "Choose a person"
     , chooseEquipment = "Choose an equipment"
diff --git a/modules/webapp/src/main/elm/Messages/SearchStatsViewComp.elm b/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm
similarity index 84%
rename from modules/webapp/src/main/elm/Messages/SearchStatsViewComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm
index d6913f09..5810c588 100644
--- a/modules/webapp/src/main/elm/Messages/SearchStatsViewComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm
@@ -1,4 +1,4 @@
-module Messages.SearchStatsViewComp exposing (..)
+module Messages.Comp.SearchStatsView exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/SentMailsComp.elm b/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm
similarity index 87%
rename from modules/webapp/src/main/elm/Messages/SentMailsComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/SentMails.elm
index 6f68bc65..1dd241fc 100644
--- a/modules/webapp/src/main/elm/Messages/SentMailsComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm
@@ -1,4 +1,4 @@
-module Messages.SentMailsComp exposing (..)
+module Messages.Comp.SentMails exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/SourceFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm
similarity index 94%
rename from modules/webapp/src/main/elm/Messages/SourceFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm
index ab941c80..9aac062c 100644
--- a/modules/webapp/src/main/elm/Messages/SourceFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm
@@ -1,8 +1,8 @@
-module Messages.SourceFormComp exposing (..)
+module Messages.Comp.SourceForm exposing (..)
 
 import Data.Language exposing (Language)
 import Messages.Basics
-import Messages.LanguageData
+import Messages.Data.Language
 
 
 type alias Texts =
@@ -62,6 +62,6 @@ Specify a file glob to filter files when uploading archives
     , languageInfo =
         "Used for text extraction and analysis. The collective's "
             ++ "default language is used if not specified here."
-    , languageLabel = Messages.LanguageData.gb
+    , languageLabel = Messages.Data.Language.gb
     , selectPlaceholder = "Select…"
     }
diff --git a/modules/webapp/src/main/elm/Messages/SourceManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm
similarity index 82%
rename from modules/webapp/src/main/elm/Messages/SourceManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm
index a6b68cf2..8b466539 100644
--- a/modules/webapp/src/main/elm/Messages/SourceManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm
@@ -1,14 +1,14 @@
-module Messages.SourceManageComp exposing (..)
+module Messages.Comp.SourceManage exposing (..)
 
 import Messages.Basics
-import Messages.SourceFormComp
-import Messages.SourceTableComp
+import Messages.Comp.SourceForm
+import Messages.Comp.SourceTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , sourceTable : Messages.SourceTableComp.Texts
-    , sourceForm : Messages.SourceFormComp.Texts
+    , sourceTable : Messages.Comp.SourceTable.Texts
+    , sourceForm : Messages.Comp.SourceForm.Texts
     , addSourceUrl : String
     , newSource : String
     , publicUploads : String
@@ -28,8 +28,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , sourceTable = Messages.SourceTableComp.gb
-    , sourceForm = Messages.SourceFormComp.gb
+    , sourceTable = Messages.Comp.SourceTable.gb
+    , sourceForm = Messages.Comp.SourceForm.gb
     , addSourceUrl = "Add a source url"
     , newSource = "New source"
     , publicUploads = "Public Uploads"
diff --git a/modules/webapp/src/main/elm/Messages/SourceTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm
similarity index 87%
rename from modules/webapp/src/main/elm/Messages/SourceTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm
index 1b306995..90d6ea29 100644
--- a/modules/webapp/src/main/elm/Messages/SourceTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm
@@ -1,4 +1,4 @@
-module Messages.SourceTableComp exposing (..)
+module Messages.Comp.SourceTable exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/TagFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm
similarity index 84%
rename from modules/webapp/src/main/elm/Messages/TagFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/TagForm.elm
index 7e37f3af..7893a63f 100644
--- a/modules/webapp/src/main/elm/Messages/TagFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm
@@ -1,4 +1,4 @@
-module Messages.TagFormComp exposing (..)
+module Messages.Comp.TagForm exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/TagManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm
similarity index 59%
rename from modules/webapp/src/main/elm/Messages/TagManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/TagManage.elm
index c69b043c..1a05c160 100644
--- a/modules/webapp/src/main/elm/Messages/TagManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm
@@ -1,14 +1,14 @@
-module Messages.TagManageComp exposing (..)
+module Messages.Comp.TagManage exposing (..)
 
 import Messages.Basics
-import Messages.TagFormComp
-import Messages.TagTableComp
+import Messages.Comp.TagForm
+import Messages.Comp.TagTable
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , tagTable : Messages.TagTableComp.Texts
-    , tagForm : Messages.TagFormComp.Texts
+    , tagTable : Messages.Comp.TagTable.Texts
+    , tagForm : Messages.Comp.TagForm.Texts
     , createNewTag : String
     , newTag : String
     , reallyDeleteTag : String
@@ -19,8 +19,8 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , tagTable = Messages.TagTableComp.gb
-    , tagForm = Messages.TagFormComp.gb
+    , tagTable = Messages.Comp.TagTable.gb
+    , tagForm = Messages.Comp.TagForm.gb
     , createNewTag = "Create a new tag"
     , newTag = "New Tag"
     , reallyDeleteTag = "Really delete this tag?"
diff --git a/modules/webapp/src/main/elm/Messages/TagSelectComp.elm b/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm
similarity index 83%
rename from modules/webapp/src/main/elm/Messages/TagSelectComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm
index e07949ac..ac790146 100644
--- a/modules/webapp/src/main/elm/Messages/TagSelectComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm
@@ -1,4 +1,4 @@
-module Messages.TagSelectComp exposing (..)
+module Messages.Comp.TagSelect exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/TagTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm
similarity index 76%
rename from modules/webapp/src/main/elm/Messages/TagTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/TagTable.elm
index 611f32c1..5e0dc40b 100644
--- a/modules/webapp/src/main/elm/Messages/TagTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm
@@ -1,4 +1,4 @@
-module Messages.TagTableComp exposing (..)
+module Messages.Comp.TagTable exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/UiSettingsFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm
similarity index 94%
rename from modules/webapp/src/main/elm/Messages/UiSettingsFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm
index 5da66fcb..920c321f 100644
--- a/modules/webapp/src/main/elm/Messages/UiSettingsFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm
@@ -1,9 +1,9 @@
-module Messages.UiSettingsFormComp exposing (..)
+module Messages.Comp.UiSettingsForm exposing (..)
 
 import Data.Color exposing (Color)
 import Data.Fields exposing (Field)
-import Messages.ColorData
-import Messages.FieldsData
+import Messages.Data.Color
+import Messages.Data.Fields
 
 
 type alias Texts =
@@ -78,10 +78,10 @@ gb =
     , browserNativePdfView = "Browser-native PDF preview"
     , keyboardShortcutLabel = "Use keyboard shortcuts for navigation and confirm/unconfirm with open edit menu."
     , tagCategoryColors = "Tag Category Colors"
-    , colorLabel = Messages.ColorData.gb
+    , colorLabel = Messages.Data.Color.gb
     , chooseTagColorLabel = "Choose color for tag categories"
     , tagColorDescription = "Tags can be represented differently based on their category."
     , fields = "Fields"
     , fieldsInfo = "Choose which fields to display in search and edit menus."
-    , fieldLabel = Messages.FieldsData.gb
+    , fieldLabel = Messages.Data.Fields.gb
     }
diff --git a/modules/webapp/src/main/elm/Messages/UiSettingsManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm
similarity index 51%
rename from modules/webapp/src/main/elm/Messages/UiSettingsManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm
index 669e016d..3b38bcbd 100644
--- a/modules/webapp/src/main/elm/Messages/UiSettingsManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm
@@ -1,12 +1,12 @@
-module Messages.UiSettingsManageComp exposing (..)
+module Messages.Comp.UiSettingsManage exposing (..)
 
 import Messages.Basics
-import Messages.UiSettingsFormComp
+import Messages.Comp.UiSettingsForm
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , uiSettingsForm : Messages.UiSettingsFormComp.Texts
+    , uiSettingsForm : Messages.Comp.UiSettingsForm.Texts
     , saveSettings : String
     }
 
@@ -14,6 +14,6 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , uiSettingsForm = Messages.UiSettingsFormComp.gb
+    , uiSettingsForm = Messages.Comp.UiSettingsForm.gb
     , saveSettings = "Save settings"
     }
diff --git a/modules/webapp/src/main/elm/Messages/UserFormComp.elm b/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm
similarity index 84%
rename from modules/webapp/src/main/elm/Messages/UserFormComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/UserForm.elm
index 4616f360..f533bcd8 100644
--- a/modules/webapp/src/main/elm/Messages/UserFormComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm
@@ -1,4 +1,4 @@
-module Messages.UserFormComp exposing (..)
+module Messages.Comp.UserForm exposing (..)
 
 
 type alias Texts =
diff --git a/modules/webapp/src/main/elm/Messages/UserManageComp.elm b/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm
similarity index 69%
rename from modules/webapp/src/main/elm/Messages/UserManageComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/UserManage.elm
index 98870683..19b927f5 100644
--- a/modules/webapp/src/main/elm/Messages/UserManageComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm
@@ -1,13 +1,13 @@
-module Messages.UserManageComp exposing (..)
+module Messages.Comp.UserManage exposing (..)
 
 import Messages.Basics
-import Messages.UserFormComp
-import Messages.UserTableComp
+import Messages.Comp.UserForm
+import Messages.Comp.UserTable
 
 
 type alias Texts =
-    { userTable : Messages.UserTableComp.Texts
-    , userForm : Messages.UserFormComp.Texts
+    { userTable : Messages.Comp.UserTable.Texts
+    , userForm : Messages.Comp.UserForm.Texts
     , users : String
     , newUser : String
     , addNewUser : String
@@ -21,8 +21,8 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { userTable = Messages.UserTableComp.gb
-    , userForm = Messages.UserFormComp.gb
+    { userTable = Messages.Comp.UserTable.gb
+    , userForm = Messages.Comp.UserForm.gb
     , basics = Messages.Basics.gb
     , users = "Users"
     , newUser = "New user"
diff --git a/modules/webapp/src/main/elm/Messages/UserTableComp.elm b/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm
similarity index 90%
rename from modules/webapp/src/main/elm/Messages/UserTableComp.elm
rename to modules/webapp/src/main/elm/Messages/Comp/UserTable.elm
index 30939c31..e434e42f 100644
--- a/modules/webapp/src/main/elm/Messages/UserTableComp.elm
+++ b/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm
@@ -1,4 +1,4 @@
-module Messages.UserTableComp exposing (..)
+module Messages.Comp.UserTable exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/CustomFieldManageComp.elm b/modules/webapp/src/main/elm/Messages/CustomFieldManageComp.elm
deleted file mode 100644
index b6449cc4..00000000
--- a/modules/webapp/src/main/elm/Messages/CustomFieldManageComp.elm
+++ /dev/null
@@ -1,24 +0,0 @@
-module Messages.CustomFieldManageComp exposing (..)
-
-import Messages.Basics
-import Messages.CustomFieldFormComp
-import Messages.CustomFieldTableComp
-
-
-type alias Texts =
-    { basics : Messages.Basics.Texts
-    , fieldForm : Messages.CustomFieldFormComp.Texts
-    , fieldTable : Messages.CustomFieldTableComp.Texts
-    , addCustomField : String
-    , newCustomField : String
-    }
-
-
-gb : Texts
-gb =
-    { basics = Messages.Basics.gb
-    , fieldForm = Messages.CustomFieldFormComp.gb
-    , fieldTable = Messages.CustomFieldTableComp.gb
-    , addCustomField = "Add a new custom field"
-    , newCustomField = "New custom field"
-    }
diff --git a/modules/webapp/src/main/elm/Messages/CustomFieldMultiInputComp.elm b/modules/webapp/src/main/elm/Messages/CustomFieldMultiInputComp.elm
deleted file mode 100644
index 96e2a209..00000000
--- a/modules/webapp/src/main/elm/Messages/CustomFieldMultiInputComp.elm
+++ /dev/null
@@ -1,14 +0,0 @@
-module Messages.CustomFieldMultiInputComp exposing (..)
-
-import Messages.CustomFieldInputComp
-
-
-type alias Texts =
-    { customFieldInput : Messages.CustomFieldInputComp.Texts
-    }
-
-
-gb : Texts
-gb =
-    { customFieldInput = Messages.CustomFieldInputComp.gb
-    }
diff --git a/modules/webapp/src/main/elm/Messages/ColorData.elm b/modules/webapp/src/main/elm/Messages/Data/Color.elm
similarity index 93%
rename from modules/webapp/src/main/elm/Messages/ColorData.elm
rename to modules/webapp/src/main/elm/Messages/Data/Color.elm
index fe495cf1..cc516943 100644
--- a/modules/webapp/src/main/elm/Messages/ColorData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/Color.elm
@@ -1,4 +1,4 @@
-module Messages.ColorData exposing (..)
+module Messages.Data.Color exposing (..)
 
 import Data.Color exposing (Color(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/ContactTypeData.elm b/modules/webapp/src/main/elm/Messages/Data/ContactType.elm
similarity index 87%
rename from modules/webapp/src/main/elm/Messages/ContactTypeData.elm
rename to modules/webapp/src/main/elm/Messages/Data/ContactType.elm
index 8464d08f..06056387 100644
--- a/modules/webapp/src/main/elm/Messages/ContactTypeData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/ContactType.elm
@@ -1,4 +1,4 @@
-module Messages.ContactTypeData exposing (..)
+module Messages.Data.ContactType exposing (..)
 
 import Data.ContactType exposing (ContactType(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/CustomFieldTypeData.elm b/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm
similarity index 85%
rename from modules/webapp/src/main/elm/Messages/CustomFieldTypeData.elm
rename to modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm
index 2069725b..39fba224 100644
--- a/modules/webapp/src/main/elm/Messages/CustomFieldTypeData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm
@@ -1,4 +1,4 @@
-module Messages.CustomFieldTypeData exposing (..)
+module Messages.Data.CustomFieldType exposing (..)
 
 import Data.CustomFieldType exposing (CustomFieldType(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/EquipmentUseData.elm b/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm
similarity index 80%
rename from modules/webapp/src/main/elm/Messages/EquipmentUseData.elm
rename to modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm
index a10c0eee..bc3cbdca 100644
--- a/modules/webapp/src/main/elm/Messages/EquipmentUseData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm
@@ -1,4 +1,4 @@
-module Messages.EquipmentUseData exposing (..)
+module Messages.Data.EquipmentUse exposing (..)
 
 import Data.EquipmentUse exposing (EquipmentUse(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/FieldsData.elm b/modules/webapp/src/main/elm/Messages/Data/Fields.elm
similarity index 94%
rename from modules/webapp/src/main/elm/Messages/FieldsData.elm
rename to modules/webapp/src/main/elm/Messages/Data/Fields.elm
index 1fd406fa..f9b65e23 100644
--- a/modules/webapp/src/main/elm/Messages/FieldsData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/Fields.elm
@@ -1,4 +1,4 @@
-module Messages.FieldsData exposing (..)
+module Messages.Data.Fields exposing (..)
 
 import Data.Fields exposing (Field(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/LanguageData.elm b/modules/webapp/src/main/elm/Messages/Data/Language.elm
similarity index 94%
rename from modules/webapp/src/main/elm/Messages/LanguageData.elm
rename to modules/webapp/src/main/elm/Messages/Data/Language.elm
index b55a4ef0..3c21f593 100644
--- a/modules/webapp/src/main/elm/Messages/LanguageData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/Language.elm
@@ -1,4 +1,4 @@
-module Messages.LanguageData exposing (..)
+module Messages.Data.Language exposing (..)
 
 import Data.Language exposing (Language(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/OrgUseData.elm b/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm
similarity index 81%
rename from modules/webapp/src/main/elm/Messages/OrgUseData.elm
rename to modules/webapp/src/main/elm/Messages/Data/OrgUse.elm
index bf318146..b765b153 100644
--- a/modules/webapp/src/main/elm/Messages/OrgUseData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm
@@ -1,4 +1,4 @@
-module Messages.OrgUseData exposing (..)
+module Messages.Data.OrgUse exposing (..)
 
 import Data.OrgUse exposing (OrgUse(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/PersonUseData.elm b/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm
similarity index 86%
rename from modules/webapp/src/main/elm/Messages/PersonUseData.elm
rename to modules/webapp/src/main/elm/Messages/Data/PersonUse.elm
index 4db90e04..f1c46bf6 100644
--- a/modules/webapp/src/main/elm/Messages/PersonUseData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm
@@ -1,4 +1,4 @@
-module Messages.PersonUseData exposing (..)
+module Messages.Data.PersonUse exposing (..)
 
 import Data.PersonUse exposing (PersonUse(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/SSLTypeData.elm b/modules/webapp/src/main/elm/Messages/Data/SSLType.elm
similarity index 82%
rename from modules/webapp/src/main/elm/Messages/SSLTypeData.elm
rename to modules/webapp/src/main/elm/Messages/Data/SSLType.elm
index 803f7ba7..6e051ae0 100644
--- a/modules/webapp/src/main/elm/Messages/SSLTypeData.elm
+++ b/modules/webapp/src/main/elm/Messages/Data/SSLType.elm
@@ -1,4 +1,4 @@
-module Messages.SSLTypeData exposing (..)
+module Messages.Data.SSLType exposing (..)
 
 import Data.SSLType exposing (SSLType(..))
 
diff --git a/modules/webapp/src/main/elm/Messages/DetailEditComp.elm b/modules/webapp/src/main/elm/Messages/DetailEditComp.elm
deleted file mode 100644
index 7a6ddeb9..00000000
--- a/modules/webapp/src/main/elm/Messages/DetailEditComp.elm
+++ /dev/null
@@ -1,29 +0,0 @@
-module Messages.DetailEditComp exposing (..)
-
-import Messages.Basics
-import Messages.CustomFieldFormComp
-import Messages.EquipmentFormComp
-import Messages.OrgFormComp
-import Messages.PersonFormComp
-import Messages.TagFormComp
-
-
-type alias Texts =
-    { basics : Messages.Basics.Texts
-    , tagForm : Messages.TagFormComp.Texts
-    , personForm : Messages.PersonFormComp.Texts
-    , orgForm : Messages.OrgFormComp.Texts
-    , equipmentForm : Messages.EquipmentFormComp.Texts
-    , customFieldForm : Messages.CustomFieldFormComp.Texts
-    }
-
-
-gb : Texts
-gb =
-    { basics = Messages.Basics.gb
-    , tagForm = Messages.TagFormComp.gb
-    , personForm = Messages.PersonFormComp.gb
-    , orgForm = Messages.OrgFormComp.gb
-    , equipmentForm = Messages.EquipmentFormComp.gb
-    , customFieldForm = Messages.CustomFieldFormComp.gb
-    }
diff --git a/modules/webapp/src/main/elm/Messages/ItemCardListComp.elm b/modules/webapp/src/main/elm/Messages/ItemCardListComp.elm
deleted file mode 100644
index 79a5adeb..00000000
--- a/modules/webapp/src/main/elm/Messages/ItemCardListComp.elm
+++ /dev/null
@@ -1,14 +0,0 @@
-module Messages.ItemCardListComp exposing (..)
-
-import Messages.ItemCardComp
-
-
-type alias Texts =
-    { itemCard : Messages.ItemCardComp.Texts
-    }
-
-
-gb : Texts
-gb =
-    { itemCard = Messages.ItemCardComp.gb
-    }
diff --git a/modules/webapp/src/main/elm/Messages/ItemDetailPage.elm b/modules/webapp/src/main/elm/Messages/ItemDetailPage.elm
deleted file mode 100644
index ea1fbda3..00000000
--- a/modules/webapp/src/main/elm/Messages/ItemDetailPage.elm
+++ /dev/null
@@ -1,26 +0,0 @@
-module Messages.ItemDetailPage exposing (..)
-
-import Messages.EditFormComp
-import Messages.ItemDetailComp
-
-
-type alias Texts =
-    { itemDetail : Messages.ItemDetailComp.Texts
-    , editForm : Messages.EditFormComp.Texts
-    , editMetadata : String
-    , collapseExpand : String
-    }
-
-
-gb : Texts
-gb =
-    { itemDetail = Messages.ItemDetailComp.gb
-    , editForm = Messages.EditFormComp.gb
-    , editMetadata = "Edit Metadata"
-    , collapseExpand = "Collapse/Expand"
-    }
-
-
-de : Texts
-de =
-    gb
diff --git a/modules/webapp/src/main/elm/Messages/ManageDataPage.elm b/modules/webapp/src/main/elm/Messages/ManageDataPage.elm
deleted file mode 100644
index c416169a..00000000
--- a/modules/webapp/src/main/elm/Messages/ManageDataPage.elm
+++ /dev/null
@@ -1,49 +0,0 @@
-module Messages.ManageDataPage exposing (..)
-
-import Messages.Basics
-import Messages.CustomFieldManageComp
-import Messages.EquipmentManageComp
-import Messages.FolderManageComp
-import Messages.OrgManageComp
-import Messages.PersonManageComp
-import Messages.TagManageComp
-
-
-type alias Texts =
-    { basics : Messages.Basics.Texts
-    , tagManage : Messages.TagManageComp.Texts
-    , equipmentManage : Messages.EquipmentManageComp.Texts
-    , orgManage : Messages.OrgManageComp.Texts
-    , personManage : Messages.PersonManageComp.Texts
-    , folderManage : Messages.FolderManageComp.Texts
-    , customFieldManage : Messages.CustomFieldManageComp.Texts
-    , manageData : String
-    , equipment : String
-    , organization : String
-    , person : String
-    , folder : String
-    , customFields : String
-    }
-
-
-gb : Texts
-gb =
-    { basics = Messages.Basics.gb
-    , tagManage = Messages.TagManageComp.gb
-    , equipmentManage = Messages.EquipmentManageComp.gb
-    , orgManage = Messages.OrgManageComp.gb
-    , personManage = Messages.PersonManageComp.gb
-    , folderManage = Messages.FolderManageComp.gb
-    , customFieldManage = Messages.CustomFieldManageComp.gb
-    , manageData = "Manage Data"
-    , equipment = "Equipment"
-    , organization = "Organization"
-    , person = "Person"
-    , folder = "Folder"
-    , customFields = "Custom Fields"
-    }
-
-
-de : Texts
-de =
-    gb
diff --git a/modules/webapp/src/main/elm/Messages/NotificationManageComp.elm b/modules/webapp/src/main/elm/Messages/NotificationManageComp.elm
deleted file mode 100644
index 30b8547e..00000000
--- a/modules/webapp/src/main/elm/Messages/NotificationManageComp.elm
+++ /dev/null
@@ -1,24 +0,0 @@
-module Messages.NotificationManageComp exposing (..)
-
-import Messages.Basics
-import Messages.NotificationFormComp
-import Messages.NotificationTableComp
-
-
-type alias Texts =
-    { basics : Messages.Basics.Texts
-    , notificationForm : Messages.NotificationFormComp.Texts
-    , notificationTable : Messages.NotificationTableComp.Texts
-    , newTask : String
-    , createNewTask : String
-    }
-
-
-gb : Texts
-gb =
-    { basics = Messages.Basics.gb
-    , notificationForm = Messages.NotificationFormComp.gb
-    , notificationTable = Messages.NotificationTableComp.gb
-    , newTask = "New Task"
-    , createNewTask = "Create a new notification task"
-    }
diff --git a/modules/webapp/src/main/elm/Messages/CollectiveSettingsPage.elm b/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm
similarity index 53%
rename from modules/webapp/src/main/elm/Messages/CollectiveSettingsPage.elm
rename to modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm
index 8d05c859..0e254a9f 100644
--- a/modules/webapp/src/main/elm/Messages/CollectiveSettingsPage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm
@@ -1,16 +1,16 @@
-module Messages.CollectiveSettingsPage exposing (..)
+module Messages.Page.CollectiveSettings exposing (..)
 
 import Messages.Basics
-import Messages.CollectiveSettingsFormComp
-import Messages.SourceManageComp
-import Messages.UserManageComp
+import Messages.Comp.CollectiveSettingsForm
+import Messages.Comp.SourceManage
+import Messages.Comp.UserManage
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , userManage : Messages.UserManageComp.Texts
-    , collectiveSettingsForm : Messages.CollectiveSettingsFormComp.Texts
-    , sourceManage : Messages.SourceManageComp.Texts
+    , userManage : Messages.Comp.UserManage.Texts
+    , collectiveSettingsForm : Messages.Comp.CollectiveSettingsForm.Texts
+    , sourceManage : Messages.Comp.SourceManage.Texts
     , collectiveSettings : String
     , insights : String
     , sources : String
@@ -25,9 +25,9 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , userManage = Messages.UserManageComp.gb
-    , collectiveSettingsForm = Messages.CollectiveSettingsFormComp.gb
-    , sourceManage = Messages.SourceManageComp.gb
+    , userManage = Messages.Comp.UserManage.gb
+    , collectiveSettingsForm = Messages.Comp.CollectiveSettingsForm.gb
+    , sourceManage = Messages.Comp.SourceManage.gb
     , collectiveSettings = "Collective Settings"
     , insights = "Insights"
     , sources = "Sources"
diff --git a/modules/webapp/src/main/elm/Messages/HomePage.elm b/modules/webapp/src/main/elm/Messages/Page/Home.elm
similarity index 77%
rename from modules/webapp/src/main/elm/Messages/HomePage.elm
rename to modules/webapp/src/main/elm/Messages/Page/Home.elm
index 575af594..1299926d 100644
--- a/modules/webapp/src/main/elm/Messages/HomePage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Home.elm
@@ -1,16 +1,16 @@
-module Messages.HomePage exposing (..)
+module Messages.Page.Home exposing (..)
 
 import Messages.Basics
-import Messages.HomeSideMenu
-import Messages.ItemCardListComp
-import Messages.SearchStatsViewComp
+import Messages.Comp.ItemCardList
+import Messages.Comp.SearchStatsView
+import Messages.Page.HomeSideMenu
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , sideMenu : Messages.HomeSideMenu.Texts
-    , itemCardList : Messages.ItemCardListComp.Texts
-    , searchStatsView : Messages.SearchStatsViewComp.Texts
+    , itemCardList : Messages.Comp.ItemCardList.Texts
+    , searchStatsView : Messages.Comp.SearchStatsView.Texts
+    , sideMenu : Messages.Page.HomeSideMenu.Texts
     , contentSearch : String
     , searchInNames : String
     , selectModeTitle : String
@@ -32,9 +32,9 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , sideMenu = Messages.HomeSideMenu.gb
-    , itemCardList = Messages.ItemCardListComp.gb
-    , searchStatsView = Messages.SearchStatsViewComp.gb
+    , itemCardList = Messages.Comp.ItemCardList.gb
+    , searchStatsView = Messages.Comp.SearchStatsView.gb
+    , sideMenu = Messages.Page.HomeSideMenu.gb
     , contentSearch = "Content search…"
     , searchInNames = "Search in names…"
     , selectModeTitle = "Select Mode"
diff --git a/modules/webapp/src/main/elm/Messages/HomeSideMenu.elm b/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm
similarity index 54%
rename from modules/webapp/src/main/elm/Messages/HomeSideMenu.elm
rename to modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm
index 0517f6cf..6701a8cd 100644
--- a/modules/webapp/src/main/elm/Messages/HomeSideMenu.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm
@@ -1,12 +1,12 @@
-module Messages.HomeSideMenu exposing (..)
+module Messages.Page.HomeSideMenu exposing (..)
 
-import Messages.MultiEditMenuComp
-import Messages.SearchMenuComp
+import Messages.Comp.ItemDetail.MultiEditMenu
+import Messages.Comp.SearchMenu
 
 
 type alias Texts =
-    { searchMenu : Messages.SearchMenuComp.Texts
-    , multiEdit : Messages.MultiEditMenuComp.Texts
+    { searchMenu : Messages.Comp.SearchMenu.Texts
+    , multiEdit : Messages.Comp.ItemDetail.MultiEditMenu.Texts
     , editMode : String
     , resetSearchForm : String
     , multiEditHeader : String
@@ -17,8 +17,8 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { searchMenu = Messages.SearchMenuComp.gb
-    , multiEdit = Messages.MultiEditMenuComp.gb
+    { searchMenu = Messages.Comp.SearchMenu.gb
+    , multiEdit = Messages.Comp.ItemDetail.MultiEditMenu.gb
     , editMode = "Edit Mode"
     , resetSearchForm = "Reset search form"
     , multiEditHeader = "Multi-Edit"
diff --git a/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm b/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm
new file mode 100644
index 00000000..5bd48731
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm
@@ -0,0 +1,26 @@
+module Messages.Page.ItemDetail exposing (..)
+
+import Messages.Comp.ItemDetail
+import Messages.Comp.ItemDetail.EditForm
+
+
+type alias Texts =
+    { itemDetail : Messages.Comp.ItemDetail.Texts
+    , editForm : Messages.Comp.ItemDetail.EditForm.Texts
+    , editMetadata : String
+    , collapseExpand : String
+    }
+
+
+gb : Texts
+gb =
+    { itemDetail = Messages.Comp.ItemDetail.gb
+    , editForm = Messages.Comp.ItemDetail.EditForm.gb
+    , editMetadata = "Edit Metadata"
+    , collapseExpand = "Collapse/Expand"
+    }
+
+
+de : Texts
+de =
+    gb
diff --git a/modules/webapp/src/main/elm/Messages/LoginPage.elm b/modules/webapp/src/main/elm/Messages/Page/Login.elm
similarity index 97%
rename from modules/webapp/src/main/elm/Messages/LoginPage.elm
rename to modules/webapp/src/main/elm/Messages/Page/Login.elm
index 94d2b2d5..00322cd9 100644
--- a/modules/webapp/src/main/elm/Messages/LoginPage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Login.elm
@@ -1,4 +1,4 @@
-module Messages.LoginPage exposing
+module Messages.Page.Login exposing
     ( Texts
     , de
     , gb
diff --git a/modules/webapp/src/main/elm/Messages/Page/ManageData.elm b/modules/webapp/src/main/elm/Messages/Page/ManageData.elm
new file mode 100644
index 00000000..b2051ed6
--- /dev/null
+++ b/modules/webapp/src/main/elm/Messages/Page/ManageData.elm
@@ -0,0 +1,49 @@
+module Messages.Page.ManageData exposing (..)
+
+import Messages.Basics
+import Messages.Comp.CustomFieldManage
+import Messages.Comp.EquipmentManage
+import Messages.Comp.FolderManage
+import Messages.Comp.OrgManage
+import Messages.Comp.PersonManage
+import Messages.Comp.TagManage
+
+
+type alias Texts =
+    { basics : Messages.Basics.Texts
+    , tagManage : Messages.Comp.TagManage.Texts
+    , equipmentManage : Messages.Comp.EquipmentManage.Texts
+    , orgManage : Messages.Comp.OrgManage.Texts
+    , personManage : Messages.Comp.PersonManage.Texts
+    , folderManage : Messages.Comp.FolderManage.Texts
+    , customFieldManage : Messages.Comp.CustomFieldManage.Texts
+    , manageData : String
+    , equipment : String
+    , organization : String
+    , person : String
+    , folder : String
+    , customFields : String
+    }
+
+
+gb : Texts
+gb =
+    { basics = Messages.Basics.gb
+    , tagManage = Messages.Comp.TagManage.gb
+    , equipmentManage = Messages.Comp.EquipmentManage.gb
+    , orgManage = Messages.Comp.OrgManage.gb
+    , personManage = Messages.Comp.PersonManage.gb
+    , folderManage = Messages.Comp.FolderManage.gb
+    , customFieldManage = Messages.Comp.CustomFieldManage.gb
+    , manageData = "Manage Data"
+    , equipment = "Equipment"
+    , organization = "Organization"
+    , person = "Person"
+    , folder = "Folder"
+    , customFields = "Custom Fields"
+    }
+
+
+de : Texts
+de =
+    gb
diff --git a/modules/webapp/src/main/elm/Messages/NewInvitePage.elm b/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm
similarity index 94%
rename from modules/webapp/src/main/elm/Messages/NewInvitePage.elm
rename to modules/webapp/src/main/elm/Messages/Page/NewInvite.elm
index 1a8e1eb0..0654c75b 100644
--- a/modules/webapp/src/main/elm/Messages/NewInvitePage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm
@@ -1,4 +1,4 @@
-module Messages.NewInvitePage exposing (..)
+module Messages.Page.NewInvite exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/QueuePage.elm b/modules/webapp/src/main/elm/Messages/Page/Queue.elm
similarity index 96%
rename from modules/webapp/src/main/elm/Messages/QueuePage.elm
rename to modules/webapp/src/main/elm/Messages/Page/Queue.elm
index 2d43501d..689eb045 100644
--- a/modules/webapp/src/main/elm/Messages/QueuePage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Queue.elm
@@ -1,4 +1,4 @@
-module Messages.QueuePage exposing (..)
+module Messages.Page.Queue exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/RegisterPage.elm b/modules/webapp/src/main/elm/Messages/Page/Register.elm
similarity index 95%
rename from modules/webapp/src/main/elm/Messages/RegisterPage.elm
rename to modules/webapp/src/main/elm/Messages/Page/Register.elm
index 6b0dba5f..ac6f3543 100644
--- a/modules/webapp/src/main/elm/Messages/RegisterPage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Register.elm
@@ -1,4 +1,4 @@
-module Messages.RegisterPage exposing (..)
+module Messages.Page.Register exposing (..)
 
 import Messages.Basics
 
diff --git a/modules/webapp/src/main/elm/Messages/UploadPage.elm b/modules/webapp/src/main/elm/Messages/Page/Upload.elm
similarity index 87%
rename from modules/webapp/src/main/elm/Messages/UploadPage.elm
rename to modules/webapp/src/main/elm/Messages/Page/Upload.elm
index 08524567..8effba94 100644
--- a/modules/webapp/src/main/elm/Messages/UploadPage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/Upload.elm
@@ -1,14 +1,14 @@
-module Messages.UploadPage exposing (..)
+module Messages.Page.Upload exposing (..)
 
 import Data.Language exposing (Language)
 import Messages.Basics
-import Messages.DropzoneComp
-import Messages.LanguageData
+import Messages.Comp.Dropzone
+import Messages.Data.Language
 
 
 type alias Texts =
     { basics : Messages.Basics.Texts
-    , dropzone : Messages.DropzoneComp.Texts
+    , dropzone : Messages.Comp.Dropzone.Texts
     , reset : String
     , allFilesOneItem : String
     , skipExistingFiles : String
@@ -34,7 +34,7 @@ type alias Texts =
 gb : Texts
 gb =
     { basics = Messages.Basics.gb
-    , dropzone = Messages.DropzoneComp.gb
+    , dropzone = Messages.Comp.Dropzone.gb
     , reset = "Reset"
     , allFilesOneItem = "All files are one single item"
     , skipExistingFiles = "Skip files already present in docspell"
@@ -57,7 +57,7 @@ gb =
         , resetLine2 = " to upload more files."
         }
     , selectedFiles = "Selected Files"
-    , languageLabel = Messages.LanguageData.gb
+    , languageLabel = Messages.Data.Language.gb
     }
 
 
diff --git a/modules/webapp/src/main/elm/Messages/UserSettingsPage.elm b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm
similarity index 65%
rename from modules/webapp/src/main/elm/Messages/UserSettingsPage.elm
rename to modules/webapp/src/main/elm/Messages/Page/UserSettings.elm
index ad4d5aea..4b44fc5a 100644
--- a/modules/webapp/src/main/elm/Messages/UserSettingsPage.elm
+++ b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm
@@ -1,20 +1,20 @@
-module Messages.UserSettingsPage exposing (..)
+module Messages.Page.UserSettings exposing (..)
 
-import Messages.ChangePasswordFormComp
-import Messages.EmailSettingsManageComp
-import Messages.ImapSettingsManageComp
-import Messages.NotificationManageComp
-import Messages.ScanMailboxManageComp
-import Messages.UiSettingsManageComp
+import Messages.Comp.ChangePasswordForm
+import Messages.Comp.EmailSettingsManage
+import Messages.Comp.ImapSettingsManage
+import Messages.Comp.NotificationManage
+import Messages.Comp.ScanMailboxManage
+import Messages.Comp.UiSettingsManage
 
 
 type alias Texts =
-    { changePasswordForm : Messages.ChangePasswordFormComp.Texts
-    , uiSettingsManage : Messages.UiSettingsManageComp.Texts
-    , emailSettingsManage : Messages.EmailSettingsManageComp.Texts
-    , imapSettingsManage : Messages.ImapSettingsManageComp.Texts
-    , notificationManage : Messages.NotificationManageComp.Texts
-    , scanMailboxManage : Messages.ScanMailboxManageComp.Texts
+    { changePasswordForm : Messages.Comp.ChangePasswordForm.Texts
+    , uiSettingsManage : Messages.Comp.UiSettingsManage.Texts
+    , emailSettingsManage : Messages.Comp.EmailSettingsManage.Texts
+    , imapSettingsManage : Messages.Comp.ImapSettingsManage.Texts
+    , notificationManage : Messages.Comp.NotificationManage.Texts
+    , scanMailboxManage : Messages.Comp.ScanMailboxManage.Texts
     , userSettings : String
     , uiSettings : String
     , notifications : String
@@ -32,12 +32,12 @@ type alias Texts =
 
 gb : Texts
 gb =
-    { changePasswordForm = Messages.ChangePasswordFormComp.gb
-    , uiSettingsManage = Messages.UiSettingsManageComp.gb
-    , emailSettingsManage = Messages.EmailSettingsManageComp.gb
-    , imapSettingsManage = Messages.ImapSettingsManageComp.gb
-    , notificationManage = Messages.NotificationManageComp.gb
-    , scanMailboxManage = Messages.ScanMailboxManageComp.gb
+    { changePasswordForm = Messages.Comp.ChangePasswordForm.gb
+    , uiSettingsManage = Messages.Comp.UiSettingsManage.gb
+    , emailSettingsManage = Messages.Comp.EmailSettingsManage.gb
+    , imapSettingsManage = Messages.Comp.ImapSettingsManage.gb
+    , notificationManage = Messages.Comp.NotificationManage.gb
+    , scanMailboxManage = Messages.Comp.ScanMailboxManage.gb
     , userSettings = "User Settings"
     , uiSettings = "UI Settings"
     , notifications = "Notifications"
diff --git a/modules/webapp/src/main/elm/Messages/ScanMailboxManageComp.elm b/modules/webapp/src/main/elm/Messages/ScanMailboxManageComp.elm
deleted file mode 100644
index 2d0b7c24..00000000
--- a/modules/webapp/src/main/elm/Messages/ScanMailboxManageComp.elm
+++ /dev/null
@@ -1,24 +0,0 @@
-module Messages.ScanMailboxManageComp exposing (..)
-
-import Messages.Basics
-import Messages.ScanMailboxFormComp
-import Messages.ScanMailboxTableComp
-
-
-type alias Texts =
-    { basics : Messages.Basics.Texts
-    , form : Messages.ScanMailboxFormComp.Texts
-    , table : Messages.ScanMailboxTableComp.Texts
-    , newTask : String
-    , createNewTask : String
-    }
-
-
-gb : Texts
-gb =
-    { basics = Messages.Basics.gb
-    , form = Messages.ScanMailboxFormComp.gb
-    , table = Messages.ScanMailboxTableComp.gb
-    , newTask = "New Task"
-    , createNewTask = "Create a new scan mailbox task"
-    }
diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm
index 33c89996..54fecf9c 100644
--- a/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm
+++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm
@@ -11,7 +11,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.CollectiveSettingsPage exposing (Texts)
+import Messages.Page.CollectiveSettings exposing (Texts)
 import Page.CollectiveSettings.Data exposing (..)
 import Styles as S
 import Util.Maybe
diff --git a/modules/webapp/src/main/elm/Page/Home/SideMenu.elm b/modules/webapp/src/main/elm/Page/Home/SideMenu.elm
index f09c84e9..79433f0a 100644
--- a/modules/webapp/src/main/elm/Page/Home/SideMenu.elm
+++ b/modules/webapp/src/main/elm/Page/Home/SideMenu.elm
@@ -9,7 +9,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.HomeSideMenu exposing (Texts)
+import Messages.Page.HomeSideMenu exposing (Texts)
 import Page.Home.Data exposing (..)
 import Set
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Page/Home/View2.elm b/modules/webapp/src/main/elm/Page/Home/View2.elm
index a1e223e4..e31f5545 100644
--- a/modules/webapp/src/main/elm/Page/Home/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Home/View2.elm
@@ -13,7 +13,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput)
-import Messages.HomePage exposing (Texts)
+import Messages.Page.Home exposing (Texts)
 import Page exposing (Page(..))
 import Page.Home.Data exposing (..)
 import Page.Home.SideMenu
diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm b/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm
index e3d4b3d9..17c61fe6 100644
--- a/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm
+++ b/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm
@@ -11,7 +11,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.ItemDetailPage exposing (Texts)
+import Messages.Page.ItemDetail exposing (Texts)
 import Page.ItemDetail.Data exposing (..)
 import Styles as S
 
diff --git a/modules/webapp/src/main/elm/Page/Login/View2.elm b/modules/webapp/src/main/elm/Page/Login/View2.elm
index 1289132c..c3a2d972 100644
--- a/modules/webapp/src/main/elm/Page/Login/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Login/View2.elm
@@ -6,7 +6,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onCheck, onInput, onSubmit)
-import Messages.LoginPage exposing (Texts)
+import Messages.Page.Login exposing (Texts)
 import Page exposing (Page(..))
 import Page.Login.Data exposing (..)
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Page/ManageData/View2.elm b/modules/webapp/src/main/elm/Page/ManageData/View2.elm
index 437f49b7..0749a0ce 100644
--- a/modules/webapp/src/main/elm/Page/ManageData/View2.elm
+++ b/modules/webapp/src/main/elm/Page/ManageData/View2.elm
@@ -13,7 +13,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.ManageDataPage exposing (Texts)
+import Messages.Page.ManageData exposing (Texts)
 import Page.ManageData.Data exposing (..)
 import Styles as S
 
diff --git a/modules/webapp/src/main/elm/Page/NewInvite/View2.elm b/modules/webapp/src/main/elm/Page/NewInvite/View2.elm
index f81666e9..5b0368ba 100644
--- a/modules/webapp/src/main/elm/Page/NewInvite/View2.elm
+++ b/modules/webapp/src/main/elm/Page/NewInvite/View2.elm
@@ -6,7 +6,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput, onSubmit)
 import Markdown
-import Messages.NewInvitePage exposing (Texts)
+import Messages.Page.NewInvite exposing (Texts)
 import Page.NewInvite.Data exposing (..)
 import Styles as S
 
diff --git a/modules/webapp/src/main/elm/Page/Queue/View2.elm b/modules/webapp/src/main/elm/Page/Queue/View2.elm
index 1fd14053..f1f62704 100644
--- a/modules/webapp/src/main/elm/Page/Queue/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Queue/View2.elm
@@ -10,7 +10,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
-import Messages.QueuePage exposing (Texts)
+import Messages.Page.Queue exposing (Texts)
 import Page.Queue.Data exposing (..)
 import Styles as S
 import Util.Time exposing (formatDateTime, formatIsoDateTime)
diff --git a/modules/webapp/src/main/elm/Page/Register/View2.elm b/modules/webapp/src/main/elm/Page/Register/View2.elm
index 9da3a1c2..d71cb3d8 100644
--- a/modules/webapp/src/main/elm/Page/Register/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Register/View2.elm
@@ -6,7 +6,7 @@ import Data.UiSettings exposing (UiSettings)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick, onInput, onSubmit)
-import Messages.RegisterPage exposing (Texts)
+import Messages.Page.Register exposing (Texts)
 import Page exposing (Page(..))
 import Page.Register.Data exposing (..)
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Page/Upload/View2.elm b/modules/webapp/src/main/elm/Page/Upload/View2.elm
index 0cc8cb35..7abc6006 100644
--- a/modules/webapp/src/main/elm/Page/Upload/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Upload/View2.elm
@@ -5,14 +5,13 @@ import Comp.FixedDropdown
 import Comp.Progress
 import Data.DropdownStyle as DS
 import Data.Flags exposing (Flags)
-import Data.Language
 import Data.UiSettings exposing (UiSettings)
 import Dict
 import File exposing (File)
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onCheck, onClick)
-import Messages.UploadPage exposing (Texts)
+import Messages.Page.Upload exposing (Texts)
 import Page exposing (Page(..))
 import Page.Upload.Data exposing (..)
 import Styles as S
diff --git a/modules/webapp/src/main/elm/Page/UserSettings/View2.elm b/modules/webapp/src/main/elm/Page/UserSettings/View2.elm
index 0756cbfb..a29a37bf 100644
--- a/modules/webapp/src/main/elm/Page/UserSettings/View2.elm
+++ b/modules/webapp/src/main/elm/Page/UserSettings/View2.elm
@@ -12,7 +12,7 @@ import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Markdown
-import Messages.UserSettingsPage exposing (Texts)
+import Messages.Page.UserSettings exposing (Texts)
 import Page.UserSettings.Data exposing (..)
 import Styles as S