diff --git a/MC/api/core/Client.cpp b/MC/api/core/Client.cpp
index 52a82db..56f7592 100644
--- a/MC/api/core/Client.cpp
+++ b/MC/api/core/Client.cpp
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <thread>
 #include "Client.h"
-#include "Mph.h"
-#include "Response.h"
+#include "../../../MP/Mph.h"
+#include "../../../MP/Response.h"
 
 
 Client::Client(const std::string&& ip, int port) : ip(ip), port(port) {
diff --git a/MC/api/user/UserOperation.h b/MC/api/user/UserOperation.h
index c3d49e8..1ab2df6 100644
--- a/MC/api/user/UserOperation.h
+++ b/MC/api/user/UserOperation.h
@@ -8,7 +8,7 @@
 
 #include <string>
 #include <optional>
-#include "Request.h"
+#include "../../../MP/Request.h"
 #include "event2/bufferevent.h"
 #include "../core/Client.h"
 
diff --git a/include/mp/Body.h b/MP/Body.h
similarity index 100%
rename from include/mp/Body.h
rename to MP/Body.h
diff --git a/include/mp/Cqi.h b/MP/Cqi.h
similarity index 100%
rename from include/mp/Cqi.h
rename to MP/Cqi.h
diff --git a/include/mp/EnumMapping.h b/MP/EnumMapping.h
similarity index 100%
rename from include/mp/EnumMapping.h
rename to MP/EnumMapping.h
diff --git a/include/mp/Mph.h b/MP/Mph.h
similarity index 100%
rename from include/mp/Mph.h
rename to MP/Mph.h
diff --git a/include/mp/Packet.h b/MP/Packet.h
similarity index 100%
rename from include/mp/Packet.h
rename to MP/Packet.h
diff --git a/include/mp/Request.h b/MP/Request.h
similarity index 100%
rename from include/mp/Request.h
rename to MP/Request.h
diff --git a/include/mp/Response.h b/MP/Response.h
similarity index 100%
rename from include/mp/Response.h
rename to MP/Response.h
diff --git a/include/mp/Sri.h b/MP/Sri.h
similarity index 100%
rename from include/mp/Sri.h
rename to MP/Sri.h
diff --git a/MP/proto/mp.body.pb.cc b/MP/proto/mp.body.pb.cc
index 605a8f8..af1c40a 100644
--- a/MP/proto/mp.body.pb.cc
+++ b/MP/proto/mp.body.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.body.proto
 
-#include "proto/mp.body.pb.h"
+#include "mp.body.pb.h"
 
 #include <algorithm>
 
diff --git a/include/mp/proto/mp.body.pb.h b/MP/proto/mp.body.pb.h
similarity index 100%
rename from include/mp/proto/mp.body.pb.h
rename to MP/proto/mp.body.pb.h
diff --git a/MP/proto/mp.cqi.pb.cc b/MP/proto/mp.cqi.pb.cc
index 63adcda..e5d57ed 100644
--- a/MP/proto/mp.cqi.pb.cc
+++ b/MP/proto/mp.cqi.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.cqi.proto
 
-#include "proto/mp.cqi.pb.h"
+#include "mp.cqi.pb.h"
 
 #include <algorithm>
 
diff --git a/include/mp/proto/mp.cqi.pb.h b/MP/proto/mp.cqi.pb.h
similarity index 100%
rename from include/mp/proto/mp.cqi.pb.h
rename to MP/proto/mp.cqi.pb.h
diff --git a/MP/proto/mp.mph.pb.cc b/MP/proto/mp.mph.pb.cc
index 1437e29..55daa97 100644
--- a/MP/proto/mp.mph.pb.cc
+++ b/MP/proto/mp.mph.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.mph.proto
 
-#include "proto/mp.mph.pb.h"
+#include "mp.mph.pb.h"
 
 #include <algorithm>
 
diff --git a/include/mp/proto/mp.mph.pb.h b/MP/proto/mp.mph.pb.h
similarity index 100%
rename from include/mp/proto/mp.mph.pb.h
rename to MP/proto/mp.mph.pb.h
diff --git a/MP/proto/mp.request.pb.cc b/MP/proto/mp.request.pb.cc
index 48c1ceb..439ef5c 100644
--- a/MP/proto/mp.request.pb.cc
+++ b/MP/proto/mp.request.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.request.proto
 
-#include "proto/mp.request.pb.h"
+#include "mp.request.pb.h"
 
 #include <algorithm>
 
diff --git a/include/mp/proto/mp.request.pb.h b/MP/proto/mp.request.pb.h
similarity index 100%
rename from include/mp/proto/mp.request.pb.h
rename to MP/proto/mp.request.pb.h
diff --git a/MP/proto/mp.response.pb.cc b/MP/proto/mp.response.pb.cc
index 7c61c38..9ee16ef 100644
--- a/MP/proto/mp.response.pb.cc
+++ b/MP/proto/mp.response.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.response.proto
 
-#include "proto/mp.response.pb.h"
+#include "mp.response.pb.h"
 
 #include <algorithm>
 
diff --git a/include/mp/proto/mp.response.pb.h b/MP/proto/mp.response.pb.h
similarity index 100%
rename from include/mp/proto/mp.response.pb.h
rename to MP/proto/mp.response.pb.h
diff --git a/MP/proto/mp.sri.pb.cc b/MP/proto/mp.sri.pb.cc
index df41389..330ba17 100644
--- a/MP/proto/mp.sri.pb.cc
+++ b/MP/proto/mp.sri.pb.cc
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: mp.sri.proto
 
-#include "proto/mp.sri.pb.h"
+#include "mp.sri.pb.h"
 
 #include <algorithm>
 
diff --git a/include/mp/proto/mp.sri.pb.h b/MP/proto/mp.sri.pb.h
similarity index 100%
rename from include/mp/proto/mp.sri.pb.h
rename to MP/proto/mp.sri.pb.h
diff --git a/include/mp/protohuf/mp.body.proto b/MP/protohuf/mp.body.proto
similarity index 100%
rename from include/mp/protohuf/mp.body.proto
rename to MP/protohuf/mp.body.proto
diff --git a/include/mp/protohuf/mp.cqi.proto b/MP/protohuf/mp.cqi.proto
similarity index 100%
rename from include/mp/protohuf/mp.cqi.proto
rename to MP/protohuf/mp.cqi.proto
diff --git a/include/mp/protohuf/mp.mph.proto b/MP/protohuf/mp.mph.proto
similarity index 100%
rename from include/mp/protohuf/mp.mph.proto
rename to MP/protohuf/mp.mph.proto
diff --git a/include/mp/protohuf/mp.request.proto b/MP/protohuf/mp.request.proto
similarity index 100%
rename from include/mp/protohuf/mp.request.proto
rename to MP/protohuf/mp.request.proto
diff --git a/include/mp/protohuf/mp.response.proto b/MP/protohuf/mp.response.proto
similarity index 100%
rename from include/mp/protohuf/mp.response.proto
rename to MP/protohuf/mp.response.proto
diff --git a/include/mp/protohuf/mp.sri.proto b/MP/protohuf/mp.sri.proto
similarity index 100%
rename from include/mp/protohuf/mp.sri.proto
rename to MP/protohuf/mp.sri.proto
diff --git a/MS/CMakeLists.txt b/MS/CMakeLists.txt
index ff38c98..ee9b741 100644
--- a/MS/CMakeLists.txt
+++ b/MS/CMakeLists.txt
@@ -8,7 +8,6 @@ aux_source_directory(tools DIR_TOOLS)
 aux_source_directory(smtp DIR_EMAIL)
 
 include_directories(${CMAKE_SOURCE_DIR}/include/libevent)
-include_directories(${CMAKE_SOURCE_DIR}/include/mp)
 include_directories(${CMAKE_SOURCE_DIR}/include/ini)
 include_directories(${CMAKE_SOURCE_DIR}/include/cpp_email)
 include_directories(${CMAKE_SOURCE_DIR}/include/rapidjson)
@@ -16,6 +15,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/mysql++)
 include_directories(${CMAKE_SOURCE_DIR}/include/mysql++/mysql)
 include_directories(${CMAKE_SOURCE_DIR}/include/smtp)
 include_directories(${CMAKE_SOURCE_DIR}/MDB/imm_mysqldb)
