diff --git a/include/setup/Factory.h b/include/setup/Factory.h
new file mode 100644
index 0000000..9df5468
--- /dev/null
+++ b/include/setup/Factory.h
@@ -0,0 +1,54 @@
+#ifndef _FACTORY_H_
+#define _FACTORY_H_
+
+#include <io/logger/ILogger.h>
+#include <io/reader/ITaskInstanceReader.h>
+#include <io/reader/ITaskReader.h>
+
+#include <memory>
+#include <optional>
+
+namespace e2e {
+namespace setup {
+namespace factory {
+
+using namespace e2e::io;
+
+template <typename LoggerType, typename... Args>
+std::unique_ptr<ILogger> makeLogger(Args... args)
+    requires std::is_base_of_v<ILogger, LoggerType>;
+
+template <typename TaskInstanceReaderType, typename... Args>
+std::unique_ptr<ITaskInstanceReader> makeTaskInstanceReader(Args... args)
+    requires std::is_base_of_v<ITaskInstanceReader, TaskInstanceReaderType>;
+
+template <typename TaskReaderType, typename... Args>
+std::unique_ptr<ITaskReader> makeTaskReader(Args... args)
+    requires std::is_base_of_v<ITaskReader, TaskReaderType>;
+
+template <typename LoggerType, typename... Args>
+inline std::unique_ptr<ILogger> makeLogger(Args... args)
+    requires std::is_base_of_v<ILogger, LoggerType>
+{
+    return std::make_unique<LoggerType>(args...);
+}
+
+template <typename TaskInstanceReaderType, typename... Args>
+inline std::unique_ptr<ITaskInstanceReader> makeTaskInstanceReader(Args... args)
+    requires std::is_base_of_v<ITaskInstanceReader, TaskInstanceReaderType>
+{
+    return std::make_unique<TaskInstanceReaderType>(args...);
+}
+
+template <typename TaskReaderType, typename... Args>
+inline std::unique_ptr<ITaskReader> makeTaskReader(Args... args)
+    requires std::is_base_of_v<ITaskReader, TaskReaderType>
+{
+    return std::make_unique<TaskReaderType>(args...);
+}
+
+}  // namespace factory
+}  // namespace setup
+}  // namespace e2e
+
+#endif
\ No newline at end of file
diff --git a/include/setup/Setup.h b/include/setup/Setup.h
index 7085b74..10b0224 100644
--- a/include/setup/Setup.h
+++ b/include/setup/Setup.h
@@ -13,53 +13,12 @@ namespace setup {
 
 using namespace e2e::io;
 
-// Get objects from supported types----------------------------------
-
-template <typename LoggerType, typename... Args>
-std::unique_ptr<ILogger> makeLogger(Args... args)
-    requires std::is_base_of_v<ILogger, LoggerType>;
-
-template <typename TaskInstanceReaderType, typename... Args>
-std::unique_ptr<ITaskInstanceReader> makeTaskInstanceReader(Args... args)
-    requires std::is_base_of_v<ITaskInstanceReader, TaskInstanceReaderType>;
-
-template <typename TaskReaderType, typename... Args>
-std::unique_ptr<ITaskReader> makeTaskReader(Args... args)
-    requires std::is_base_of_v<ITaskReader, TaskReaderType>;
-
-// Get objects from supported types----------------------------------
-
-// Get objects from strings types------------------------------------
-
 std::unique_ptr<ILogger> logger(const std::string& loggerStr);
 std::unique_ptr<ILogger> simpleLogger(const std::string& loggerStr);
 std::unique_ptr<ITaskInstanceReader> taskInstanceReader(
     const std::string& readerStr);
 std::unique_ptr<ITaskReader> taskReader(const std::string& readerStr);
 
-// Get objects from strings types------------------------------------
-
-template <typename LoggerType, typename... Args>
-inline std::unique_ptr<ILogger> makeLogger(Args... args)
-    requires std::is_base_of_v<ILogger, LoggerType>
-{
-    return std::make_unique<LoggerType>(args...);
-}
-
-template <typename TaskInstanceReaderType, typename... Args>
-inline std::unique_ptr<ITaskInstanceReader> makeTaskInstanceReader(Args... args)
-    requires std::is_base_of_v<ITaskInstanceReader, TaskInstanceReaderType>
-{
-    return std::make_unique<TaskInstanceReaderType>(args...);
-}
-
-template <typename TaskReaderType, typename... Args>
-inline std::unique_ptr<ITaskReader> makeTaskReader(Args... args)
-    requires std::is_base_of_v<ITaskReader, TaskReaderType>
-{
-    return std::make_unique<TaskReaderType>(args...);
-}
-
 }  // namespace setup
 }  // namespace e2e
 
diff --git a/source/setup/Preset.cpp b/source/setup/Preset.cpp
index a60f7e6..e689905 100644
--- a/source/setup/Preset.cpp
+++ b/source/setup/Preset.cpp
@@ -2,6 +2,7 @@
 #include <io/logger/SimplifiedConsoleLogger.h>
 #include <io/reader/PlainTextTaskInstanceReader.h>
 #include <io/reader/PlainTextTaskReader.h>
+#include <setup/Factory.h>
 #include <setup/Preset.h>
 
 #include <iostream>
