diff --git a/DBHomework.cbp b/DBHomework.cbp
index 402f462..14d807e 100644
--- a/DBHomework.cbp
+++ b/DBHomework.cbp
@@ -33,11 +33,12 @@
 			<Add option="-fexceptions" />
 			<Add option="-D_HTTPWRAPPER_WITH_SESSION" />
 			<Add option="-D_HTTPWRAPPER_WITH_MYSQL" />
-			<Add directory="MySQLWrapper" />
+			<Add directory="MySQLWrapper/include" />
 			<Add directory="mysql_include" />
 			<Add directory="HTTPWrapper" />
 			<Add directory="WinUtil" />
 			<Add directory="D:/CodeBlocks_Codes/DBHomework/" />
+			<Add directory="MySQLWrapper/src/include" />
 		</Compiler>
 		<Linker>
 			<Add library="mysql_lib/libmysql.lib" />
@@ -53,11 +54,75 @@
 		<Unit filename="HTTPWrapper/Singleton.hpp" />
 		<Unit filename="HTTPWrapper/Util.cpp" />
 		<Unit filename="HTTPWrapper/Util.h" />
-		<Unit filename="MySQLWrapper/MySQLInclude.h" />
-		<Unit filename="MySQLWrapper/MySQLTransaction.cpp" />
-		<Unit filename="MySQLWrapper/MySQLTransaction.h" />
-		<Unit filename="MySQLWrapper/MySQLWrapper.cpp" />
-		<Unit filename="MySQLWrapper/MySQLWrapper.h" />
+		<Unit filename="MySQLWrapper/include/MySQLTransaction.h" />
+		<Unit filename="MySQLWrapper/include/MySQLWrapper.h" />
+		<Unit filename="MySQLWrapper/include/big_endian.h" />
+		<Unit filename="MySQLWrapper/include/binary_log_types.h" />
+		<Unit filename="MySQLWrapper/include/byte_order_generic.h" />
+		<Unit filename="MySQLWrapper/include/byte_order_generic_x86.h" />
+		<Unit filename="MySQLWrapper/include/decimal.h" />
+		<Unit filename="MySQLWrapper/include/errmsg.h" />
+		<Unit filename="MySQLWrapper/include/keycache.h" />
+		<Unit filename="MySQLWrapper/include/little_endian.h" />
+		<Unit filename="MySQLWrapper/include/m_ctype.h" />
+		<Unit filename="MySQLWrapper/include/m_string.h" />
+		<Unit filename="MySQLWrapper/include/my_alloc.h" />
+		<Unit filename="MySQLWrapper/include/my_byteorder.h" />
+		<Unit filename="MySQLWrapper/include/my_command.h" />
+		<Unit filename="MySQLWrapper/include/my_compiler.h" />
+		<Unit filename="MySQLWrapper/include/my_config.h" />
+		<Unit filename="MySQLWrapper/include/my_dbug.h" />
+		<Unit filename="MySQLWrapper/include/my_dir.h" />
+		<Unit filename="MySQLWrapper/include/my_getopt.h" />
+		<Unit filename="MySQLWrapper/include/my_global.h" />
+		<Unit filename="MySQLWrapper/include/my_list.h" />
+		<Unit filename="MySQLWrapper/include/my_sys.h" />
+		<Unit filename="MySQLWrapper/include/my_thread.h" />
+		<Unit filename="MySQLWrapper/include/my_thread_local.h" />
+		<Unit filename="MySQLWrapper/include/my_xml.h" />
+		<Unit filename="MySQLWrapper/include/mysql.h" />
+		<Unit filename="MySQLWrapper/include/mysql/client_authentication.h" />
+		<Unit filename="MySQLWrapper/include/mysql/client_plugin.h" />
+		<Unit filename="MySQLWrapper/include/mysql/get_password.h" />
+		<Unit filename="MySQLWrapper/include/mysql/mysql_lex_string.h" />
+		<Unit filename="MySQLWrapper/include/mysql/plugin_auth_common.h" />
+		<Unit filename="MySQLWrapper/include/mysql/plugin_trace.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_file.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_idle.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_mdl.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_memory.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_ps.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_socket.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_sp.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_stage.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_statement.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_table.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_thread.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/mysql_transaction.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/psi.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/psi_base.h" />
+		<Unit filename="MySQLWrapper/include/mysql/psi/psi_memory.h" />
+		<Unit filename="MySQLWrapper/include/mysql/service_my_snprintf.h" />
+		<Unit filename="MySQLWrapper/include/mysql/service_mysql_alloc.h" />
+		<Unit filename="MySQLWrapper/include/mysql_com.h" />
+		<Unit filename="MySQLWrapper/include/mysql_com_server.h" />
+		<Unit filename="MySQLWrapper/include/mysql_embed.h" />
+		<Unit filename="MySQLWrapper/include/mysql_time.h" />
+		<Unit filename="MySQLWrapper/include/mysql_version.h" />
+		<Unit filename="MySQLWrapper/include/mysqld_ername.h" />
+		<Unit filename="MySQLWrapper/include/mysqld_error.h" />
+		<Unit filename="MySQLWrapper/include/sql_common.h" />
+		<Unit filename="MySQLWrapper/include/sql_state.h" />
+		<Unit filename="MySQLWrapper/include/sslopt-case.h" />
+		<Unit filename="MySQLWrapper/include/sslopt-longopts.h" />
+		<Unit filename="MySQLWrapper/include/sslopt-vars.h" />
+		<Unit filename="MySQLWrapper/include/thr_cond.h" />
+		<Unit filename="MySQLWrapper/include/thr_mutex.h" />
+		<Unit filename="MySQLWrapper/include/thr_rwlock.h" />
+		<Unit filename="MySQLWrapper/include/typelib.h" />
+		<Unit filename="MySQLWrapper/src/MySQLTransaction.cpp" />
+		<Unit filename="MySQLWrapper/src/MySQLWrapper.cpp" />
+		<Unit filename="MySQLWrapper/src/include/MySQLInclude.h" />
 		<Unit filename="bs_util.cpp" />
 		<Unit filename="bs_util.h" />
 		<Unit filename="handler.h" />
