25 files changed, 44 insertions, 44 deletions
diff --git a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj
index db27b0b8ce..f250fbd15b 100644
--- a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj
+++ b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj
@@ -78,7 +78,7 @@
       <MinimalRebuild>true</MinimalRebuild>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
@@ -101,7 +101,7 @@
       <Optimization>Disabled</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <ResourceCompile>
@@ -125,7 +125,7 @@
       <Optimization>Full</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <ResourceCompile>
@@ -151,7 +151,7 @@
       <Optimization>Full</Optimization>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ChangeKeyboardLayout_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     </ClCompile>
     <ResourceCompile>
@@ -170,28 +170,28 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="hook_events.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="text_operations.cpp" />
+    <ClCompile Include="src\hook_events.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\text_operations.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h" />
-    <ClInclude Include="hook_events.h" />
-    <ClInclude Include="options.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="text_operations.h" />
+    <ClInclude Include="src\commonheaders.h" />
+    <ClInclude Include="src\hook_events.h" />
+    <ClInclude Include="src\options.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\text_operations.h" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="Ico\Alt.bmp" />
-    <CustomBuild Include="Ico\CopyToClipboard.ico" />
-    <CustomBuild Include="Ico\Ctrl.bmp" />
-    <CustomBuild Include="Ico\Popup.ico" />
-    <CustomBuild Include="Ico\Shift.bmp" />
-    <CustomBuild Include="Ico\Win.bmp" />
+    <CustomBuild Include="res\Alt.bmp" />
+    <CustomBuild Include="res\CopyToClipboard.ico" />
+    <CustomBuild Include="res\Ctrl.bmp" />
+    <CustomBuild Include="res\Popup.ico" />
+    <CustomBuild Include="res\Shift.bmp" />
+    <CustomBuild Include="res\Win.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="ChangeKeyboardLayout.rc" />
+    <ResourceCompile Include="res\ChangeKeyboardLayout.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters
index 9b6985c2df..08d69521d7 100644
--- a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters
+++ b/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.vcxproj.filters
@@ -15,58 +15,58 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="hook_events.cpp">
+    <ClCompile Include="src\hook_events.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="text_operations.cpp">
+    <ClCompile Include="src\text_operations.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h">
+    <ClInclude Include="src\commonheaders.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="hook_events.h">
+    <ClInclude Include="src\hook_events.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="options.h">
+    <ClInclude Include="src\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="text_operations.h">
+    <ClInclude Include="src\text_operations.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="ChangeKeyboardLayout.rc">
+    <ResourceCompile Include="res\ChangeKeyboardLayout.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="Ico\Alt.bmp">
+    <CustomBuild Include="res\Alt.bmp">
       <Filter>Resource Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="Ico\CopyToClipboard.ico">
+    <CustomBuild Include="res\CopyToClipboard.ico">
       <Filter>Resource Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="Ico\Ctrl.bmp">
+    <CustomBuild Include="res\Ctrl.bmp">
       <Filter>Resource Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="Ico\Popup.ico">
+    <CustomBuild Include="res\Popup.ico">
       <Filter>Resource Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="Ico\Shift.bmp">
+    <CustomBuild Include="res\Shift.bmp">
       <Filter>Resource Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="Ico\Win.bmp">
+    <CustomBuild Include="res\Win.bmp">
       <Filter>Resource Files</Filter>
     </CustomBuild>
   </ItemGroup>
