34 files changed, 4 insertions, 1 deletions
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index 1955d709..be137441 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -34,8 +34,11 @@ enable_testing()
 set(SINK_RESOURCE_PLUGINS_PATH ${QT_PLUGIN_INSTALL_DIR}/sink/resources)
-add_subdirectory(mail)
+# The actions framework
 add_subdirectory(actions)
+# The settings framework
 add_subdirectory(settings)
+# Domain specific domain logic
+add_subdirectory(domain)
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/framework/mail/CMakeLists.txt b/framework/domain/CMakeLists.txt
index 822b2981..822b2981 100644
--- a/framework/mail/CMakeLists.txt
+++ b/framework/domain/CMakeLists.txt
diff --git a/framework/mail/actions/mailactions.cpp b/framework/domain/actions/mailactions.cpp
index dab0533e..dab0533e 100644
--- a/framework/mail/actions/mailactions.cpp
+++ b/framework/domain/actions/mailactions.cpp
diff --git a/framework/mail/actions/sinkactions.cpp b/framework/domain/actions/sinkactions.cpp
index a19ab149..a19ab149 100644
--- a/framework/mail/actions/sinkactions.cpp
+++ b/framework/domain/actions/sinkactions.cpp
diff --git a/framework/mail/composer.cpp b/framework/domain/composer.cpp
index 2f4fe2e9..2f4fe2e9 100644
--- a/framework/mail/composer.cpp
+++ b/framework/domain/composer.cpp
diff --git a/framework/mail/composer.h b/framework/domain/composer.h
index dd066b2e..dd066b2e 100644
--- a/framework/mail/composer.h
+++ b/framework/domain/composer.h
diff --git a/framework/mail/csshelper.cpp b/framework/domain/csshelper.cpp
index a6355c57..a6355c57 100644
--- a/framework/mail/csshelper.cpp
+++ b/framework/domain/csshelper.cpp
diff --git a/framework/mail/csshelper.h b/framework/domain/csshelper.h
index 775014e3..775014e3 100644
--- a/framework/mail/csshelper.h
+++ b/framework/domain/csshelper.h
diff --git a/framework/mail/data/mail.css b/framework/domain/data/mail.css
index b77e36ee..b77e36ee 100644
--- a/framework/mail/data/mail.css
+++ b/framework/domain/data/mail.css
diff --git a/framework/mail/folderlistcontroller.cpp b/framework/domain/folderlistcontroller.cpp
index 46a6f648..46a6f648 100644
--- a/framework/mail/folderlistcontroller.cpp
+++ b/framework/domain/folderlistcontroller.cpp
diff --git a/framework/mail/folderlistcontroller.h b/framework/domain/folderlistcontroller.h
index 11057f21..11057f21 100644
--- a/framework/mail/folderlistcontroller.h
+++ b/framework/domain/folderlistcontroller.h
diff --git a/framework/mail/folderlistmodel.cpp b/framework/domain/folderlistmodel.cpp
index ce6fb4fd..ce6fb4fd 100644
--- a/framework/mail/folderlistmodel.cpp
+++ b/framework/domain/folderlistmodel.cpp
diff --git a/framework/mail/folderlistmodel.h b/framework/domain/folderlistmodel.h
index 7844e59a..7844e59a 100644
--- a/framework/mail/folderlistmodel.h
+++ b/framework/domain/folderlistmodel.h
diff --git a/framework/mail/maillistcontroller.cpp b/framework/domain/maillistcontroller.cpp
index a4bd6436..a4bd6436 100644
--- a/framework/mail/maillistcontroller.cpp
+++ b/framework/domain/maillistcontroller.cpp
diff --git a/framework/mail/maillistcontroller.h b/framework/domain/maillistcontroller.h
index 959c63a3..959c63a3 100644
--- a/framework/mail/maillistcontroller.h
+++ b/framework/domain/maillistcontroller.h
diff --git a/framework/mail/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index b46fabf8..b46fabf8 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
diff --git a/framework/mail/maillistmodel.h b/framework/domain/maillistmodel.h
index 47a2a091..47a2a091 100644
--- a/framework/mail/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
diff --git a/framework/mail/mailplugin.cpp b/framework/domain/mailplugin.cpp
index 2d19a437..2d19a437 100644
--- a/framework/mail/mailplugin.cpp
+++ b/framework/domain/mailplugin.cpp
diff --git a/framework/mail/mailplugin.h b/framework/domain/mailplugin.h
index ebd091ee..ebd091ee 100644
--- a/framework/mail/mailplugin.h
+++ b/framework/domain/mailplugin.h
diff --git a/framework/mail/mailtemplates.cpp b/framework/domain/mailtemplates.cpp
index e5ee8533..e5ee8533 100644
--- a/framework/mail/mailtemplates.cpp
+++ b/framework/domain/mailtemplates.cpp
diff --git a/framework/mail/mailtemplates.h b/framework/domain/mailtemplates.h
index 6519122a..6519122a 100644
--- a/framework/mail/mailtemplates.h
+++ b/framework/domain/mailtemplates.h
diff --git a/framework/mail/mailtransport.cpp b/framework/domain/mailtransport.cpp
index 49d858e1..49d858e1 100644
--- a/framework/mail/mailtransport.cpp
+++ b/framework/domain/mailtransport.cpp
diff --git a/framework/mail/mailtransport.h b/framework/domain/mailtransport.h
index 2eb30a03..2eb30a03 100644
--- a/framework/mail/mailtransport.h
+++ b/framework/domain/mailtransport.h
diff --git a/framework/mail/messageparser.cpp b/framework/domain/messageparser.cpp
index 89f67f38..89f67f38 100644
--- a/framework/mail/messageparser.cpp
+++ b/framework/domain/messageparser.cpp
diff --git a/framework/mail/messageparser.h b/framework/domain/messageparser.h
index ba08a5ec..ba08a5ec 100644
--- a/framework/mail/messageparser.h
+++ b/framework/domain/messageparser.h
diff --git a/framework/mail/objecttreesource.cpp b/framework/domain/objecttreesource.cpp
index d14b7b9b..d14b7b9b 100644
--- a/framework/mail/objecttreesource.cpp
+++ b/framework/domain/objecttreesource.cpp
diff --git a/framework/mail/objecttreesource.h b/framework/domain/objecttreesource.h
index db14e3ff..db14e3ff 100644
--- a/framework/mail/objecttreesource.h
+++ b/framework/domain/objecttreesource.h
diff --git a/framework/mail/qmldir b/framework/domain/qmldir
index fd54e5ee..fd54e5ee 100644
--- a/framework/mail/qmldir
+++ b/framework/domain/qmldir
diff --git a/framework/mail/retriever.cpp b/framework/domain/retriever.cpp
index b8e29523..b8e29523 100644
--- a/framework/mail/retriever.cpp
+++ b/framework/domain/retriever.cpp
diff --git a/framework/mail/retriever.h b/framework/domain/retriever.h
index e454532d..e454532d 100644
--- a/framework/mail/retriever.h
+++ b/framework/domain/retriever.h
diff --git a/framework/mail/singlemailcontroller.cpp b/framework/domain/singlemailcontroller.cpp
index 8ee4acbb..8ee4acbb 100644
--- a/framework/mail/singlemailcontroller.cpp
+++ b/framework/domain/singlemailcontroller.cpp
diff --git a/framework/mail/singlemailcontroller.h b/framework/domain/singlemailcontroller.h
index 283b03c4..283b03c4 100644
--- a/framework/mail/singlemailcontroller.h
+++ b/framework/domain/singlemailcontroller.h
diff --git a/framework/mail/stringhtmlwriter.cpp b/framework/domain/stringhtmlwriter.cpp
index df108946..df108946 100644
--- a/framework/mail/stringhtmlwriter.cpp
+++ b/framework/domain/stringhtmlwriter.cpp
diff --git a/framework/mail/stringhtmlwriter.h b/framework/domain/stringhtmlwriter.h
index fa0a7aa5..fa0a7aa5 100644
--- a/framework/mail/stringhtmlwriter.h
+++ b/framework/domain/stringhtmlwriter.h