8 files changed, 37 insertions, 77 deletions
diff --git a/src/converter/file.cpp b/src/converter/file_to_struct.cpp
index a33381f..4c4bec8 100644
--- a/src/converter/file.cpp
+++ b/src/converter/file_to_struct.cpp
@@ -1,8 +1,8 @@
-#include "file.hpp"
+#include "file_to_struct.hpp"
 
 namespace smtp::converter
 {
-    manage::SettingsFields File::Convert( manage::SettingsFileDataType const& from ) const
+    manage::SettingsFields FileToStruct::Convert( manage::SettingsFileDataType const& from ) const
     {
         manage::SettingsFields result;
 
@@ -16,21 +16,21 @@ namespace smtp::converter
         return result;
     }
 
-    void File::ApplyAuth( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
+    void FileToStruct::ApplyAuth( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
     {
         static const std::string FIELD = "is_need_auth";
 
         ApplyBool(from, FIELD, result.is_need_auth);
     }
 
-    void File::ApplySsl( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
+    void FileToStruct::ApplySsl( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
     {
         static const std::string FIELD = "is_need_ssl";
 
         ApplyBool(from, FIELD, result.is_need_ssl);
     }
 
-    void File::ApplyBool( manage::SettingsFileDataType const& from, std::string const& search_field, bool& field ) const
+    void FileToStruct::ApplyBool( manage::SettingsFileDataType const& from, std::string const& search_field, bool& field ) const
     {
         static const std::string TRUE_AS_STRING = "true";
         static const std::string FALSE_AS_STRING = "false";
@@ -47,35 +47,35 @@ namespace smtp::converter
         field = (find->second == TRUE_AS_STRING);
     }
 
-    void File::ApplyUsername( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
+    void FileToStruct::ApplyUsername( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
     {
         static const std::string FIELD = "username";
 
         ApplyString( from, FIELD, result.username );
     }
 
-    void File::ApplyPassword( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
+    void FileToStruct::ApplyPassword( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
     {
         static const std::string FIELD = "password";
 
         ApplyString( from, FIELD, result.password );
     }
 
-    void File::ApplyHost( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
+    void FileToStruct::ApplyHost( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
     {
         static const std::string FIELD = "host";
 
         ApplyString( from, FIELD, result.host );
     }
 
-    void File::ApplyPort( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
+    void FileToStruct::ApplyPort( manage::SettingsFields &result, manage::SettingsFileDataType const& from ) const
     {
         static const std::string FIELD = "port";
 
         ApplyString(from, FIELD, result.port);
     }
 
-    void File::ApplyString( manage::SettingsFileDataType const& from,  std::string const& search_field, std::string& field ) const
+    void FileToStruct::ApplyString( manage::SettingsFileDataType const& from,  std::string const& search_field, std::string& field ) const
     {
         auto find = from.find( search_field );
         if( find == from.end() )
diff --git a/src/converter/file.hpp b/src/converter/file_to_struct.hpp
index daa35fd..1eb7fce 100644
--- a/src/converter/file.hpp
+++ b/src/converter/file_to_struct.hpp
@@ -7,11 +7,11 @@
 
 namespace smtp::converter
 {
-    class File
+    class FileToStruct
     {
     public:
-        File() = default;
-        ~File() = default;
+        FileToStruct() = default;
+        ~FileToStruct() = default;
 
         manage::SettingsFields Convert( manage::SettingsFileDataType const& from ) const;
     private:
diff --git a/src/converter/full.cpp b/src/converter/full.cpp
deleted file mode 100644
index 91a9816..0000000
--- a/src/converter/full.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "full.hpp"
-#include "file.hpp"
-#include "settings.hpp"
-
-namespace smtp::converter
-{
-    manage::SettingsFields Full::Convert( manage::SettingsFileDataType const& from ) const
-    {
-        return File{}.Convert( from );
-    }
-
-    std::unordered_map<std::string, std::string> Full::Convert( manage::SettingsFields const& from ) const
-    {
-        return Settings{}.Convert( from );
-
-    }
-}
diff --git a/src/converter/full.hpp b/src/converter/full.hpp
deleted file mode 100644
index dac7499..0000000
--- a/src/converter/full.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <unordered_map>
-#include <string>
-
-#include "management/general.hpp"
-
-namespace smtp::converter
-{
-    class Full
-    {
-    public:
-        Full() = default;
-        ~Full() = default;
-
-        manage::SettingsFields Convert( manage::SettingsFileDataType const& from ) const;
-        std::unordered_map<std::string, std::string> Convert( manage::SettingsFields const& from  ) const;
-    private:
-
-    };
-}
-
-
diff --git a/src/converter/settings.cpp b/src/converter/struct_to_file.cpp
index 10ed310..f21cffb 100644
--- a/src/converter/settings.cpp
+++ b/src/converter/struct_to_file.cpp
@@ -1,9 +1,9 @@
-#include "settings.hpp"
+#include "struct_to_file.hpp"
 
 namespace smtp::converter
 {
 
-    manage::SettingsFileDataType Settings::Convert( manage::SettingsFields const& from ) const
+    manage::SettingsFileDataType StructToFile::Convert( manage::SettingsFields const& from ) const
     {
         manage::SettingsFileDataType result;
 
@@ -17,7 +17,7 @@ namespace smtp::converter
         return result;
     }
 
-    void Settings::ApplyAuth( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
+    void StructToFile::ApplyAuth( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
     {
         static const std::string FIELD = "is_need_auth";
         static const std::string TRUE_AS_STRING = "true";
@@ -26,7 +26,7 @@ namespace smtp::converter
         from.is_need_auth ? result.insert({FIELD, TRUE_AS_STRING}) : result.insert({FIELD, FALSE_AS_STRING});
     }
 
-    void Settings::ApplySsl( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
+    void StructToFile::ApplySsl( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
     {
         static const std::string FIELD = "is_need_ssl";
         static const std::string TRUE_AS_STRING = "true";
@@ -35,28 +35,28 @@ namespace smtp::converter
         from.is_need_ssl ? result.insert({FIELD, TRUE_AS_STRING}) : result.insert({FIELD, FALSE_AS_STRING});
     }
 
-    void Settings::ApplyUsername( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
+    void StructToFile::ApplyUsername( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
     {
         static const std::string FIELD = "username";
 
         result.insert({FIELD, from.username});
     }
 
-    void Settings::ApplyPassword( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
+    void StructToFile::ApplyPassword( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
     {
         static const std::string FIELD = "password";
 
         result.insert({FIELD, from.password});
     }
 
-    void Settings::ApplyHost( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
+    void StructToFile::ApplyHost( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
     {
         static const std::string FIELD = "host";
 
         result.insert({FIELD, from.host});
     }
 
-    void Settings::ApplyPort( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
+    void StructToFile::ApplyPort( manage::SettingsFields const& from, manage::SettingsFileDataType& result ) const
     {
         static const std::string FIELD = "port";
 
diff --git a/src/converter/settings.hpp b/src/converter/struct_to_file.hpp
index 5278b16..22f7260 100644
--- a/src/converter/settings.hpp
+++ b/src/converter/struct_to_file.hpp
@@ -7,11 +7,11 @@
 
 namespace smtp::converter
 {
-    class Settings
+    class StructToFile
     {
     public:
-        Settings() = default;
-        ~Settings() = default;
+        StructToFile() = default;
+        ~StructToFile() = default;
 
         std::unordered_map<std::string, std::string> Convert( manage::SettingsFields const& from  ) const;
     private:
diff --git a/src/converter/string.cpp b/src/converter/struct_to_string.cpp
index 149d8b6..c86a6c8 100644
--- a/src/converter/string.cpp
+++ b/src/converter/struct_to_string.cpp
@@ -1,8 +1,8 @@
-#include "string.hpp"
+#include "struct_to_string.hpp"
 
 namespace smtp::converter
 {
-    std::string String::Convert( manage::SettingsFields const& from ) const
+    std::string StructToString::Convert( manage::SettingsFields const& from ) const
     {
         std::string result;
 
@@ -16,49 +16,49 @@ namespace smtp::converter
         return result;
     }
 
-    void String::ApplyAuth( manage::SettingsFields const& from, std::string& result ) const
+    void StructToString::ApplyAuth( manage::SettingsFields const& from, std::string& result ) const
     {
         static const std::string FIELD = "is_need_auth";
 
         result += GetBoolParam( FIELD, from.is_need_auth);
     }
 
-    void String::ApplySsl( manage::SettingsFields const& from, std::string& result ) const
+    void StructToString::ApplySsl( manage::SettingsFields const& from, std::string& result ) const
     {
         static const std::string FIELD = "is_need_ssl";
 
         result += GetBoolParam( FIELD, from.is_need_ssl);
     }
 
-    void String::ApplyUsername( manage::SettingsFields const& from, std::string& result ) const
+    void StructToString::ApplyUsername( manage::SettingsFields const& from, std::string& result ) const
     {
         static const std::string FIELD = "username";
 
         result += GetStringParam( FIELD, from.username );
     }
 
-    void String::ApplyPassword( manage::SettingsFields const& from, std::string& result ) const
+    void StructToString::ApplyPassword( manage::SettingsFields const& from, std::string& result ) const
     {
         static const std::string FIELD = "password";
 
         result += GetStringParam( FIELD, from.password );
     }
 
-    void String::ApplyHost( manage::SettingsFields const& from, std::string& result ) const
+    void StructToString::ApplyHost( manage::SettingsFields const& from, std::string& result ) const
     {
         static const std::string FIELD = "host";
 
         result += GetStringParam( FIELD, from.host );
     }
 
-    void String::ApplyPort( manage::SettingsFields const& from, std::string& result ) const
+    void StructToString::ApplyPort( manage::SettingsFields const& from, std::string& result ) const
     {
         static const std::string FIELD = "port";
 
         result += GetStringParam( FIELD, from.port );
     }
 
-    std::string String::GetStringParam(const std::string &field, const std::string &param) const
+    std::string StructToString::GetStringParam(const std::string &field, const std::string &param) const
     {
         std::string result;
         result += field;
@@ -68,7 +68,7 @@ namespace smtp::converter
         return result;
     }
 
-    std::string String::GetBoolParam(const std::string &field, bool param) const
+    std::string StructToString::GetBoolParam(const std::string &field, bool param) const
     {
         std::string result;
 
diff --git a/src/converter/string.hpp b/src/converter/struct_to_string.hpp
index 555e04b..0a08327 100644
--- a/src/converter/string.hpp
+++ b/src/converter/struct_to_string.hpp
@@ -7,11 +7,11 @@
 
 namespace smtp::converter
 {
-    class String
+    class StructToString
     {
     public:
-        String() = default;
-        ~String() = default;
+        StructToString() = default;
+        ~StructToString() = default;
 
         std::string Convert( manage::SettingsFields const& from  ) const;
     private: