42 files changed, 70 insertions, 70 deletions
diff --git a/plugins/MirOTR/MirOTR/MirOTR.vcxproj b/plugins/MirOTR/MirOTR/MirOTR.vcxproj
index 7b11394cfd..a365292a94 100644
--- a/plugins/MirOTR/MirOTR/MirOTR.vcxproj
+++ b/plugins/MirOTR/MirOTR/MirOTR.vcxproj
@@ -194,46 +194,46 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dbfilter.cpp" />
-    <ClCompile Include="dialogs.cpp" />
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="entities.cpp" />
-    <ClCompile Include="icons.cpp" />
-    <ClCompile Include="mirotrmenu.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="otr.cpp" />
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="src\dbfilter.cpp" />
+    <ClCompile Include="src\dialogs.cpp" />
+    <ClCompile Include="src\dllmain.cpp" />
+    <ClCompile Include="src\entities.cpp" />
+    <ClCompile Include="src\icons.cpp" />
+    <ClCompile Include="src\mirotrmenu.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\otr.cpp" />
+    <ClCompile Include="src\stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="striphtml.cpp" />
-    <ClCompile Include="svcs_menu.cpp" />
-    <ClCompile Include="svcs_proto.cpp" />
-    <ClCompile Include="svcs_srmm.cpp" />
-    <ClCompile Include="utils.cpp" />
+    <ClCompile Include="src\striphtml.cpp" />
+    <ClCompile Include="src\svcs_menu.cpp" />
+    <ClCompile Include="src\svcs_proto.cpp" />
+    <ClCompile Include="src\svcs_srmm.cpp" />
+    <ClCompile Include="src\utils.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="dbfilter.h" />
-    <ClInclude Include="dialogs.h" />
-    <ClInclude Include="dllmain.h" />
-    <ClInclude Include="entities.h" />
-    <ClInclude Include="icons.h" />
-    <ClInclude Include="language.h" />
-    <ClInclude Include="mirotrmenu.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="otr.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="striphtml.h" />
-    <ClInclude Include="svcs_menu.h" />
-    <ClInclude Include="svcs_proto.h" />
-    <ClInclude Include="svcs_srmm.h" />
-    <ClInclude Include="targetver.h" />
-    <ClInclude Include="utils.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\dbfilter.h" />
+    <ClInclude Include="src\dialogs.h" />
+    <ClInclude Include="src\dllmain.h" />
+    <ClInclude Include="src\entities.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\language.h" />
+    <ClInclude Include="src\mirotrmenu.h" />
+    <ClInclude Include="src\options.h" />
+    <ClInclude Include="src\otr.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\stdafx.h" />
+    <ClInclude Include="src\striphtml.h" />
+    <ClInclude Include="src\svcs_menu.h" />
+    <ClInclude Include="src\svcs_proto.h" />
+    <ClInclude Include="src\svcs_srmm.h" />
+    <ClInclude Include="src\targetver.h" />
+    <ClInclude Include="src\utils.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resources\resource.rc" />
-    <ResourceCompile Include="resources\version.rc" />
+    <ResourceCompile Include="res\resource.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters b/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters
index 278ee9f9a4..33f67678dc 100644
--- a/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters
+++ b/plugins/MirOTR/MirOTR/MirOTR.vcxproj.filters
@@ -15,110 +15,110 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="dbfilter.cpp">
+    <ClCompile Include="src\dbfilter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dialogs.cpp">
+    <ClCompile Include="src\dialogs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="dllmain.cpp">
+    <ClCompile Include="src\dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="entities.cpp">
+    <ClCompile Include="src\entities.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="icons.cpp">
+    <ClCompile Include="src\icons.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mirotrmenu.cpp">
+    <ClCompile Include="src\mirotrmenu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="otr.cpp">
+    <ClCompile Include="src\otr.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="src\stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="striphtml.cpp">
+    <ClCompile Include="src\striphtml.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_menu.cpp">
+    <ClCompile Include="src\svcs_menu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_proto.cpp">
+    <ClCompile Include="src\svcs_proto.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svcs_srmm.cpp">
+    <ClCompile Include="src\svcs_srmm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utils.cpp">
+    <ClCompile Include="src\utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="dbfilter.h">
+    <ClInclude Include="src\dbfilter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="dialogs.h">
+    <ClInclude Include="src\dialogs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="dllmain.h">
+    <ClInclude Include="src\dllmain.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="entities.h">
+    <ClInclude Include="src\entities.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="language.h">
+    <ClInclude Include="src\language.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="mirotrmenu.h">
+    <ClInclude Include="src\mirotrmenu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="src\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="otr.h">
+    <ClInclude Include="src\otr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="src\stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="striphtml.h">
+    <ClInclude Include="src\striphtml.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_menu.h">
+    <ClInclude Include="src\svcs_menu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_proto.h">
+    <ClInclude Include="src\svcs_proto.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="svcs_srmm.h">
+    <ClInclude Include="src\svcs_srmm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="targetver.h">
+    <ClInclude Include="src\targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utils.h">
+    <ClInclude Include="src\utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resources\resource.rc">
+    <ResourceCompile Include="res\resource.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="resources\version.rc">
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/MirOTR/MirOTR/resources/finished.ico b/plugins/MirOTR/MirOTR/res/finished.ico
index 870cd0a216..870cd0a216 100644
--- a/plugins/MirOTR/MirOTR/resources/finished.ico
+++ b/plugins/MirOTR/MirOTR/res/finished.ico
diff --git a/plugins/MirOTR/MirOTR/resources/insecure.ico b/plugins/MirOTR/MirOTR/res/insecure.ico
index 4a72fe3ff4..4a72fe3ff4 100644
--- a/plugins/MirOTR/MirOTR/resources/insecure.ico
+++ b/plugins/MirOTR/MirOTR/res/insecure.ico
diff --git a/plugins/MirOTR/MirOTR/resources/otr.ico b/plugins/MirOTR/MirOTR/res/otr.ico
index 298a3baf2e..298a3baf2e 100644
--- a/plugins/MirOTR/MirOTR/resources/otr.ico
+++ b/plugins/MirOTR/MirOTR/res/otr.ico
diff --git a/plugins/MirOTR/MirOTR/resources/private.ico b/plugins/MirOTR/MirOTR/res/private.ico
index b7c8585b88..b7c8585b88 100644
--- a/plugins/MirOTR/MirOTR/resources/private.ico
+++ b/plugins/MirOTR/MirOTR/res/private.ico
diff --git a/plugins/MirOTR/MirOTR/resources/refresh.ico b/plugins/MirOTR/MirOTR/res/refresh.ico
index 45fbbf2e7c..45fbbf2e7c 100644
--- a/plugins/MirOTR/MirOTR/resources/refresh.ico
+++ b/plugins/MirOTR/MirOTR/res/refresh.ico
diff --git a/plugins/MirOTR/MirOTR/resources/resource.rc b/plugins/MirOTR/MirOTR/res/resource.rc
index edb1e714c4..da2a1cb26d 100644
--- a/plugins/MirOTR/MirOTR/resources/resource.rc
+++ b/plugins/MirOTR/MirOTR/res/resource.rc
@@ -6,7 +6,7 @@
 #endif
 
 #include "windows.h"
