From 41faa3610364dd83cc936935645102450a10a763 Mon Sep 17 00:00:00 2001 From: Jim Nelson Date: Thu, 23 Jun 2011 19:59:38 -0700 Subject: [PATCH] New file naming scheme and organization for the Engine. The code base is growing much faster than expected, faster than Shotwell it seems (not necessarily line count, but files and necessary organization of the library vs. Shotwell's initial flat directory). After some thought decided to move to a more standard Vala/GTK naming scheme of all lowercase with dashes for spaces starting with namespace (minus the "geary-", unless the class was in the topmost namespace). Three motivations: 1. Often confusing when working on code to see three "Folder.vala" in the gedit tabs: one IMAP, one SQLite, and one the interface definition. 2. This paves the way for waf integration, as right now we're held up using it because it barfs on projects with two files of the same name in different directories. 3. I find the CamelCase in the file browser becoming hard on the eyes, and this scheme seems a little more browsable. --- Makefile | 160 +++++++++--------- .../api/{Account.vala => geary-account.vala} | 0 ...redentials.vala => geary-credentials.vala} | 0 ...ocation.vala => geary-email-location.vala} | 0 ...rties.vala => geary-email-properties.vala} | 0 .../api/{Email.vala => geary-email.vala} | 0 ...gineError.vala => geary-engine-error.vala} | 0 .../geary-engine-folder.vala} | 0 .../{Engine.vala => api/geary-engine.vala} | 0 ...ties.vala => geary-folder-properties.vala} | 0 .../api/{Folder.vala => geary-folder.vala} | 0 .../geary-imap-engine.vala} | 0 ...faces.vala => geary-local-interfaces.vala} | 0 ...aces.vala => geary-remote-interfaces.vala} | 0 .../common/common-interfaces.vala} | 0 ...sageData.vala => common-message-data.vala} | 0 .../common/common-string.vala} | 0 .../api/{Account.vala => imap-account.vala} | 0 ...Location.vala => imap-email-location.vala} | 0 ...erties.vala => imap-email-properties.vala} | 0 ...rties.vala => imap-folder-properties.vala} | 0 .../api/{Folder.vala => imap-folder.vala} | 0 .../imap-command-response.vala} | 0 .../imap-command.vala} | 0 .../imap-commands.vala} | 0 ...Results.vala => imap-command-results.vala} | 0 ...oder.vala => imap-fetch-data-decoder.vala} | 0 ...chResults.vala => imap-fetch-results.vala} | 0 ...istResults.vala => imap-list-results.vala} | 0 ...oopResults.vala => imap-noop-results.vala} | 0 ....vala => imap-select-examine-results.vala} | 0 ...sResults.vala => imap-status-results.vala} | 0 .../imap/{Error.vala => imap-error.vala} | 0 .../imap-data-format.vala} | 0 .../imap-fetch-data-type.vala} | 0 .../{Flag.vala => message/imap-flag.vala} | 0 .../imap-message-data.vala} | 0 .../imap-message-set.vala} | 0 .../imap-parameter.vala} | 0 .../imap/{Tag.vala => message/imap-tag.vala} | 0 .../imap-response-code-type.vala} | 0 .../imap-response-code.vala} | 0 .../imap-server-data-type.vala} | 0 .../imap-server-data.vala} | 0 .../imap-server-response.vala} | 0 .../imap-status-data-type.vala} | 0 .../imap-status-response.vala} | 0 .../imap-status.vala} | 0 .../imap-client-connection.vala} | 0 .../imap-client-session-manager.vala} | 0 .../imap-client-session.vala} | 0 .../imap-deserializer.vala} | 0 .../imap-mailbox.vala} | 0 .../imap-serializable.vala} | 0 .../imap-serializer.vala} | 0 ...dress.vala => rfc822-mailbox-address.vala} | 0 ...ses.vala => rfc822-mailbox-addresses.vala} | 0 ...sageData.vala => rfc822-message-data.vala} | 0 .../sqlite-database.vala} | 0 .../{Row.vala => abstract/sqlite-row.vala} | 0 .../sqlite-table.vala} | 0 .../api/{Account.vala => sqlite-account.vala} | 0 .../api/{Folder.vala => sqlite-folder.vala} | 0 .../sqlite-folder-row.vala} | 0 .../sqlite-folder-table.vala} | 0 .../sqlite-mail-database.vala} | 0 .../sqlite-message-location-row.vala} | 0 .../sqlite-message-location-table.vala} | 0 .../sqlite-message-row.vala} | 0 .../sqlite-message-table.vala} | 0 ...imap-message-location-properties-row.vala} | 0 ...ap-message-location-properties-table.vala} | 0 ...tor.vala => state-machine-descriptor.vala} | 0 .../{Machine.vala => state-machine.vala} | 0 .../{Mapping.vala => state-mapping.vala} | 0 .../util/{Memory.vala => util-memory.vala} | 0 ...ics.vala => util-reference-semantics.vala} | 0 .../{Trillian.vala => util-trillian.vala} | 0 78 files changed, 83 insertions(+), 77 deletions(-) rename src/engine/api/{Account.vala => geary-account.vala} (100%) rename src/engine/api/{Credentials.vala => geary-credentials.vala} (100%) rename src/engine/api/{EmailLocation.vala => geary-email-location.vala} (100%) rename src/engine/api/{EmailProperties.vala => geary-email-properties.vala} (100%) rename src/engine/api/{Email.vala => geary-email.vala} (100%) rename src/engine/api/{EngineError.vala => geary-engine-error.vala} (100%) rename src/engine/{EngineFolder.vala => api/geary-engine-folder.vala} (100%) rename src/engine/{Engine.vala => api/geary-engine.vala} (100%) rename src/engine/api/{FolderProperties.vala => geary-folder-properties.vala} (100%) rename src/engine/api/{Folder.vala => geary-folder.vala} (100%) rename src/engine/{ImapEngine.vala => api/geary-imap-engine.vala} (100%) rename src/engine/api/{LocalInterfaces.vala => geary-local-interfaces.vala} (100%) rename src/engine/api/{RemoteInterfaces.vala => geary-remote-interfaces.vala} (100%) rename src/{common/Interfaces.vala => engine/common/common-interfaces.vala} (100%) rename src/engine/common/{MessageData.vala => common-message-data.vala} (100%) rename src/{common/String.vala => engine/common/common-string.vala} (100%) rename src/engine/imap/api/{Account.vala => imap-account.vala} (100%) rename src/engine/imap/api/{EmailLocation.vala => imap-email-location.vala} (100%) rename src/engine/imap/api/{EmailProperties.vala => imap-email-properties.vala} (100%) rename src/engine/imap/api/{FolderProperties.vala => imap-folder-properties.vala} (100%) rename src/engine/imap/api/{Folder.vala => imap-folder.vala} (100%) rename src/engine/imap/{CommandResponse.vala => command/imap-command-response.vala} (100%) rename src/engine/imap/{Command.vala => command/imap-command.vala} (100%) rename src/engine/imap/{Commands.vala => command/imap-commands.vala} (100%) rename src/engine/imap/decoders/{CommandResults.vala => imap-command-results.vala} (100%) rename src/engine/imap/decoders/{FetchDataDecoder.vala => imap-fetch-data-decoder.vala} (100%) rename src/engine/imap/decoders/{FetchResults.vala => imap-fetch-results.vala} (100%) rename src/engine/imap/decoders/{ListResults.vala => imap-list-results.vala} (100%) rename src/engine/imap/decoders/{NoopResults.vala => imap-noop-results.vala} (100%) rename src/engine/imap/decoders/{SelectExamineResults.vala => imap-select-examine-results.vala} (100%) rename src/engine/imap/decoders/{StatusResults.vala => imap-status-results.vala} (100%) rename src/engine/imap/{Error.vala => imap-error.vala} (100%) rename src/engine/imap/{DataFormat.vala => message/imap-data-format.vala} (100%) rename src/engine/imap/{FetchDataType.vala => message/imap-fetch-data-type.vala} (100%) rename src/engine/imap/{Flag.vala => message/imap-flag.vala} (100%) rename src/engine/imap/{MessageData.vala => message/imap-message-data.vala} (100%) rename src/engine/imap/{MessageSet.vala => message/imap-message-set.vala} (100%) rename src/engine/imap/{Parameter.vala => message/imap-parameter.vala} (100%) rename src/engine/imap/{Tag.vala => message/imap-tag.vala} (100%) rename src/engine/imap/{ResponseCodeType.vala => response/imap-response-code-type.vala} (100%) rename src/engine/imap/{ResponseCode.vala => response/imap-response-code.vala} (100%) rename src/engine/imap/{ServerDataType.vala => response/imap-server-data-type.vala} (100%) rename src/engine/imap/{ServerData.vala => response/imap-server-data.vala} (100%) rename src/engine/imap/{ServerResponse.vala => response/imap-server-response.vala} (100%) rename src/engine/imap/{StatusDataType.vala => response/imap-status-data-type.vala} (100%) rename src/engine/imap/{StatusResponse.vala => response/imap-status-response.vala} (100%) rename src/engine/imap/{Status.vala => response/imap-status.vala} (100%) rename src/engine/imap/{ClientConnection.vala => transport/imap-client-connection.vala} (100%) rename src/engine/imap/{ClientSessionManager.vala => transport/imap-client-session-manager.vala} (100%) rename src/engine/imap/{ClientSession.vala => transport/imap-client-session.vala} (100%) rename src/engine/imap/{Deserializer.vala => transport/imap-deserializer.vala} (100%) rename src/engine/imap/{Mailbox.vala => transport/imap-mailbox.vala} (100%) rename src/engine/imap/{Serializable.vala => transport/imap-serializable.vala} (100%) rename src/engine/imap/{Serializer.vala => transport/imap-serializer.vala} (100%) rename src/engine/rfc822/{MailboxAddress.vala => rfc822-mailbox-address.vala} (100%) rename src/engine/rfc822/{MailboxAddresses.vala => rfc822-mailbox-addresses.vala} (100%) rename src/engine/rfc822/{MessageData.vala => rfc822-message-data.vala} (100%) rename src/engine/sqlite/{Database.vala => abstract/sqlite-database.vala} (100%) rename src/engine/sqlite/{Row.vala => abstract/sqlite-row.vala} (100%) rename src/engine/sqlite/{Table.vala => abstract/sqlite-table.vala} (100%) rename src/engine/sqlite/api/{Account.vala => sqlite-account.vala} (100%) rename src/engine/sqlite/api/{Folder.vala => sqlite-folder.vala} (100%) rename src/engine/sqlite/{FolderRow.vala => email/sqlite-folder-row.vala} (100%) rename src/engine/sqlite/{FolderTable.vala => email/sqlite-folder-table.vala} (100%) rename src/engine/sqlite/{MailDatabase.vala => email/sqlite-mail-database.vala} (100%) rename src/engine/sqlite/{MessageLocationRow.vala => email/sqlite-message-location-row.vala} (100%) rename src/engine/sqlite/{MessageLocationTable.vala => email/sqlite-message-location-table.vala} (100%) rename src/engine/sqlite/{MessageRow.vala => email/sqlite-message-row.vala} (100%) rename src/engine/sqlite/{MessageTable.vala => email/sqlite-message-table.vala} (100%) rename src/engine/sqlite/{ImapMessageLocationPropertiesRow.vala => imap/sqlite-imap-message-location-properties-row.vala} (100%) rename src/engine/sqlite/{ImapMessageLocationPropertiesTable.vala => imap/sqlite-imap-message-location-properties-table.vala} (100%) rename src/engine/state/{MachineDescriptor.vala => state-machine-descriptor.vala} (100%) rename src/engine/state/{Machine.vala => state-machine.vala} (100%) rename src/engine/state/{Mapping.vala => state-mapping.vala} (100%) rename src/engine/util/{Memory.vala => util-memory.vala} (100%) rename src/engine/util/{ReferenceSemantics.vala => util-reference-semantics.vala} (100%) rename src/engine/util/{Trillian.vala => util-trillian.vala} (100%) diff --git a/Makefile b/Makefile index aec577ad..cd07c81a 100644 --- a/Makefile +++ b/Makefile @@ -9,85 +9,91 @@ VALAFLAGS := -g --enable-checking --fatal-warnings --vapidir=vapi APPS := geary console watchmbox ENGINE_SRC := \ - src/engine/Engine.vala \ - src/engine/ImapEngine.vala \ - src/engine/EngineFolder.vala \ - src/engine/api/Account.vala \ - src/engine/api/Email.vala \ - src/engine/api/EmailProperties.vala \ - src/engine/api/EmailLocation.vala \ - src/engine/api/Folder.vala \ - src/engine/api/FolderProperties.vala \ - src/engine/api/Credentials.vala \ - src/engine/api/EngineError.vala \ - src/engine/api/RemoteInterfaces.vala \ - src/engine/api/LocalInterfaces.vala \ - src/engine/sqlite/Database.vala \ - src/engine/sqlite/Table.vala \ - src/engine/sqlite/Row.vala \ - src/engine/sqlite/MailDatabase.vala \ - src/engine/sqlite/FolderTable.vala \ - src/engine/sqlite/FolderRow.vala \ - src/engine/sqlite/MessageRow.vala \ - src/engine/sqlite/MessageTable.vala \ - src/engine/sqlite/MessageLocationRow.vala \ - src/engine/sqlite/MessageLocationTable.vala \ - src/engine/sqlite/ImapMessageLocationPropertiesTable.vala \ - src/engine/sqlite/ImapMessageLocationPropertiesRow.vala \ - src/engine/sqlite/api/Account.vala \ - src/engine/sqlite/api/Folder.vala \ - src/engine/state/Machine.vala \ - src/engine/state/MachineDescriptor.vala \ - src/engine/state/Mapping.vala \ - src/engine/common/MessageData.vala \ - src/engine/imap/ClientConnection.vala \ - src/engine/imap/ClientSession.vala \ - src/engine/imap/ClientSessionManager.vala \ - src/engine/imap/DataFormat.vala \ - src/engine/imap/Mailbox.vala \ - src/engine/imap/Parameter.vala \ - src/engine/imap/Tag.vala \ - src/engine/imap/Command.vala \ - src/engine/imap/Commands.vala \ - src/engine/imap/ResponseCode.vala \ - src/engine/imap/ResponseCodeType.vala \ - src/engine/imap/ServerResponse.vala \ - src/engine/imap/StatusResponse.vala \ - src/engine/imap/StatusDataType.vala \ - src/engine/imap/ServerData.vala \ - src/engine/imap/ServerDataType.vala \ - src/engine/imap/FetchDataType.vala \ - src/engine/imap/Status.vala \ - src/engine/imap/CommandResponse.vala \ - src/engine/imap/MessageData.vala \ - src/engine/imap/MessageSet.vala \ - src/engine/imap/Serializable.vala \ - src/engine/imap/Serializer.vala \ - src/engine/imap/Deserializer.vala \ - src/engine/imap/Error.vala \ - src/engine/imap/Flag.vala \ - src/engine/imap/decoders/CommandResults.vala \ - src/engine/imap/decoders/FetchDataDecoder.vala \ - src/engine/imap/decoders/FetchResults.vala \ - src/engine/imap/decoders/NoopResults.vala \ - src/engine/imap/decoders/ListResults.vala \ - src/engine/imap/decoders/SelectExamineResults.vala \ - src/engine/imap/decoders/StatusResults.vala \ - src/engine/imap/api/Account.vala \ - src/engine/imap/api/EmailLocation.vala \ - src/engine/imap/api/EmailProperties.vala \ - src/engine/imap/api/Folder.vala \ - src/engine/imap/api/FolderProperties.vala \ - src/engine/rfc822/MailboxAddress.vala \ - src/engine/rfc822/MailboxAddresses.vala \ - src/engine/rfc822/MessageData.vala \ - src/engine/util/Memory.vala \ - src/engine/util/ReferenceSemantics.vala \ - src/engine/util/Trillian.vala + src/engine/api/geary-account.vala \ + src/engine/api/geary-credentials.vala \ + src/engine/api/geary-email-location.vala \ + src/engine/api/geary-email-properties.vala \ + src/engine/api/geary-email.vala \ + src/engine/api/geary-engine-error.vala \ + src/engine/api/geary-engine-folder.vala \ + src/engine/api/geary-engine.vala \ + src/engine/api/geary-folder-properties.vala \ + src/engine/api/geary-folder.vala \ + src/engine/api/geary-imap-engine.vala \ + src/engine/api/geary-local-interfaces.vala \ + src/engine/api/geary-remote-interfaces.vala \ + \ + src/engine/common/common-interfaces.vala \ + src/engine/common/common-message-data.vala \ + src/engine/common/common-string.vala \ + \ + src/engine/imap/api/imap-account.vala \ + src/engine/imap/api/imap-email-location.vala \ + src/engine/imap/api/imap-email-properties.vala \ + src/engine/imap/api/imap-folder-properties.vala \ + src/engine/imap/api/imap-folder.vala \ + src/engine/imap/command/imap-command-response.vala \ + src/engine/imap/command/imap-commands.vala \ + src/engine/imap/command/imap-command.vala \ + src/engine/imap/decoders/imap-command-results.vala \ + src/engine/imap/decoders/imap-fetch-data-decoder.vala \ + src/engine/imap/decoders/imap-fetch-results.vala \ + src/engine/imap/decoders/imap-list-results.vala \ + src/engine/imap/decoders/imap-noop-results.vala \ + src/engine/imap/decoders/imap-select-examine-results.vala \ + src/engine/imap/decoders/imap-status-results.vala \ + src/engine/imap/imap-error.vala \ + src/engine/imap/message/imap-data-format.vala \ + src/engine/imap/message/imap-fetch-data-type.vala \ + src/engine/imap/message/imap-flag.vala \ + src/engine/imap/message/imap-message-data.vala \ + src/engine/imap/message/imap-message-set.vala \ + src/engine/imap/message/imap-parameter.vala \ + src/engine/imap/message/imap-tag.vala \ + src/engine/imap/response/imap-response-code-type.vala \ + src/engine/imap/response/imap-response-code.vala \ + src/engine/imap/response/imap-server-data-type.vala \ + src/engine/imap/response/imap-server-data.vala \ + src/engine/imap/response/imap-server-response.vala \ + src/engine/imap/response/imap-status-data-type.vala \ + src/engine/imap/response/imap-status-response.vala \ + src/engine/imap/response/imap-status.vala \ + src/engine/imap/transport/imap-client-connection.vala \ + src/engine/imap/transport/imap-client-session-manager.vala \ + src/engine/imap/transport/imap-client-session.vala \ + src/engine/imap/transport/imap-deserializer.vala \ + src/engine/imap/transport/imap-mailbox.vala \ + src/engine/imap/transport/imap-serializable.vala \ + src/engine/imap/transport/imap-serializer.vala \ + \ + src/engine/rfc822/rfc822-mailbox-addresses.vala \ + src/engine/rfc822/rfc822-mailbox-address.vala \ + src/engine/rfc822/rfc822-message-data.vala \ + \ + src/engine/sqlite/abstract/sqlite-database.vala \ + src/engine/sqlite/abstract/sqlite-row.vala \ + src/engine/sqlite/abstract/sqlite-table.vala \ + src/engine/sqlite/api/sqlite-account.vala \ + src/engine/sqlite/api/sqlite-folder.vala \ + src/engine/sqlite/email/sqlite-folder-row.vala \ + src/engine/sqlite/email/sqlite-folder-table.vala \ + src/engine/sqlite/email/sqlite-mail-database.vala \ + src/engine/sqlite/email/sqlite-message-location-row.vala \ + src/engine/sqlite/email/sqlite-message-location-table.vala \ + src/engine/sqlite/email/sqlite-message-row.vala \ + src/engine/sqlite/email/sqlite-message-table.vala \ + src/engine/sqlite/imap/sqlite-imap-message-location-properties-row.vala \ + src/engine/sqlite/imap/sqlite-imap-message-location-properties-table.vala \ + \ + src/engine/state/state-machine-descriptor.vala \ + src/engine/state/state-machine.vala \ + src/engine/state/state-mapping.vala \ + \ + src/engine/util/util-memory.vala \ + src/engine/util/util-reference-semantics.vala \ + src/engine/util/util-trillian.vala COMMON_SRC := \ - src/common/String.vala \ - src/common/Interfaces.vala \ src/common/YorbaApplication.vala \ src/common/Date.vala diff --git a/src/engine/api/Account.vala b/src/engine/api/geary-account.vala similarity index 100% rename from src/engine/api/Account.vala rename to src/engine/api/geary-account.vala diff --git a/src/engine/api/Credentials.vala b/src/engine/api/geary-credentials.vala similarity index 100% rename from src/engine/api/Credentials.vala rename to src/engine/api/geary-credentials.vala diff --git a/src/engine/api/EmailLocation.vala b/src/engine/api/geary-email-location.vala similarity index 100% rename from src/engine/api/EmailLocation.vala rename to src/engine/api/geary-email-location.vala diff --git a/src/engine/api/EmailProperties.vala b/src/engine/api/geary-email-properties.vala similarity index 100% rename from src/engine/api/EmailProperties.vala rename to src/engine/api/geary-email-properties.vala diff --git a/src/engine/api/Email.vala b/src/engine/api/geary-email.vala similarity index 100% rename from src/engine/api/Email.vala rename to src/engine/api/geary-email.vala diff --git a/src/engine/api/EngineError.vala b/src/engine/api/geary-engine-error.vala similarity index 100% rename from src/engine/api/EngineError.vala rename to src/engine/api/geary-engine-error.vala diff --git a/src/engine/EngineFolder.vala b/src/engine/api/geary-engine-folder.vala similarity index 100% rename from src/engine/EngineFolder.vala rename to src/engine/api/geary-engine-folder.vala diff --git a/src/engine/Engine.vala b/src/engine/api/geary-engine.vala similarity index 100% rename from src/engine/Engine.vala rename to src/engine/api/geary-engine.vala diff --git a/src/engine/api/FolderProperties.vala b/src/engine/api/geary-folder-properties.vala similarity index 100% rename from src/engine/api/FolderProperties.vala rename to src/engine/api/geary-folder-properties.vala diff --git a/src/engine/api/Folder.vala b/src/engine/api/geary-folder.vala similarity index 100% rename from src/engine/api/Folder.vala rename to src/engine/api/geary-folder.vala diff --git a/src/engine/ImapEngine.vala b/src/engine/api/geary-imap-engine.vala similarity index 100% rename from src/engine/ImapEngine.vala rename to src/engine/api/geary-imap-engine.vala diff --git a/src/engine/api/LocalInterfaces.vala b/src/engine/api/geary-local-interfaces.vala similarity index 100% rename from src/engine/api/LocalInterfaces.vala rename to src/engine/api/geary-local-interfaces.vala diff --git a/src/engine/api/RemoteInterfaces.vala b/src/engine/api/geary-remote-interfaces.vala similarity index 100% rename from src/engine/api/RemoteInterfaces.vala rename to src/engine/api/geary-remote-interfaces.vala diff --git a/src/common/Interfaces.vala b/src/engine/common/common-interfaces.vala similarity index 100% rename from src/common/Interfaces.vala rename to src/engine/common/common-interfaces.vala diff --git a/src/engine/common/MessageData.vala b/src/engine/common/common-message-data.vala similarity index 100% rename from src/engine/common/MessageData.vala rename to src/engine/common/common-message-data.vala diff --git a/src/common/String.vala b/src/engine/common/common-string.vala similarity index 100% rename from src/common/String.vala rename to src/engine/common/common-string.vala diff --git a/src/engine/imap/api/Account.vala b/src/engine/imap/api/imap-account.vala similarity index 100% rename from src/engine/imap/api/Account.vala rename to src/engine/imap/api/imap-account.vala diff --git a/src/engine/imap/api/EmailLocation.vala b/src/engine/imap/api/imap-email-location.vala similarity index 100% rename from src/engine/imap/api/EmailLocation.vala rename to src/engine/imap/api/imap-email-location.vala diff --git a/src/engine/imap/api/EmailProperties.vala b/src/engine/imap/api/imap-email-properties.vala similarity index 100% rename from src/engine/imap/api/EmailProperties.vala rename to src/engine/imap/api/imap-email-properties.vala diff --git a/src/engine/imap/api/FolderProperties.vala b/src/engine/imap/api/imap-folder-properties.vala similarity index 100% rename from src/engine/imap/api/FolderProperties.vala rename to src/engine/imap/api/imap-folder-properties.vala diff --git a/src/engine/imap/api/Folder.vala b/src/engine/imap/api/imap-folder.vala similarity index 100% rename from src/engine/imap/api/Folder.vala rename to src/engine/imap/api/imap-folder.vala diff --git a/src/engine/imap/CommandResponse.vala b/src/engine/imap/command/imap-command-response.vala similarity index 100% rename from src/engine/imap/CommandResponse.vala rename to src/engine/imap/command/imap-command-response.vala diff --git a/src/engine/imap/Command.vala b/src/engine/imap/command/imap-command.vala similarity index 100% rename from src/engine/imap/Command.vala rename to src/engine/imap/command/imap-command.vala diff --git a/src/engine/imap/Commands.vala b/src/engine/imap/command/imap-commands.vala similarity index 100% rename from src/engine/imap/Commands.vala rename to src/engine/imap/command/imap-commands.vala diff --git a/src/engine/imap/decoders/CommandResults.vala b/src/engine/imap/decoders/imap-command-results.vala similarity index 100% rename from src/engine/imap/decoders/CommandResults.vala rename to src/engine/imap/decoders/imap-command-results.vala diff --git a/src/engine/imap/decoders/FetchDataDecoder.vala b/src/engine/imap/decoders/imap-fetch-data-decoder.vala similarity index 100% rename from src/engine/imap/decoders/FetchDataDecoder.vala rename to src/engine/imap/decoders/imap-fetch-data-decoder.vala diff --git a/src/engine/imap/decoders/FetchResults.vala b/src/engine/imap/decoders/imap-fetch-results.vala similarity index 100% rename from src/engine/imap/decoders/FetchResults.vala rename to src/engine/imap/decoders/imap-fetch-results.vala diff --git a/src/engine/imap/decoders/ListResults.vala b/src/engine/imap/decoders/imap-list-results.vala similarity index 100% rename from src/engine/imap/decoders/ListResults.vala rename to src/engine/imap/decoders/imap-list-results.vala diff --git a/src/engine/imap/decoders/NoopResults.vala b/src/engine/imap/decoders/imap-noop-results.vala similarity index 100% rename from src/engine/imap/decoders/NoopResults.vala rename to src/engine/imap/decoders/imap-noop-results.vala diff --git a/src/engine/imap/decoders/SelectExamineResults.vala b/src/engine/imap/decoders/imap-select-examine-results.vala similarity index 100% rename from src/engine/imap/decoders/SelectExamineResults.vala rename to src/engine/imap/decoders/imap-select-examine-results.vala diff --git a/src/engine/imap/decoders/StatusResults.vala b/src/engine/imap/decoders/imap-status-results.vala similarity index 100% rename from src/engine/imap/decoders/StatusResults.vala rename to src/engine/imap/decoders/imap-status-results.vala diff --git a/src/engine/imap/Error.vala b/src/engine/imap/imap-error.vala similarity index 100% rename from src/engine/imap/Error.vala rename to src/engine/imap/imap-error.vala diff --git a/src/engine/imap/DataFormat.vala b/src/engine/imap/message/imap-data-format.vala similarity index 100% rename from src/engine/imap/DataFormat.vala rename to src/engine/imap/message/imap-data-format.vala diff --git a/src/engine/imap/FetchDataType.vala b/src/engine/imap/message/imap-fetch-data-type.vala similarity index 100% rename from src/engine/imap/FetchDataType.vala rename to src/engine/imap/message/imap-fetch-data-type.vala diff --git a/src/engine/imap/Flag.vala b/src/engine/imap/message/imap-flag.vala similarity index 100% rename from src/engine/imap/Flag.vala rename to src/engine/imap/message/imap-flag.vala diff --git a/src/engine/imap/MessageData.vala b/src/engine/imap/message/imap-message-data.vala similarity index 100% rename from src/engine/imap/MessageData.vala rename to src/engine/imap/message/imap-message-data.vala diff --git a/src/engine/imap/MessageSet.vala b/src/engine/imap/message/imap-message-set.vala similarity index 100% rename from src/engine/imap/MessageSet.vala rename to src/engine/imap/message/imap-message-set.vala diff --git a/src/engine/imap/Parameter.vala b/src/engine/imap/message/imap-parameter.vala similarity index 100% rename from src/engine/imap/Parameter.vala rename to src/engine/imap/message/imap-parameter.vala diff --git a/src/engine/imap/Tag.vala b/src/engine/imap/message/imap-tag.vala similarity index 100% rename from src/engine/imap/Tag.vala rename to src/engine/imap/message/imap-tag.vala diff --git a/src/engine/imap/ResponseCodeType.vala b/src/engine/imap/response/imap-response-code-type.vala similarity index 100% rename from src/engine/imap/ResponseCodeType.vala rename to src/engine/imap/response/imap-response-code-type.vala diff --git a/src/engine/imap/ResponseCode.vala b/src/engine/imap/response/imap-response-code.vala similarity index 100% rename from src/engine/imap/ResponseCode.vala rename to src/engine/imap/response/imap-response-code.vala diff --git a/src/engine/imap/ServerDataType.vala b/src/engine/imap/response/imap-server-data-type.vala similarity index 100% rename from src/engine/imap/ServerDataType.vala rename to src/engine/imap/response/imap-server-data-type.vala diff --git a/src/engine/imap/ServerData.vala b/src/engine/imap/response/imap-server-data.vala similarity index 100% rename from src/engine/imap/ServerData.vala rename to src/engine/imap/response/imap-server-data.vala diff --git a/src/engine/imap/ServerResponse.vala b/src/engine/imap/response/imap-server-response.vala similarity index 100% rename from src/engine/imap/ServerResponse.vala rename to src/engine/imap/response/imap-server-response.vala diff --git a/src/engine/imap/StatusDataType.vala b/src/engine/imap/response/imap-status-data-type.vala similarity index 100% rename from src/engine/imap/StatusDataType.vala rename to src/engine/imap/response/imap-status-data-type.vala diff --git a/src/engine/imap/StatusResponse.vala b/src/engine/imap/response/imap-status-response.vala similarity index 100% rename from src/engine/imap/StatusResponse.vala rename to src/engine/imap/response/imap-status-response.vala diff --git a/src/engine/imap/Status.vala b/src/engine/imap/response/imap-status.vala similarity index 100% rename from src/engine/imap/Status.vala rename to src/engine/imap/response/imap-status.vala diff --git a/src/engine/imap/ClientConnection.vala b/src/engine/imap/transport/imap-client-connection.vala similarity index 100% rename from src/engine/imap/ClientConnection.vala rename to src/engine/imap/transport/imap-client-connection.vala diff --git a/src/engine/imap/ClientSessionManager.vala b/src/engine/imap/transport/imap-client-session-manager.vala similarity index 100% rename from src/engine/imap/ClientSessionManager.vala rename to src/engine/imap/transport/imap-client-session-manager.vala diff --git a/src/engine/imap/ClientSession.vala b/src/engine/imap/transport/imap-client-session.vala similarity index 100% rename from src/engine/imap/ClientSession.vala rename to src/engine/imap/transport/imap-client-session.vala diff --git a/src/engine/imap/Deserializer.vala b/src/engine/imap/transport/imap-deserializer.vala similarity index 100% rename from src/engine/imap/Deserializer.vala rename to src/engine/imap/transport/imap-deserializer.vala diff --git a/src/engine/imap/Mailbox.vala b/src/engine/imap/transport/imap-mailbox.vala similarity index 100% rename from src/engine/imap/Mailbox.vala rename to src/engine/imap/transport/imap-mailbox.vala diff --git a/src/engine/imap/Serializable.vala b/src/engine/imap/transport/imap-serializable.vala similarity index 100% rename from src/engine/imap/Serializable.vala rename to src/engine/imap/transport/imap-serializable.vala diff --git a/src/engine/imap/Serializer.vala b/src/engine/imap/transport/imap-serializer.vala similarity index 100% rename from src/engine/imap/Serializer.vala rename to src/engine/imap/transport/imap-serializer.vala diff --git a/src/engine/rfc822/MailboxAddress.vala b/src/engine/rfc822/rfc822-mailbox-address.vala similarity index 100% rename from src/engine/rfc822/MailboxAddress.vala rename to src/engine/rfc822/rfc822-mailbox-address.vala diff --git a/src/engine/rfc822/MailboxAddresses.vala b/src/engine/rfc822/rfc822-mailbox-addresses.vala similarity index 100% rename from src/engine/rfc822/MailboxAddresses.vala rename to src/engine/rfc822/rfc822-mailbox-addresses.vala diff --git a/src/engine/rfc822/MessageData.vala b/src/engine/rfc822/rfc822-message-data.vala similarity index 100% rename from src/engine/rfc822/MessageData.vala rename to src/engine/rfc822/rfc822-message-data.vala diff --git a/src/engine/sqlite/Database.vala b/src/engine/sqlite/abstract/sqlite-database.vala similarity index 100% rename from src/engine/sqlite/Database.vala rename to src/engine/sqlite/abstract/sqlite-database.vala diff --git a/src/engine/sqlite/Row.vala b/src/engine/sqlite/abstract/sqlite-row.vala similarity index 100% rename from src/engine/sqlite/Row.vala rename to src/engine/sqlite/abstract/sqlite-row.vala diff --git a/src/engine/sqlite/Table.vala b/src/engine/sqlite/abstract/sqlite-table.vala similarity index 100% rename from src/engine/sqlite/Table.vala rename to src/engine/sqlite/abstract/sqlite-table.vala diff --git a/src/engine/sqlite/api/Account.vala b/src/engine/sqlite/api/sqlite-account.vala similarity index 100% rename from src/engine/sqlite/api/Account.vala rename to src/engine/sqlite/api/sqlite-account.vala diff --git a/src/engine/sqlite/api/Folder.vala b/src/engine/sqlite/api/sqlite-folder.vala similarity index 100% rename from src/engine/sqlite/api/Folder.vala rename to src/engine/sqlite/api/sqlite-folder.vala diff --git a/src/engine/sqlite/FolderRow.vala b/src/engine/sqlite/email/sqlite-folder-row.vala similarity index 100% rename from src/engine/sqlite/FolderRow.vala rename to src/engine/sqlite/email/sqlite-folder-row.vala diff --git a/src/engine/sqlite/FolderTable.vala b/src/engine/sqlite/email/sqlite-folder-table.vala similarity index 100% rename from src/engine/sqlite/FolderTable.vala rename to src/engine/sqlite/email/sqlite-folder-table.vala diff --git a/src/engine/sqlite/MailDatabase.vala b/src/engine/sqlite/email/sqlite-mail-database.vala similarity index 100% rename from src/engine/sqlite/MailDatabase.vala rename to src/engine/sqlite/email/sqlite-mail-database.vala diff --git a/src/engine/sqlite/MessageLocationRow.vala b/src/engine/sqlite/email/sqlite-message-location-row.vala similarity index 100% rename from src/engine/sqlite/MessageLocationRow.vala rename to src/engine/sqlite/email/sqlite-message-location-row.vala diff --git a/src/engine/sqlite/MessageLocationTable.vala b/src/engine/sqlite/email/sqlite-message-location-table.vala similarity index 100% rename from src/engine/sqlite/MessageLocationTable.vala rename to src/engine/sqlite/email/sqlite-message-location-table.vala diff --git a/src/engine/sqlite/MessageRow.vala b/src/engine/sqlite/email/sqlite-message-row.vala similarity index 100% rename from src/engine/sqlite/MessageRow.vala rename to src/engine/sqlite/email/sqlite-message-row.vala diff --git a/src/engine/sqlite/MessageTable.vala b/src/engine/sqlite/email/sqlite-message-table.vala similarity index 100% rename from src/engine/sqlite/MessageTable.vala rename to src/engine/sqlite/email/sqlite-message-table.vala diff --git a/src/engine/sqlite/ImapMessageLocationPropertiesRow.vala b/src/engine/sqlite/imap/sqlite-imap-message-location-properties-row.vala similarity index 100% rename from src/engine/sqlite/ImapMessageLocationPropertiesRow.vala rename to src/engine/sqlite/imap/sqlite-imap-message-location-properties-row.vala diff --git a/src/engine/sqlite/ImapMessageLocationPropertiesTable.vala b/src/engine/sqlite/imap/sqlite-imap-message-location-properties-table.vala similarity index 100% rename from src/engine/sqlite/ImapMessageLocationPropertiesTable.vala rename to src/engine/sqlite/imap/sqlite-imap-message-location-properties-table.vala diff --git a/src/engine/state/MachineDescriptor.vala b/src/engine/state/state-machine-descriptor.vala similarity index 100% rename from src/engine/state/MachineDescriptor.vala rename to src/engine/state/state-machine-descriptor.vala diff --git a/src/engine/state/Machine.vala b/src/engine/state/state-machine.vala similarity index 100% rename from src/engine/state/Machine.vala rename to src/engine/state/state-machine.vala diff --git a/src/engine/state/Mapping.vala b/src/engine/state/state-mapping.vala similarity index 100% rename from src/engine/state/Mapping.vala rename to src/engine/state/state-mapping.vala diff --git a/src/engine/util/Memory.vala b/src/engine/util/util-memory.vala similarity index 100% rename from src/engine/util/Memory.vala rename to src/engine/util/util-memory.vala diff --git a/src/engine/util/ReferenceSemantics.vala b/src/engine/util/util-reference-semantics.vala similarity index 100% rename from src/engine/util/ReferenceSemantics.vala rename to src/engine/util/util-reference-semantics.vala diff --git a/src/engine/util/Trillian.vala b/src/engine/util/util-trillian.vala similarity index 100% rename from src/engine/util/Trillian.vala rename to src/engine/util/util-trillian.vala