diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f396c258..8e4124a0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,8 @@
 #   - supports Windows, Linux, *BSD, macOS, OS/2, Android,
 #   - Qt 5.9.0 or newer is required,
 #   - cmake 3.9.0 or newer is required,
-#   - if you wish to make packages for Windows, then you must initialize all submodules within repository before compilation,
+#   - if you wish to make packages for Windows, then you must initialize all submodules
+#     within repository before compilation,
 #   - C++ 11/17 is required.
 #
 # Building on OS/2:
diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt
index 4fdd60250..a7cb0ae57 100644
--- a/src/librssguard/CMakeLists.txt
+++ b/src/librssguard/CMakeLists.txt
@@ -331,11 +331,7 @@ set(SOURCES
   services/reddit/redditserviceroot.h
   services/reddit/redditsubscription.cpp
   services/reddit/redditsubscription.h
-  services/standard/atomparser.cpp
-  services/standard/atomparser.h
   services/standard/definitions.h
-  services/standard/feedparser.cpp
-  services/standard/feedparser.h
   services/standard/gui/formeditstandardaccount.cpp
   services/standard/gui/formeditstandardaccount.h
   services/standard/gui/formstandardfeeddetails.cpp
@@ -344,12 +340,16 @@ set(SOURCES
   services/standard/gui/formstandardimportexport.h
   services/standard/gui/standardfeeddetails.cpp
   services/standard/gui/standardfeeddetails.h
-  services/standard/jsonparser.cpp
-  services/standard/jsonparser.h
-  services/standard/rdfparser.cpp
-  services/standard/rdfparser.h
-  services/standard/rssparser.cpp
-  services/standard/rssparser.h
+  services/standard/parsers/feedparser.cpp
+  services/standard/parsers/feedparser.h
+  services/standard/parsers/atomparser.cpp
+  services/standard/parsers/atomparser.h
+  services/standard/parsers/jsonparser.cpp
+  services/standard/parsers/jsonparser.h
+  services/standard/parsers/rdfparser.cpp
+  services/standard/parsers/rdfparser.h
+  services/standard/parsers/rssparser.cpp
+  services/standard/parsers/rssparser.h
   services/standard/standardcategory.cpp
   services/standard/standardcategory.h
   services/standard/standardfeed.cpp
diff --git a/src/librssguard/services/standard/atomparser.cpp b/src/librssguard/services/standard/parsers/atomparser.cpp
similarity index 99%
rename from src/librssguard/services/standard/atomparser.cpp
rename to src/librssguard/services/standard/parsers/atomparser.cpp
index 6f9e45314..da9110a3b 100644
--- a/src/librssguard/services/standard/atomparser.cpp
+++ b/src/librssguard/services/standard/parsers/atomparser.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "services/standard/atomparser.h"
+#include "services/standard/parsers/atomparser.h"
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/textfactory.h"
diff --git a/src/librssguard/services/standard/atomparser.h b/src/librssguard/services/standard/parsers/atomparser.h
similarity index 92%
rename from src/librssguard/services/standard/atomparser.h
rename to src/librssguard/services/standard/parsers/atomparser.h
index c445c5a75..1be8ab6d0 100644
--- a/src/librssguard/services/standard/atomparser.h
+++ b/src/librssguard/services/standard/parsers/atomparser.h
@@ -3,7 +3,7 @@
 #ifndef ATOMPARSER_H
 #define ATOMPARSER_H
 
-#include "services/standard/feedparser.h"
+#include "services/standard/parsers/feedparser.h"
 
 #include "core/message.h"
 
diff --git a/src/librssguard/services/standard/feedparser.cpp b/src/librssguard/services/standard/parsers/feedparser.cpp
similarity index 98%
rename from src/librssguard/services/standard/feedparser.cpp
rename to src/librssguard/services/standard/parsers/feedparser.cpp
index 571d29927..bbacc6ef9 100644
--- a/src/librssguard/services/standard/feedparser.cpp
+++ b/src/librssguard/services/standard/parsers/feedparser.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "services/standard/feedparser.h"
+#include "services/standard/parsers/feedparser.h"
 
 #include "exceptions/applicationexception.h"
 #include "miscellaneous/application.h"
diff --git a/src/librssguard/services/standard/feedparser.h b/src/librssguard/services/standard/parsers/feedparser.h
similarity index 100%
rename from src/librssguard/services/standard/feedparser.h
rename to src/librssguard/services/standard/parsers/feedparser.h
diff --git a/src/librssguard/services/standard/jsonparser.cpp b/src/librssguard/services/standard/parsers/jsonparser.cpp
similarity index 95%
rename from src/librssguard/services/standard/jsonparser.cpp
rename to src/librssguard/services/standard/parsers/jsonparser.cpp
index 7c1885c07..b83b085ff 100644
--- a/src/librssguard/services/standard/jsonparser.cpp
+++ b/src/librssguard/services/standard/parsers/jsonparser.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "services/standard/jsonparser.h"
+#include "services/standard/parsers/jsonparser.h"
 
 #include "exceptions/feedfetchexception.h"
 #include "miscellaneous/textfactory.h"
diff --git a/src/librssguard/services/standard/jsonparser.h b/src/librssguard/services/standard/parsers/jsonparser.h
similarity index 100%
rename from src/librssguard/services/standard/jsonparser.h
rename to src/librssguard/services/standard/parsers/jsonparser.h
diff --git a/src/librssguard/services/standard/rdfparser.cpp b/src/librssguard/services/standard/parsers/rdfparser.cpp
similarity index 98%
rename from src/librssguard/services/standard/rdfparser.cpp
rename to src/librssguard/services/standard/parsers/rdfparser.cpp
index a081f8be3..10df00bee 100644
--- a/src/librssguard/services/standard/rdfparser.cpp
+++ b/src/librssguard/services/standard/parsers/rdfparser.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "services/standard/rdfparser.h"
+#include "services/standard/parsers/rdfparser.h"
 
 #include "exceptions/applicationexception.h"
 #include "miscellaneous/application.h"
diff --git a/src/librssguard/services/standard/rdfparser.h b/src/librssguard/services/standard/parsers/rdfparser.h
similarity index 91%
rename from src/librssguard/services/standard/rdfparser.h
rename to src/librssguard/services/standard/parsers/rdfparser.h
index 053b662c4..de5a29110 100644
--- a/src/librssguard/services/standard/rdfparser.h
+++ b/src/librssguard/services/standard/parsers/rdfparser.h
@@ -3,7 +3,7 @@
 #ifndef RDFPARSER_H
 #define RDFPARSER_H
 
-#include "services/standard/feedparser.h"
+#include "services/standard/parsers/feedparser.h"
 
 #include "core/message.h"
 
diff --git a/src/librssguard/services/standard/rssparser.cpp b/src/librssguard/services/standard/parsers/rssparser.cpp
similarity index 98%
rename from src/librssguard/services/standard/rssparser.cpp
rename to src/librssguard/services/standard/parsers/rssparser.cpp
index 8eb9bd71d..1264abdf6 100644
--- a/src/librssguard/services/standard/rssparser.cpp
+++ b/src/librssguard/services/standard/parsers/rssparser.cpp
@@ -1,6 +1,6 @@
 // For license of this file, see <project-root-folder>/LICENSE.md.
 
-#include "services/standard/rssparser.h"
+#include "services/standard/parsers/rssparser.h"
 
 #include "exceptions/applicationexception.h"
 #include "miscellaneous/application.h"
diff --git a/src/librssguard/services/standard/rssparser.h b/src/librssguard/services/standard/parsers/rssparser.h
similarity index 89%
rename from src/librssguard/services/standard/rssparser.h
rename to src/librssguard/services/standard/parsers/rssparser.h
index 7dabc9eef..ced859417 100644
--- a/src/librssguard/services/standard/rssparser.h
+++ b/src/librssguard/services/standard/parsers/rssparser.h
@@ -3,7 +3,7 @@
 #ifndef RSSPARSER_H
 #define RSSPARSER_H
 
-#include "services/standard/feedparser.h"
+#include "services/standard/parsers/feedparser.h"
 
 #include "core/message.h"
 
diff --git a/src/librssguard/services/standard/standardfeed.cpp b/src/librssguard/services/standard/standardfeed.cpp
index 4ae4f0106..57f1de938 100644
--- a/src/librssguard/services/standard/standardfeed.cpp
+++ b/src/librssguard/services/standard/standardfeed.cpp
@@ -17,12 +17,12 @@
 #include "miscellaneous/textfactory.h"
 #include "network-web/networkfactory.h"
 #include "services/abstract/recyclebin.h"
-#include "services/standard/atomparser.h"
 #include "services/standard/definitions.h"
 #include "services/standard/gui/formstandardfeeddetails.h"
-#include "services/standard/jsonparser.h"
-#include "services/standard/rdfparser.h"
-#include "services/standard/rssparser.h"
+#include "services/standard/parsers/atomparser.h"
+#include "services/standard/parsers/jsonparser.h"
+#include "services/standard/parsers/rdfparser.h"
+#include "services/standard/parsers/rssparser.h"
 #include "services/standard/standardserviceroot.h"
 
 #include <QCommandLineParser>
diff --git a/src/librssguard/services/standard/standardserviceroot.cpp b/src/librssguard/services/standard/standardserviceroot.cpp
index a74b09acc..d8f3615c8 100644
--- a/src/librssguard/services/standard/standardserviceroot.cpp
+++ b/src/librssguard/services/standard/standardserviceroot.cpp
@@ -19,14 +19,14 @@
 #include "services/abstract/importantnode.h"
 #include "services/abstract/labelsnode.h"
 #include "services/abstract/recyclebin.h"
-#include "services/standard/atomparser.h"
 #include "services/standard/definitions.h"
 #include "services/standard/gui/formeditstandardaccount.h"
 #include "services/standard/gui/formstandardfeeddetails.h"
 #include "services/standard/gui/formstandardimportexport.h"
-#include "services/standard/jsonparser.h"
-#include "services/standard/rdfparser.h"
-#include "services/standard/rssparser.h"
+#include "services/standard/parsers/atomparser.h"
+#include "services/standard/parsers/jsonparser.h"
+#include "services/standard/parsers/rdfparser.h"
+#include "services/standard/parsers/rssparser.h"
 #include "services/standard/standardcategory.h"
 #include "services/standard/standardfeed.h"
 #include "services/standard/standardfeedsimportexportmodel.h"
@@ -360,7 +360,7 @@ bool StandardServiceRoot::mergeImportExportModel(FeedsImportExportModel* model,
         auto* source_feed = qobject_cast<StandardFeed*>(source_item);
         const auto* feed_with_same_url = target_root_node->getItemFromSubTree([source_feed](const RootItem* it) {
           return it->kind() == RootItem::Kind::Feed &&
-          it->toFeed()->source().toLower() == source_feed->source().toLower();
+                 it->toFeed()->source().toLower() == source_feed->source().toLower();
         });
 
         if (feed_with_same_url != nullptr) {