10 files changed, 10 insertions, 12 deletions
diff --git a/plugins/Gender/gender-translation.txt b/plugins/Gender/docs/gender-translation.txt
index e7085dfd0b..e7085dfd0b 100644
--- a/plugins/Gender/gender-translation.txt
+++ b/plugins/Gender/docs/gender-translation.txt
diff --git a/plugins/Gender/gender_10.vcxproj b/plugins/Gender/gender_10.vcxproj
index a458303538..977ba6375d 100644
--- a/plugins/Gender/gender_10.vcxproj
+++ b/plugins/Gender/gender_10.vcxproj
@@ -160,21 +160,19 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="options.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\options.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="commonheaders.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\commonheaders.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="icons\female.ico" />
-    <None Include="icons\male.ico" />
     <None Include="docs\gender-readme.txt" />
     <None Include="docs\gender-translate.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="gender.rc" />
+    <ResourceCompile Include="res\gender.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Gender/icons/female.ico b/plugins/Gender/res/female.ico
index fe1cbd2bce..fe1cbd2bce 100644
--- a/plugins/Gender/icons/female.ico
+++ b/plugins/Gender/res/female.ico
diff --git a/plugins/Gender/icons/gender.ico b/plugins/Gender/res/gender.ico
index 930c34279c..930c34279c 100644
--- a/plugins/Gender/icons/gender.ico
+++ b/plugins/Gender/res/gender.ico
diff --git a/plugins/Gender/gender.rc b/plugins/Gender/res/gender.rc
index 651f86bd36..7907593e0b 100644
--- a/plugins/Gender/gender.rc
+++ b/plugins/Gender/res/gender.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -28,9 +28,9 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_MALE                ICON                    "icons\\male.ico"
-IDI_FEMALE              ICON                    "icons\\female.ico"
-IDI_UNDEF               ICON                    "icons\\gender.ico"
+IDI_MALE                ICON                    "male.ico"
+IDI_FEMALE              ICON                    "female.ico"
+IDI_UNDEF               ICON                    "gender.ico"
 #endif    // Ukrainian resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -52,7 +52,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
diff --git a/plugins/Gender/icons/male.ico b/plugins/Gender/res/male.ico
index ebd0420554..ebd0420554 100644
--- a/plugins/Gender/icons/male.ico
+++ b/plugins/Gender/res/male.ico
diff --git a/plugins/Gender/commonheaders.h b/plugins/Gender/src/commonheaders.h
index bdea1613da..bdea1613da 100644
--- a/plugins/Gender/commonheaders.h
+++ b/plugins/Gender/src/commonheaders.h
diff --git a/plugins/Gender/main.cpp b/plugins/Gender/src/main.cpp
index 5e5f1f4992..5e5f1f4992 100644
--- a/plugins/Gender/main.cpp
+++ b/plugins/Gender/src/main.cpp
diff --git a/plugins/Gender/options.cpp b/plugins/Gender/src/options.cpp
index 4d4875c0af..4d4875c0af 100644
--- a/plugins/Gender/options.cpp
+++ b/plugins/Gender/src/options.cpp
diff --git a/plugins/Gender/resource.h b/plugins/Gender/src/resource.h
index 8ea2786991..8ea2786991 100644
--- a/plugins/Gender/resource.h
+++ b/plugins/Gender/src/resource.h