refactoringfeature/refactor

1 files changed, 26 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d93f95..7b4acc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,28 +76,34 @@ endif()
 include_directories(src)
 
 set(SRC_DIR src)
+set(MESSAGE_DIR src/message)
+set(SERVICE_DIR src/service)
+
 set(SRC_FILES
     ${SRC_DIR}/main.cpp
-    ${SRC_DIR}/smtp_service.cpp
-    ${SRC_DIR}/smtp_service.hpp
-    ${SRC_DIR}/message_sender.hpp
-    ${SRC_DIR}/message_sender.cpp
-    ${SRC_DIR}/settings_storage.hpp
-
-    ${SRC_DIR}/message_builder/date.hpp
-    ${SRC_DIR}/message_builder/date.cpp
-    ${SRC_DIR}/message_builder/mail_to.hpp
-    ${SRC_DIR}/message_builder/mail_to.cpp
-    ${SRC_DIR}/message_builder/cc.hpp
-    ${SRC_DIR}/message_builder/cc.cpp
-    ${SRC_DIR}/message_builder/subject.hpp
-    ${SRC_DIR}/message_builder/subject.cpp
-    ${SRC_DIR}/message_builder/text.hpp
-    ${SRC_DIR}/message_builder/text.cpp
-    ${SRC_DIR}/message_builder/from.hpp
-    ${SRC_DIR}/message_builder/from.cpp
-
-    ${SRC_DIR}/message_builder/types/idecorator.hpp
+
+    ${SERVICE_DIR}/smtp.cpp
+    ${SERVICE_DIR}/smtp.hpp
+    ${SERVICE_DIR}/settings.hpp
+    ${SERVICE_DIR}/settings.cpp
+
+    ${MESSAGE_DIR}/sender.hpp
+    ${MESSAGE_DIR}/sender.cpp
+
+    ${MESSAGE_DIR}/builder/date.hpp
+    ${MESSAGE_DIR}/builder/date.cpp
+    ${MESSAGE_DIR}/builder/mail_to.hpp
+    ${MESSAGE_DIR}/builder/mail_to.cpp
+    ${MESSAGE_DIR}/builder/cc.hpp
+    ${MESSAGE_DIR}/builder/cc.cpp
+    ${MESSAGE_DIR}/builder/subject.hpp
+    ${MESSAGE_DIR}/builder/subject.cpp
+    ${MESSAGE_DIR}/builder/text.hpp
+    ${MESSAGE_DIR}/builder/text.cpp
+    ${MESSAGE_DIR}/builder/from.hpp
+    ${MESSAGE_DIR}/builder/from.cpp
+    ${MESSAGE_DIR}/builder/types/imessage_builder.hpp
+    ${MESSAGE_DIR}/builder/types/idecorator.hpp
     )
 
 add_executable(smtp ${SRC_FILES})