-#include "../resource.h"
+#include "..\src\resource.h"
 
 LANGUAGE 9,0
 
diff --git a/plugins/MirOTR/MirOTR/resources/unverified.ico b/plugins/MirOTR/MirOTR/res/unverified.ico
index 95cc6629fa..95cc6629fa 100644
--- a/plugins/MirOTR/MirOTR/resources/unverified.ico
+++ b/plugins/MirOTR/MirOTR/res/unverified.ico
diff --git a/plugins/MirOTR/MirOTR/resources/version.rc b/plugins/MirOTR/MirOTR/res/version.rc
index da4afefd9f..232f2dc04c 100644
--- a/plugins/MirOTR/MirOTR/resources/version.rc
+++ b/plugins/MirOTR/MirOTR/res/version.rc
@@ -5,7 +5,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/plugins/MirOTR/MirOTR/dbfilter.cpp b/plugins/MirOTR/MirOTR/src/dbfilter.cpp
index aab60e18e5..aab60e18e5 100644
--- a/plugins/MirOTR/MirOTR/dbfilter.cpp
+++ b/plugins/MirOTR/MirOTR/src/dbfilter.cpp
diff --git a/plugins/MirOTR/MirOTR/dbfilter.h b/plugins/MirOTR/MirOTR/src/dbfilter.h
index 99a6d50428..99a6d50428 100644
--- a/plugins/MirOTR/MirOTR/dbfilter.h
+++ b/plugins/MirOTR/MirOTR/src/dbfilter.h
diff --git a/plugins/MirOTR/MirOTR/dialogs.cpp b/plugins/MirOTR/MirOTR/src/dialogs.cpp
index 3335935282..3335935282 100644
--- a/plugins/MirOTR/MirOTR/dialogs.cpp
+++ b/plugins/MirOTR/MirOTR/src/dialogs.cpp
diff --git a/plugins/MirOTR/MirOTR/dialogs.h b/plugins/MirOTR/MirOTR/src/dialogs.h
index 0422dc3095..0422dc3095 100644
--- a/plugins/MirOTR/MirOTR/dialogs.h
+++ b/plugins/MirOTR/MirOTR/src/dialogs.h
diff --git a/plugins/MirOTR/MirOTR/dllmain.cpp b/plugins/MirOTR/MirOTR/src/dllmain.cpp
index 80833c9b2e..80833c9b2e 100644
--- a/plugins/MirOTR/MirOTR/dllmain.cpp
+++ b/plugins/MirOTR/MirOTR/src/dllmain.cpp
diff --git a/plugins/MirOTR/MirOTR/dllmain.h b/plugins/MirOTR/MirOTR/src/dllmain.h
index b2346859f6..b2346859f6 100644
--- a/plugins/MirOTR/MirOTR/dllmain.h
+++ b/plugins/MirOTR/MirOTR/src/dllmain.h
diff --git a/plugins/MirOTR/MirOTR/entities.cpp b/plugins/MirOTR/MirOTR/src/entities.cpp
index ae2335bc01..ae2335bc01 100644
--- a/plugins/MirOTR/MirOTR/entities.cpp
+++ b/plugins/MirOTR/MirOTR/src/entities.cpp
diff --git a/plugins/MirOTR/MirOTR/entities.h b/plugins/MirOTR/MirOTR/src/entities.h
index e4121dc5da..e4121dc5da 100644
--- a/plugins/MirOTR/MirOTR/entities.h
+++ b/plugins/MirOTR/MirOTR/src/entities.h
diff --git a/plugins/MirOTR/MirOTR/icons.cpp b/plugins/MirOTR/MirOTR/src/icons.cpp
index c9dd1a10db..c9dd1a10db 100644
--- a/plugins/MirOTR/MirOTR/icons.cpp
+++ b/plugins/MirOTR/MirOTR/src/icons.cpp
diff --git a/plugins/MirOTR/MirOTR/icons.h b/plugins/MirOTR/MirOTR/src/icons.h
index 0983cc147c..0983cc147c 100644
--- a/plugins/MirOTR/MirOTR/icons.h
+++ b/plugins/MirOTR/MirOTR/src/icons.h
diff --git a/plugins/MirOTR/MirOTR/language.h b/plugins/MirOTR/MirOTR/src/language.h
index 8934405608..8934405608 100644
--- a/plugins/MirOTR/MirOTR/language.h
+++ b/plugins/MirOTR/MirOTR/src/language.h
diff --git a/plugins/MirOTR/MirOTR/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
index 07a874c425..07a874c425 100644
--- a/plugins/MirOTR/MirOTR/mirotrmenu.cpp
+++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
diff --git a/plugins/MirOTR/MirOTR/mirotrmenu.h b/plugins/MirOTR/MirOTR/src/mirotrmenu.h
index fe070f0ba8..fe070f0ba8 100644
--- a/plugins/MirOTR/MirOTR/mirotrmenu.h
+++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.h
diff --git a/plugins/MirOTR/MirOTR/options.cpp b/plugins/MirOTR/MirOTR/src/options.cpp
index 8af221d5da..8af221d5da 100644
--- a/plugins/MirOTR/MirOTR/options.cpp
+++ b/plugins/MirOTR/MirOTR/src/options.cpp
diff --git a/plugins/MirOTR/MirOTR/options.h b/plugins/MirOTR/MirOTR/src/options.h
index b66125d473..b66125d473 100644
--- a/plugins/MirOTR/MirOTR/options.h
+++ b/plugins/MirOTR/MirOTR/src/options.h
diff --git a/plugins/MirOTR/MirOTR/otr.cpp b/plugins/MirOTR/MirOTR/src/otr.cpp
index ee6e3e0e12..ee6e3e0e12 100644
--- a/plugins/MirOTR/MirOTR/otr.cpp
+++ b/plugins/MirOTR/MirOTR/src/otr.cpp
diff --git a/plugins/MirOTR/MirOTR/otr.h b/plugins/MirOTR/MirOTR/src/otr.h
index 110bcd9485..110bcd9485 100644
--- a/plugins/MirOTR/MirOTR/otr.h
+++ b/plugins/MirOTR/MirOTR/src/otr.h
diff --git a/plugins/MirOTR/MirOTR/resource.h b/plugins/MirOTR/MirOTR/src/resource.h
index b861799546..b861799546 100644
--- a/plugins/MirOTR/MirOTR/resource.h
+++ b/plugins/MirOTR/MirOTR/src/resource.h
diff --git a/plugins/MirOTR/MirOTR/stdafx.cpp b/plugins/MirOTR/MirOTR/src/stdafx.cpp
index 98540cbccf..98540cbccf 100644
--- a/plugins/MirOTR/MirOTR/stdafx.cpp
+++ b/plugins/MirOTR/MirOTR/src/stdafx.cpp
diff --git a/plugins/MirOTR/MirOTR/stdafx.h b/plugins/MirOTR/MirOTR/src/stdafx.h
index ec471e83bd..ec471e83bd 100644
--- a/plugins/MirOTR/MirOTR/stdafx.h
+++ b/plugins/MirOTR/MirOTR/src/stdafx.h
diff --git a/plugins/MirOTR/MirOTR/striphtml.cpp b/plugins/MirOTR/MirOTR/src/striphtml.cpp
index c76b0f7d80..c76b0f7d80 100644
--- a/plugins/MirOTR/MirOTR/striphtml.cpp
+++ b/plugins/MirOTR/MirOTR/src/striphtml.cpp
diff --git a/plugins/MirOTR/MirOTR/striphtml.h b/plugins/MirOTR/MirOTR/src/striphtml.h
index 7cffc41f22..7cffc41f22 100644
--- a/plugins/MirOTR/MirOTR/striphtml.h
+++ b/plugins/MirOTR/MirOTR/src/striphtml.h
diff --git a/plugins/MirOTR/MirOTR/svcs_menu.cpp b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
index 17c2d9a4b0..17c2d9a4b0 100644
--- a/plugins/MirOTR/MirOTR/svcs_menu.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_menu.cpp
diff --git a/plugins/MirOTR/MirOTR/svcs_menu.h b/plugins/MirOTR/MirOTR/src/svcs_menu.h
index 7dfc11a9ea..7dfc11a9ea 100644
--- a/plugins/MirOTR/MirOTR/svcs_menu.h
+++ b/plugins/MirOTR/MirOTR/src/svcs_menu.h
diff --git a/plugins/MirOTR/MirOTR/svcs_proto.cpp b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
index 618034cc10..618034cc10 100644
--- a/plugins/MirOTR/MirOTR/svcs_proto.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
diff --git a/plugins/MirOTR/MirOTR/svcs_proto.h b/plugins/MirOTR/MirOTR/src/svcs_proto.h
index fe0db53a4e..fe0db53a4e 100644
--- a/plugins/MirOTR/MirOTR/svcs_proto.h
+++ b/plugins/MirOTR/MirOTR/src/svcs_proto.h
diff --git a/plugins/MirOTR/MirOTR/svcs_srmm.cpp b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
index 707eb0a020..707eb0a020 100644
--- a/plugins/MirOTR/MirOTR/svcs_srmm.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_srmm.cpp
diff --git a/plugins/MirOTR/MirOTR/svcs_srmm.h b/plugins/MirOTR/MirOTR/src/svcs_srmm.h
index 4bc204656d..4bc204656d 100644
--- a/plugins/MirOTR/MirOTR/svcs_srmm.h
+++ b/plugins/MirOTR/MirOTR/src/svcs_srmm.h
diff --git a/plugins/MirOTR/MirOTR/targetver.h b/plugins/MirOTR/MirOTR/src/targetver.h
index 4b435d653b..4b435d653b 100644
--- a/plugins/MirOTR/MirOTR/targetver.h
+++ b/plugins/MirOTR/MirOTR/src/targetver.h
diff --git a/plugins/MirOTR/MirOTR/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp
index ce2bbc5b9a..ce2bbc5b9a 100644
--- a/plugins/MirOTR/MirOTR/utils.cpp
+++ b/plugins/MirOTR/MirOTR/src/utils.cpp
diff --git a/plugins/MirOTR/MirOTR/utils.h b/plugins/MirOTR/MirOTR/src/utils.h
index 01c1b44f69..01c1b44f69 100644
--- a/plugins/MirOTR/MirOTR/utils.h
+++ b/plugins/MirOTR/MirOTR/src/utils.h
diff --git a/plugins/MirOTR/MirOTR/version.h b/plugins/MirOTR/MirOTR/src/version.h
index 2bd9618de7..2bd9618de7 100644
--- a/plugins/MirOTR/MirOTR/version.h
+++ b/plugins/MirOTR/MirOTR/src/version.h