diff --git a/plugins/ChangeKeyboardLayout/ChangeLogEn.txt b/plugins/ChangeKeyboardLayout/docs/ChangeLogEn.txt
index 1d2e0324f5..1d2e0324f5 100644
--- a/plugins/ChangeKeyboardLayout/ChangeLogEn.txt
+++ b/plugins/ChangeKeyboardLayout/docs/ChangeLogEn.txt
diff --git a/plugins/ChangeKeyboardLayout/ChangeLogRu.txt b/plugins/ChangeKeyboardLayout/docs/ChangeLogRu.txt
index b71786267a..b71786267a 100644
--- a/plugins/ChangeKeyboardLayout/ChangeLogRu.txt
+++ b/plugins/ChangeKeyboardLayout/docs/ChangeLogRu.txt
diff --git a/plugins/ChangeKeyboardLayout/changekeyboardlayout-translation.txt b/plugins/ChangeKeyboardLayout/docs/changekeyboardlayout-translation.txt
index 03dd47d661..03dd47d661 100644
--- a/plugins/ChangeKeyboardLayout/changekeyboardlayout-translation.txt
+++ b/plugins/ChangeKeyboardLayout/docs/changekeyboardlayout-translation.txt
diff --git a/plugins/ChangeKeyboardLayout/Ico/Alt.bmp b/plugins/ChangeKeyboardLayout/res/Alt.bmp
index e91a8a8f81..e91a8a8f81 100644
--- a/plugins/ChangeKeyboardLayout/Ico/Alt.bmp
+++ b/plugins/ChangeKeyboardLayout/res/Alt.bmp
diff --git a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
index 14480583dc..9628a928c6 100644
--- a/plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.rc
+++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 1 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
-    "resource.h\0"
+    "..src\resource.h\0"
 END
 
 2 TEXTINCLUDE MOVEABLE PURE 
@@ -54,18 +54,18 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_POPUPICON           ICON    DISCARDABLE     "Ico\\Popup.ico"
-IDI_COPYICON            ICON    DISCARDABLE     "Ico\\CopyToClipboard.ico"
+IDI_POPUPICON           ICON         "Popup.ico"
+IDI_COPYICON            ICON         "CopyToClipboard.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Bitmap
 //
 