@@ -14,7 +15,8 @@ e2e::setup::preset::makeDefaultTaskInstanceReader() {
     std::cout << "Reader type: text" << std::endl;
     std::cout << "Enter path to input file: ";
     std::cin >> inputPath;
-    return makeTaskInstanceReader<PlainTextTaskInstanceReader>(inputPath);
+    return factory::makeTaskInstanceReader<PlainTextTaskInstanceReader>(
+        inputPath);
 }
 
 std::unique_ptr<ITaskReader> e2e::setup::preset::makeDefaultTaskReader() {
@@ -22,13 +24,13 @@ std::unique_ptr<ITaskReader> e2e::setup::preset::makeDefaultTaskReader() {
     std::cout << "Reader type: text" << std::endl;
     std::cout << "Enter path to input file: ";
     std::cin >> inputPath;
-    return makeTaskReader<PlainTextTaskReader>(inputPath);
+    return factory::makeTaskReader<PlainTextTaskReader>(inputPath);
 }
 
 std::unique_ptr<ILogger> e2e::setup::preset::makeDefaultLogger() {
-    return makeLogger<ConsoleLogger>();
+    return factory::makeLogger<ConsoleLogger>();
 }
 
 std::unique_ptr<ILogger> e2e::setup::preset::makeDefaultSimplifiedLogger() {
-    return makeLogger<SimplifiedConsoleLogger>();
+    return factory::makeLogger<SimplifiedConsoleLogger>();
 }
\ No newline at end of file
diff --git a/source/setup/Setup.cpp b/source/setup/Setup.cpp
index 8b261ef..853d171 100644
--- a/source/setup/Setup.cpp
+++ b/source/setup/Setup.cpp
@@ -6,6 +6,7 @@
 #include <io/reader/ConsoleTaskReader.h>
 #include <io/reader/PlainTextTaskInstanceReader.h>
 #include <io/reader/PlainTextTaskReader.h>
+#include <setup/Factory.h>
 #include <setup/Setup.h>
 
 #include <algorithm>
@@ -22,7 +23,7 @@ std::unique_ptr<ILogger> setup::logger(const std::string& loggerStr) {
 
     if (lowercaseLoggerStr == "console") {
         std::cout << "Logger type: console" << std::endl;
-        return makeLogger<ConsoleLogger>();
+        return factory::makeLogger<ConsoleLogger>();
     }
 
     if (lowercaseLoggerStr == "text") {
@@ -30,7 +31,7 @@ std::unique_ptr<ILogger> setup::logger(const std::string& loggerStr) {
         std::cout << "Logger type: text" << std::endl;
         std::cout << "Enter output path: ";
         std::cin >> outputPath;
-        return makeLogger<PlainTextLogger>(outputPath);
+        return factory::makeLogger<PlainTextLogger>(outputPath);
     }
 
     return nullptr;
@@ -44,7 +45,7 @@ std::unique_ptr<ILogger> setup::simpleLogger(const std::string& loggerStr) {
 
     if (lowercaseLoggerStr == "console") {
         std::cout << "Logger type: console" << std::endl;
-        return makeLogger<SimplifiedConsoleLogger>();
+        return factory::makeLogger<SimplifiedConsoleLogger>();
     }
 
     if (lowercaseLoggerStr == "text") {
@@ -52,9 +53,10 @@ std::unique_ptr<ILogger> setup::simpleLogger(const std::string& loggerStr) {
         std::cout << "Logger type: text" << std::endl;
         std::cout << "Enter output path: ";
         std::cin >> outputPath;
-        return makeLogger<SimplifiedPlainTextLogger>(outputPath);
+        return factory::makeLogger<SimplifiedPlainTextLogger>(outputPath);
     }
 
+    std::cout << "Entered logger is not supported" << std::endl;
     return nullptr;
 }
 
@@ -67,7 +69,7 @@ std::unique_ptr<ITaskInstanceReader> setup::taskInstanceReader(
 
     if (lowercaseReaderStr == "console") {
         std::cout << "Reader type: console" << std::endl;
-        return makeTaskInstanceReader<ConsoleTaskInstanceReader>();
+        return factory::makeTaskInstanceReader<ConsoleTaskInstanceReader>();
     }
 
     if (lowercaseReaderStr == "text") {
@@ -75,9 +77,11 @@ std::unique_ptr<ITaskInstanceReader> setup::taskInstanceReader(
         std::cout << "Reader type: text" << std::endl;
         std::cout << "Enter path to input file: ";
         std::cin >> inputPath;
-        return makeTaskInstanceReader<PlainTextTaskInstanceReader>(inputPath);
+        return factory::makeTaskInstanceReader<PlainTextTaskInstanceReader>(
+            inputPath);
     }
 
+    std::cout << "Entered task instance reader is not supported" << std::endl;
     return nullptr;
 }
 
@@ -90,7 +94,7 @@ std::unique_ptr<ITaskReader> e2e::setup::taskReader(
 
     if (lowercaseReaderStr == "console") {
         std::cout << "Reader type: console" << std::endl;
-        return makeTaskReader<ConsoleTaskReader>();
+        return factory::makeTaskReader<ConsoleTaskReader>();
     }
 
     if (lowercaseReaderStr == "text") {
@@ -98,8 +102,9 @@ std::unique_ptr<ITaskReader> e2e::setup::taskReader(
         std::cout << "Reader type: text" << std::endl;
         std::cout << "Enter path to input file: ";
         std::cin >> inputPath;
-        return makeTaskReader<PlainTextTaskReader>(inputPath);
+        return factory::makeTaskReader<PlainTextTaskReader>(inputPath);
     }
 
+    std::cout << "Entered task reader is not supported" << std::endl;
     return nullptr;
 }