diff --git a/CMakeLists.txt b/CMakeLists.txt
index 111cde85c5965a746c8d72330c64cc996e89b215..ae0ac2c0e5099d3cad303c556ee8fd5028e44028 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,9 @@ if(Qt5Core_FOUND)
     add_definitions(-DQT_DEPRECATED_WARNINGS)
 
     set_package_properties(Qt5 PROPERTIES URL "http://qt-project.org/")
-    set_package_properties(Qt5Widgets PROPERTIES TYPE RECOMMENDED PURPOSE "Required for analyzer and administraion tool.")
-    set_package_properties(Qt5Charts PROPERTIES TYPE RECOMMENDED PURPOSE "Required for analyzer and administraion tool.")
-    set_package_properties(KF5WidgetsAddons PROPERTIES TYPE RECOMMENDED PURPOSE "Required for analyzer and administraion tool.")
+    set_package_properties(Qt5Widgets PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.")
+    set_package_properties(Qt5Charts PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.")
+    set_package_properties(KF5WidgetsAddons PROPERTIES TYPE RECOMMENDED PURPOSE "Required for UserFeedbackConsole.")
 # Qt4
 else()
     set(QT_USE_IMPORTED_TARGETS true)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 1af2eb550d9eb676a3783e78590b6fda19a620b6..5f5494e4e191982fd4dedf0a9ba400d59a0a1f0a 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,7 +3,7 @@ add_library(UserFeedbackTestUtils STATIC
     servercontroller.cpp
     ${CMAKE_SOURCE_DIR}/3rdparty/qt/modeltest.cpp
 )
-target_link_libraries(UserFeedbackTestUtils LINK_PUBLIC Qt5::Test UserFeedbackAnalyzer)
+target_link_libraries(UserFeedbackTestUtils LINK_PUBLIC Qt5::Test UserFeedbackConsole)
 
 function(uf_add_test _file)
     get_filename_component(_name ${_file} NAME_WE)
@@ -12,11 +12,11 @@ function(uf_add_test _file)
     add_test(NAME ${_name} COMMAND ${_name})
 endfunction()
 
-uf_add_test(producttest UserFeedbackAnalyzer)
-uf_add_test(schematemplatetest.cpp UserFeedbackAnalyzer)
+uf_add_test(producttest UserFeedbackConsole)
+uf_add_test(schematemplatetest.cpp UserFeedbackConsole)
 uf_add_test(schemamodeltest UserFeedbackTestUtils)
 uf_add_test(datasourcetest UserFeedbackCore Qt5::Gui) # needs Gui for ScreenInfoSource to work
-uf_add_test(sampletest UserFeedbackAnalyzer)
+uf_add_test(sampletest UserFeedbackConsole)
 uf_add_test(datamodeltest UserFeedbackTestUtils)
 uf_add_test(timeaggregationmodeltest UserFeedbackTestUtils)
 uf_add_test(categoryaggregationmodeltest UserFeedbackTestUtils)
diff --git a/autotests/categoryaggregationmodeltest.cpp b/autotests/categoryaggregationmodeltest.cpp
index 88a823252633243411b424e54d67541c164f8950..c2225b7a6d13c3eeb48ccee5021f0602251845e4 100644
--- a/autotests/categoryaggregationmodeltest.cpp
+++ b/autotests/categoryaggregationmodeltest.cpp
@@ -15,11 +15,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <analyzer/model/categoryaggregationmodel.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
+#include <console/model/categoryaggregationmodel.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
 
 #include <3rdparty/qt/modeltest.h>
 
@@ -28,7 +28,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class CategoryAggregationModelTest : public QObject
 {
diff --git a/autotests/datamodeltest.cpp b/autotests/datamodeltest.cpp
index ababcac40d46c0cf7fe8a7dc6f8aab1ddad938ed..e0ed86c920cfce698ddd3b2b16af4b87c0e812e7 100644
--- a/autotests/datamodeltest.cpp
+++ b/autotests/datamodeltest.cpp
@@ -15,9 +15,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
-#include <analyzer/model/datamodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
+#include <console/model/datamodel.h>
 
 #include <3rdparty/qt/modeltest.h>
 
@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class DataModelTest : public QObject
 {
diff --git a/autotests/numericaggregationmodeltest.cpp b/autotests/numericaggregationmodeltest.cpp
index d30062f03a11d7f6fc6cc74e38acdeda6b21c019..ef6f2ab1f580a6e357e668fc5a10e9bf2dc78f4e 100644
--- a/autotests/numericaggregationmodeltest.cpp
+++ b/autotests/numericaggregationmodeltest.cpp
@@ -15,11 +15,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <analyzer/model/numericaggregationmodel.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
+#include <console/model/numericaggregationmodel.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
 
 #include <3rdparty/qt/modeltest.h>
 
@@ -28,7 +28,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class NumericAggregationModelTest : public QObject
 {
diff --git a/autotests/productapitest.cpp b/autotests/productapitest.cpp
index 68ff512383da81e1aa1cfb258139ac7e1fb37333..dbd1aebd57bfb1c1c9da2c74f0eeca677c52fd99 100644
--- a/autotests/productapitest.cpp
+++ b/autotests/productapitest.cpp
@@ -30,7 +30,7 @@
 #include <QSignalSpy>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class ProductApiTest : public QObject
 {
diff --git a/autotests/productmodeltest.cpp b/autotests/productmodeltest.cpp
index 5818b7673b2e6221f26752cbf4012c625fa4fb08..a184006045621f47591cb16b197aedbb1113fee7 100644
--- a/autotests/productmodeltest.cpp
+++ b/autotests/productmodeltest.cpp
@@ -29,7 +29,7 @@
 #include <QSignalSpy>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class ProductModelTest : public QObject
 {
diff --git a/autotests/producttest.cpp b/autotests/producttest.cpp
index eab18f206621c483f84298a9a1dd75baccd0796f..824aea330106cfe9d75318305da96a461c76d674 100644
--- a/autotests/producttest.cpp
+++ b/autotests/producttest.cpp
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <analyzer/core/aggregation.h>
-#include <analyzer/core/product.h>
+#include <console/core/aggregation.h>
+#include <console/core/product.h>
 
 #include <3rdparty/qt/modeltest.h>
 
@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class ProductTest : public QObject
 {
diff --git a/autotests/providertest.cpp b/autotests/providertest.cpp
index a1cdbf8fa72ffacb35f30f682c548de690eead6b..02f15e74374facf2e33aea8c17c07cc2f468682c 100644
--- a/autotests/providertest.cpp
+++ b/autotests/providertest.cpp
@@ -39,7 +39,7 @@
 #include <QStandardPaths>
 
 using namespace UserFeedback;
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class ProviderTest : public QObject
 {
diff --git a/autotests/ratiosetaggregationmodeltest.cpp b/autotests/ratiosetaggregationmodeltest.cpp
index e3af6e665ac80d6d85012b75cfd329b11c4438b0..43731edda71f86ce4d64cef5514656da6b207f6c 100644
--- a/autotests/ratiosetaggregationmodeltest.cpp
+++ b/autotests/ratiosetaggregationmodeltest.cpp
@@ -15,11 +15,11 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <analyzer/model/ratiosetaggregationmodel.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
+#include <console/model/ratiosetaggregationmodel.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
 
 #include <3rdparty/qt/modeltest.h>
 
@@ -28,7 +28,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class RatioSetAggregationModelTest : public QObject
 {
diff --git a/autotests/sampletest.cpp b/autotests/sampletest.cpp
index 1b6e851893e98fe02c140f7991b1350415f034c8..32474de0da0bda5f569aab4f6e88d7e62a6d9723 100644
--- a/autotests/sampletest.cpp
+++ b/autotests/sampletest.cpp
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SampleTest : public QObject
 {
diff --git a/autotests/schemamodeltest.cpp b/autotests/schemamodeltest.cpp
index 3b07e2f7bdbae6a8d6c550e0b7981f6723142f96..a19f2c82f99165723a614a74e1f77a289f5afc6d 100644
--- a/autotests/schemamodeltest.cpp
+++ b/autotests/schemamodeltest.cpp
@@ -26,7 +26,7 @@
 #include <QSignalSpy>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SchemaModelTest : public QObject
 {
diff --git a/autotests/schematemplatetest.cpp b/autotests/schematemplatetest.cpp
index 4189c73856be4e4ec8c0a92bdf3eb38142f99a1e..2f331a5d386cd28ef6fe0780ee5713f4db2c4531 100644
--- a/autotests/schematemplatetest.cpp
+++ b/autotests/schematemplatetest.cpp
@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SchemaTemplateTest : public QObject
 {
diff --git a/autotests/servercontroller.cpp b/autotests/servercontroller.cpp
index 4b9765a199928068db0e4c973fc5d15632a55ea7..d282eacc2ea7eccdd4ef357be80c521cc3005684 100644
--- a/autotests/servercontroller.cpp
+++ b/autotests/servercontroller.cpp
@@ -26,7 +26,7 @@
 #include <QUrl>
 #include <QSignalSpy>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 ServerController::ServerController()
 {
diff --git a/autotests/surveyapitest.cpp b/autotests/surveyapitest.cpp
index edd89292079e5fd8dae712943dbfcb71149a735e..a2be013c963532c85aa45918782c0f30d30ba62d 100644
--- a/autotests/surveyapitest.cpp
+++ b/autotests/surveyapitest.cpp
@@ -32,7 +32,7 @@
 
 #include <limits>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class SurveyApiTest : public QObject
 {
diff --git a/autotests/timeaggregationmodeltest.cpp b/autotests/timeaggregationmodeltest.cpp
index 814cd6c5cdaf448d7de792a40e764d99d7f15503..adadd9c0bb9020974a3798b0e09d5429bfd8da07 100644
--- a/autotests/timeaggregationmodeltest.cpp
+++ b/autotests/timeaggregationmodeltest.cpp
@@ -15,10 +15,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <analyzer/core/sample.h>
-#include <analyzer/core/schemaentrytemplates.h>
-#include <analyzer/model/datamodel.h>
-#include <analyzer/model/timeaggregationmodel.h>
+#include <console/core/sample.h>
+#include <console/core/schemaentrytemplates.h>
+#include <console/model/datamodel.h>
+#include <console/model/timeaggregationmodel.h>
 
 #include <3rdparty/qt/modeltest.h>
 
@@ -27,7 +27,7 @@
 #include <QObject>
 #include <QStandardPaths>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 class TimeAggregationModelTest : public QObject
 {
diff --git a/data/org.kde.UserFeedbackAnalyzer.schema b/data/org.kde.UserFeedbackConsole.schema
similarity index 98%
rename from data/org.kde.UserFeedbackAnalyzer.schema
rename to data/org.kde.UserFeedbackConsole.schema
index b4e1cc5320f6c380d8682d1d14d4aa17bf99093a..73ceb0cf92232ed16bd6186987032e8b9103ee18 100644
--- a/data/org.kde.UserFeedbackAnalyzer.schema
+++ b/data/org.kde.UserFeedbackConsole.schema
@@ -61,7 +61,7 @@
             "type": "numeric"
         }
     ],
-    "name": "org.kde.UserFeedbackAnalyzer",
+    "name": "org.kde.UserFeedbackConsole",
     "schema": [
         {
             "elements": [
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54aa63649acfc95c5e87fb0f1d5509933ad18597..5ca3aece26e3e3fac9288b1078338f5d7e82eff7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(provider)
 add_subdirectory(server)
 if(Qt5Charts_FOUND AND NOT CMAKE_VERSION VERSION_LESS 3.0)
-    add_subdirectory(analyzer)
+    add_subdirectory(console)
 endif()
diff --git a/src/analyzer/CMakeLists.txt b/src/console/CMakeLists.txt
similarity index 65%
rename from src/analyzer/CMakeLists.txt
rename to src/console/CMakeLists.txt
index 3b453529c12673609651fdf34805ef10c7a800eb..0ae3a74b9a5b7e24860f21b52dcd4c48248b5edd 100644
--- a/src/analyzer/CMakeLists.txt
+++ b/src/console/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(analyzer_lib_srcs
+set(console_lib_srcs
     core/aggregation.cpp
     core/aggregationelement.cpp
     core/product.cpp
@@ -30,16 +30,16 @@ set(analyzer_lib_srcs
     schematemplates/schematemplates.qrc
 )
 
-add_library(UserFeedbackAnalyzer STATIC ${analyzer_lib_srcs})
-target_link_libraries(UserFeedbackAnalyzer Qt5::Network)
-target_include_directories(UserFeedbackAnalyzer PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..>")
-target_compile_features(UserFeedbackAnalyzer PRIVATE cxx_generic_lambdas)
+add_library(UserFeedbackConsole STATIC ${console_lib_srcs})
+target_link_libraries(UserFeedbackConsole Qt5::Network)
+target_include_directories(UserFeedbackConsole PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..>")
+target_compile_features(UserFeedbackConsole PRIVATE cxx_generic_lambdas)
 
 if(NOT TARGET UserFeedbackWidgets)
     return()
 endif()
 
-set(analyzer_srcs
+set(console_srcs
     connectdialog.cpp
     main.cpp
     mainwindow.cpp
@@ -63,8 +63,8 @@ set(analyzer_srcs
     widgets/metaenumcombobox.cpp
 )
 
-add_executable(UserFeedbackAnalyzerApplication ${analyzer_srcs})
-set_target_properties(UserFeedbackAnalyzerApplication PROPERTIES OUTPUT_NAME UserFeedbackAnalyzer)
-target_link_libraries(UserFeedbackAnalyzerApplication Qt5::Widgets Qt5::Network Qt5::Charts UserFeedbackWidgets UserFeedbackAnalyzer)
+add_executable(UserFeedbackConsoleApplication ${console_srcs})
+set_target_properties(UserFeedbackConsoleApplication PROPERTIES OUTPUT_NAME UserFeedbackConsole)
+target_link_libraries(UserFeedbackConsoleApplication Qt5::Widgets Qt5::Network Qt5::Charts UserFeedbackWidgets UserFeedbackConsole)
 
-install(TARGETS UserFeedbackAnalyzerApplication ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS UserFeedbackConsoleApplication ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/analyzer/analytics/aggregator.cpp b/src/console/analytics/aggregator.cpp
similarity index 97%
rename from src/analyzer/analytics/aggregator.cpp
rename to src/console/analytics/aggregator.cpp
index 3169cd6cfa6706063a95e1a213db15a456c5e323..d7a472f62820f5caccc1916aecf6d2375b345f31 100644
--- a/src/analyzer/analytics/aggregator.cpp
+++ b/src/console/analytics/aggregator.cpp
@@ -19,7 +19,7 @@
 
 #include <model/singlerowfilterproxymodel.h>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 Aggregator::Aggregator() = default;
 Aggregator::~Aggregator() = default;
diff --git a/src/analyzer/analytics/aggregator.h b/src/console/analytics/aggregator.h
similarity index 86%
rename from src/analyzer/analytics/aggregator.h
rename to src/console/analytics/aggregator.h
index 7583f6241165fd9578be86e30d7e0d462f451696..abc1e9b6bc35a2e81733d796f465f0f97ce20ed8 100644
--- a/src/analyzer/analytics/aggregator.h
+++ b/src/console/analytics/aggregator.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_AGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_AGGREGATOR_H
 
 #include <core/aggregation.h>
 
@@ -29,7 +29,7 @@ class QChart;
 }
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Aggregation;
 class SingleRowFilterProxyModel;
@@ -72,7 +72,7 @@ private:
 
 }}
 
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Aggregator*)
-Q_DECLARE_OPERATORS_FOR_FLAGS(UserFeedback::Analyzer::Aggregator::ChartModes)
+Q_DECLARE_METATYPE(UserFeedback::Console::Aggregator*)
+Q_DECLARE_OPERATORS_FOR_FLAGS(UserFeedback::Console::Aggregator::ChartModes)
 
-#endif // USERFEEDBACK_ANALYZER_AGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATOR_H
diff --git a/src/analyzer/analytics/analyticsview.cpp b/src/console/analytics/analyticsview.cpp
similarity index 99%
rename from src/analyzer/analytics/analyticsview.cpp
rename to src/console/analytics/analyticsview.cpp
index d90b9cb427704403b0f7cc99d317a3651d028fbc..f643fa63ef0d82bce146870524b1c36c1db9d41d 100644
--- a/src/analyzer/analytics/analyticsview.cpp
+++ b/src/console/analytics/analyticsview.cpp
@@ -41,7 +41,7 @@
 #include <QNetworkReply>
 #include <QSettings>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 AnalyticsView::AnalyticsView(QWidget* parent) :
     QWidget(parent),
diff --git a/src/analyzer/analytics/analyticsview.h b/src/console/analytics/analyticsview.h
similarity index 92%
rename from src/analyzer/analytics/analyticsview.h
rename to src/console/analytics/analyticsview.h
index 04ac7543290ceea0b10f7df064af589515fa602b..67d130ada8a1e07c2b30791c67d2991704d65d0f 100644
--- a/src/analyzer/analytics/analyticsview.h
+++ b/src/console/analytics/analyticsview.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_ANALYTICSVIEW_H
-#define USERFEEDBACK_ANALYZER_ANALYTICSVIEW_H
+#ifndef USERFEEDBACK_CONSOLE_ANALYTICSVIEW_H
+#define USERFEEDBACK_CONSOLE_ANALYTICSVIEW_H
 
 #include <core/product.h>
 
@@ -32,7 +32,7 @@ class QChart;
 }
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Aggregator;
 class AggregatedDataModel;
@@ -83,4 +83,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_ANALYTICSVIEW_H
+#endif // USERFEEDBACK_CONSOLE_ANALYTICSVIEW_H
diff --git a/src/analyzer/analytics/analyticsview.ui b/src/console/analytics/analyticsview.ui
similarity index 98%
rename from src/analyzer/analytics/analyticsview.ui
rename to src/console/analytics/analyticsview.ui
index 5a7b3d1038c46a64ad2dff8277935d520bded2d5..218747ab030033f3ea21b85721ce1b12ec8823b8 100644
--- a/src/analyzer/analytics/analyticsview.ui
+++ b/src/console/analytics/analyticsview.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::AnalyticsView</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::AnalyticsView">
+ <class>UserFeedback::Console::AnalyticsView</class>
+ <widget class="QWidget" name="UserFeedback::Console::AnalyticsView">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/analyzer/analytics/categoryaggregator.cpp b/src/console/analytics/categoryaggregator.cpp
similarity index 99%
rename from src/analyzer/analytics/categoryaggregator.cpp
rename to src/console/analytics/categoryaggregator.cpp
index f5eba083f49a9a9f4b5564dfb079347bd2683b81..4b8bf184dc76fa00b9d7363ab342e139ddaf96db 100644
--- a/src/analyzer/analytics/categoryaggregator.cpp
+++ b/src/console/analytics/categoryaggregator.cpp
@@ -34,7 +34,7 @@
 
 #include <QDebug>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 using namespace QtCharts;
 
 CategoryAggregator::CategoryAggregator() = default;
diff --git a/src/analyzer/analytics/categoryaggregator.h b/src/console/analytics/categoryaggregator.h
similarity index 89%
rename from src/analyzer/analytics/categoryaggregator.h
rename to src/console/analytics/categoryaggregator.h
index 7645ad78301728ec9e9fd0d1c58129083aef6281..14539e08e56b1240df3032267e97af2237d10959 100644
--- a/src/analyzer/analytics/categoryaggregator.h
+++ b/src/console/analytics/categoryaggregator.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_CATEGORYAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_CATEGORYAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_CATEGORYAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_CATEGORYAGGREGATOR_H
 
 #include "aggregator.h"
 
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class CategoryAggregationModel;
 
@@ -50,4 +50,4 @@ private:
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_CATEGORYAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_CATEGORYAGGREGATOR_H
diff --git a/src/analyzer/analytics/chartutil.cpp b/src/console/analytics/chartutil.cpp
similarity index 96%
rename from src/analyzer/analytics/chartutil.cpp
rename to src/console/analytics/chartutil.cpp
index fc0ca3002e380b62bf8b9dc8e34667b2a7ccb2c9..7bd45ea7cfb52573b994bf3940c23700be163018 100644
--- a/src/analyzer/analytics/chartutil.cpp
+++ b/src/console/analytics/chartutil.cpp
@@ -21,7 +21,7 @@
 
 #include <QApplication>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 using namespace QtCharts;
 
 void ChartUtil::applyTheme(QtCharts::QChart *chart)
diff --git a/src/analyzer/analytics/chartutil.h b/src/console/analytics/chartutil.h
similarity index 85%
rename from src/analyzer/analytics/chartutil.h
rename to src/console/analytics/chartutil.h
index 6b273ea734282459a09e0638df38e79db17a049a..42a42c245b2b0376729d9c5fe9f7cc38b7158bb0 100644
--- a/src/analyzer/analytics/chartutil.h
+++ b/src/console/analytics/chartutil.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_CHARTUTIL_H
-#define USERFEEDBACK_ANALYZER_CHARTUTIL_H
+#ifndef USERFEEDBACK_CONSOLE_CHARTUTIL_H
+#define USERFEEDBACK_CONSOLE_CHARTUTIL_H
 
 namespace QtCharts {
 class QChart;
 }
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 namespace ChartUtil
 {
@@ -32,4 +32,4 @@ void applyTheme(QtCharts::QChart *chart);
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_CHARTUTIL_H
+#endif // USERFEEDBACK_CONSOLE_CHARTUTIL_H
diff --git a/src/analyzer/analytics/numericaggregator.cpp b/src/console/analytics/numericaggregator.cpp
similarity index 98%
rename from src/analyzer/analytics/numericaggregator.cpp
rename to src/console/analytics/numericaggregator.cpp
index a8cc8ebfd262d346f456a925012d3b8bcf6b9019..56352d9a033aefb03df1811c570acf1d4ae8028d 100644
--- a/src/analyzer/analytics/numericaggregator.cpp
+++ b/src/console/analytics/numericaggregator.cpp
@@ -27,7 +27,7 @@
 #include <QtCharts/QHBoxPlotModelMapper>
 #include <QtCharts/QValueAxis>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 using namespace QtCharts;
 
 NumericAggregator::NumericAggregator() = default;
diff --git a/src/analyzer/analytics/numericaggregator.h b/src/console/analytics/numericaggregator.h
similarity index 88%
rename from src/analyzer/analytics/numericaggregator.h
rename to src/console/analytics/numericaggregator.h
index 9aac14a7e46272820d37c219947c6395d663d2b1..8994386664ab4cbc08d99d008fc41e57eda8b227 100644
--- a/src/analyzer/analytics/numericaggregator.h
+++ b/src/console/analytics/numericaggregator.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_NUMERICAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_NUMERICAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_NUMERICAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_NUMERICAGGREGATOR_H
 
 #include "aggregator.h"
 
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class NumericAggregationModel;
 
@@ -47,4 +47,4 @@ private:
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_NUMERICAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_NUMERICAGGREGATOR_H
diff --git a/src/analyzer/analytics/ratiosetaggregator.cpp b/src/console/analytics/ratiosetaggregator.cpp
similarity index 99%
rename from src/analyzer/analytics/ratiosetaggregator.cpp
rename to src/console/analytics/ratiosetaggregator.cpp
index 10dbf24f9f1130264811fdb423f7c2a5bdf3c0cb..9d8acdde791d2e4cf84435647060a11d0de2bc19 100644
--- a/src/analyzer/analytics/ratiosetaggregator.cpp
+++ b/src/console/analytics/ratiosetaggregator.cpp
@@ -30,7 +30,7 @@
 #include <QtCharts/QValueAxis>
 #include <QtCharts/QVXYModelMapper>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 using namespace QtCharts;
 
 RatioSetAggregator::RatioSetAggregator() = default;
diff --git a/src/analyzer/analytics/ratiosetaggregator.h b/src/console/analytics/ratiosetaggregator.h
similarity index 89%
rename from src/analyzer/analytics/ratiosetaggregator.h
rename to src/console/analytics/ratiosetaggregator.h
index e726b7186df1b276f8bde5b466af467ba586d55a..8c3e7519bcd6de49e77fc609c55af55a030831e2 100644
--- a/src/analyzer/analytics/ratiosetaggregator.h
+++ b/src/console/analytics/ratiosetaggregator.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_RATIOSETAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_RATIOSETAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_RATIOSETAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_RATIOSETAGGREGATOR_H
 
 #include "aggregator.h"
 
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class RatioSetAggregationModel;
 
@@ -50,4 +50,4 @@ private:
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_RATIOSETAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_RATIOSETAGGREGATOR_H
diff --git a/src/analyzer/analytics/totalaggregator.cpp b/src/console/analytics/totalaggregator.cpp
similarity index 98%
rename from src/analyzer/analytics/totalaggregator.cpp
rename to src/console/analytics/totalaggregator.cpp
index 8d6166df8bdd2a524f375aa61bb904a327cb4186..f59e809b09cc519f0f7f39db1ca002f540a9ad77 100644
--- a/src/analyzer/analytics/totalaggregator.cpp
+++ b/src/console/analytics/totalaggregator.cpp
@@ -30,7 +30,7 @@
 
 #include <numeric>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 using namespace QtCharts;
 
 TotalAggregator::TotalAggregator() = default;
diff --git a/src/analyzer/analytics/totalaggregator.h b/src/console/analytics/totalaggregator.h
similarity index 83%
rename from src/analyzer/analytics/totalaggregator.h
rename to src/console/analytics/totalaggregator.h
index 480e40616efb1c04916b18d6f03c0ded6519758a..8d1e343fb82230696bdff6e145ec25beb1b0d5f7 100644
--- a/src/analyzer/analytics/totalaggregator.h
+++ b/src/console/analytics/totalaggregator.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_TOTALAGGREGATOR_H
-#define USERFEEDBACK_ANALYZER_TOTALAGGREGATOR_H
+#ifndef USERFEEDBACK_CONSOLE_TOTALAGGREGATOR_H
+#define USERFEEDBACK_CONSOLE_TOTALAGGREGATOR_H
 
 #include "aggregator.h"
 
@@ -25,11 +25,11 @@
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class TotalAggregator : public Aggregator
 {
-    Q_DECLARE_TR_FUNCTIONS(UserFeedback::Analyzer::TotalAggregator)
+    Q_DECLARE_TR_FUNCTIONS(UserFeedback::Console::TotalAggregator)
 public:
     TotalAggregator();
     ~TotalAggregator();
@@ -47,4 +47,4 @@ private:
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_TOTALAGGREGATOR_H
+#endif // USERFEEDBACK_CONSOLE_TOTALAGGREGATOR_H
diff --git a/src/analyzer/connectdialog.cpp b/src/console/connectdialog.cpp
similarity index 98%
rename from src/analyzer/connectdialog.cpp
rename to src/console/connectdialog.cpp
index b400e4bf44a7d6f41fec07238e728eef45a3353b..9d267e565e7a915a9117f4f3b6be8bf4fde8c852 100644
--- a/src/analyzer/connectdialog.cpp
+++ b/src/console/connectdialog.cpp
@@ -24,7 +24,7 @@
 #include <QIcon>
 #include <QUrl>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 ConnectDialog::ConnectDialog(QWidget *parent) :
     QDialog(parent),
diff --git a/src/analyzer/connectdialog.h b/src/console/connectdialog.h
similarity index 88%
rename from src/analyzer/connectdialog.h
rename to src/console/connectdialog.h
index 531f9295ffb22f20bff06b93e66e15495009eea8..438000433889605ca452d0c88dfb3f24a3e52db0 100644
--- a/src/analyzer/connectdialog.h
+++ b/src/console/connectdialog.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_CONNECTDIALOG_H
-#define USERFEEDBACK_ANALYZER_CONNECTDIALOG_H
+#ifndef USERFEEDBACK_CONSOLE_CONNECTDIALOG_H
+#define USERFEEDBACK_CONSOLE_CONNECTDIALOG_H
 
 #include <QDialog>
 
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 namespace Ui
 {
@@ -53,4 +53,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_CONNECTDIALOG_H
+#endif // USERFEEDBACK_CONSOLE_CONNECTDIALOG_H
diff --git a/src/analyzer/connectdialog.ui b/src/console/connectdialog.ui
similarity index 92%
rename from src/analyzer/connectdialog.ui
rename to src/console/connectdialog.ui
index 3d1604fc203972edd8d8845dbccd8d4b3abd0866..70eb666e292ff705ab28d5cd7aaad51f2feb5f9b 100644
--- a/src/analyzer/connectdialog.ui
+++ b/src/console/connectdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::ConnectDialog</class>
- <widget class="QDialog" name="UserFeedback::Analyzer::ConnectDialog">
+ <class>UserFeedback::Console::ConnectDialog</class>
+ <widget class="QDialog" name="UserFeedback::Console::ConnectDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -91,7 +91,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>UserFeedback::Analyzer::ConnectDialog</receiver>
+   <receiver>UserFeedback::Console::ConnectDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -107,7 +107,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>UserFeedback::Analyzer::ConnectDialog</receiver>
+   <receiver>UserFeedback::Console::ConnectDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/analyzer/core/aggregation.cpp b/src/console/core/aggregation.cpp
similarity index 98%
rename from src/analyzer/core/aggregation.cpp
rename to src/console/core/aggregation.cpp
index 6769fb0d552f0d304aa23304328dc073cb6c8039..979865a9590beca4bd30616284ab5b32278abaef 100644
--- a/src/analyzer/core/aggregation.cpp
+++ b/src/console/core/aggregation.cpp
@@ -21,7 +21,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 static const struct {
     Aggregation::Type type;
diff --git a/src/analyzer/core/aggregation.h b/src/console/core/aggregation.h
similarity index 83%
rename from src/analyzer/core/aggregation.h
rename to src/console/core/aggregation.h
index 61f6fef0833c0d48bfc88bce97bc03ec57f9d309..7fcffe6f2659a541a7b52e685e813a0de0a51be7 100644
--- a/src/analyzer/core/aggregation.h
+++ b/src/console/core/aggregation.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATION_H
-#define USERFEEDBACK_ANALYZER_AGGREGATION_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATION_H
+#define USERFEEDBACK_CONSOLE_AGGREGATION_H
 
 #include <core/aggregationelement.h>
 
@@ -26,7 +26,7 @@ class QJsonArray;
 class QJsonObject;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 
@@ -63,7 +63,7 @@ private:
 }
 }
 
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Aggregation, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Aggregation::Type)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Aggregation, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Aggregation::Type)
 
-#endif // USERFEEDBACK_ANALYZER_AGGREGATION_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATION_H
diff --git a/src/analyzer/core/aggregationelement.cpp b/src/console/core/aggregationelement.cpp
similarity index 98%
rename from src/analyzer/core/aggregationelement.cpp
rename to src/console/core/aggregationelement.cpp
index c7f80c6c0252e980587cf033c1f363955bce2ab2..e9d6beb28837c1f50c20494cbbff0d4d3f704652 100644
--- a/src/analyzer/core/aggregationelement.cpp
+++ b/src/console/core/aggregationelement.cpp
@@ -22,7 +22,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 static const struct {
     AggregationElement::Type type;
diff --git a/src/analyzer/core/aggregationelement.h b/src/console/core/aggregationelement.h
similarity index 83%
rename from src/analyzer/core/aggregationelement.h
rename to src/console/core/aggregationelement.h
index 8889ad8d3e9937f8fc51d3517f41490fc6410e0c..5f059e59d930979a7a35aebda694af12223a0997 100644
--- a/src/analyzer/core/aggregationelement.h
+++ b/src/console/core/aggregationelement.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONELEMENT_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONELEMENT_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONELEMENT_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONELEMENT_H
 
 #include "schemaentry.h"
 #include "schemaentryelement.h"
@@ -25,7 +25,7 @@ class QJsonArray;
 class QJsonObject;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 
@@ -64,7 +64,7 @@ private:
 }
 }
 
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::AggregationElement, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::AggregationElement)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::AggregationElement, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::AggregationElement)
 
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONELEMENT_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONELEMENT_H
diff --git a/src/analyzer/core/product.cpp b/src/console/core/product.cpp
similarity index 98%
rename from src/analyzer/core/product.cpp
rename to src/console/core/product.cpp
index 61205e69ea81e990db6273e5a8c2eb1ac2fe74db..c0c801334282adb2ded71a81e00166a0f0b5480c 100644
--- a/src/analyzer/core/product.cpp
+++ b/src/console/core/product.cpp
@@ -24,10 +24,10 @@
 #include <QSharedData>
 #include <QString>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 class ProductData : public QSharedData
 {
 public:
diff --git a/src/analyzer/core/product.h b/src/console/core/product.h
similarity index 85%
rename from src/analyzer/core/product.h
rename to src/console/core/product.h
index 911b12dc990f617c4d3f731fdee14b72e9bbc536..ce5cf6c46bc66388c79a36e3070fe1148f762138 100644
--- a/src/analyzer/core/product.h
+++ b/src/console/core/product.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_PRODUCT_H
-#define USERFEEDBACK_ANALYZER_PRODUCT_H
+#ifndef USERFEEDBACK_CONSOLE_PRODUCT_H
+#define USERFEEDBACK_CONSOLE_PRODUCT_H
 
 #include "schemaentry.h"
 
@@ -27,7 +27,7 @@
 class QString;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Aggregation;
 class ProductData;
@@ -66,7 +66,7 @@ private:
 }
 }
 
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Product, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Product)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Product, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Product)
 
-#endif // USERFEEDBACK_ANALYZER_PRODUCT_H
+#endif // USERFEEDBACK_CONSOLE_PRODUCT_H
diff --git a/src/analyzer/core/sample.cpp b/src/console/core/sample.cpp
similarity index 98%
rename from src/analyzer/core/sample.cpp
rename to src/console/core/sample.cpp
index f2baba24dde4a77f58471fcdb3fc9c2cde222e26..0202532fc66a64adf618d8578234983fef11f81a 100644
--- a/src/analyzer/core/sample.cpp
+++ b/src/console/core/sample.cpp
@@ -29,9 +29,9 @@
 #include <QSharedData>
 #include <QVariant>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
-class UserFeedback::Analyzer::SampleData : public QSharedData
+class UserFeedback::Console::SampleData : public QSharedData
 {
 public:
     QDateTime timestamp;
diff --git a/src/analyzer/core/sample.h b/src/console/core/sample.h
similarity index 84%
rename from src/analyzer/core/sample.h
rename to src/console/core/sample.h
index adb6d42f20ee81afe9680abe5936ba4e06ce513e..5afb082d124a951acdf443d8a556d25ff225a663 100644
--- a/src/analyzer/core/sample.h
+++ b/src/console/core/sample.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SAMPLE_H
-#define USERFEEDBACK_ANALYZER_SAMPLE_H
+#ifndef USERFEEDBACK_CONSOLE_SAMPLE_H
+#define USERFEEDBACK_CONSOLE_SAMPLE_H
 
 #include <QMetaType>
 #include <QSharedDataPointer>
@@ -26,7 +26,7 @@ class QDateTime;
 class QString;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 class SampleData;
@@ -53,7 +53,7 @@ private:
 }
 }
 
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Sample, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Sample)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Sample, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Sample)
 
-#endif // USERFEEDBACK_ANALYZER_SAMPLE_H
+#endif // USERFEEDBACK_CONSOLE_SAMPLE_H
diff --git a/src/analyzer/core/schemaentry.cpp b/src/console/core/schemaentry.cpp
similarity index 98%
rename from src/analyzer/core/schemaentry.cpp
rename to src/console/core/schemaentry.cpp
index 140ebc0f39803c0bbbab348e5195858bb502bbff..7da39bdd3ec1ff4e953bb52f0f0ee31963da05ee 100644
--- a/src/analyzer/core/schemaentry.cpp
+++ b/src/console/core/schemaentry.cpp
@@ -25,10 +25,10 @@
 #include <QObject>
 #include <QSharedData>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class SchemaEntryData : public QSharedData
 {
diff --git a/src/analyzer/core/schemaentry.h b/src/console/core/schemaentry.h
similarity index 91%
rename from src/analyzer/core/schemaentry.h
rename to src/console/core/schemaentry.h
index cb77cb9ac6987479557d94665aad7a297f2c56c8..40709ce9ecbd23afacf261645bff5b5a767a58e1 100644
--- a/src/analyzer/core/schemaentry.h
+++ b/src/console/core/schemaentry.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRY_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRY_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRY_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRY_H
 
 #include <QObject>
 #include <QSharedDataPointer>
@@ -26,7 +26,7 @@ class QJsonArray;
 class QJsonObject;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class SchemaEntryData;
 class SchemaEntryElement;
@@ -96,7 +96,7 @@ private:
 }
 }
 
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::SchemaEntry)
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::SchemaEntry, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::SchemaEntry)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::SchemaEntry, Q_MOVABLE_TYPE);
 
-#endif // USERFEEDBACK_ANALYZER_PRODUCTSCHEMAENTRY_H
+#endif // USERFEEDBACK_CONSOLE_PRODUCTSCHEMAENTRY_H
diff --git a/src/analyzer/core/schemaentryelement.cpp b/src/console/core/schemaentryelement.cpp
similarity index 97%
rename from src/analyzer/core/schemaentryelement.cpp
rename to src/console/core/schemaentryelement.cpp
index 68a40ec3d7131c7d4be498f82ee265a310020a04..5fff68856b7e9a31f6f85678e389a671cc0708a9 100644
--- a/src/analyzer/core/schemaentryelement.cpp
+++ b/src/console/core/schemaentryelement.cpp
@@ -23,10 +23,10 @@
 #include <QSharedData>
 #include <QVector>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 class SchemaEntryElementData : public QSharedData
 {
 public:
diff --git a/src/analyzer/core/schemaentryelement.h b/src/console/core/schemaentryelement.h
similarity index 81%
rename from src/analyzer/core/schemaentryelement.h
rename to src/console/core/schemaentryelement.h
index d30471370a74b82c8b13a1560a7c2081c89f7a16..67c4f2d396bc3acb601c484581af1593d9b5a549 100644
--- a/src/analyzer/core/schemaentryelement.h
+++ b/src/console/core/schemaentryelement.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRYELEMENT_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRYELEMENT_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRYELEMENT_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRYELEMENT_H
 
 #include <qobjectdefs.h>
 #include <QMetaType>
@@ -29,7 +29,7 @@ template <typename T> class QVector;
 QT_END_NAMESPACE
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class SchemaEntryElementData;
 
@@ -68,8 +68,8 @@ private:
 }
 }
 
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::SchemaEntryElement)
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::SchemaEntryElement::Type)
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::SchemaEntryElement, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::SchemaEntryElement)
+Q_DECLARE_METATYPE(UserFeedback::Console::SchemaEntryElement::Type)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::SchemaEntryElement, Q_MOVABLE_TYPE);
 
-#endif // USERFEEDBACK_ANALYZER_SCHEMAENTRYELEMENT_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAENTRYELEMENT_H
diff --git a/src/analyzer/core/schemaentrytemplates.cpp b/src/console/core/schemaentrytemplates.cpp
similarity index 97%
rename from src/analyzer/core/schemaentrytemplates.cpp
rename to src/console/core/schemaentrytemplates.cpp
index ab85f1a93a7b9a3eecd85db5ad41bb15b92df29a..c71b65d1975d24372f417f97af2a2f5ce27a7c2c 100644
--- a/src/analyzer/core/schemaentrytemplates.cpp
+++ b/src/console/core/schemaentrytemplates.cpp
@@ -28,7 +28,7 @@
 
 #include <algorithm>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 QVector<Product> SchemaEntryTemplates::availableTemplates()
 {
diff --git a/src/analyzer/core/schemaentrytemplates.h b/src/console/core/schemaentrytemplates.h
similarity index 83%
rename from src/analyzer/core/schemaentrytemplates.h
rename to src/console/core/schemaentrytemplates.h
index b6e5b5d6eab9630da69fa72460186ea76d1fc238..4b7807bc3982f70ee8ee7eba7eee83506f4727e6 100644
--- a/src/analyzer/core/schemaentrytemplates.h
+++ b/src/console/core/schemaentrytemplates.h
@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRYTEMPLATES_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRYTEMPLATES_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRYTEMPLATES_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRYTEMPLATES_H
 
 template <typename T> class QVector;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 
@@ -33,4 +33,4 @@ namespace SchemaEntryTemplates
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SCHEMAENTRYTEMPLATES_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAENTRYTEMPLATES_H
diff --git a/src/analyzer/core/survey.cpp b/src/console/core/survey.cpp
similarity index 98%
rename from src/analyzer/core/survey.cpp
rename to src/console/core/survey.cpp
index 69e6f4589dadeaa0a6d41101a313342330afa18a..bd79ddcfa6a071e56b604f17a389ae99b87f1451 100644
--- a/src/analyzer/core/survey.cpp
+++ b/src/console/core/survey.cpp
@@ -25,10 +25,10 @@
 #include <QString>
 #include <QUrl>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class SurveyData : public QSharedData
 {
diff --git a/src/analyzer/core/survey.h b/src/console/core/survey.h
similarity index 85%
rename from src/analyzer/core/survey.h
rename to src/console/core/survey.h
index bff1b129513c1ee5367c202c0531f32a3fc65425..35705e2efcb9a0d5002b95e931ef27fee60ee83a 100644
--- a/src/analyzer/core/survey.h
+++ b/src/console/core/survey.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SURVEY_H
-#define USERFEEDBACK_ANALYZER_SURVEY_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEY_H
+#define USERFEEDBACK_CONSOLE_SURVEY_H
 
 #include <QMetaType>
 #include <QSharedDataPointer>
@@ -26,7 +26,7 @@ class QString;
 class QUrl;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class SurveyData;
 
@@ -63,7 +63,7 @@ private:
 }
 }
 
-Q_DECLARE_TYPEINFO(UserFeedback::Analyzer::Survey, Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(UserFeedback::Analyzer::Survey)
+Q_DECLARE_TYPEINFO(UserFeedback::Console::Survey, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(UserFeedback::Console::Survey)
 
-#endif // USERFEEDBACK_ANALYZER_SURVEY_H
+#endif // USERFEEDBACK_CONSOLE_SURVEY_H
diff --git a/src/analyzer/core/util.h b/src/console/core/util.h
similarity index 92%
rename from src/analyzer/core/util.h
rename to src/console/core/util.h
index 5182fcdc00c51de8a696256c9c11b8cd88191c41..e54dec3f3486e5bf36a379832263c56988270dbd 100644
--- a/src/analyzer/core/util.h
+++ b/src/console/core/util.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_UTIL_H
-#define USERFEEDBACK_ANALYZER_UTIL_H
+#ifndef USERFEEDBACK_CONSOLE_UTIL_H
+#define USERFEEDBACK_CONSOLE_UTIL_H
 
 #include <QMetaEnum>
 #include <QMetaType>
@@ -24,7 +24,7 @@
 class QString;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 namespace Util
 {
     template<typename Enum, typename Table, std::size_t N>
@@ -61,4 +61,4 @@ namespace Util
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_UTIL_H
+#endif // USERFEEDBACK_CONSOLE_UTIL_H
diff --git a/src/analyzer/main.cpp b/src/console/main.cpp
similarity index 94%
rename from src/analyzer/main.cpp
rename to src/console/main.cpp
index 0640a1ff5abb60d11d1c4d61f4133f80e89169d5..fe977cb28a2153008b7158514956af455222a98c 100644
--- a/src/analyzer/main.cpp
+++ b/src/console/main.cpp
@@ -22,7 +22,7 @@
 
 int main(int argc, char** argv)
 {
-    QCoreApplication::setApplicationName(QStringLiteral("UserFeedbackAnalyzer"));
+    QCoreApplication::setApplicationName(QStringLiteral("UserFeedbackConsole"));
     QCoreApplication::setApplicationVersion(QStringLiteral(USERFEEDBACK_VERSION));
     QCoreApplication::setOrganizationName(QStringLiteral("KDE"));
     QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org"));
@@ -31,7 +31,7 @@ int main(int argc, char** argv)
 
     QApplication app(argc, argv);
 
-    UserFeedback::Analyzer::MainWindow mainWindow;
+    UserFeedback::Console::MainWindow mainWindow;
     mainWindow.show();
 
     return app.exec();
diff --git a/src/analyzer/mainwindow.cpp b/src/console/mainwindow.cpp
similarity index 98%
rename from src/analyzer/mainwindow.cpp
rename to src/console/mainwindow.cpp
index 3116fb38f5f8a227d29f834ffd11557ba21039d9..7e5b01250c6418aeca5355d4308969ae28b0ca78 100644
--- a/src/analyzer/mainwindow.cpp
+++ b/src/console/mainwindow.cpp
@@ -47,7 +47,7 @@
 #include <QTimer>
 #include <QUrl>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 MainWindow::MainWindow() :
     ui(new Ui::MainWindow),
@@ -113,7 +113,7 @@ MainWindow::MainWindow() :
         dlg.exec();
     });
     connect(ui->actionAbout, &QAction::triggered, this, [this]() {
-        QMessageBox::about(this, tr("About User Feedback Analyzer"), tr(
+        QMessageBox::about(this, tr("About User Feedback Console"), tr(
             "Version: %1\n"
             "License: LGPLv2+\n"
             "Copyright ⓒ 2016 Volker Krause <vkrause@kde.org>"
diff --git a/src/analyzer/mainwindow.h b/src/console/mainwindow.h
similarity index 91%
rename from src/analyzer/mainwindow.h
rename to src/console/mainwindow.h
index ccd9e3ee02fdfb574a75f6f49dd0446f45d51361..8c5d5665626ed5766e46f9fa426a43f8b8ca7215 100644
--- a/src/analyzer/mainwindow.h
+++ b/src/console/mainwindow.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_MAINWINDOW_H
-#define USERFEEDBACK_ANALYZER_MAINWINDOW_H
+#ifndef USERFEEDBACK_CONSOLE_MAINWINDOW_H
+#define USERFEEDBACK_CONSOLE_MAINWINDOW_H
 
 #include <QMainWindow>
 #include <QVector>
@@ -30,7 +30,7 @@ namespace UserFeedback {
 
 class Provider;
 
-namespace Analyzer {
+namespace Console {
 
 namespace Ui
 {
@@ -74,4 +74,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_MAINWINDOW_H
+#endif // USERFEEDBACK_CONSOLE_MAINWINDOW_H
diff --git a/src/analyzer/mainwindow.ui b/src/console/mainwindow.ui
similarity index 93%
rename from src/analyzer/mainwindow.ui
rename to src/console/mainwindow.ui
index a9c8d26c9a890a460cd5ea5dbb843506b67b3348..7e8f8b970955a13ffb83287d00a5c44019e69232 100644
--- a/src/analyzer/mainwindow.ui
+++ b/src/console/mainwindow.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::MainWindow</class>
- <widget class="QMainWindow" name="UserFeedback::Analyzer::MainWindow">
+ <class>UserFeedback::Console::MainWindow</class>
+ <widget class="QMainWindow" name="UserFeedback::Console::MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>User Feedback Analyzer</string>
+   <string>User Feedback Console</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -29,9 +29,9 @@
     </property>
     <item>
      <widget class="QStackedWidget" name="viewStack">
-      <widget class="UserFeedback::Analyzer::AnalyticsView" name="analyticsView"/>
-      <widget class="UserFeedback::Analyzer::SurveyEditor" name="surveyEditor"/>
-      <widget class="UserFeedback::Analyzer::SchemaEditor" name="schemaEdit"/>
+      <widget class="UserFeedback::Console::AnalyticsView" name="analyticsView"/>
+      <widget class="UserFeedback::Console::SurveyEditor" name="surveyEditor"/>
+      <widget class="UserFeedback::Console::SchemaEditor" name="schemaEdit"/>
      </widget>
     </item>
     <item>
@@ -194,7 +194,7 @@
     <string>&amp;Quit</string>
    </property>
    <property name="toolTip">
-    <string>Quit the user feedback analyzer.</string>
+    <string>Quit the user feedback console.</string>
    </property>
    <property name="menuRole">
     <enum>QAction::QuitRole</enum>
@@ -292,19 +292,19 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>UserFeedback::Analyzer::SchemaEditor</class>
+   <class>UserFeedback::Console::SchemaEditor</class>
    <extends>QWidget</extends>
    <header>schemaeditor/schemaeditor.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>UserFeedback::Analyzer::SurveyEditor</class>
+   <class>UserFeedback::Console::SurveyEditor</class>
    <extends>QWidget</extends>
    <header location="global">surveyeditor/surveyeditor.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>UserFeedback::Analyzer::AnalyticsView</class>
+   <class>UserFeedback::Console::AnalyticsView</class>
    <extends>QWidget</extends>
    <header location="global">analytics/analyticsview.h</header>
    <container>1</container>
diff --git a/src/analyzer/model/aggregateddatamodel.cpp b/src/console/model/aggregateddatamodel.cpp
similarity index 98%
rename from src/analyzer/model/aggregateddatamodel.cpp
rename to src/console/model/aggregateddatamodel.cpp
index 5e626442f3bab82c8303bb6b6db78c3f91a7322f..290921ea7b43b19c11960d122db97864ff593167 100644
--- a/src/analyzer/model/aggregateddatamodel.cpp
+++ b/src/console/model/aggregateddatamodel.cpp
@@ -20,7 +20,7 @@
 
 #include <QDebug>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 AggregatedDataModel::AggregatedDataModel(QObject *parent) :
     QAbstractTableModel(parent)
diff --git a/src/analyzer/model/aggregateddatamodel.h b/src/console/model/aggregateddatamodel.h
similarity index 90%
rename from src/analyzer/model/aggregateddatamodel.h
rename to src/console/model/aggregateddatamodel.h
index bf093400754c10de8169c8bcfac0f9337a7d80eb..aa2d9f75a9c40b7ad438b2abcc29665894e9ce76 100644
--- a/src/analyzer/model/aggregateddatamodel.h
+++ b/src/console/model/aggregateddatamodel.h
@@ -15,14 +15,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATEDDATAMODEL_H
-#define USERFEEDBACK_ANALYZER_AGGREGATEDDATAMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATEDDATAMODEL_H
+#define USERFEEDBACK_CONSOLE_AGGREGATEDDATAMODEL_H
 
 #include <QAbstractTableModel>
 #include <QVector>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 /** Joint model for all time-aggregated data, for user display and export. */
 class AggregatedDataModel : public QAbstractTableModel
@@ -52,4 +52,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_AGGREGATEDDATAMODEL_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATEDDATAMODEL_H
diff --git a/src/analyzer/model/aggregationeditormodel.cpp b/src/console/model/aggregationeditormodel.cpp
similarity index 98%
rename from src/analyzer/model/aggregationeditormodel.cpp
rename to src/console/model/aggregationeditormodel.cpp
index 704b30e2ffd6189e5ffcd15da9dd39fdf7f594bc..4168dc1c47629de5f55d2f470984b7fb5807aa56 100644
--- a/src/analyzer/model/aggregationeditormodel.cpp
+++ b/src/console/model/aggregationeditormodel.cpp
@@ -20,7 +20,7 @@
 #include <core/aggregation.h>
 #include <core/util.h>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 AggregationEditorModel::AggregationEditorModel(QObject* parent) :
     QAbstractTableModel(parent)
diff --git a/src/analyzer/model/aggregationeditormodel.h b/src/console/model/aggregationeditormodel.h
similarity index 89%
rename from src/analyzer/model/aggregationeditormodel.h
rename to src/console/model/aggregationeditormodel.h
index 3f58b0a8cf543aae5fadfee3360d239c94794b65..340714574d72d8038ef8203643978ff57bf6670b 100644
--- a/src/analyzer/model/aggregationeditormodel.h
+++ b/src/console/model/aggregationeditormodel.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONEDITORMODEL_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONEDITORMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONEDITORMODEL_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONEDITORMODEL_H
 
 #include <core/product.h>
 
 #include <QAbstractTableModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class AggregationEditorModel : public QAbstractTableModel
 {
@@ -48,4 +48,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONEDITORMODEL_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONEDITORMODEL_H
diff --git a/src/analyzer/model/aggregationelementmodel.cpp b/src/console/model/aggregationelementmodel.cpp
similarity index 98%
rename from src/analyzer/model/aggregationelementmodel.cpp
rename to src/console/model/aggregationelementmodel.cpp
index 61256d589c97dd6f842b62bc7fdf4fc0cabc7e21..c7f2f5ab1b892da4068939d7e7ff3cf435261e5d 100644
--- a/src/analyzer/model/aggregationelementmodel.cpp
+++ b/src/console/model/aggregationelementmodel.cpp
@@ -19,7 +19,7 @@
 
 #include <core/product.h>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 AggregationElementModel::AggregationElementModel(QObject* parent) :
     QAbstractListModel(parent)
diff --git a/src/analyzer/model/aggregationelementmodel.h b/src/console/model/aggregationelementmodel.h
similarity index 88%
rename from src/analyzer/model/aggregationelementmodel.h
rename to src/console/model/aggregationelementmodel.h
index 6add72e9a409cf856004ece5b190002de57b5d6d..39e659f7b344b01d05ae096710a95be53d8e9b5d 100644
--- a/src/analyzer/model/aggregationelementmodel.h
+++ b/src/console/model/aggregationelementmodel.h
@@ -16,8 +16,8 @@
 */
 
 
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONELEMENTMODEL_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONELEMENTMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONELEMENTMODEL_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONELEMENTMODEL_H
 
 #include <core/aggregation.h>
 
@@ -25,7 +25,7 @@
 #include <QVector>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 
@@ -48,4 +48,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONELEMENTMODEL_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONELEMENTMODEL_H
diff --git a/src/analyzer/model/categoryaggregationmodel.cpp b/src/console/model/categoryaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/categoryaggregationmodel.cpp
rename to src/console/model/categoryaggregationmodel.cpp
index 17843c94dfa4c91c2b039d9030877db68e0bdb9c..034601041691708783441f641e8d677c3d85f6d4 100644
--- a/src/analyzer/model/categoryaggregationmodel.cpp
+++ b/src/console/model/categoryaggregationmodel.cpp
@@ -25,7 +25,7 @@
 #include <algorithm>
 #include <string.h>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 CategoryAggregationModel::CategoryAggregationModel(QObject *parent) :
     QAbstractTableModel(parent)
diff --git a/src/analyzer/model/categoryaggregationmodel.h b/src/console/model/categoryaggregationmodel.h
similarity index 89%
rename from src/analyzer/model/categoryaggregationmodel.h
rename to src/console/model/categoryaggregationmodel.h
index 1ff200dc588c6879168c80163329bb8e34f1c60f..5eaba2154f7287f39c3fd3b98bf1ee7e3aaf073f 100644
--- a/src/analyzer/model/categoryaggregationmodel.h
+++ b/src/console/model/categoryaggregationmodel.h
@@ -15,14 +15,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_CATEGORYAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_CATEGORYAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_CATEGORYAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_CATEGORYAGGREGATIONMODEL_H
 
 #include <QAbstractTableModel>
 #include <QVector>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 /** Aggregate by time and one string category value (e.g. version. platform, etc). */
 class CategoryAggregationModel : public QAbstractTableModel
@@ -53,4 +53,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_CATEGORYAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_CATEGORYAGGREGATIONMODEL_H
diff --git a/src/analyzer/model/datamodel.cpp b/src/console/model/datamodel.cpp
similarity index 98%
rename from src/analyzer/model/datamodel.cpp
rename to src/console/model/datamodel.cpp
index 797ad709b660ca65c6d4fada962788e87ac0955e..04e57e5c8380c336e5afb61fa15df5f68f0d74b3 100644
--- a/src/analyzer/model/datamodel.cpp
+++ b/src/console/model/datamodel.cpp
@@ -26,7 +26,7 @@
 
 #include <algorithm>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 static QString mapToString(const QVariantMap &map)
 {
@@ -106,7 +106,7 @@ void DataModel::setSamples(const QVector<Sample> &samples)
     endResetModel();
 }
 
-void UserFeedback::Analyzer::DataModel::reload()
+void UserFeedback::Console::DataModel::reload()
 {
     if (!m_restClient || !m_restClient->isConnected() || !m_product.isValid())
         return;
diff --git a/src/analyzer/model/datamodel.h b/src/console/model/datamodel.h
similarity index 93%
rename from src/analyzer/model/datamodel.h
rename to src/console/model/datamodel.h
index 0ef29a245d30d4eea578a67de49850a452df4b43..41f4cada1879457bb8e9460e68fc43256548a2ed 100644
--- a/src/analyzer/model/datamodel.h
+++ b/src/console/model/datamodel.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_DATAMODEL_H
-#define USERFEEDBACK_ANALYZER_DATAMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_DATAMODEL_H
+#define USERFEEDBACK_CONSOLE_DATAMODEL_H
 
 #include <core/product.h>
 #include <core/schemaentry.h>
@@ -25,7 +25,7 @@
 #include <QAbstractTableModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class RESTClient;
 class Sample;
@@ -72,4 +72,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_DATAMODEL_H
+#endif // USERFEEDBACK_CONSOLE_DATAMODEL_H
diff --git a/src/analyzer/model/extrarowsproxymodel.cpp b/src/console/model/extrarowsproxymodel.cpp
similarity index 98%
rename from src/analyzer/model/extrarowsproxymodel.cpp
rename to src/console/model/extrarowsproxymodel.cpp
index 6608db244815e2f07990900c2f7e08bd61f81462..ef3f48dfadb922a804f56740b10fea5602af1252 100644
--- a/src/analyzer/model/extrarowsproxymodel.cpp
+++ b/src/console/model/extrarowsproxymodel.cpp
@@ -17,7 +17,7 @@
 
 #include "extrarowsproxymodel.h"
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 ExtraRowsProxyModel::ExtraRowsProxyModel(QObject* parent) :
     QIdentityProxyModel(parent)
diff --git a/src/analyzer/model/extrarowsproxymodel.h b/src/console/model/extrarowsproxymodel.h
similarity index 88%
rename from src/analyzer/model/extrarowsproxymodel.h
rename to src/console/model/extrarowsproxymodel.h
index e3be49edfe9ac6b85125ad97bee877e5142dfe93..760f1dc1f4722c29f37c49ed85bd07fe52d8ed3a 100644
--- a/src/analyzer/model/extrarowsproxymodel.h
+++ b/src/console/model/extrarowsproxymodel.h
@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_EXTRAROWSPROXYMODEL_H
-#define USERFEEDBACK_ANALYZER_EXTRAROWSPROXYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_EXTRAROWSPROXYMODEL_H
+#define USERFEEDBACK_CONSOLE_EXTRAROWSPROXYMODEL_H
 
 #include <QIdentityProxyModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class ExtraRowsProxyModel : public QIdentityProxyModel
 {
@@ -44,4 +44,4 @@ private:
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_EXTRAROWSPROXYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_EXTRAROWSPROXYMODEL_H
diff --git a/src/analyzer/model/numericaggregationmodel.cpp b/src/console/model/numericaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/numericaggregationmodel.cpp
rename to src/console/model/numericaggregationmodel.cpp
index b26d9e47046765b44f823fc734cbae8738158434..7f2e85e5fb3dfd1054325441230e7e8d3c5d0685 100644
--- a/src/analyzer/model/numericaggregationmodel.cpp
+++ b/src/console/model/numericaggregationmodel.cpp
@@ -19,7 +19,7 @@
 #include <model/timeaggregationmodel.h>
 #include <core/sample.h>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 NumericAggregationModel::NumericAggregationModel(QObject *parent) :
     QAbstractTableModel(parent)
diff --git a/src/analyzer/model/numericaggregationmodel.h b/src/console/model/numericaggregationmodel.h
similarity index 90%
rename from src/analyzer/model/numericaggregationmodel.h
rename to src/console/model/numericaggregationmodel.h
index 0c0b6c8e11a6d804e002eb56c6158483174f55b3..0449e3eab953b8669e01a1d8dc0e09c4217dfa2d 100644
--- a/src/analyzer/model/numericaggregationmodel.h
+++ b/src/console/model/numericaggregationmodel.h
@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_NUMERICAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_NUMERICAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_NUMERICAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_NUMERICAGGREGATIONMODEL_H
 
 #include <QAbstractTableModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class NumericAggregationModel : public QAbstractTableModel
 {
@@ -58,4 +58,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_NUMERICAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_NUMERICAGGREGATIONMODEL_H
diff --git a/src/analyzer/model/productmodel.cpp b/src/console/model/productmodel.cpp
similarity index 99%
rename from src/analyzer/model/productmodel.cpp
rename to src/console/model/productmodel.cpp
index 4b06c8577a68de94603a0b71f17f04c5e434a34a..b1c4d7883dcc6fac89550e31c272151abf6bdf37 100644
--- a/src/analyzer/model/productmodel.cpp
+++ b/src/console/model/productmodel.cpp
@@ -22,7 +22,7 @@
 
 #include <QNetworkReply>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 ProductModel::ProductModel(QObject *parent) :
     QAbstractListModel(parent)
diff --git a/src/analyzer/model/productmodel.h b/src/console/model/productmodel.h
similarity index 91%
rename from src/analyzer/model/productmodel.h
rename to src/console/model/productmodel.h
index 1263f7ea609d62b2885fe1af1690cb76baa97365..6868fa682d1d373a26ca154a0d71fbd710db0ec4 100644
--- a/src/analyzer/model/productmodel.h
+++ b/src/console/model/productmodel.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_PRODUCTMODEL_H
-#define USERFEEDBACK_ANALYZER_PRODUCTMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_PRODUCTMODEL_H
+#define USERFEEDBACK_CONSOLE_PRODUCTMODEL_H
 
 #include <core/product.h>
 #include <rest/serverinfo.h>
@@ -25,7 +25,7 @@
 #include <QVector>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class RESTClient;
 
@@ -58,4 +58,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_PRODUCTMODEL_H
+#endif // USERFEEDBACK_CONSOLE_PRODUCTMODEL_H
diff --git a/src/analyzer/model/ratiosetaggregationmodel.cpp b/src/console/model/ratiosetaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/ratiosetaggregationmodel.cpp
rename to src/console/model/ratiosetaggregationmodel.cpp
index 33cee1c7b1d47130335ab516adb9c2c62bd90d6e..4572cc63833e23b26de6487c7b146691ec08e0bf 100644
--- a/src/analyzer/model/ratiosetaggregationmodel.cpp
+++ b/src/console/model/ratiosetaggregationmodel.cpp
@@ -21,7 +21,7 @@
 
 #include <QSet>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 RatioSetAggregationModel::RatioSetAggregationModel(QObject *parent) :
     QAbstractTableModel(parent)
diff --git a/src/analyzer/model/ratiosetaggregationmodel.h b/src/console/model/ratiosetaggregationmodel.h
similarity index 89%
rename from src/analyzer/model/ratiosetaggregationmodel.h
rename to src/console/model/ratiosetaggregationmodel.h
index 0c8b7612349b4c457db87b1b5d4e1c77df45b861..93f69a66acd1916561f7f98f9cbfc5cfe5a0a30c 100644
--- a/src/analyzer/model/ratiosetaggregationmodel.h
+++ b/src/console/model/ratiosetaggregationmodel.h
@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_RATIOSETAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_RATIOSETAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_RATIOSETAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_RATIOSETAGGREGATIONMODEL_H
 
 #include <QAbstractTableModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class RatioSetAggregationModel : public QAbstractTableModel
 {
@@ -50,4 +50,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_RATIOSETAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_RATIOSETAGGREGATIONMODEL_H
diff --git a/src/analyzer/model/rolemappingproxymodel.cpp b/src/console/model/rolemappingproxymodel.cpp
similarity index 97%
rename from src/analyzer/model/rolemappingproxymodel.cpp
rename to src/console/model/rolemappingproxymodel.cpp
index b1a1c39177f7cd965de50094c24c4d05c3cf7a34..8f10952551ab1a7629e046591a4a262f70a2a6eb 100644
--- a/src/analyzer/model/rolemappingproxymodel.cpp
+++ b/src/console/model/rolemappingproxymodel.cpp
@@ -17,7 +17,7 @@
 
 #include "rolemappingproxymodel.h"
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 RoleMappingProxyModel::RoleMappingProxyModel(QObject* parent) :
     QIdentityProxyModel(parent)
diff --git a/src/analyzer/model/rolemappingproxymodel.h b/src/console/model/rolemappingproxymodel.h
similarity index 86%
rename from src/analyzer/model/rolemappingproxymodel.h
rename to src/console/model/rolemappingproxymodel.h
index 13ecd2091d9fcc8b5c8cbfd712125e4c2b0f3c96..522c1ae5c74a249030ef872201a597acf69269d8 100644
--- a/src/analyzer/model/rolemappingproxymodel.h
+++ b/src/console/model/rolemappingproxymodel.h
@@ -15,14 +15,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_ROLEMAPPINGPROXYMODEL_H
-#define USERFEEDBACK_ANALYZER_ROLEMAPPINGPROXYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_ROLEMAPPINGPROXYMODEL_H
+#define USERFEEDBACK_CONSOLE_ROLEMAPPINGPROXYMODEL_H
 
 #include <QIdentityProxyModel>
 #include <QHash>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 /**
  * @todo write docs
@@ -44,4 +44,4 @@ private:
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_ROLEMAPPINGPROXYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_ROLEMAPPINGPROXYMODEL_H
diff --git a/src/analyzer/model/schemamodel.cpp b/src/console/model/schemamodel.cpp
similarity index 99%
rename from src/analyzer/model/schemamodel.cpp
rename to src/console/model/schemamodel.cpp
index 66ae058d6067dfbe1b62d76ba5f76ea6d77d2fd8..b3165b3ae1a2011cfe9413fdbf15126da586271b 100644
--- a/src/analyzer/model/schemamodel.cpp
+++ b/src/console/model/schemamodel.cpp
@@ -22,7 +22,7 @@
 
 #include <limits>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 static const auto TOPLEVEL = std::numeric_limits<quintptr>::max();
 
diff --git a/src/analyzer/model/schemamodel.h b/src/console/model/schemamodel.h
similarity index 92%
rename from src/analyzer/model/schemamodel.h
rename to src/console/model/schemamodel.h
index 590f08982c026da292eefd1fa499097d0be37734..af6ea9d4a749895e2490376e1904a1073a4b32a7 100644
--- a/src/analyzer/model/schemamodel.h
+++ b/src/console/model/schemamodel.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAMODEL_H
-#define USERFEEDBACK_ANALYZER_SCHEMAMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAMODEL_H
+#define USERFEEDBACK_CONSOLE_SCHEMAMODEL_H
 
 #include <core/product.h>
 
 #include <QAbstractTableModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 
@@ -58,4 +58,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SCHEMAMODEL_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAMODEL_H
diff --git a/src/analyzer/model/singlerowfilterproxymodel.cpp b/src/console/model/singlerowfilterproxymodel.cpp
similarity index 96%
rename from src/analyzer/model/singlerowfilterproxymodel.cpp
rename to src/console/model/singlerowfilterproxymodel.cpp
index 8b5d01307d97aca4c0b1bbbd48ee7f3819e540c3..aa0e1e303f86329abde7aaf39b793c60dc4ff888 100644
--- a/src/analyzer/model/singlerowfilterproxymodel.cpp
+++ b/src/console/model/singlerowfilterproxymodel.cpp
@@ -17,7 +17,7 @@
 
 #include "singlerowfilterproxymodel.h"
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 SingleRowFilterProxyModel::SingleRowFilterProxyModel(QObject* parent) :
     QSortFilterProxyModel(parent)
diff --git a/src/analyzer/model/singlerowfilterproxymodel.h b/src/console/model/singlerowfilterproxymodel.h
similarity index 85%
rename from src/analyzer/model/singlerowfilterproxymodel.h
rename to src/console/model/singlerowfilterproxymodel.h
index e77649a7b3a94715729aee85cbca58061d15fe0f..4816469aa121f44de3a3cca5e94d0364384745eb 100644
--- a/src/analyzer/model/singlerowfilterproxymodel.h
+++ b/src/console/model/singlerowfilterproxymodel.h
@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SINGLEROWFILTERPROXYMODEL_H
-#define USERFEEDBACK_ANALYZER_SINGLEROWFILTERPROXYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_SINGLEROWFILTERPROXYMODEL_H
+#define USERFEEDBACK_CONSOLE_SINGLEROWFILTERPROXYMODEL_H
 
 #include <QSortFilterProxyModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 /** Keep a single row from the source model. */
 class SingleRowFilterProxyModel : public QSortFilterProxyModel
@@ -40,4 +40,4 @@ private:
 
 }}
 
-#endif // USERFEEDBACK_ANALYZER_SINGLEROWFILTERPROXYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_SINGLEROWFILTERPROXYMODEL_H
diff --git a/src/analyzer/model/surveymodel.cpp b/src/console/model/surveymodel.cpp
similarity index 98%
rename from src/analyzer/model/surveymodel.cpp
rename to src/console/model/surveymodel.cpp
index 67091e84eebd8160b192b340ad492c87c24f94b5..12d6bb9efb9e65b674e810d8fcf60e8b8d2c824a 100644
--- a/src/analyzer/model/surveymodel.cpp
+++ b/src/console/model/surveymodel.cpp
@@ -24,7 +24,7 @@
 #include <QNetworkReply>
 #include <QUrl>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 SurveyModel::SurveyModel(QObject *parent) : QAbstractTableModel(parent)
 {
diff --git a/src/analyzer/model/surveymodel.h b/src/console/model/surveymodel.h
similarity index 92%
rename from src/analyzer/model/surveymodel.h
rename to src/console/model/surveymodel.h
index d086bd45361333601ccace7fcb1dd7f5ef4b7153..6f3829fd943def0a6a9f7784fd3d82335f71fc28 100644
--- a/src/analyzer/model/surveymodel.h
+++ b/src/console/model/surveymodel.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SURVEYMODEL_H
-#define USERFEEDBACK_ANALYZER_SURVEYMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEYMODEL_H
+#define USERFEEDBACK_CONSOLE_SURVEYMODEL_H
 
 #include <core/product.h>
 #include <core/survey.h>
@@ -24,7 +24,7 @@
 #include <QAbstractTableModel>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class RESTClient;
 
@@ -59,4 +59,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SURVEYMODEL_H
+#endif // USERFEEDBACK_CONSOLE_SURVEYMODEL_H
diff --git a/src/analyzer/model/timeaggregationmodel.cpp b/src/console/model/timeaggregationmodel.cpp
similarity index 99%
rename from src/analyzer/model/timeaggregationmodel.cpp
rename to src/console/model/timeaggregationmodel.cpp
index aa7ca67efa5c527bcbdd8ffd195023dc545bb182..24ee3737f4b5ced2d62622349999e66b656e7c48 100644
--- a/src/analyzer/model/timeaggregationmodel.cpp
+++ b/src/console/model/timeaggregationmodel.cpp
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <numeric>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 TimeAggregationModel::TimeAggregationModel(QObject *parent) :
     QAbstractTableModel(parent)
diff --git a/src/analyzer/model/timeaggregationmodel.h b/src/console/model/timeaggregationmodel.h
similarity index 92%
rename from src/analyzer/model/timeaggregationmodel.h
rename to src/console/model/timeaggregationmodel.h
index 361c6e261db11880088342553dc3d5882264c7f1..f887edcc9cf76ed96d823132daa94bb8bed4ae02 100644
--- a/src/analyzer/model/timeaggregationmodel.h
+++ b/src/console/model/timeaggregationmodel.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_TIMEAGGREGATIONMODEL_H
-#define USERFEEDBACK_ANALYZER_TIMEAGGREGATIONMODEL_H
+#ifndef USERFEEDBACK_CONSOLE_TIMEAGGREGATIONMODEL_H
+#define USERFEEDBACK_CONSOLE_TIMEAGGREGATIONMODEL_H
 
 #include <QAbstractTableModel>
 #include <QDateTime>
 #include <QVector>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Sample;
 
@@ -79,4 +79,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_TIMEAGGREGATIONMODEL_H
+#endif // USERFEEDBACK_CONSOLE_TIMEAGGREGATIONMODEL_H
diff --git a/src/analyzer/rest/restapi.cpp b/src/console/rest/restapi.cpp
similarity index 98%
rename from src/analyzer/rest/restapi.cpp
rename to src/console/rest/restapi.cpp
index 48a3a8c12985eaa7a17adb531144a26c22ed7747..7c183585ebfce6bfcccb634c2283df527f11dbb5 100644
--- a/src/analyzer/rest/restapi.cpp
+++ b/src/console/rest/restapi.cpp
@@ -22,7 +22,7 @@
 #include <core/sample.h>
 #include <core/survey.h>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 QNetworkReply* RESTApi::checkSchema(RESTClient *client)
 {
diff --git a/src/analyzer/rest/restapi.h b/src/console/rest/restapi.h
similarity index 94%
rename from src/analyzer/rest/restapi.h
rename to src/console/rest/restapi.h
index 4019338ecca472d07572c23569915814476adb9f..9898a8d9c4cca674e2b9ec3334df5088cf99d007 100644
--- a/src/analyzer/rest/restapi.h
+++ b/src/console/rest/restapi.h
@@ -15,14 +15,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_RESTAPI_H
-#define USERFEEDBACK_ANALYZER_RESTAPI_H
+#ifndef USERFEEDBACK_CONSOLE_RESTAPI_H
+#define USERFEEDBACK_CONSOLE_RESTAPI_H
 
 class QNetworkReply;
 template <typename T> class QVector;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 class RESTClient;
@@ -81,4 +81,4 @@ namespace RESTApi
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_RESTAPI_H
+#endif // USERFEEDBACK_CONSOLE_RESTAPI_H
diff --git a/src/analyzer/rest/restclient.cpp b/src/console/rest/restclient.cpp
similarity index 94%
rename from src/analyzer/rest/restclient.cpp
rename to src/console/rest/restclient.cpp
index df858975aea7d1db16c3fe2b1f9c0c9324285755..f66cbd405cde72bc43b16068bf56511ba1bf32ea 100644
--- a/src/analyzer/rest/restclient.cpp
+++ b/src/console/rest/restclient.cpp
@@ -23,7 +23,7 @@
 #include <QNetworkReply>
 #include <QNetworkRequest>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 RESTClient::RESTClient(QObject *parent) :
     QObject(parent),
@@ -40,7 +40,7 @@ void RESTClient::connectToServer(const ServerInfo& info)
         emit clientConnected();
 }
 
-bool UserFeedback::Analyzer::RESTClient::isConnected() const
+bool UserFeedback::Console::RESTClient::isConnected() const
 {
     return m_serverInfo.url().isValid();
 }
@@ -86,7 +86,7 @@ QNetworkRequest RESTClient::makeRequest(const QString& command)
     QNetworkRequest request(url);
     const auto authToken = m_serverInfo.userName().toUtf8() + ':' + m_serverInfo.password().toUtf8();
     request.setRawHeader("Authorization", "Basic " + authToken.toBase64());
-    request.setHeader(QNetworkRequest::UserAgentHeader, QStringLiteral("UserFeedbackAnalyzer/") + QStringLiteral(USERFEEDBACK_VERSION));
+    request.setHeader(QNetworkRequest::UserAgentHeader, QStringLiteral("UserFeedbackConsole/") + QStringLiteral(USERFEEDBACK_VERSION));
     return request;
 }
 
diff --git a/src/analyzer/rest/restclient.h b/src/console/rest/restclient.h
similarity index 91%
rename from src/analyzer/rest/restclient.h
rename to src/console/rest/restclient.h
index ac7fd9a63c57c8902feaa19c9321397d09a1b117..285008f55cfc7fdcc2248e603df55334c54c21f7 100644
--- a/src/analyzer/rest/restclient.h
+++ b/src/console/rest/restclient.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_RESTCLIENT_H
-#define USERFEEDBACK_ANALYZER_RESTCLIENT_H
+#ifndef USERFEEDBACK_CONSOLE_RESTCLIENT_H
+#define USERFEEDBACK_CONSOLE_RESTCLIENT_H
 
 #include "serverinfo.h"
 
@@ -27,7 +27,7 @@ class QNetworkReply;
 class QNetworkRequest;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 /** REST communication handling. */
 class RESTClient : public QObject
@@ -60,4 +60,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_RESTCLIENT_H
+#endif // USERFEEDBACK_CONSOLE_RESTCLIENT_H
diff --git a/src/analyzer/rest/serverinfo.cpp b/src/console/rest/serverinfo.cpp
similarity index 93%
rename from src/analyzer/rest/serverinfo.cpp
rename to src/console/rest/serverinfo.cpp
index 359b5bf1c613c5b6febc66c2a32ad2fc804897f1..7f04a6e6b5b14a970bd36d4195f65a1b1f90d581 100644
--- a/src/analyzer/rest/serverinfo.cpp
+++ b/src/console/rest/serverinfo.cpp
@@ -21,10 +21,10 @@
 #include <QSettings>
 #include <QUrl>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 class ServerInfoData : public QSharedData
 {
 public:
@@ -81,7 +81,7 @@ void ServerInfo::save() const
     settings.setValue(QStringLiteral("password"), password()); // TODO
 }
 
-UserFeedback::Analyzer::ServerInfo UserFeedback::Analyzer::ServerInfo::load(const QString& url)
+UserFeedback::Console::ServerInfo UserFeedback::Console::ServerInfo::load(const QString& url)
 {
     QSettings settings;
     settings.beginGroup(QStringLiteral("ServerInfo"));
diff --git a/src/analyzer/rest/serverinfo.h b/src/console/rest/serverinfo.h
similarity index 90%
rename from src/analyzer/rest/serverinfo.h
rename to src/console/rest/serverinfo.h
index 30e976ed01ac0b270caff55caa23b449fe2bb72c..876f58b8f971dd40bebc701b6190bb71186f9ee1 100644
--- a/src/analyzer/rest/serverinfo.h
+++ b/src/console/rest/serverinfo.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SERVERINFO_H
-#define USERFEEDBACK_ANALYZER_SERVERINFO_H
+#ifndef USERFEEDBACK_CONSOLE_SERVERINFO_H
+#define USERFEEDBACK_CONSOLE_SERVERINFO_H
 
 #include <QSharedDataPointer>
 
 class QUrl;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class ServerInfoData;
 
@@ -57,4 +57,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SERVERINFO_H
+#endif // USERFEEDBACK_CONSOLE_SERVERINFO_H
diff --git a/src/analyzer/schemaeditor/aggregationeditwidget.cpp b/src/console/schemaeditor/aggregationeditwidget.cpp
similarity index 98%
rename from src/analyzer/schemaeditor/aggregationeditwidget.cpp
rename to src/console/schemaeditor/aggregationeditwidget.cpp
index aec8b66ac28a6ef2ee444968ccc6ed689f0b6b1a..fbdb98923d5a0e67a7aa116112163964bd07ae81 100644
--- a/src/analyzer/schemaeditor/aggregationeditwidget.cpp
+++ b/src/console/schemaeditor/aggregationeditwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <QStyledItemDelegate>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 AggregationEditWidget::AggregationEditWidget(QWidget* parent) :
     QWidget(parent),
diff --git a/src/analyzer/schemaeditor/aggregationeditwidget.h b/src/console/schemaeditor/aggregationeditwidget.h
similarity index 88%
rename from src/analyzer/schemaeditor/aggregationeditwidget.h
rename to src/console/schemaeditor/aggregationeditwidget.h
index f8050b74f0d84e0e6b9f84f94aea3eb358c7b28a..b8e4cd5b3e587270058b6bdf95de09b604432e06 100644
--- a/src/analyzer/schemaeditor/aggregationeditwidget.h
+++ b/src/console/schemaeditor/aggregationeditwidget.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_AGGREGATIONEDITWIDGET_H
-#define USERFEEDBACK_ANALYZER_AGGREGATIONEDITWIDGET_H
+#ifndef USERFEEDBACK_CONSOLE_AGGREGATIONEDITWIDGET_H
+#define USERFEEDBACK_CONSOLE_AGGREGATIONEDITWIDGET_H
 
 #include <QWidget>
 
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class AggregationEditorModel;
 class Product;
@@ -57,4 +57,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_AGGREGATIONEDITWIDGET_H
+#endif // USERFEEDBACK_CONSOLE_AGGREGATIONEDITWIDGET_H
diff --git a/src/analyzer/schemaeditor/aggregationeditwidget.ui b/src/console/schemaeditor/aggregationeditwidget.ui
similarity index 89%
rename from src/analyzer/schemaeditor/aggregationeditwidget.ui
rename to src/console/schemaeditor/aggregationeditwidget.ui
index af748402ea7b9692429697c70c1654aff951cba3..18add49455a401c04d7d95de91a6038ec21bd2c2 100644
--- a/src/analyzer/schemaeditor/aggregationeditwidget.ui
+++ b/src/console/schemaeditor/aggregationeditwidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::AggregationEditWidget</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::AggregationEditWidget">
+ <class>UserFeedback::Console::AggregationEditWidget</class>
+ <widget class="QWidget" name="UserFeedback::Console::AggregationEditWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/analyzer/schemaeditor/schemaeditor.cpp b/src/console/schemaeditor/schemaeditor.cpp
similarity index 99%
rename from src/analyzer/schemaeditor/schemaeditor.cpp
rename to src/console/schemaeditor/schemaeditor.cpp
index c893fe56241225b57ea84be52e9a8165b5ea2657..a8fd9f580bc491010f6e46357e1507f68c430dd0 100644
--- a/src/analyzer/schemaeditor/schemaeditor.cpp
+++ b/src/console/schemaeditor/schemaeditor.cpp
@@ -28,7 +28,7 @@
 #include <QMessageBox>
 #include <QNetworkReply>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 
 SchemaEditor::SchemaEditor(QWidget* parent) :
diff --git a/src/analyzer/schemaeditor/schemaeditor.h b/src/console/schemaeditor/schemaeditor.h
similarity index 90%
rename from src/analyzer/schemaeditor/schemaeditor.h
rename to src/console/schemaeditor/schemaeditor.h
index a0c2223165704938a89a67d9fbd76161e9db6208..d764c16bc0338e917d090eafb74c869a38e8da4e 100644
--- a/src/analyzer/schemaeditor/schemaeditor.h
+++ b/src/console/schemaeditor/schemaeditor.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAEDITOR_H
-#define USERFEEDBACK_ANALYZER_SCHEMAEDITOR_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAEDITOR_H
+#define USERFEEDBACK_CONSOLE_SCHEMAEDITOR_H
 
 #include <QWidget>
 
@@ -25,7 +25,7 @@
 class QAction;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class Product;
 class RESTClient;
@@ -65,4 +65,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SCHEMAEDITOR_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAEDITOR_H
diff --git a/src/analyzer/schemaeditor/schemaeditor.ui b/src/console/schemaeditor/schemaeditor.ui
similarity index 84%
rename from src/analyzer/schemaeditor/schemaeditor.ui
rename to src/console/schemaeditor/schemaeditor.ui
index 01ff959b4434c7552d04f9e7edaccc6b0822fad5..da176a32a5a0d44c7384db7683a2c5efdd6e9396 100644
--- a/src/analyzer/schemaeditor/schemaeditor.ui
+++ b/src/console/schemaeditor/schemaeditor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::SchemaEditor</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::SchemaEditor">
+ <class>UserFeedback::Console::SchemaEditor</class>
+ <widget class="QWidget" name="UserFeedback::Console::SchemaEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -28,12 +28,12 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="UserFeedback::Analyzer::SchemaEditWidget" name="schema">
+     <widget class="UserFeedback::Console::SchemaEditWidget" name="schema">
       <attribute name="title">
        <string>Schema</string>
       </attribute>
      </widget>
-     <widget class="UserFeedback::Analyzer::AggregationEditWidget" name="aggregation">
+     <widget class="UserFeedback::Console::AggregationEditWidget" name="aggregation">
       <attribute name="title">
        <string>Aggregation</string>
       </attribute>
@@ -80,13 +80,13 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>UserFeedback::Analyzer::SchemaEditWidget</class>
+   <class>UserFeedback::Console::SchemaEditWidget</class>
    <extends>QWidget</extends>
    <header>schemaeditor/schemaeditwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>UserFeedback::Analyzer::AggregationEditWidget</class>
+   <class>UserFeedback::Console::AggregationEditWidget</class>
    <extends>QWidget</extends>
    <header>schemaeditor/aggregationeditwidget.h</header>
    <container>1</container>
diff --git a/src/analyzer/schemaeditor/schemaeditwidget.cpp b/src/console/schemaeditor/schemaeditwidget.cpp
similarity index 98%
rename from src/analyzer/schemaeditor/schemaeditwidget.cpp
rename to src/console/schemaeditor/schemaeditwidget.cpp
index dacfcc2ccbfc957ee9611afa7e2612363fa0a027..35d0e0d10276ae9fad846860ac02a37a195d949a 100644
--- a/src/analyzer/schemaeditor/schemaeditwidget.cpp
+++ b/src/console/schemaeditor/schemaeditwidget.cpp
@@ -30,7 +30,7 @@
 #include <QNetworkReply>
 #include <QStyledItemDelegate>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 SchemaEditWidget::SchemaEditWidget(QWidget *parent) :
     QWidget(parent),
diff --git a/src/analyzer/schemaeditor/schemaeditwidget.h b/src/console/schemaeditor/schemaeditwidget.h
similarity index 89%
rename from src/analyzer/schemaeditor/schemaeditwidget.h
rename to src/console/schemaeditor/schemaeditwidget.h
index 3917f53c677b344b251db9708744216580fbfce3..b9721724f8d2b2a1f96b01af485123005edb3656 100644
--- a/src/analyzer/schemaeditor/schemaeditwidget.h
+++ b/src/console/schemaeditor/schemaeditwidget.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAEDITWIDGET_H
-#define USERFEEDBACK_ANALYZER_SCHEMAEDITWIDGET_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAEDITWIDGET_H
+#define USERFEEDBACK_CONSOLE_SCHEMAEDITWIDGET_H
 
 #include <QWidget>
 
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 namespace Ui
 {
@@ -63,4 +63,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SCHEMAEDITWIDGET_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAEDITWIDGET_H
diff --git a/src/analyzer/schemaeditor/schemaeditwidget.ui b/src/console/schemaeditor/schemaeditwidget.ui
similarity index 91%
rename from src/analyzer/schemaeditor/schemaeditwidget.ui
rename to src/console/schemaeditor/schemaeditwidget.ui
index 505808c98c2db96dbc9072d5cfd406095dd76446..73c2dd1e4414ee9bd163a3dc37f311480ae0593d 100644
--- a/src/analyzer/schemaeditor/schemaeditwidget.ui
+++ b/src/console/schemaeditor/schemaeditwidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::SchemaEditWidget</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::SchemaEditWidget">
+ <class>UserFeedback::Console::SchemaEditWidget</class>
+ <widget class="QWidget" name="UserFeedback::Console::SchemaEditWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.cpp b/src/console/schemaeditor/schemaentryitemeditorfactory.cpp
similarity index 97%
rename from src/analyzer/schemaeditor/schemaentryitemeditorfactory.cpp
rename to src/console/schemaeditor/schemaentryitemeditorfactory.cpp
index 9f132d85765eeb6327a3b5510b84278c4349221a..f96fce19ac191be9d5061d746088762792580c07 100644
--- a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.cpp
+++ b/src/console/schemaeditor/schemaentryitemeditorfactory.cpp
@@ -25,10 +25,10 @@
 
 #include <QDebug>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class AggregationElementComboBox : public QComboBox
 {
diff --git a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.h b/src/console/schemaeditor/schemaentryitemeditorfactory.h
similarity index 84%
rename from src/analyzer/schemaeditor/schemaentryitemeditorfactory.h
rename to src/console/schemaeditor/schemaentryitemeditorfactory.h
index 0e1f65cd01e36734a10bcfb0dce3acce689c29b5..b03c57de9c20c1428dd51919f471124e5b3dd210 100644
--- a/src/analyzer/schemaeditor/schemaentryitemeditorfactory.h
+++ b/src/console/schemaeditor/schemaentryitemeditorfactory.h
@@ -15,15 +15,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SCHEMAENTRYITEMEDITORFACTORY_H
-#define USERFEEDBACK_ANALYZER_SCHEMAENTRYITEMEDITORFACTORY_H
+#ifndef USERFEEDBACK_CONSOLE_SCHEMAENTRYITEMEDITORFACTORY_H
+#define USERFEEDBACK_CONSOLE_SCHEMAENTRYITEMEDITORFACTORY_H
 
 #include <QItemEditorFactory>
 
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class AggregationElementModel;
 class Product;
@@ -44,4 +44,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SCHEMAENTRYITEMEDITORFACTORY_H
+#endif // USERFEEDBACK_CONSOLE_SCHEMAENTRYITEMEDITORFACTORY_H
diff --git a/src/analyzer/schematemplates/applicationVersion.schema b/src/console/schematemplates/applicationVersion.schema
similarity index 100%
rename from src/analyzer/schematemplates/applicationVersion.schema
rename to src/console/schematemplates/applicationVersion.schema
diff --git a/src/analyzer/schematemplates/platform.schema b/src/console/schematemplates/platform.schema
similarity index 100%
rename from src/analyzer/schematemplates/platform.schema
rename to src/console/schematemplates/platform.schema
diff --git a/src/analyzer/schematemplates/propertyRatio.schema b/src/console/schematemplates/propertyRatio.schema
similarity index 100%
rename from src/analyzer/schematemplates/propertyRatio.schema
rename to src/console/schematemplates/propertyRatio.schema
diff --git a/src/analyzer/schematemplates/qtVersion.schema b/src/console/schematemplates/qtVersion.schema
similarity index 100%
rename from src/analyzer/schematemplates/qtVersion.schema
rename to src/console/schematemplates/qtVersion.schema
diff --git a/src/analyzer/schematemplates/schematemplates.qrc b/src/console/schematemplates/schematemplates.qrc
similarity index 100%
rename from src/analyzer/schematemplates/schematemplates.qrc
rename to src/console/schematemplates/schematemplates.qrc
diff --git a/src/analyzer/schematemplates/screens.schema b/src/console/schematemplates/screens.schema
similarity index 100%
rename from src/analyzer/schematemplates/screens.schema
rename to src/console/schematemplates/screens.schema
diff --git a/src/analyzer/schematemplates/usageCount.schema b/src/console/schematemplates/usageCount.schema
similarity index 100%
rename from src/analyzer/schematemplates/usageCount.schema
rename to src/console/schematemplates/usageCount.schema
diff --git a/src/analyzer/schematemplates/usageTime.schema b/src/console/schematemplates/usageTime.schema
similarity index 100%
rename from src/analyzer/schematemplates/usageTime.schema
rename to src/console/schematemplates/usageTime.schema
diff --git a/src/analyzer/surveyeditor/surveydialog.cpp b/src/console/surveyeditor/surveydialog.cpp
similarity index 97%
rename from src/analyzer/surveyeditor/surveydialog.cpp
rename to src/console/surveyeditor/surveydialog.cpp
index c56c6cdbe86c3f606057f66eec85ad5dd7ceda82..17d3f915c3b2f85d70ef0f95ef00a2cd6abc5f9e 100644
--- a/src/analyzer/surveyeditor/surveydialog.cpp
+++ b/src/console/surveyeditor/surveydialog.cpp
@@ -23,7 +23,7 @@
 #include <QIcon>
 #include <QUrl>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 SurveyDialog::SurveyDialog(QWidget *parent) :
     QDialog(parent),
diff --git a/src/analyzer/surveyeditor/surveydialog.h b/src/console/surveyeditor/surveydialog.h
similarity index 87%
rename from src/analyzer/surveyeditor/surveydialog.h
rename to src/console/surveyeditor/surveydialog.h
index 031f6893644e7da3ada395bb7a2d82cf34c1ffb5..99cb3a680e91a10bf2c99676d249eee96ae28c40 100644
--- a/src/analyzer/surveyeditor/surveydialog.h
+++ b/src/console/surveyeditor/surveydialog.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SURVEYDIALOG_H
-#define USERFEEDBACK_ANALYZER_SURVEYDIALOG_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEYDIALOG_H
+#define USERFEEDBACK_CONSOLE_SURVEYDIALOG_H
 
 #include <QDialog>
 
@@ -25,7 +25,7 @@
 class QUrl;
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 namespace Ui
 {
@@ -51,4 +51,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SURVEYDIALOG_H
+#endif // USERFEEDBACK_CONSOLE_SURVEYDIALOG_H
diff --git a/src/analyzer/surveyeditor/surveydialog.ui b/src/console/surveyeditor/surveydialog.ui
similarity index 89%
rename from src/analyzer/surveyeditor/surveydialog.ui
rename to src/console/surveyeditor/surveydialog.ui
index 6a71ad379b5716d22b95d37847cddc878221d0d8..4ca4f28434f90f788fe3ad9d114c32ea79fc1a39 100644
--- a/src/analyzer/surveyeditor/surveydialog.ui
+++ b/src/console/surveyeditor/surveydialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::SurveyDialog</class>
- <widget class="QDialog" name="UserFeedback::Analyzer::SurveyDialog">
+ <class>UserFeedback::Console::SurveyDialog</class>
+ <widget class="QDialog" name="UserFeedback::Console::SurveyDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -61,7 +61,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>UserFeedback::Analyzer::SurveyDialog</receiver>
+   <receiver>UserFeedback::Console::SurveyDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -77,7 +77,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>UserFeedback::Analyzer::SurveyDialog</receiver>
+   <receiver>UserFeedback::Console::SurveyDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/analyzer/surveyeditor/surveyeditor.cpp b/src/console/surveyeditor/surveyeditor.cpp
similarity index 98%
rename from src/analyzer/surveyeditor/surveyeditor.cpp
rename to src/console/surveyeditor/surveyeditor.cpp
index 30a059b700c9e40b1444d50800a2a01b3681abf0..b386cb97878ae00463cb055478f21d6f014dc158 100644
--- a/src/analyzer/surveyeditor/surveyeditor.cpp
+++ b/src/console/surveyeditor/surveyeditor.cpp
@@ -25,7 +25,7 @@
 
 #include <QNetworkReply>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 SurveyEditor::SurveyEditor(QWidget* parent) :
     QWidget(parent),
diff --git a/src/analyzer/surveyeditor/surveyeditor.h b/src/console/surveyeditor/surveyeditor.h
similarity index 89%
rename from src/analyzer/surveyeditor/surveyeditor.h
rename to src/console/surveyeditor/surveyeditor.h
index ed5de7c536add97b59c1fa2634448b24ea343e95..273923f682a87ab9bd929a79b046cdac59ee4b65 100644
--- a/src/analyzer/surveyeditor/surveyeditor.h
+++ b/src/console/surveyeditor/surveyeditor.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_SURVEYEDITOR_H
-#define USERFEEDBACK_ANALYZER_SURVEYEDITOR_H
+#ifndef USERFEEDBACK_CONSOLE_SURVEYEDITOR_H
+#define USERFEEDBACK_CONSOLE_SURVEYEDITOR_H
 
 #include <core/product.h>
 
@@ -25,7 +25,7 @@
 #include <memory>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class RESTClient;
 class SurveyModel;
@@ -62,4 +62,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_SURVEYEDITOR_H
+#endif // USERFEEDBACK_CONSOLE_SURVEYEDITOR_H
diff --git a/src/analyzer/surveyeditor/surveyeditor.ui b/src/console/surveyeditor/surveyeditor.ui
similarity index 91%
rename from src/analyzer/surveyeditor/surveyeditor.ui
rename to src/console/surveyeditor/surveyeditor.ui
index e6f588f66ee5674efae6a36be4f220efe9263421..b789cc38677b14f8ae553d44ab570730ba5f97e0 100644
--- a/src/analyzer/surveyeditor/surveyeditor.ui
+++ b/src/console/surveyeditor/surveyeditor.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UserFeedback::Analyzer::SurveyEditor</class>
- <widget class="QWidget" name="UserFeedback::Analyzer::SurveyEditor">
+ <class>UserFeedback::Console::SurveyEditor</class>
+ <widget class="QWidget" name="UserFeedback::Console::SurveyEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/analyzer/widgets/metaenumcombobox.cpp b/src/console/widgets/metaenumcombobox.cpp
similarity index 97%
rename from src/analyzer/widgets/metaenumcombobox.cpp
rename to src/console/widgets/metaenumcombobox.cpp
index e8b4c725d49b43c42a9d246e2a9dd68f3dd8a605..c7768300e494efe64ee03df3e9f6eaaa431f7484 100644
--- a/src/analyzer/widgets/metaenumcombobox.cpp
+++ b/src/console/widgets/metaenumcombobox.cpp
@@ -21,7 +21,7 @@
 #include <QMetaEnum>
 #include <QMetaType>
 
-using namespace UserFeedback::Analyzer;
+using namespace UserFeedback::Console;
 
 MetaEnumComboBox::MetaEnumComboBox(QWidget* parent) :
     QComboBox(parent)
diff --git a/src/analyzer/widgets/metaenumcombobox.h b/src/console/widgets/metaenumcombobox.h
similarity index 86%
rename from src/analyzer/widgets/metaenumcombobox.h
rename to src/console/widgets/metaenumcombobox.h
index b2b108c78cc7bf5ea48d57fcef92bf7163d7bd7c..b3ed1f207b59516f4287fef2d22bf4a231e5ff19 100644
--- a/src/analyzer/widgets/metaenumcombobox.h
+++ b/src/console/widgets/metaenumcombobox.h
@@ -15,13 +15,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_METAENUMCOMBOBOX_H
-#define USERFEEDBACK_ANALYZER_METAENUMCOMBOBOX_H
+#ifndef USERFEEDBACK_CONSOLE_METAENUMCOMBOBOX_H
+#define USERFEEDBACK_CONSOLE_METAENUMCOMBOBOX_H
 
 #include <QComboBox>
 
 namespace UserFeedback {
-namespace Analyzer {
+namespace Console {
 
 class MetaEnumComboBox : public QComboBox
 {
@@ -41,4 +41,4 @@ private:
 }
 }
 
-#endif // USERFEEDBACK_ANALYZER_METAENUMCOMBOBOX_H
+#endif // USERFEEDBACK_CONSOLE_METAENUMCOMBOBOX_H
diff --git a/src/provider/widgets/feedbackconfigdialog.h b/src/provider/widgets/feedbackconfigdialog.h
index 629d045ac342680b646d129541de7ab241d874b3..71d7d4cfa7a0a4dddc8ff4b1cabd6253d77b9e48 100644
--- a/src/provider/widgets/feedbackconfigdialog.h
+++ b/src/provider/widgets/feedbackconfigdialog.h
@@ -15,8 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef USERFEEDBACK_ANALYZER_FEEDBACKCONFIGDIALOG_H
-#define USERFEEDBACK_ANALYZER_FEEDBACKCONFIGDIALOG_H
+#ifndef USERFEEDBACK_CONSOLE_FEEDBACKCONFIGDIALOG_H
+#define USERFEEDBACK_CONSOLE_FEEDBACKCONFIGDIALOG_H
 
 #include "userfeedbackwidgets_export.h"
 #include <QDialog>
@@ -53,4 +53,4 @@ private:
 
 }
 
-#endif // USERFEEDBACK_ANALYZER_FEEDBACKCONFIGDIALOG_H
+#endif // USERFEEDBACK_CONSOLE_FEEDBACKCONFIGDIALOG_H