-IDB_BITMAP_WIN          BITMAP  DISCARDABLE     "Ico\\Win.bmp"
-IDB_BITMAP_ALT          BITMAP  DISCARDABLE     "Ico\\Alt.bmp"
-IDB_BITMAP_CTRL         BITMAP  DISCARDABLE     "Ico\\Ctrl.bmp"
-IDB_BITMAP_SHIFT        BITMAP  DISCARDABLE     "Ico\\Shift.bmp"
+IDB_BITMAP_WIN          BITMAP       "Win.bmp"
+IDB_BITMAP_ALT          BITMAP       "Alt.bmp"
+IDB_BITMAP_CTRL         BITMAP       "Ctrl.bmp"
+IDB_BITMAP_SHIFT        BITMAP       "Shift.bmp"
 
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ChangeKeyboardLayout/Ico/CopyToClipboard.ico b/plugins/ChangeKeyboardLayout/res/CopyToClipboard.ico
index f1c1b7f2e3..f1c1b7f2e3 100644
--- a/plugins/ChangeKeyboardLayout/Ico/CopyToClipboard.ico
+++ b/plugins/ChangeKeyboardLayout/res/CopyToClipboard.ico
diff --git a/plugins/ChangeKeyboardLayout/Ico/Ctrl.bmp b/plugins/ChangeKeyboardLayout/res/Ctrl.bmp
index 982698f8b2..982698f8b2 100644
--- a/plugins/ChangeKeyboardLayout/Ico/Ctrl.bmp
+++ b/plugins/ChangeKeyboardLayout/res/Ctrl.bmp
diff --git a/plugins/ChangeKeyboardLayout/Ico/Popup.ico b/plugins/ChangeKeyboardLayout/res/Popup.ico
index 0d95f3523c..0d95f3523c 100644
--- a/plugins/ChangeKeyboardLayout/Ico/Popup.ico
+++ b/plugins/ChangeKeyboardLayout/res/Popup.ico
diff --git a/plugins/ChangeKeyboardLayout/Ico/Shift.bmp b/plugins/ChangeKeyboardLayout/res/Shift.bmp
index efb314742c..efb314742c 100644
--- a/plugins/ChangeKeyboardLayout/Ico/Shift.bmp
+++ b/plugins/ChangeKeyboardLayout/res/Shift.bmp
diff --git a/plugins/ChangeKeyboardLayout/Ico/Win.bmp b/plugins/ChangeKeyboardLayout/res/Win.bmp
index 61e26876b3..61e26876b3 100644
--- a/plugins/ChangeKeyboardLayout/Ico/Win.bmp
+++ b/plugins/ChangeKeyboardLayout/res/Win.bmp
diff --git a/plugins/ChangeKeyboardLayout/Ico/alt.ico b/plugins/ChangeKeyboardLayout/res/alt.ico
index d9a0c3f721..d9a0c3f721 100644
--- a/plugins/ChangeKeyboardLayout/Ico/alt.ico
+++ b/plugins/ChangeKeyboardLayout/res/alt.ico
diff --git a/plugins/ChangeKeyboardLayout/Ico/ctrl.ico b/plugins/ChangeKeyboardLayout/res/ctrl.ico
index 0f894cf2cb..0f894cf2cb 100644
--- a/plugins/ChangeKeyboardLayout/Ico/ctrl.ico
+++ b/plugins/ChangeKeyboardLayout/res/ctrl.ico
diff --git a/plugins/ChangeKeyboardLayout/Ico/shift.ico b/plugins/ChangeKeyboardLayout/res/shift.ico
index 15d7d89f34..15d7d89f34 100644
--- a/plugins/ChangeKeyboardLayout/Ico/shift.ico
+++ b/plugins/ChangeKeyboardLayout/res/shift.ico
diff --git a/plugins/ChangeKeyboardLayout/Ico/win.ico b/plugins/ChangeKeyboardLayout/res/win.ico
index a6b4623522..a6b4623522 100644
--- a/plugins/ChangeKeyboardLayout/Ico/win.ico
+++ b/plugins/ChangeKeyboardLayout/res/win.ico
diff --git a/plugins/ChangeKeyboardLayout/commonheaders.h b/plugins/ChangeKeyboardLayout/src/commonheaders.h
index 32aa776844..32aa776844 100644
--- a/plugins/ChangeKeyboardLayout/commonheaders.h
+++ b/plugins/ChangeKeyboardLayout/src/commonheaders.h
diff --git a/plugins/ChangeKeyboardLayout/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index 5c94609252..5c94609252 100644
--- a/plugins/ChangeKeyboardLayout/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
diff --git a/plugins/ChangeKeyboardLayout/hook_events.h b/plugins/ChangeKeyboardLayout/src/hook_events.h
index 992c7cd0c3..992c7cd0c3 100644
--- a/plugins/ChangeKeyboardLayout/hook_events.h
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.h
diff --git a/plugins/ChangeKeyboardLayout/main.cpp b/plugins/ChangeKeyboardLayout/src/main.cpp
index 5cda47443b..5cda47443b 100644
--- a/plugins/ChangeKeyboardLayout/main.cpp
+++ b/plugins/ChangeKeyboardLayout/src/main.cpp
diff --git a/plugins/ChangeKeyboardLayout/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp
index 39c678a9f3..39c678a9f3 100644
--- a/plugins/ChangeKeyboardLayout/options.cpp
+++ b/plugins/ChangeKeyboardLayout/src/options.cpp
diff --git a/plugins/ChangeKeyboardLayout/options.h b/plugins/ChangeKeyboardLayout/src/options.h
index bcf46a244b..bcf46a244b 100644
--- a/plugins/ChangeKeyboardLayout/options.h
+++ b/plugins/ChangeKeyboardLayout/src/options.h
diff --git a/plugins/ChangeKeyboardLayout/resource.h b/plugins/ChangeKeyboardLayout/src/resource.h
index 8ca2e0e8be..8ca2e0e8be 100644
--- a/plugins/ChangeKeyboardLayout/resource.h
+++ b/plugins/ChangeKeyboardLayout/src/resource.h
diff --git a/plugins/ChangeKeyboardLayout/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
index f4441ef4ae..f4441ef4ae 100644
--- a/plugins/ChangeKeyboardLayout/text_operations.cpp
+++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp
diff --git a/plugins/ChangeKeyboardLayout/text_operations.h b/plugins/ChangeKeyboardLayout/src/text_operations.h
index 6671406f3d..6671406f3d 100644
--- a/plugins/ChangeKeyboardLayout/text_operations.h
+++ b/plugins/ChangeKeyboardLayout/src/text_operations.h