58 files changed, 85 insertions, 124 deletions
diff --git a/protocols/Twitter/changelog.html b/protocols/Twitter/changelog.html
deleted file mode 100644
index 44a157bd7a..0000000000
--- a/protocols/Twitter/changelog.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
- <head>
-  <title>Miranda Twitter Changelog!</title>
- </head>
- <body>
- <h2>0.0.9.7</h2>
-  - Major options cleanup<br>
-  - Default group now has a GUI in the options/accounts<br>
-  - stopped twitter from going offline so much (needs 3 network fails in a row before it will go offline)<br>
-  - open source! code is super messy.  please feel free to post if you have any questions.  the open source code will not compile with the official OAUTH keys!<br>
-  - added code to stop tweets becoming messages.  you will need to add a "tweetToMsg" variable as type BYTE to the db, and set to 0 if you want tweets to NOT become messages.<br>
-  - fixed single % signs from disappearing in the group chat, and also stopped "%" becoming "%%" if you typed it into the group chat input area to tweet.<br>
-  - fixed long native retweets from being truncated<br>
-  - code cleanup, minor fixes<br>
- <h2>0.0.9.6</h2>
- - Updater now working<br>
- - Basic "auto" group support.  If you want to have twitter contacts auto added to a group, before you connect to twitter (but after you create the account in miranda) create a "DefaultGroup" string key in the database and make the value the group you want twitter contacts to be automatically added to.  This won't copy existing contacts to the group, just newly added ones.<br>
- - Other minor fixes<br>
-  <h2>0.0.9.5</h2>
-- Retweets will now appear in the timeline!<br>
-- Fixed group chat highlighting when YOU make a tweet<br>
-- Stopped self contact joining the clist<br>
-<h2>0.0.9.4</h2>
-- Fixed duplicate contacts<br>
-<h2>0.0.9.3</h2>
-- Fixed connection problems<br>
-- Hopefully fixed unicode problems, please let me know!<br>
-- Cleaned up some code, got rid of the password input field as this isn't required with OAuth. If you're security conscious feel free to delete the password field from the database. i'll add some code to do this automatically next time.<br>
-<h2>0.0.9.2</h2>
-- DMs now actually work.<br>
-- your username should appear in the chat window now.. thx Thief<br>
-<h2>0.0.9.1</h2>
-- Tweeting (and posting DMs?) now works (thanks Borkra!)<br>
-- Removed dependencies on WinInet, so this now an actual Release build. yay<br>
-- seem to have broken proxy support.. which is weird. working on it.<br>
-<h2>0.0.9.0</h2>
-- OAuth used for authorisation now<br>
-- I have broken many things, and desecrated Dentist's once beautiful code. i think at one point i added a "2" to a variable name because i couldn't think of a better name. So sorry :(<br>
-</body>
-</html>
diff --git a/protocols/Twitter/betaVersion.html b/protocols/Twitter/docs/betaVersion.html
index 13f1601e8e..13f1601e8e 100644
--- a/protocols/Twitter/betaVersion.html
+++ b/protocols/Twitter/docs/betaVersion.html
diff --git a/protocols/Twitter/docs/changelog.html b/protocols/Twitter/docs/changelog.html
index 6da6b1d409..44a157bd7a 100644
--- a/protocols/Twitter/docs/changelog.html
+++ b/protocols/Twitter/docs/changelog.html
@@ -3,10 +3,19 @@
   <title>Miranda Twitter Changelog!</title>
  </head>
  <body>
+ <h2>0.0.9.7</h2>
+  - Major options cleanup<br>
+  - Default group now has a GUI in the options/accounts<br>
+  - stopped twitter from going offline so much (needs 3 network fails in a row before it will go offline)<br>
+  - open source! code is super messy.  please feel free to post if you have any questions.  the open source code will not compile with the official OAUTH keys!<br>
+  - added code to stop tweets becoming messages.  you will need to add a "tweetToMsg" variable as type BYTE to the db, and set to 0 if you want tweets to NOT become messages.<br>
+  - fixed single % signs from disappearing in the group chat, and also stopped "%" becoming "%%" if you typed it into the group chat input area to tweet.<br>
+  - fixed long native retweets from being truncated<br>
+  - code cleanup, minor fixes<br>
  <h2>0.0.9.6</h2>
- - Updater now working
- - Basic "auto" group support.  If you want to have twitter contacts auto added to a group, before you connect to twitter (but after you create the account in miranda) create a "DefaultGroup" string key in the database and make the value the group you want twitter contacts to be automatically added to.  This won't copy existing contacts to the group, just newly added ones.
- - Other minor fixes
+ - Updater now working<br>
+ - Basic "auto" group support.  If you want to have twitter contacts auto added to a group, before you connect to twitter (but after you create the account in miranda) create a "DefaultGroup" string key in the database and make the value the group you want twitter contacts to be automatically added to.  This won't copy existing contacts to the group, just newly added ones.<br>
+ - Other minor fixes<br>
   <h2>0.0.9.5</h2>
 - Retweets will now appear in the timeline!<br>
 - Fixed group chat highlighting when YOU make a tweet<br>
diff --git a/protocols/Twitter/twitter-translation.txt b/protocols/Twitter/docs/twitter-translation.txt
index d27e9902d0..d27e9902d0 100644
--- a/protocols/Twitter/twitter-translation.txt
+++ b/protocols/Twitter/docs/twitter-translation.txt
diff --git a/protocols/Twitter/version.html b/protocols/Twitter/docs/version.html
index 13f1601e8e..13f1601e8e 100644
--- a/protocols/Twitter/version.html
+++ b/protocols/Twitter/docs/version.html
diff --git a/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj b/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj
index 6230925b29..69bab782c5 100644
--- a/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj
+++ b/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj
@@ -119,10 +119,10 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Proto_Twitter.rc" />
+    <ResourceCompile Include="res\Proto_Twitter.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters b/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters
index f265aa8a93..27ba4dd1c4 100644
--- a/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters
+++ b/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters
@@ -11,12 +11,12 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Proto_Twitter.rc">
+    <ResourceCompile Include="res\Proto_Twitter.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/protocols/Twitter/proto_twitter/icos/Offline.ico b/protocols/Twitter/proto_twitter/res/Offline.ico
index 0e24167ade..0e24167ade 100644
--- a/protocols/Twitter/proto_twitter/icos/Offline.ico
+++ b/protocols/Twitter/proto_twitter/res/Offline.ico
diff --git a/protocols/Twitter/proto_twitter/icos/Online.ico b/protocols/Twitter/proto_twitter/res/Online.ico
index c6aa9d8ea3..c6aa9d8ea3 100644
--- a/protocols/Twitter/proto_twitter/icos/Online.ico
+++ b/protocols/Twitter/proto_twitter/res/Online.ico
diff --git a/protocols/Twitter/proto_twitter/Proto_Twitter.rc b/protocols/Twitter/proto_twitter/res/Proto_Twitter.rc
index 7edaa5f3df..3eaac4e99b 100644
--- a/protocols/Twitter/proto_twitter/Proto_Twitter.rc
+++ b/protocols/Twitter/proto_twitter/res/Proto_Twitter.rc
diff --git a/protocols/Twitter/proto_twitter/resource.h b/protocols/Twitter/proto_twitter/src/resource.h
index 9c605d9a4c..9c605d9a4c 100644
--- a/protocols/Twitter/proto_twitter/resource.h
+++ b/protocols/Twitter/proto_twitter/src/resource.h
diff --git a/protocols/Twitter/icons/twitter.ico b/protocols/Twitter/res/twitter.ico
index e9f61fb6c5..e9f61fb6c5 100644
--- a/protocols/Twitter/icons/twitter.ico
+++ b/protocols/Twitter/res/twitter.ico
diff --git a/protocols/Twitter/twitter.rc b/protocols/Twitter/res/twitter.rc
index 231058a1b7..ad75909610 100644
--- a/protocols/Twitter/twitter.rc
+++ b/protocols/Twitter/res/twitter.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 1 TEXTINCLUDE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
@@ -137,7 +137,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_TWITTER             ICON                    "icons\\twitter.ico"
+IDI_TWITTER             ICON                    "twitter.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/protocols/Twitter/Base64Coder.cpp b/protocols/Twitter/src/Base64Coder.cpp
index 4944034c3e..4944034c3e 100644
--- a/protocols/Twitter/Base64Coder.cpp
+++ b/protocols/Twitter/src/Base64Coder.cpp
diff --git a/protocols/Twitter/Base64Coder.h b/protocols/Twitter/src/Base64Coder.h
index d65868070e..d65868070e 100644
--- a/protocols/Twitter/Base64Coder.h
+++ b/protocols/Twitter/src/Base64Coder.h
diff --git a/protocols/Twitter/Debug.c b/protocols/Twitter/src/Debug.c
index 947df7a536..947df7a536 100644
--- a/protocols/Twitter/Debug.c
+++ b/protocols/Twitter/src/Debug.c
diff --git a/protocols/Twitter/Debug.h b/protocols/Twitter/src/Debug.h
index b8814193f5..b8814193f5 100644
--- a/protocols/Twitter/Debug.h
+++ b/protocols/Twitter/src/Debug.h
diff --git a/protocols/Twitter/StringConv.cpp b/protocols/Twitter/src/StringConv.cpp
index c0e4f9221c..c0e4f9221c 100644
--- a/protocols/Twitter/StringConv.cpp
+++ b/protocols/Twitter/src/StringConv.cpp
diff --git a/protocols/Twitter/StringConv.h b/protocols/Twitter/src/StringConv.h
index ec25c15ef7..ec25c15ef7 100644
--- a/protocols/Twitter/StringConv.h
+++ b/protocols/Twitter/src/StringConv.h
diff --git a/protocols/Twitter/StringUtil.cpp b/protocols/Twitter/src/StringUtil.cpp
index a395b67fa7..a395b67fa7 100644
--- a/protocols/Twitter/StringUtil.cpp
+++ b/protocols/Twitter/src/StringUtil.cpp
diff --git a/protocols/Twitter/StringUtil.h b/protocols/Twitter/src/StringUtil.h
index 902e262c02..902e262c02 100644
--- a/protocols/Twitter/StringUtil.h
+++ b/protocols/Twitter/src/StringUtil.h
diff --git a/protocols/Twitter/chat.cpp b/protocols/Twitter/src/chat.cpp
index cafb46025c..cafb46025c 100644
--- a/protocols/Twitter/chat.cpp
+++ b/protocols/Twitter/src/chat.cpp
diff --git a/protocols/Twitter/common.h b/protocols/Twitter/src/common.h
index b9fade2a9f..b9fade2a9f 100644
--- a/protocols/Twitter/common.h
+++ b/protocols/Twitter/src/common.h
diff --git a/protocols/Twitter/connection.cpp b/protocols/Twitter/src/connection.cpp
index 488bd3e657..488bd3e657 100644
--- a/protocols/Twitter/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
diff --git a/protocols/Twitter/contacts.cpp b/protocols/Twitter/src/contacts.cpp
index 78a53f47be..78a53f47be 100644
--- a/protocols/Twitter/contacts.cpp
+++ b/protocols/Twitter/src/contacts.cpp
diff --git a/protocols/Twitter/http.cpp b/protocols/Twitter/src/http.cpp
index 877399cc11..877399cc11 100644
--- a/protocols/Twitter/http.cpp
+++ b/protocols/Twitter/src/http.cpp
diff --git a/protocols/Twitter/http.h b/protocols/Twitter/src/http.h
index 65ef5af407..65ef5af407 100644
--- a/protocols/Twitter/http.h
+++ b/protocols/Twitter/src/http.h
diff --git a/protocols/Twitter/main.cpp b/protocols/Twitter/src/main.cpp
index d5612be8b4..d5612be8b4 100644
--- a/protocols/Twitter/main.cpp
+++ b/protocols/Twitter/src/main.cpp
diff --git a/protocols/Twitter/oauth.cpp b/protocols/Twitter/src/oauth.cpp
index 2235ca88ce..2235ca88ce 100644
--- a/protocols/Twitter/oauth.cpp
+++ b/protocols/Twitter/src/oauth.cpp
diff --git a/protocols/Twitter/oauth.dev.h b/protocols/Twitter/src/oauth.dev.h
index 13c383b3ab..13c383b3ab 100644
--- a/protocols/Twitter/oauth.dev.h
+++ b/protocols/Twitter/src/oauth.dev.h
diff --git a/protocols/Twitter/oauth/Makefile.am b/protocols/Twitter/src/oauth/Makefile.am
index b59c7c71df..b59c7c71df 100644
--- a/protocols/Twitter/oauth/Makefile.am
+++ b/protocols/Twitter/src/oauth/Makefile.am
diff --git a/protocols/Twitter/oauth/hash.c b/protocols/Twitter/src/oauth/hash.c
index ca00adaa8c..ca00adaa8c 100644
--- a/protocols/Twitter/oauth/hash.c
+++ b/protocols/Twitter/src/oauth/hash.c
diff --git a/protocols/Twitter/oauth/oauth.c b/protocols/Twitter/src/oauth/oauth.c
index 0f205572dd..0f205572dd 100644
--- a/protocols/Twitter/oauth/oauth.c
+++ b/protocols/Twitter/src/oauth/oauth.c
diff --git a/protocols/Twitter/oauth/oauth.h b/protocols/Twitter/src/oauth/oauth.h
index 4efb472fc8..4efb472fc8 100644
--- a/protocols/Twitter/oauth/oauth.h
+++ b/protocols/Twitter/src/oauth/oauth.h
diff --git a/protocols/Twitter/oauth/oauth_http.c b/protocols/Twitter/src/oauth/oauth_http.c
index 0e06b10dae..0e06b10dae 100644
--- a/protocols/Twitter/oauth/oauth_http.c
+++ b/protocols/Twitter/src/oauth/oauth_http.c
diff --git a/protocols/Twitter/oauth/sha1.c b/protocols/Twitter/src/oauth/sha1.c
index c3189008ac..c3189008ac 100644
--- a/protocols/Twitter/oauth/sha1.c
+++ b/protocols/Twitter/src/oauth/sha1.c
diff --git a/protocols/Twitter/oauth/xmalloc.c b/protocols/Twitter/src/oauth/xmalloc.c
index f831e13895..f831e13895 100644
--- a/protocols/Twitter/oauth/xmalloc.c
+++ b/protocols/Twitter/src/oauth/xmalloc.c
diff --git a/protocols/Twitter/oauth/xmalloc.h b/protocols/Twitter/src/oauth/xmalloc.h
index 7ec9b61fdd..7ec9b61fdd 100644
--- a/protocols/Twitter/oauth/xmalloc.h
+++ b/protocols/Twitter/src/oauth/xmalloc.h
diff --git a/protocols/Twitter/proto.cpp b/protocols/Twitter/src/proto.cpp
index ae843d8b07..ae843d8b07 100644
--- a/protocols/Twitter/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
diff --git a/protocols/Twitter/proto.h b/protocols/Twitter/src/proto.h
index 31acca9768..31acca9768 100644
--- a/protocols/Twitter/proto.h
+++ b/protocols/Twitter/src/proto.h
diff --git a/protocols/Twitter/resource.h b/protocols/Twitter/src/resource.h
index 909c859e88..909c859e88 100644
--- a/protocols/Twitter/resource.h
+++ b/protocols/Twitter/src/resource.h
diff --git a/protocols/Twitter/stdafx.h b/protocols/Twitter/src/stdafx.h
index 6e216fce33..6e216fce33 100644
--- a/protocols/Twitter/stdafx.h
+++ b/protocols/Twitter/src/stdafx.h
diff --git a/protocols/Twitter/stubs.cpp b/protocols/Twitter/src/stubs.cpp
index 472138abe3..472138abe3 100644
--- a/protocols/Twitter/stubs.cpp
+++ b/protocols/Twitter/src/stubs.cpp
diff --git a/protocols/Twitter/targetver.h b/protocols/Twitter/src/targetver.h
index a38195a4ef..a38195a4ef 100644
--- a/protocols/Twitter/targetver.h
+++ b/protocols/Twitter/src/targetver.h
diff --git a/protocols/Twitter/tc2.cpp b/protocols/Twitter/src/tc2.cpp
index 6348e2703a..6348e2703a 100644
--- a/protocols/Twitter/tc2.cpp
+++ b/protocols/Twitter/src/tc2.cpp
diff --git a/protocols/Twitter/tc2.h b/protocols/Twitter/src/tc2.h
index bbf3884fd6..bbf3884fd6 100644
--- a/protocols/Twitter/tc2.h
+++ b/protocols/Twitter/src/tc2.h
diff --git a/protocols/Twitter/theme.cpp b/protocols/Twitter/src/theme.cpp
index 11dea3cb44..11dea3cb44 100644
--- a/protocols/Twitter/theme.cpp
+++ b/protocols/Twitter/src/theme.cpp
diff --git a/protocols/Twitter/theme.h b/protocols/Twitter/src/theme.h
index fd331236fe..fd331236fe 100644
--- a/protocols/Twitter/theme.h
+++ b/protocols/Twitter/src/theme.h
diff --git a/protocols/Twitter/tinyjson.hpp b/protocols/Twitter/src/tinyjson.hpp
index 240a3503c5..240a3503c5 100644
--- a/protocols/Twitter/tinyjson.hpp
+++ b/protocols/Twitter/src/tinyjson.hpp
diff --git a/protocols/Twitter/twitter.cpp b/protocols/Twitter/src/twitter.cpp
index b9a6c7242b..b9a6c7242b 100644
--- a/protocols/Twitter/twitter.cpp
+++ b/protocols/Twitter/src/twitter.cpp
diff --git a/protocols/Twitter/twitter.h b/protocols/Twitter/src/twitter.h
index 10c1115967..10c1115967 100644
--- a/protocols/Twitter/twitter.h
+++ b/protocols/Twitter/src/twitter.h
diff --git a/protocols/Twitter/ui.cpp b/protocols/Twitter/src/ui.cpp
index fa6899c13d..fa6899c13d 100644
--- a/protocols/Twitter/ui.cpp
+++ b/protocols/Twitter/src/ui.cpp
diff --git a/protocols/Twitter/ui.h b/protocols/Twitter/src/ui.h
index f5520bba40..f5520bba40 100644
--- a/protocols/Twitter/ui.h
+++ b/protocols/Twitter/src/ui.h
diff --git a/protocols/Twitter/utility.cpp b/protocols/Twitter/src/utility.cpp
index 090bfebf09..090bfebf09 100644
--- a/protocols/Twitter/utility.cpp
+++ b/protocols/Twitter/src/utility.cpp
diff --git a/protocols/Twitter/utility.h b/protocols/Twitter/src/utility.h
index a8823291d1..a8823291d1 100644
--- a/protocols/Twitter/utility.h
+++ b/protocols/Twitter/src/utility.h
diff --git a/protocols/Twitter/version.h b/protocols/Twitter/src/version.h
index 0196f658bb..0196f658bb 100644
--- a/protocols/Twitter/version.h
+++ b/protocols/Twitter/src/version.h
diff --git a/protocols/Twitter/twitter.vcxproj b/protocols/Twitter/twitter.vcxproj
index 1dc786e820..5fed13bfd2 100644
--- a/protocols/Twitter/twitter.vcxproj
+++ b/protocols/Twitter/twitter.vcxproj
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -115,7 +115,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
@@ -139,7 +139,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
@@ -162,44 +162,41 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Base64Coder.cpp" />
-    <ClCompile Include="chat.cpp" />
-    <ClCompile Include="connection.cpp" />
-    <ClCompile Include="contacts.cpp" />
-    <ClCompile Include="Debug.c" />
-    <ClCompile Include="http.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="oauth.cpp" />
-    <ClCompile Include="proto.cpp" />
-    <ClCompile Include="StringConv.cpp" />
-    <ClCompile Include="StringUtil.cpp" />
-    <ClCompile Include="stubs.cpp" />
-    <ClCompile Include="theme.cpp" />
-    <ClCompile Include="twitter.cpp" />
-    <ClCompile Include="ui.cpp" />
-    <ClCompile Include="utility.cpp" />
+    <ClCompile Include="src\Base64Coder.cpp" />
+    <ClCompile Include="src\chat.cpp" />
+    <ClCompile Include="src\connection.cpp" />
+    <ClCompile Include="src\contacts.cpp" />
+    <ClCompile Include="src\Debug.c" />
+    <ClCompile Include="src\http.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\oauth.cpp" />
+    <ClCompile Include="src\proto.cpp" />
+    <ClCompile Include="src\StringConv.cpp" />
+    <ClCompile Include="src\StringUtil.cpp" />
+    <ClCompile Include="src\stubs.cpp" />
+    <ClCompile Include="src\theme.cpp" />
+    <ClCompile Include="src\twitter.cpp" />
+    <ClCompile Include="src\ui.cpp" />
+    <ClCompile Include="src\utility.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Base64Coder.h" />
-    <ClInclude Include="common.h" />
-    <ClInclude Include="http.h" />
-    <ClInclude Include="proto.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="StringConv.h" />
-    <ClInclude Include="StringUtil.h" />
-    <ClInclude Include="theme.h" />
-    <ClInclude Include="tinyjson.hpp" />
-    <ClInclude Include="twitter.h" />
-    <ClInclude Include="ui.h" />
-    <ClInclude Include="utility.h" />
-    <ClInclude Include="version.h" />
+    <ClInclude Include="src\Base64Coder.h" />
+    <ClInclude Include="src\common.h" />
+    <ClInclude Include="src\http.h" />
+    <ClInclude Include="src\proto.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\stdafx.h" />
+    <ClInclude Include="src\StringConv.h" />
+    <ClInclude Include="src\StringUtil.h" />
+    <ClInclude Include="src\theme.h" />
+    <ClInclude Include="src\tinyjson.hpp" />
+    <ClInclude Include="src\twitter.h" />
+    <ClInclude Include="src\ui.h" />
+    <ClInclude Include="src\utility.h" />
+    <ClInclude Include="src\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="icons\twitter.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="twitter.rc" />
+    <ResourceCompile Include="res\twitter.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/Twitter/twitter.vcxproj.filters b/protocols/Twitter/twitter.vcxproj.filters
index d43977df12..a1e9502d37 100644
--- a/protocols/Twitter/twitter.vcxproj.filters
+++ b/protocols/Twitter/twitter.vcxproj.filters
@@ -15,106 +15,101 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="chat.cpp">
+    <ClCompile Include="src\chat.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="connection.cpp">
+    <ClCompile Include="src\connection.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="contacts.cpp">
+    <ClCompile Include="src\contacts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="http.cpp">
+    <ClCompile Include="src\http.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="proto.cpp">
+    <ClCompile Include="src\proto.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stubs.cpp">
+    <ClCompile Include="src\stubs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="theme.cpp">
+    <ClCompile Include="src\theme.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="twitter.cpp">
+    <ClCompile Include="src\twitter.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ui.cpp">
+    <ClCompile Include="src\ui.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="utility.cpp">
+    <ClCompile Include="src\utility.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Base64Coder.cpp">
+    <ClCompile Include="src\Base64Coder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="StringConv.cpp">
+    <ClCompile Include="src\StringConv.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="StringUtil.cpp">
+    <ClCompile Include="src\StringUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="oauth.cpp">
+    <ClCompile Include="src\oauth.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Debug.c">
+    <ClCompile Include="src\Debug.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="common.h">
+    <ClInclude Include="src\common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="http.h">
+    <ClInclude Include="src\http.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="proto.h">
+    <ClInclude Include="src\proto.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="theme.h">
+    <ClInclude Include="src\theme.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="tinyjson.hpp">
+    <ClInclude Include="src\tinyjson.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="twitter.h">
+    <ClInclude Include="src\twitter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ui.h">
+    <ClInclude Include="src\ui.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="utility.h">
+    <ClInclude Include="src\utility.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="StringUtil.h">
+    <ClInclude Include="src\StringUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="StringConv.h">
+    <ClInclude Include="src\StringConv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="src\stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Base64Coder.h">
+    <ClInclude Include="src\Base64Coder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="icons\twitter.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="twitter.rc">
+    <ResourceCompile Include="res\twitter.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>