+include_directories(${CMAKE_SOURCE_DIR}/MP)
 include_directories(${CMAKE_SOURCE_DIR}/MS/works)
 message("CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/include/libevent")
 
diff --git a/MS/mmm/agreement.cpp b/MS/mmm/agreement.cpp
index 9e5a2a1..d55a53a 100644
--- a/MS/mmm/agreement.cpp
+++ b/MS/mmm/agreement.cpp
@@ -3,8 +3,6 @@
 //
 
 #include "agreement.h"
-#include "Response.h"
-
 
 agreement_request::agreement_request() : agreement() {}
 agreement_request::~agreement_request()  {}
diff --git a/MS/mmm/management.cpp b/MS/mmm/management.cpp
index b576c8e..a9ecff9 100644
--- a/MS/mmm/management.cpp
+++ b/MS/mmm/management.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "management.h"
-#include "Response.h"
 
 
 management::management() {
diff --git a/MS/smtp/smtp.cpp b/MS/smtp/smtp.cpp
index f4ed0cd..466393a 100644
--- a/MS/smtp/smtp.cpp
+++ b/MS/smtp/smtp.cpp
@@ -130,7 +130,7 @@ int Smtp::Socket(int family, int type, int protocol) {
 
 ssize_t Smtp::Send(const std::string& str) {
    ssize_t n;
-   std::cout << str;
+//   std::cout << str;
    if((n = send(m_sockfd, str.c_str(), str.length(), 0)) == -1) {
         perror("write error");
         exit(-1);
diff --git a/MS/works/db/UserFriendsDB.h b/MS/works/db/UserFriendsDB.h
index 8890687..811b836 100644
--- a/MS/works/db/UserFriendsDB.h
+++ b/MS/works/db/UserFriendsDB.h
@@ -8,8 +8,8 @@
 #include <optional>
 
 #include "DB.h"
-#include "proto/mp.sri.pb.h"
-#include "proto/mp.body.pb.h"
+#include "../../../MP/proto/mp.sri.pb.h"
+#include "../../../MP/proto/mp.body.pb.h"
 #include "document.h"
 
 class UserFriendsDB : public DB {
diff --git a/MS/works/service/Service.h b/MS/works/service/Service.h
index 67cb285..2574750 100644
--- a/MS/works/service/Service.h
+++ b/MS/works/service/Service.h
@@ -6,7 +6,7 @@
 #define IM2_SERVICE_H
 
 #include <mysql++/connection.h>
-#include <proto/mp.sri.pb.h>
+#include "proto/mp.sri.pb.h"
 #include "db/UserDB.h"
 
 class Service {