Reorganize messages to reflect page structure

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
 

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

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

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
 

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
 

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
 

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

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
 

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
 

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

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
 

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
 

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)
 

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
 

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
 

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
 
 

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
 

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

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
 
 

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

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
 
 

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
 

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
 

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
 

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
 
 

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

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

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(..))
 
 

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)

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

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

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

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

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

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

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
 

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

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
 

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
 

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
 

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

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

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
 
 

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

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
 

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"
             }

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
 

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
 

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(..))

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
 
 

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
 

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

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

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
 

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
 

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

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

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
 
 

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)

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
 

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
 

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

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)
 

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
     }

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 =

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
 

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 =

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
 

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 =
         """
 

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
     }

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 "

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 =

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"
+    }

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
+    }

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
 

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
+    }

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 =

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."

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?"

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 =

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
     }

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?"

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
     }

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
 

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"

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
 

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."

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?"

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 =

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 =

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
+    }

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."

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"

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…"

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 =

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."

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
 

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"

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
 

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"