diff --git a/DBHomework.layout b/DBHomework.layout
index d4c520a..97d8a97 100644
--- a/DBHomework.layout
+++ b/DBHomework.layout
@@ -2,39 +2,19 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="HTTPWrapper\Singleton.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="217" topLine="27" />
-		</Cursor>
-	</File>
 	<File name="jsonfail.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="559" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="MySQLWrapper\MySQLWrapper.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1849" topLine="80" />
-		</Cursor>
-	</File>
-	<File name="HTTPWrapper\CookieVec.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="2194" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="HTTPWrapper\Session_MySQL.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1693" topLine="0" />
-		</Cursor>
-	</File>
 	<File name="src\bs_src_util.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="2" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="14" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="HTTPWrapper\Session.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="HTTPWrapper\Request.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="120" topLine="10" />
+			<Cursor1 position="71" topLine="4" />
 		</Cursor>
 	</File>
 	<File name="bs_util.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -42,59 +22,19 @@
 			<Cursor1 position="208" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="jsonfail.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="HTTPWrapper\Response.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="364" topLine="0" />
+			<Cursor1 position="292" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="HTTPWrapper\Util.h" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="src\BookSearch.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="419" topLine="12" />
+			<Cursor1 position="39511" topLine="1365" />
 		</Cursor>
 	</File>
-	<File name="src\bs_src_util.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="HTTPWrapper\Session_MySQL.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="HTTPWrapper\Response.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="858" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="handler.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="530" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="MySQLWrapper\MySQLTransaction.h" open="0" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="506" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="HTTPWrapper\Util.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="563" topLine="10" />
-		</Cursor>
-	</File>
-	<File name="HTTPWrapper\Request.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="3" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="369" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="MySQLWrapper\MySQLWrapper.h" open="0" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="556" topLine="26" />
-		</Cursor>
-	</File>
-	<File name="bs_util.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="1732" topLine="56" />
-		</Cursor>
-	</File>
-	<File name="HTTPWrapper\Request.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="71" topLine="4" />
+			<Cursor1 position="1693" topLine="0" />
 		</Cursor>
 	</File>
 	<File name="main.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -102,19 +42,64 @@
 			<Cursor1 position="2340" topLine="82" />
 		</Cursor>
 	</File>
-	<File name="HTTPWrapper\Response.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="handler.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="292" topLine="0" />
+			<Cursor1 position="530" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="MySQLWrapper\MySQLTransaction.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="HTTPWrapper\Util.cpp" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="536" topLine="19" />
+			<Cursor1 position="563" topLine="10" />
 		</Cursor>
 	</File>
-	<File name="src\BookSearch.cpp" open="1" top="1" tabpos="7" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
+	<File name="jsonfail.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="39511" topLine="1366" />
+			<Cursor1 position="364" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="MySQLWrapper\src\MySQLWrapper.cpp" open="1" top="1" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="44" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="src\bs_src_util.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="HTTPWrapper\Singleton.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="217" topLine="27" />
+		</Cursor>
+	</File>
+	<File name="bs_util.cpp" open="0" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1732" topLine="56" />
+		</Cursor>
+	</File>
+	<File name="HTTPWrapper\CookieVec.h" open="0" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="2194" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="HTTPWrapper\Request.cpp" open="0" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="3" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="369" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="HTTPWrapper\Response.cpp" open="0" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="858" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="HTTPWrapper\Util.h" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="110" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="HTTPWrapper\Session.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="120" topLine="10" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>