253 files changed, 17 insertions, 1337 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 42942b1a18..095efe92fc 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -172,7 +172,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "W7UI", "..\plugins\W7UI\w7u
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhenWasIt", "..\plugins\WhenWasIt\WhenWasIt_10.vcxproj", "{63E05ECA-0A63-479E-86BD-2CAF53869BDA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\plugins\YAMN\YAMN_10.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAMN", "..\protocols\YAMN\YAMN_10.vcxproj", "{C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YAPP", "..\plugins\YAPP\popups2_10.vcxproj", "{B6FC188B-8E54-4197-9444-8BADE9AA75E2}"
 EndProject
@@ -194,7 +194,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Alarms", "..\plugins\Alarms
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LangMan", "..\plugins\LangMan\langman.vcxproj", "{F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\plugins\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Quotes", "..\protocols\Quotes\Forex.vcxproj", "{C619A811-8023-4441-B3D7-785388A09DF0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroNotify", "..\plugins\ZeroNotification\Zero Notification_10.vcxproj", "{E37561EB-B9C5-4215-9FF9-DB559916FBA2}"
 EndProject
@@ -290,7 +290,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpellChecker_Flags_Angelika
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons_XP", "..\plugins\TabSRMM\icons\ICONSXP\iconsxp_10.vcxproj", "{987C5A57-A46B-4779-BB85-077E21F7BF7F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\plugins\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewsAggregator", "..\protocols\NewsAggregator\NewsAggregator_10.vcxproj", "{6DE11A47-2268-4B08-8DE5-15A1705FCE28}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/plugins/Twitter/m_folders.h b/plugins/Twitter/m_folders.h
deleted file mode 100644
index 54d19589c2..0000000000
--- a/plugins/Twitter/m_folders.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-Custom profile folders plugin for Miranda IM
-
-Copyright � 2005 Cristian Libotean
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef M_CUSTOM_FOLDERS_H
-#define M_CUSTOM_FOLDERS_H
-
-#define FOLDERS_API 501 //dunno why it's here but it is :)
-
-#define PROFILE_PATH "%profile_path%"
-#define CURRENT_PROFILE "%current_profile%"
-#define MIRANDA_PATH "%miranda_path%"
-#define PLUGINS_PATH "%miranda_path%" "\\plugins"
-
-#define TO_WIDE(x)     L ## x
-
-#define PROFILE_PATHW    L"%profile_path%"
-#define CURRENT_PROFILEW L"%current_profile%"
-#define MIRANDA_PATHW    L"%miranda_path%"
-
-#define FOLDER_AVATARS                 PROFILE_PATH "\\" CURRENT_PROFILE "\\avatars"
-#define FOLDER_VCARDS                  PROFILE_PATH "\\" CURRENT_PROFILE "\\vcards"
-#define FOLDER_LOGS                    PROFILE_PATH "\\" CURRENT_PROFILE "\\logs"
-#define FOLDER_RECEIVED_FILES          PROFILE_PATH "\\" CURRENT_PROFILE "\\received files"
-#define FOLDER_DOCS                    MIRANDA_PATH "\\" "docs"
-
-#define FOLDER_CONFIG                  PLUGINS_PATH "\\" "config"
-
-#define FOLDER_SCRIPTS                 MIRANDA_PATH "\\" "scripts"
-
-#define FOLDER_UPDATES                 MIRANDA_PATH "\\" "updates"
-
-#define FOLDER_CUSTOMIZE               MIRANDA_PATH "\\" "customize"
-#define FOLDER_CUSTOMIZE_SOUNDS        FOLDER_CUSTOMIZE "\\sounds"
-#define FOLDER_CUSTOMIZE_ICONS         FOLDER_CUSTOMIZE "\\icons"
-#define FOLDER_CUSTOMIZE_SMILEYS       FOLDER_CUSTOMIZE "\\smileys"
-#define FOLDER_CUSTOMIZE_SKINS         FOLDER_CUSTOMIZE "\\skins"
-#define FOLDER_CUSTOMIZE_THEMES        FOLDER_CUSTOMIZE "\\themes"
-
-
-#define FOLDERS_NAME_MAX_SIZE 64  //maximum name and section size
-
-#define FF_UNICODE 0x00000001
-
-#if defined (UNICODE)
-	#define FF_TCHAR	FF_UNICODE
-#else
-	#define FF_TCHAR	0
-#endif
-
-typedef struct{
-  int cbSize;                                  //size of struct
-  char szSection[FOLDERS_NAME_MAX_SIZE];       //section name, if it doesn't exist it will be created otherwise it will just add this entry to it
-  char szName[FOLDERS_NAME_MAX_SIZE];          //entry name - will be shown in options
-  union{
-    const char *szFormat;                      //default string format. Fallback string in case there's no entry in the database for this folder. This should be the initial value for the path, users will be able to change it later.
-    const wchar_t *szFormatW;                  //String is dup()'d so you can free it later. If you set the unicode string don't forget to set the flag accordingly.
-    const TCHAR *szFormatT;
-  };
-  DWORD flags;                                 //FF_* flags
-} FOLDERSDATA;
-
-/*Folders/Register/Path service
-  wParam - not used, must be 0
-  lParam - (LPARAM) (const FOLDERDATA *) - Data structure filled with 
-  the necessary information.
-  Returns a handle to the registered path or 0 on error. 
-  You need to use this to call the other services.
-*/
-#define MS_FOLDERS_REGISTER_PATH "Folders/Register/Path"
-
-/*Folders/Get/PathSize service
-  wParam - (WPARAM) (int) - handle to registered path
-  lParam - (LPARAM) (int *) - pointer to the variable that receives the size of the path 
-  string (not including the null character). Depending on the flags set when creating the path
-  it will either call strlen() or wcslen() to get the length of the string.
-  Returns the size of the buffer.
-*/
-#define MS_FOLDERS_GET_SIZE "Folders/Get/PathSize"
-
-typedef struct{
-	int cbSize;
-	int nMaxPathSize;                     //maximum size of buffer. This represents the number of characters that can be copied to it (so for unicode strings you don't send the number of bytes but the length of the string).
-	union{
-		char *szPath;                     //pointer to the buffer that receives the path without the last "\\"
-		wchar_t *szPathW;                 //unicode version of the buffer.
-		TCHAR *szPathT;
-	};
-} FOLDERSGETDATA;
-
-/*Folders/Get/Path service
-  wParam - (WPARAM) (int) - handle to registered path
-  lParam - (LPARAM) (FOLDERSGETDATA *) pointer to a FOLDERSGETDATA that has all the relevant fields filled.
-  Should return 0 on success, or nonzero otherwise.
-*/
-#define MS_FOLDERS_GET_PATH "Folders/Get/Path"
-
-typedef struct{
-  int cbSize;
-  union{
-    char **szPath;                    //address of a string variable (char *) or (wchar_t*) where the path should be stored (the last \ won't be copied).
-    wchar_t **szPathW;                //unicode version of string.
-    TCHAR **szPathT;
-	};
-} FOLDERSGETALLOCDATA;
-
-/*Folders/GetRelativePath/Alloc service
-  wParam - (WPARAM) (int) - Handle to registered path
-  lParam - (LPARAM) (FOLDERSALLOCDATA *) data
-  This service is the same as MS_FOLDERS_GET_PATH with the difference that this service
-  allocates the needed space for the buffer. It uses miranda's memory functions for that and you need
-  to use those to free the resulting buffer.
-  Should return 0 on success, or nonzero otherwise. Currently it only returns 0.
-*/
-#define MS_FOLDERS_GET_PATH_ALLOC "Folders/Get/Path/Alloc"
-
-
-/*Folders/On/Path/Changed
-	wParam - (WPARAM) 0
-	lParam - (LPARAM) 0
-	Triggered when the folders change, you should reget the paths you registered.
-*/
-#define ME_FOLDERS_PATH_CHANGED "Folders/On/Path/Changed"
-
-#ifndef FOLDERS_NO_HELPER_FUNCTIONS
-
-#ifndef M_UTILS_H__
-#error The helper functions require that m_utils.h be included in the project. Please include that file if you want to use the helper functions. If you don''t want to use the functions just define FOLDERS_NO_HELPER_FUNCTIONS.
-#endif
-//#include "../../../include/newpluginapi.h"
-
-__inline static HANDLE FoldersRegisterCustomPath(const char *section, const char *name, const char *defaultPath)
-{
-	FOLDERSDATA fd = {0};
-	if (!ServiceExists(MS_FOLDERS_REGISTER_PATH)) return 0;
-	fd.cbSize = sizeof(FOLDERSDATA);
-	strncpy(fd.szSection, section, FOLDERS_NAME_MAX_SIZE);
-	fd.szSection[FOLDERS_NAME_MAX_SIZE - 1] = '\0';
-	strncpy(fd.szName, name, FOLDERS_NAME_MAX_SIZE);
-	fd.szName[FOLDERS_NAME_MAX_SIZE - 1] = '\0';
-	fd.szFormat = defaultPath;
-	return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);
-}
-
-__inline static HANDLE FoldersRegisterCustomPathW(const char *section, const char *name, const wchar_t *defaultPathW)
-{
-	FOLDERSDATA fd = {0};
-	if (!ServiceExists(MS_FOLDERS_REGISTER_PATH)) return 0;
-	fd.cbSize = sizeof(FOLDERSDATA);
-	strncpy(fd.szSection, section, FOLDERS_NAME_MAX_SIZE);
-	fd.szSection[FOLDERS_NAME_MAX_SIZE - 1] = '\0'; //make sure it's NULL terminated
-	strncpy(fd.szName, name, FOLDERS_NAME_MAX_SIZE);
-	fd.szName[FOLDERS_NAME_MAX_SIZE - 1] = '\0'; //make sure it's NULL terminated
-	fd.szFormatW = defaultPathW;
-	fd.flags = FF_UNICODE;
-	return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);
-}
-
-__inline static int FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const int size, const char *notFound)
-{
-	FOLDERSGETDATA fgd = {0};
-	int res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = size;
-	fgd.szPath = path;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		char buffer[MAX_PATH];
-		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);
-		mir_snprintf(path, size, "%s", buffer);
-	}
-		
-	return res;
-}
-
-__inline static int FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, const int count, const wchar_t *notFoundW)
-{
-	FOLDERSGETDATA fgd = {0};
-	int res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = count;
-	fgd.szPathW = pathW;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		wcsncpy(pathW, notFoundW, count);
-		pathW[count - 1] = '\0';
-	}
-		
-	return res;
-}
-
-__inline static int FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, const int size, char *notFound, char *fileName)
-{
-	FOLDERSGETDATA fgd = {0};
-	int res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = size;
-	fgd.szPath = path;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		char buffer[MAX_PATH];
-		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);
-		mir_snprintf(path, size, "%s", buffer);
-	}
-	if (strlen(path) > 0)
-	{
-		strcat(path, "\\");
-	}
-	else{
-		path[0] = '\0';
-	}
-	
-	if (fileName)
-	{
-		strcat(path, fileName);
-	}
-	
-	return res;
-}
-
-__inline static int FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW, wchar_t *fileNameW)
-{
-	FOLDERSGETDATA fgd = {0};
-	int res;
-	fgd.cbSize = sizeof(FOLDERSGETDATA);
-	fgd.nMaxPathSize = count;
-	fgd.szPathW = pathW;
-	res = CallService(MS_FOLDERS_GET_PATH, (WPARAM) hFolderEntry, (LPARAM) &fgd);
-	if (res)
-	{
-		wcsncpy(pathW, notFoundW, count);
-		pathW[count - 1] = '\0';
-	}
-	
-	if (wcslen(pathW) > 0)
-	{
-		wcscat(pathW, L"\\");
-	}
-	else{
-		pathW[0] = L'\0';
-	}
-	
-	if (fileNameW)
-	{
-		wcscat(pathW, fileNameW);
-	}
-	
-	return res;
-}
-
-# ifdef _UNICODE
-#  define FoldersGetCustomPathT FoldersGetCustomPathW
-#  define FoldersGetCustomPathExT FoldersGetCustomPathExW
-#  define FoldersRegisterCustomPathT FoldersRegisterCustomPathW
-#else
-#  define FoldersGetCustomPathT FoldersGetCustomPath
-#  define FoldersGetCustomPathExT FoldersGetCustomPath
-#  define FoldersRegisterCustomPathT FoldersRegisterCustomPath
-#endif
-
-#endif
-
-#endif //M_CUSTOM_FOLDERS_H
diff --git a/plugins/Twitter/m_historyevents.h b/plugins/Twitter/m_historyevents.h
deleted file mode 100644
index aa44637861..0000000000
--- a/plugins/Twitter/m_historyevents.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/* 
-Copyright (C) 2006 Ricardo Pescuma Domenecci
-
-This is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this file; see the file license.txt.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  
-*/
-
-
-#ifndef __M_HISTORYEVENTS_H__
-# define __M_HISTORYEVENTS_H__
-
-
-#define MIID_HISTORYEVENTS { 0xc8be8543, 0x6618, 0x4030, { 0x85, 0xcf, 0x90, 0x82, 0xc7, 0xde, 0x7f, 0xf7 } }
-
-
-#define HISTORYEVENTS_FORMAT_CHAR			1
-#define HISTORYEVENTS_FORMAT_WCHAR			2
-#define HISTORYEVENTS_FORMAT_RICH_TEXT		4
-#define HISTORYEVENTS_FORMAT_HTML			8
-
-#define HISTORYEVENTS_FLAG_DEFAULT						(1 << 0) // Is a miranda core event type
-#define HISTORYEVENTS_FLAG_SHOW_IM_SRMM					(1 << 1) // If this event has to be shown in srmm dialog
-#define HISTORYEVENTS_FLAG_USE_SENT_FLAG				(1 << 2) // Means that it can be a sent or received and uses DBEF_SENT to mark that
-#define HISTORYEVENTS_FLAG_EXPECT_CONTACT_NAME_BEFORE	(1 << 3) // Means that who is drawing this should draw the contact name before the text
-#define HISTORYEVENTS_FLAG_ONLY_LOG_IF_SRMM_OPEN		(1 << 4) // If this event will be logged only if the message window is open
-#define HISTORYEVENTS_FLAG_FLASH_MSG_WINDOW				(1 << 5) // If this event will trigger the openning/flashing of the message window
-#define HISTORYEVENTS_REGISTERED_IN_ICOLIB				(9 << 16) // If the icon is a name already registered in icolib
-#define HISTORYEVENTS_FLAG_KEEP_ONE_YEAR 				(1 << 8) // By default store in db for 1 year
-#define HISTORYEVENTS_FLAG_KEEP_SIX_MONTHS 				(2 << 8) // By default store in db for 6 months
-#define HISTORYEVENTS_FLAG_KEEP_ONE_MONTH 				(3 << 8) // By default store in db for 1 month
-#define HISTORYEVENTS_FLAG_KEEP_ONE_WEEK 				(4 << 8) // By default store in db for 1 week
-#define HISTORYEVENTS_FLAG_KEEP_ONE_DAY					(5 << 8) // By default store in db for 1 day
-#define HISTORYEVENTS_FLAG_KEEP_FOR_SRMM 				(6 << 8) // By default store in db only enought for message log
-#define HISTORYEVENTS_FLAG_KEEP_MAX_TEN 				(7 << 8) // By default store in db max 10 entries
-#define HISTORYEVENTS_FLAG_KEEP_MAX_HUNDRED				(8 << 8) // By default store in db for 100 entries
-#define HISTORYEVENTS_FLAG_KEEP_DONT					(9 << 8) // By default don't store in db (aka ignore it)
-
-
-// This function must be implemented by subscribers. It must return a pointer or NULL
-// to say it can't handle the text
-typedef void * (*fGetHistoryEventText)(HANDLE hContact, HANDLE hDbEvent, DBEVENTINFO *dbe, int format);
-
-typedef struct {
-	int cbSize;
-	char *module;
-	char *name;				// Internal event name
-	char *description;		// Will be translated. When retrieving it is already translated
-	WORD eventType;			// The event type it can handle
-	union {
-		HICON defaultIcon;
-		char * defaultIconName;		// if HISTORYEVENTS_REGISTERED_IN_ICOLIB is set. Always use this one when retrieving
-	};
-	int supports;			// What kind of return is supported - or of HISTORYEVENTS_FORMAT_*
-	int flags;				// or of HISTORYEVENTS_FLAG_*
-	fGetHistoryEventText pfGetHistoryEventText;	// NULL to use default get text (similar to message, without extra format)
-
-	// Aditional data if wants to use add to history services
-	char **templates; // Each entry is: "Name\nDefault\n%var%\tDescription\n%var%\tDescription\n%var%\tDescription"
-	int numTemplates;
-
-} HISTORY_EVENT_HANDLER;
-
-
-/*
-Get the number of registered events
-
-wParam: ignored
-lParam: ignored
-Return: The number of events registered with the plugin
-*/
-#define MS_HISTORYEVENTS_GET_COUNT		"HistoryEvents/GetCount"
-
-
-/*
-Get an event by number or by type. 
-To retrieve by number, pass -1 as type. To retrieve by type, pass -1 as number.
-
-wParam: (int) event number
-lParam: (int) event type
-Return: (const HISTORY_EVENT_HANDLER *) if the event exists, NULL  otherwise. Don't change the
-		returned strunc: it is a pointer to the internall struct.
-*/
-#define MS_HISTORYEVENTS_GET_EVENT		"HistoryEvents/GetEvent"
-
-
-/*
-Register a plugin that can handle an event type. This must be called during the call to the
-Load function of the plugin. In ModulesLoaded callback all plugins have to be already registered,
-so srmm and history modules can query then.
-
-wParam: HISTORY_EVENT_HANDLER *
-lParam: ignored
-Return: 0 for success
-*/
-#define MS_HISTORYEVENTS_REGISTER		"HistoryEvents/Register"
-
-
-typedef struct {
-	int cbSize;
-	HANDLE hDbEvent;
-	DBEVENTINFO *dbe;	// Optional
-	int format;			// one of HISTORYEVENTS_FORMAT_*
-
-} HISTORY_EVENT_PARAM;
-
-/*
-Check if an event can be handled by any subscribers
-
-wParam: WORD - event type
-lParam: ignored
-Return: BOOL 
-*/
-#define MS_HISTORYEVENTS_CAN_HANDLE		"HistoryEvents/CanHandle"
-
-/*
-Get the icon for a history event type
-
-wParam: WORD - event type
-lParam: BOOL - TRUE to copy the icon (should be released with DestroyObject), 
-			   FALSE to use icolib one (should be released with MS_HISTORYEVENTS_RELEASE_ICON)
-Return: HICON
-*/
-#define MS_HISTORYEVENTS_GET_ICON		"HistoryEvents/GetIcon"
-
-/*
-Get the flags for a history event type
-
-wParam: WORD - event type
-lParam: ignored
-Return: int - or of HISTORYEVENTS_FLAG_* or -1 if error
-*/
-#define MS_HISTORYEVENTS_GET_FLAGS		"HistoryEvents/GetFlags"
-
-/*
-Release the icon for a history event type. This is really just a forward to icolib
-
-wParam: HICON
-lParam: ignored
-*/
-#define MS_HISTORYEVENTS_RELEASE_ICON	"Skin2/Icons/ReleaseIcon"
-
-/*
-Get the text for a history event type
-
-wParam: HISTORY_EVENT_PARAM *
-lParam: ignored
-Return: char * or wchar * depending on sent flags. Free with mir_free or MS_HISTORYEVENTS_RELEASE_TEXT
-*/
-#define MS_HISTORYEVENTS_GET_TEXT		"HistoryEvents/GetText"
-
-/*
-Release the text for a history event type. Internally is just a call to mir_free
-
-wParam: char * or wchar * 
-lParam: ignored
-*/
-#define MS_HISTORYEVENTS_RELEASE_TEXT	"HistoryEvents/ReleaseText"
-
-
-
-typedef struct {
-	int cbSize;
-	HANDLE hContact;
-	WORD eventType;
-	int templateNum;
-	TCHAR **variables;
-	int numVariables;
-	PBYTE additionalData;
-	int additionalDataSize;
-	int flags;				// Flags for the event type
-	DWORD timestamp;		// 0 for now
-	BOOL addToMetaToo;
-} HISTORY_EVENT_ADD;
-
-/*
-Add an registered event to the history. This is a helper service
-
-wParam: HISTORY_EVENT_ADD
-lParam: ignored
-Return: HANDLE to the db event
-*/
-#define MS_HISTORYEVENTS_ADD_TO_HISTORY	"HistoryEvents/AddToHistory"
-
-/*
-Check if a template is enabled
-
-wParam: event type
-lParam: template num
-Return: TRUE or FALSE
-*/
-#define MS_HISTORYEVENTS_IS_ENABLED_TEMPLATE	"HistoryEvents/IsEnabledTemplate"
-
-
-
-// Helper functions //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-static int HistoryEvents_Register(char *module, char *name, char *description, int eventType, HICON defaultIcon, 
-								  int supports, int flags, fGetHistoryEventText pfGetHistoryEventText)
-{
-	HISTORY_EVENT_HANDLER heh = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_REGISTER))
-		return 1;
-
-	heh.cbSize = sizeof(heh);
-	heh.module = module;
-	heh.name = name;
-	heh.description = description;
-	heh.eventType = eventType;
-	heh.defaultIcon = defaultIcon;
-	heh.supports = supports;
-	heh.flags = flags;
-	heh.pfGetHistoryEventText = pfGetHistoryEventText;
-	return CallService(MS_HISTORYEVENTS_REGISTER, (WPARAM) &heh, 0);
-}
-
-static int HistoryEvents_RegisterWithTemplates(char *module, char *name, char *description, int eventType, HICON defaultIcon, 
-								  int supports, int flags, fGetHistoryEventText pfGetHistoryEventText,
-								  char **templates, int numTemplates)
-{
-	HISTORY_EVENT_HANDLER heh = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_REGISTER))
-		return 1;
-
-	heh.cbSize = sizeof(heh);
-	heh.module = module;
-	heh.name = name;
-	heh.description = description;
-	heh.eventType = eventType;
-	heh.defaultIcon = defaultIcon;
-	heh.supports = supports;
-	heh.flags = flags;
-	heh.pfGetHistoryEventText = pfGetHistoryEventText;
-	heh.templates = templates;
-	heh.numTemplates = numTemplates;
-	return CallService(MS_HISTORYEVENTS_REGISTER, (WPARAM) &heh, 0);
-}
-
-static int HistoryEvents_RegisterMessageStyle(char *module, char *name, char *description, int eventType, HICON defaultIcon, 
-										int flags, char **templates, int numTemplates)
-{
-	HISTORY_EVENT_HANDLER heh = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_REGISTER))
-		return 1;
-
-	heh.cbSize = sizeof(heh);
-	heh.module = module;
-	heh.name = name;
-	heh.description = description;
-	heh.eventType = eventType;
-	heh.defaultIcon = defaultIcon;
-	heh.flags = flags;
-	heh.templates = templates;
-	heh.numTemplates = numTemplates;
-	return CallService(MS_HISTORYEVENTS_REGISTER, (WPARAM) &heh, 0);
-}
-
-static BOOL HistoryEvents_CanHandle(WORD eventType)
-{
-	if (!ServiceExists(MS_HISTORYEVENTS_CAN_HANDLE))
-		return FALSE;
-
-	return (BOOL) CallService(MS_HISTORYEVENTS_CAN_HANDLE, (WPARAM) eventType, 0);
-}
-
-static HICON HistoryEvents_GetIcon(WORD eventType)
-{
-	if (!ServiceExists(MS_HISTORYEVENTS_GET_ICON))
-		return NULL;
-
-	return (HICON) CallService(MS_HISTORYEVENTS_GET_ICON, (WPARAM) eventType, 0);
-}
-
-static int HistoryEvents_GetFlags(WORD eventType)
-{
-	if (!ServiceExists(MS_HISTORYEVENTS_GET_FLAGS))
-		return -1;
-
-	return (int) CallService(MS_HISTORYEVENTS_GET_FLAGS, (WPARAM) eventType, 0);
-}
-
-static void HistoryEvents_ReleaseIcon(HICON icon)
-{
-	CallService(MS_HISTORYEVENTS_RELEASE_ICON, (WPARAM) icon, 0);
-}
-
-static char * HistoryEvents_GetTextA(HANDLE hDbEvent, DBEVENTINFO *dbe)
-{
-	HISTORY_EVENT_PARAM hep = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_GET_TEXT))
-		return NULL;
-
-	hep.cbSize = sizeof(hep);
-	hep.hDbEvent = hDbEvent;
-	hep.dbe = dbe;
-	hep.format = HISTORYEVENTS_FORMAT_CHAR;
-	return (char *) CallService(MS_HISTORYEVENTS_GET_TEXT, (WPARAM) &hep, 0);
-}
-
-static wchar_t * HistoryEvents_GetTextW(HANDLE hDbEvent, DBEVENTINFO *dbe)
-{
-	HISTORY_EVENT_PARAM hep = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_GET_TEXT))
-		return NULL;
-
-	hep.cbSize = sizeof(hep);
-	hep.hDbEvent = hDbEvent;
-	hep.dbe = dbe;
-	hep.format = HISTORYEVENTS_FORMAT_WCHAR;
-	return (wchar_t *) CallService(MS_HISTORYEVENTS_GET_TEXT, (WPARAM) &hep, 0);
-}
-
-static char * HistoryEvents_GetRichText(HANDLE hDbEvent, DBEVENTINFO *dbe)
-{
-	HISTORY_EVENT_PARAM hep = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_GET_TEXT))
-		return NULL;
-
-	hep.cbSize = sizeof(hep);
-	hep.hDbEvent = hDbEvent;
-	hep.dbe = dbe;
-	hep.format = HISTORYEVENTS_FORMAT_RICH_TEXT;
-	return (char *) CallService(MS_HISTORYEVENTS_GET_TEXT, (WPARAM) &hep, 0);
-}
-
-#define HistoryEvents_ReleaseText mir_free
-//static void HistoryEvents_ReleaseText(void *str)
-//{
-//	if (!ServiceExists(MS_HISTORYEVENTS_RELEASE_TEXT))
-//		return;
-//
-//	CallService(MS_HISTORYEVENTS_RELEASE_TEXT, (WPARAM) str, 0);
-//}
-
-
-#ifdef __cplusplus
-static HANDLE HistoryEvents_AddToHistoryEx(HANDLE hContact, WORD eventType, int templateNum, 
-										 TCHAR **variables, int numVariables, 
-										 PBYTE additionalData, int additionalDataSize,
-										 int flags = 0, DWORD timestamp = 0, BOOL addToMetaToo = FALSE)
-#else
-static HANDLE HistoryEvents_AddToHistoryEx(HANDLE hContact, WORD eventType, int templateNum, 
-										 TCHAR **variables, int numVariables, 
-										 PBYTE additionalData, int additionalDataSize,
-										 int flags, DWORD timestamp, BOOL addToMetaToo)
-#endif
-{
-	HISTORY_EVENT_ADD hea = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_ADD_TO_HISTORY))
-		return NULL;
-
-	hea.cbSize = sizeof(hea);
-	hea.hContact = hContact;
-	hea.eventType = eventType;
-	hea.templateNum = templateNum;
-	hea.numVariables = numVariables;
-	hea.variables = variables;
-	hea.additionalData = additionalData;
-	hea.additionalDataSize = additionalDataSize;
-	hea.flags = flags;
-	hea.timestamp = timestamp;
-	hea.addToMetaToo = addToMetaToo;
-
-	return (HANDLE) CallService(MS_HISTORYEVENTS_ADD_TO_HISTORY, (WPARAM) &hea, 0);
-}
-
-#ifdef __cplusplus
-static HANDLE HistoryEvents_AddToHistoryVars(HANDLE hContact, WORD eventType, int templateNum, 
-											 TCHAR **variables, int numVariables, 
-											 int flags = 0, DWORD timestamp = 0, BOOL addToMetaToo = FALSE)
-#else
-static HANDLE HistoryEvents_AddToHistoryVars(HANDLE hContact, WORD eventType, int templateNum, 
-											 TCHAR **variables, int numVariables, 
-											 int flags, DWORD timestamp, BOOL addToMetaToo)
-#endif
-{
-	HISTORY_EVENT_ADD hea = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_ADD_TO_HISTORY))
-		return NULL;
-
-	hea.cbSize = sizeof(hea);
-	hea.hContact = hContact;
-	hea.eventType = eventType;
-	hea.templateNum = templateNum;
-	hea.numVariables = numVariables;
-	hea.variables = variables;
-	hea.flags = flags;
-	hea.timestamp = timestamp;
-	hea.addToMetaToo = addToMetaToo;
-
-	return (HANDLE) CallService(MS_HISTORYEVENTS_ADD_TO_HISTORY, (WPARAM) &hea, 0);
-}
-
-#ifdef __cplusplus
-static HANDLE HistoryEvents_AddToHistorySimple(HANDLE hContact, WORD eventType, int templateNum, 
-											   int flags = 0, DWORD timestamp = 0, BOOL addToMetaToo = FALSE)
-#else
-static HANDLE HistoryEvents_AddToHistorySimple(HANDLE hContact, WORD eventType, int templateNum, 
-											   int flags, DWORD timestamp, BOOL addToMetaToo)
-#endif
-{
-	HISTORY_EVENT_ADD hea = {0};
-
-	if (!ServiceExists(MS_HISTORYEVENTS_ADD_TO_HISTORY))
-		return NULL;
-
-	hea.cbSize = sizeof(hea);
-	hea.hContact = hContact;
-	hea.eventType = eventType;
-	hea.templateNum = templateNum;
-	hea.flags = flags;
-	hea.timestamp = timestamp;
-	hea.addToMetaToo = addToMetaToo;
-
-	return (HANDLE) CallService(MS_HISTORYEVENTS_ADD_TO_HISTORY, (WPARAM) &hea, 0);
-}
-
-static BOOL HistoryEvents_IsEnabledTemplate(WORD eventType, int templateNum)
-{
-	return (BOOL) CallService(MS_HISTORYEVENTS_IS_ENABLED_TEMPLATE, eventType, templateNum);
-}
-
-#ifdef UNICODE
-# define HistoryEvents_GetTextT HistoryEvents_GetTextW
-#else
-# define HistoryEvents_GetTextT HistoryEvents_GetTextA
-#endif
-
-
-
-#endif // __M_HISTORYEVENTS_H__
diff --git a/plugins/Twitter/m_updater.h b/plugins/Twitter/m_updater.h
deleted file mode 100644
index 371b7437a0..0000000000
--- a/plugins/Twitter/m_updater.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef _M_UPDATER_H
-#define _M_UPDATER_H
-
-// NOTES:
-// - For langpack updates, include a string of the following format in the langpack text file:
-//    ";FLID: <file listing name> <version>"
-//    version must be four numbers seperated by '.', in the range 0-255 inclusive
-// - Updater will disable plugins that are downloaded but were not active prior to the update (this is so that, if an archive contains e.g. ansi and 
-//    unicode versions, the correct plugin will be the only one active after the new version is installed)...so if you add a support plugin, you may need 
-//    to install an ini file to make the plugin activate when miranda restarts after the update
-// - Updater will replace all dlls that have the same internal shortName as a downloaded update dll (this is so that msn1.dll and msn2.dll, for example,
-//    will both be updated) - so if you have a unicode and a non-unicode version of a plugin in your archive, you should make the internal names different (which will break automatic 
-//    updates from the file listing if there is only one file listing entry for both versions, unless you use the 'MS_UPDATE_REGISTER' service below)
-// - Updater will install all files in the root of the archive into the plugins folder, except for langpack files that contain the FLID string which go into the root folder (same
-//    folder as miranda32.exe)...all folders in the archive will also be copied to miranda's root folder, and their contents transferred into the new folders. The only exception is a 
-//    special folder called 'root_files' - if there is a folder by that name in the archive, it's contents will also be copied into miranda's root folder - this is intended to be used 
-//    to install additional dlls etc that a plugin may require)
-
-// if you set Update.szUpdateURL to the following value when registering, as well as setting your beta site and version data,
-// Updater will ignore szVersionURL and pbVersionPrefix, and attempt to find the file listing URL's from the backend XML data.
-// for this to work, the plugin name in pluginInfo.shortName must match the file listing exactly (except for case)
-#define UPDATER_AUTOREGISTER		"UpdaterAUTOREGISTER"
-// Updater will also use the backend xml data if you provide URL's that reference the miranda file listing for updates (so you can use that method 
-// if e.g. your plugin shortName does not match the file listing) - it will grab the file listing id from the end of these URLs
-
-typedef struct Update_tag {
-  int cbSize;     
-  char *szComponentName;		// component name as it will appear in the UI (will be translated before displaying)
-
-  char *szVersionURL;			// URL where the current version can be found (NULL to disable)
-  BYTE *pbVersionPrefix;		// bytes occuring in VersionURL before the version, used to locate the version information within the URL data
-								// (note that this URL could point at a binary file - dunno why, but it could :)
-  int cpbVersionPrefix;			// number of bytes pointed to by pbVersionPrefix
-  char *szUpdateURL;			// URL where dll/zip is located
-								// set to UPDATER_AUTOREGISTER if you want Updater to find the file listing URLs (ensure plugin shortName matches file listing!)
-
-  char *szBetaVersionURL;		// URL where the beta version can be found (NULL to disable betas)
-  BYTE *pbBetaVersionPrefix;	// bytes occuring in VersionURL before the version, used to locate the version information within the URL data
-  int cpbBetaVersionPrefix;		// number of bytes pointed to by pbVersionPrefix
-  char *szBetaUpdateURL;		// URL where dll/zip is located
-
-  BYTE *pbVersion;				// bytes of current version, used for comparison with those in VersionURL
-  int cpbVersion;				// number of bytes pointed to by pbVersion
-
-  char *szBetaChangelogURL;		// url for displaying changelog for beta versions
-} Update;
-
-// register a comonent with Updater
-//
-// wparam = 0
-// lparam = (LPARAM)&Update
-#define MS_UPDATE_REGISTER      "Update/Register"
-
-// utility functions to create a version string from a DWORD or from pluginInfo
-// point buf at a buffer at least 16 chars wide - but note the version string returned may be shorter
-//
-__inline static char *CreateVersionString(DWORD version, char *buf) {
-	mir_snprintf(buf, 16, "%d.%d.%d.%d", (version >> 24) & 0xFF, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);
-	return buf;
-}
-
-__inline static char *CreateVersionStringPlugin(PLUGININFO *pluginInfo, char *buf) {
-	return CreateVersionString(pluginInfo->version, buf);
-}
-
-
-// register the 'easy' way - use this method if you have no beta URL and the plugin is on the miranda file listing
-// NOTE: the plugin version string on the file listing must be the string version of the version in pluginInfo (i.e. 0.0.0.1,
-// four numbers between 0 and 255 inclusivem, so no letters, brackets, etc.)
-//
-// wParam = (int)fileID				- this is the file ID from the file listing (i.e. the number at the end of the download link)
-// lParam = (PLUGININFO*)&pluginInfo
-#define MS_UPDATE_REGISTERFL	"Update/RegisterFL"
-
-// this function can be used to 'unregister' components - useful for plugins that register non-plugin/langpack components and
-// may need to change those components on the fly
-// lParam = (char *)szComponentName
-#define MS_UPDATE_UNREGISTER	"Update/Unregister"
-
-// this event is fired when the startup process is complete, but NOT if a restart is imminent
-// it is designed for status managment plugins to use as a trigger for beggining their own startup process
-// wParam = lParam = 0 (unused)
-// (added in version 0.1.6.0)
-#define ME_UPDATE_STARTUPDONE	"Update/StartupDone"
-
-// this service can be used to enable/disable Updater's global status control
-// it can be called from the StartupDone event handler
-// wParam = (BOOL)enable
-// lParam = 0
-// (added in version 0.1.6.0)
-#define MS_UPDATE_ENABLESTATUSCONTROL	"Update/EnableStatusControl"
-
-// An description of usage of the above service and event:
-// Say you are a status control plugin that normally sets protocol or global statuses in your ModulesLoaded event handler.
-// In order to make yourself 'Updater compatible', you would move the status control code from ModulesLoaded to another function, 
-// say DoStartup. Then, in ModulesLoaded you would check for the existence of the MS_UPDATE_ENABLESTATUSCONTROL service.
-// If it does not exist, call DoStartup. If it does exist, hook the ME_UPDATE_STARTUPDONE event and call DoStartup from there. You may
-// also wish to call MS_UPDATE_ENABLESTATUSCONTROL with wParam == FALSE at this time, to disable Updater's own status control feature.
-
-// this service can be used to determine whether updates are possible for a component with the given name
-// wParam = 0
-// lParam = (char *)szComponentName
-// returns TRUE if updates are supported, FALSE otherwise
-#define MS_UPDATE_ISUPDATESUPPORTED		"Update/IsUpdateSupported"
-
-#endif
-
-
-/////////////// Usage Example ///////////////
-
-#ifdef EXAMPLE_CODE
-
-// you need to #include "m_updater.h" and HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded) in your Load function...
-
-int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
-
-	Update update = {0}; // for c you'd use memset or ZeroMemory...
-	char szVersion[16];
-
-	update.cbSize = sizeof(Update);
-
-	update.szComponentName = pluginInfo.shortName;
-	update.pbVersion = (BYTE *)CreateVersionString(&pluginInfo, szVersion);
-	update.cpbVersion = strlen((char *)update.pbVersion);
-
-	// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 
-	// before the version that we use to locate it on the page
-	// (note that if the update URL and the version URL point to standard file listing entries, the backend xml
-	// data will be used to check for updates rather than the actual web page - this is not true for beta urls)
-	update.szUpdateURL = "http://scottellis.com.au:81/test/updater.zip";
-	update.szVersionURL = "http://scottellis.com.au:81/test/updater_test.html";
-	update.pbVersionPrefix = (BYTE *)"Updater version ";
-	
-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);
-
-	// do the same for the beta versions of the above struct members if you wish to allow beta updates from another URL
-
-	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);
-
-	// Alternatively, to register a plugin with e.g. file ID 2254 on the file listing...
-	// CallService(MS_UPDATE_REGISTERFL, (WPARAM)2254, (LPARAM)&pluginInfo);
-
-	return 0;
-}
-
-#endif
diff --git a/plugins/Twitter/twitter.vcproj b/plugins/Twitter/twitter.vcproj
deleted file mode 100644
index 1ddb297182..0000000000
--- a/plugins/Twitter/twitter.vcproj
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="twitter"
-	ProjectGUID="{DADE9455-DC28-465A-9604-2CA28052B9FB}"
-	RootNamespace="twitter"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\miranda"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\miranda"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release ANSI|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\miranda"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug ANSI|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\miranda"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\chat.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\connection.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\contacts.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\http.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\proto.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\stubs.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\theme.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\twitter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ui.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\utility.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\http.h"
-				>
-			</File>
-			<File
-				RelativePath=".\proto.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\theme.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tinyjson.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\twitter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\utility.h"
-				>
-			</File>
-			<File
-				RelativePath=".\version.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\icons\twitter.ico"
-				>
-			</File>
-			<File
-				RelativePath=".\twitter.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/NewsAggregator/AtomText.txt b/protocols/NewsAggregator/AtomText.txt
index 052516a6bb..052516a6bb 100644
--- a/plugins/NewsAggregator/AtomText.txt
+++ b/protocols/NewsAggregator/AtomText.txt
diff --git a/plugins/NewsAggregator/NewsAggregator_10.sln b/protocols/NewsAggregator/NewsAggregator_10.sln
index aee50b713e..aee50b713e 100644
--- a/plugins/NewsAggregator/NewsAggregator_10.sln
+++ b/protocols/NewsAggregator/NewsAggregator_10.sln
diff --git a/plugins/NewsAggregator/NewsAggregator_10.vcxproj b/protocols/NewsAggregator/NewsAggregator_10.vcxproj
index 5b419a7806..4d9e94c372 100644
--- a/plugins/NewsAggregator/NewsAggregator_10.vcxproj
+++ b/protocols/NewsAggregator/NewsAggregator_10.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NEWSAGGREGATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -100,7 +100,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;NEWSAGGREGATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -125,7 +125,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NEWSAGGREGATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
@@ -151,7 +151,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;NEWSAGGREGATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
diff --git a/plugins/NewsAggregator/NewsAggregator_10.vcxproj.filters b/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters
index 7b08037070..7b08037070 100644
--- a/plugins/NewsAggregator/NewsAggregator_10.vcxproj.filters
+++ b/protocols/NewsAggregator/NewsAggregator_10.vcxproj.filters
diff --git a/plugins/NewsAggregator/Res/AddFeed.ico b/protocols/NewsAggregator/Res/AddFeed.ico
index 2503d8ec60..2503d8ec60 100644
--- a/plugins/NewsAggregator/Res/AddFeed.ico
+++ b/protocols/NewsAggregator/Res/AddFeed.ico
diff --git a/plugins/NewsAggregator/Res/CheckALL.ico b/protocols/NewsAggregator/Res/CheckALL.ico
index 98d434b2ba..98d434b2ba 100644
--- a/plugins/NewsAggregator/Res/CheckALL.ico
+++ b/protocols/NewsAggregator/Res/CheckALL.ico
diff --git a/plugins/NewsAggregator/Res/Export.ico b/protocols/NewsAggregator/Res/Export.ico
index ef475bb5cd..ef475bb5cd 100644
--- a/plugins/NewsAggregator/Res/Export.ico
+++ b/protocols/NewsAggregator/Res/Export.ico
diff --git a/plugins/NewsAggregator/Res/Import.ico b/protocols/NewsAggregator/Res/Import.ico
index 4becddf394..4becddf394 100644
--- a/plugins/NewsAggregator/Res/Import.ico
+++ b/protocols/NewsAggregator/Res/Import.ico
diff --git a/plugins/NewsAggregator/Res/Main.ico b/protocols/NewsAggregator/Res/Main.ico
index 4e9d1abc51..4e9d1abc51 100644
--- a/plugins/NewsAggregator/Res/Main.ico
+++ b/protocols/NewsAggregator/Res/Main.ico
diff --git a/plugins/NewsAggregator/Resource.rc b/protocols/NewsAggregator/Resource.rc
index a092bb26ea..a092bb26ea 100644
--- a/plugins/NewsAggregator/Resource.rc
+++ b/protocols/NewsAggregator/Resource.rc
diff --git a/plugins/NewsAggregator/RssText.txt b/protocols/NewsAggregator/RssText.txt
index b229fc9e78..b229fc9e78 100644
--- a/plugins/NewsAggregator/RssText.txt
+++ b/protocols/NewsAggregator/RssText.txt
diff --git a/plugins/NewsAggregator/Src/Common.h b/protocols/NewsAggregator/Src/Common.h
index fedb81250c..fedb81250c 100644
--- a/plugins/NewsAggregator/Src/Common.h
+++ b/protocols/NewsAggregator/Src/Common.h
diff --git a/plugins/NewsAggregator/Src/Entities.cpp b/protocols/NewsAggregator/Src/Entities.cpp
index 46a00d2d8d..46a00d2d8d 100644
--- a/plugins/NewsAggregator/Src/Entities.cpp
+++ b/protocols/NewsAggregator/Src/Entities.cpp
diff --git a/plugins/NewsAggregator/Src/Icons.cpp b/protocols/NewsAggregator/Src/Icons.cpp
index 096a38086b..096a38086b 100644
--- a/plugins/NewsAggregator/Src/Icons.cpp
+++ b/protocols/NewsAggregator/Src/Icons.cpp
diff --git a/plugins/NewsAggregator/Src/Menus.cpp b/protocols/NewsAggregator/Src/Menus.cpp
index 2ff20ce596..2ff20ce596 100644
--- a/plugins/NewsAggregator/Src/Menus.cpp
+++ b/protocols/NewsAggregator/Src/Menus.cpp
diff --git a/plugins/NewsAggregator/Src/NewsAggregator.cpp b/protocols/NewsAggregator/Src/NewsAggregator.cpp
index 716ef85d17..716ef85d17 100644
--- a/plugins/NewsAggregator/Src/NewsAggregator.cpp
+++ b/protocols/NewsAggregator/Src/NewsAggregator.cpp
diff --git a/plugins/NewsAggregator/Src/Options.cpp b/protocols/NewsAggregator/Src/Options.cpp
index b9dc78b90c..b9dc78b90c 100644
--- a/plugins/NewsAggregator/Src/Options.cpp
+++ b/protocols/NewsAggregator/Src/Options.cpp
diff --git a/plugins/NewsAggregator/Src/Services.cpp b/protocols/NewsAggregator/Src/Services.cpp
index 0c23983c79..0c23983c79 100644
--- a/plugins/NewsAggregator/Src/Services.cpp
+++ b/protocols/NewsAggregator/Src/Services.cpp
diff --git a/plugins/NewsAggregator/Src/Update.cpp b/protocols/NewsAggregator/Src/Update.cpp
index f2f5ecf92a..f2f5ecf92a 100644
--- a/plugins/NewsAggregator/Src/Update.cpp
+++ b/protocols/NewsAggregator/Src/Update.cpp
diff --git a/plugins/NewsAggregator/Src/Utils.cpp b/protocols/NewsAggregator/Src/Utils.cpp
index c42a3f7dd1..c42a3f7dd1 100644
--- a/plugins/NewsAggregator/Src/Utils.cpp
+++ b/protocols/NewsAggregator/Src/Utils.cpp
diff --git a/plugins/NewsAggregator/ToDo.txt b/protocols/NewsAggregator/ToDo.txt
index fa08c1a5f3..fa08c1a5f3 100644
--- a/plugins/NewsAggregator/ToDo.txt
+++ b/protocols/NewsAggregator/ToDo.txt
diff --git a/plugins/NewsAggregator/Version.h b/protocols/NewsAggregator/Version.h
index fe5d837fe3..fe5d837fe3 100644
--- a/plugins/NewsAggregator/Version.h
+++ b/protocols/NewsAggregator/Version.h
diff --git a/plugins/NewsAggregator/Version.rc b/protocols/NewsAggregator/Version.rc
index e637f0cb33..e637f0cb33 100644
--- a/plugins/NewsAggregator/Version.rc
+++ b/protocols/NewsAggregator/Version.rc
diff --git a/plugins/NewsAggregator/resource.h b/protocols/NewsAggregator/resource.h
index f243b95585..f243b95585 100644
--- a/plugins/NewsAggregator/resource.h
+++ b/protocols/NewsAggregator/resource.h
diff --git a/plugins/Quotes/Base64.cpp b/protocols/Quotes/Base64.cpp
index 1854fb42fd..1854fb42fd 100644
--- a/plugins/Quotes/Base64.cpp
+++ b/protocols/Quotes/Base64.cpp
diff --git a/plugins/Quotes/Base64.h b/protocols/Quotes/Base64.h
index 3f911bfeb8..3f911bfeb8 100644
--- a/plugins/Quotes/Base64.h
+++ b/protocols/Quotes/Base64.h
diff --git a/plugins/Quotes/Chart.h b/protocols/Quotes/Chart.h
index 62a658d818..62a658d818 100644
--- a/plugins/Quotes/Chart.h
+++ b/protocols/Quotes/Chart.h
diff --git a/plugins/Quotes/ComHelper.cpp b/protocols/Quotes/ComHelper.cpp
index e15d05d739..e15d05d739 100644
--- a/plugins/Quotes/ComHelper.cpp
+++ b/protocols/Quotes/ComHelper.cpp
diff --git a/plugins/Quotes/ComHelper.h b/protocols/Quotes/ComHelper.h
index 0b4140d80d..0b4140d80d 100644
--- a/plugins/Quotes/ComHelper.h
+++ b/protocols/Quotes/ComHelper.h
diff --git a/plugins/Quotes/CommonOptionDlg.cpp b/protocols/Quotes/CommonOptionDlg.cpp
index 0b460665c5..0b460665c5 100644
--- a/plugins/Quotes/CommonOptionDlg.cpp
+++ b/protocols/Quotes/CommonOptionDlg.cpp
diff --git a/plugins/Quotes/CommonOptionDlg.h b/protocols/Quotes/CommonOptionDlg.h
index b9f696362a..b9f696362a 100644
--- a/plugins/Quotes/CommonOptionDlg.h
+++ b/protocols/Quotes/CommonOptionDlg.h
diff --git a/plugins/Quotes/CreateFilePath.cpp b/protocols/Quotes/CreateFilePath.cpp
index f1a3e4f331..f1a3e4f331 100644
--- a/plugins/Quotes/CreateFilePath.cpp
+++ b/protocols/Quotes/CreateFilePath.cpp
diff --git a/plugins/Quotes/CreateFilePath.h b/protocols/Quotes/CreateFilePath.h
index f097e59a52..f097e59a52 100644
--- a/plugins/Quotes/CreateFilePath.h
+++ b/protocols/Quotes/CreateFilePath.h
diff --git a/plugins/Quotes/CurrencyConverter.cpp b/protocols/Quotes/CurrencyConverter.cpp
index 0e04d2562e..0e04d2562e 100644
--- a/plugins/Quotes/CurrencyConverter.cpp
+++ b/protocols/Quotes/CurrencyConverter.cpp
diff --git a/plugins/Quotes/CurrencyConverter.h b/protocols/Quotes/CurrencyConverter.h
index 9af7c6bca1..9af7c6bca1 100644
--- a/plugins/Quotes/CurrencyConverter.h
+++ b/protocols/Quotes/CurrencyConverter.h
diff --git a/plugins/Quotes/DBUtils.cpp b/protocols/Quotes/DBUtils.cpp
index 11c0fb3d0d..11c0fb3d0d 100644
--- a/plugins/Quotes/DBUtils.cpp
+++ b/protocols/Quotes/DBUtils.cpp
diff --git a/plugins/Quotes/DBUtils.h b/protocols/Quotes/DBUtils.h
index d154e99075..d154e99075 100644
--- a/plugins/Quotes/DBUtils.h
+++ b/protocols/Quotes/DBUtils.h
diff --git a/plugins/Quotes/EconomicRateInfo.h b/protocols/Quotes/EconomicRateInfo.h
index 73e269619c..73e269619c 100644
--- a/plugins/Quotes/EconomicRateInfo.h
+++ b/protocols/Quotes/EconomicRateInfo.h
diff --git a/plugins/Quotes/ExtraImages.cpp b/protocols/Quotes/ExtraImages.cpp
index 35a59a8c1d..35a59a8c1d 100644
--- a/plugins/Quotes/ExtraImages.cpp
+++ b/protocols/Quotes/ExtraImages.cpp
diff --git a/plugins/Quotes/ExtraImages.h b/protocols/Quotes/ExtraImages.h
index ec8ae01e39..ec8ae01e39 100644
--- a/plugins/Quotes/ExtraImages.h
+++ b/protocols/Quotes/ExtraImages.h
diff --git a/plugins/Quotes/Forex.cpp b/protocols/Quotes/Forex.cpp
index 3bb25a9f99..3bb25a9f99 100644
--- a/plugins/Quotes/Forex.cpp
+++ b/protocols/Quotes/Forex.cpp
diff --git a/plugins/Quotes/Forex.rc b/protocols/Quotes/Forex.rc
index 2bfbe8eb69..2bfbe8eb69 100644
--- a/plugins/Quotes/Forex.rc
+++ b/protocols/Quotes/Forex.rc
diff --git a/plugins/Quotes/Forex.sln b/protocols/Quotes/Forex.sln
index 5f0d619104..5f0d619104 100644
--- a/plugins/Quotes/Forex.sln
+++ b/protocols/Quotes/Forex.sln
diff --git a/plugins/Quotes/Forex.vcxproj b/protocols/Quotes/Forex.vcxproj
index 22e0803fe1..4dd737de9c 100644
--- a/plugins/Quotes/Forex.vcxproj
+++ b/protocols/Quotes/Forex.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -99,7 +99,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -124,7 +124,7 @@
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -150,7 +150,7 @@
       <Optimization>Full</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/plugins/Quotes/Forex.vcxproj.filters b/protocols/Quotes/Forex.vcxproj.filters
index 127582eda6..127582eda6 100644
--- a/plugins/Quotes/Forex.vcxproj.filters
+++ b/protocols/Quotes/Forex.vcxproj.filters
diff --git a/plugins/Quotes/HTMLParserMS.cpp b/protocols/Quotes/HTMLParserMS.cpp
index bfe58b43b1..bfe58b43b1 100644
--- a/plugins/Quotes/HTMLParserMS.cpp
+++ b/protocols/Quotes/HTMLParserMS.cpp
diff --git a/plugins/Quotes/HTMLParserMS.h b/protocols/Quotes/HTMLParserMS.h
index 0773efa42a..0773efa42a 100644
--- a/plugins/Quotes/HTMLParserMS.h
+++ b/protocols/Quotes/HTMLParserMS.h
diff --git a/plugins/Quotes/HTTPSession.cpp b/protocols/Quotes/HTTPSession.cpp
index aa66948ae9..aa66948ae9 100644
--- a/plugins/Quotes/HTTPSession.cpp
+++ b/protocols/Quotes/HTTPSession.cpp
diff --git a/plugins/Quotes/HTTPSession.h b/protocols/Quotes/HTTPSession.h
index fe93a2dce5..fe93a2dce5 100644
--- a/plugins/Quotes/HTTPSession.h
+++ b/protocols/Quotes/HTTPSession.h
diff --git a/plugins/Quotes/IHTMLEngine.h b/protocols/Quotes/IHTMLEngine.h
index 7df3074d3e..7df3074d3e 100644
--- a/plugins/Quotes/IHTMLEngine.h
+++ b/protocols/Quotes/IHTMLEngine.h
diff --git a/plugins/Quotes/IHTMLParser.h b/protocols/Quotes/IHTMLParser.h
index defc6f61cb..defc6f61cb 100644
--- a/plugins/Quotes/IHTMLParser.h
+++ b/protocols/Quotes/IHTMLParser.h
diff --git a/plugins/Quotes/IQuotesProvider.h b/protocols/Quotes/IQuotesProvider.h
index a03a2a9bcd..a03a2a9bcd 100644
--- a/plugins/Quotes/IQuotesProvider.h
+++ b/protocols/Quotes/IQuotesProvider.h
diff --git a/plugins/Quotes/IXMLEngine.h b/protocols/Quotes/IXMLEngine.h
index 910c3efea0..910c3efea0 100644
--- a/plugins/Quotes/IXMLEngine.h
+++ b/protocols/Quotes/IXMLEngine.h
diff --git a/plugins/Quotes/IconLib.cpp b/protocols/Quotes/IconLib.cpp
index 9702bfe3d8..9702bfe3d8 100644
--- a/plugins/Quotes/IconLib.cpp
+++ b/protocols/Quotes/IconLib.cpp
diff --git a/plugins/Quotes/IconLib.h b/protocols/Quotes/IconLib.h
index 29b0326622..29b0326622 100644
--- a/plugins/Quotes/IconLib.h
+++ b/protocols/Quotes/IconLib.h
diff --git a/plugins/Quotes/ImportExport.cpp b/protocols/Quotes/ImportExport.cpp
index 2e38be0c0f..2e38be0c0f 100644
--- a/plugins/Quotes/ImportExport.cpp
+++ b/protocols/Quotes/ImportExport.cpp
diff --git a/plugins/Quotes/ImportExport.h b/protocols/Quotes/ImportExport.h
index da2053e9a3..da2053e9a3 100644
--- a/plugins/Quotes/ImportExport.h
+++ b/protocols/Quotes/ImportExport.h
diff --git a/plugins/Quotes/IsWithinAccuracy.h b/protocols/Quotes/IsWithinAccuracy.h
index 5e39281719..5e39281719 100644
--- a/plugins/Quotes/IsWithinAccuracy.h
+++ b/protocols/Quotes/IsWithinAccuracy.h
diff --git a/plugins/Quotes/LightMutex.cpp b/protocols/Quotes/LightMutex.cpp
index 8d14e8e7bb..8d14e8e7bb 100644
--- a/plugins/Quotes/LightMutex.cpp
+++ b/protocols/Quotes/LightMutex.cpp
diff --git a/plugins/Quotes/LightMutex.h b/protocols/Quotes/LightMutex.h
index e8c7363ba1..e8c7363ba1 100644
--- a/plugins/Quotes/LightMutex.h
+++ b/protocols/Quotes/LightMutex.h
diff --git a/plugins/Quotes/Locale.cpp b/protocols/Quotes/Locale.cpp
index c01f67148a..c01f67148a 100644
--- a/plugins/Quotes/Locale.cpp
+++ b/protocols/Quotes/Locale.cpp
diff --git a/plugins/Quotes/Locale.h b/protocols/Quotes/Locale.h
index 92d3a56ed4..92d3a56ed4 100644
--- a/plugins/Quotes/Locale.h
+++ b/protocols/Quotes/Locale.h
diff --git a/plugins/Quotes/Log.cpp b/protocols/Quotes/Log.cpp
index d692763bad..d692763bad 100644
--- a/plugins/Quotes/Log.cpp
+++ b/protocols/Quotes/Log.cpp
diff --git a/plugins/Quotes/Log.h b/protocols/Quotes/Log.h
index 274fcfec06..274fcfec06 100644
--- a/plugins/Quotes/Log.h
+++ b/protocols/Quotes/Log.h
diff --git a/plugins/Quotes/ModuleInfo.cpp b/protocols/Quotes/ModuleInfo.cpp
index 69a835409e..69a835409e 100644
--- a/plugins/Quotes/ModuleInfo.cpp
+++ b/protocols/Quotes/ModuleInfo.cpp
diff --git a/plugins/Quotes/ModuleInfo.h b/protocols/Quotes/ModuleInfo.h
index 5dcf7e5de6..5dcf7e5de6 100644
--- a/plugins/Quotes/ModuleInfo.h
+++ b/protocols/Quotes/ModuleInfo.h
diff --git a/plugins/Quotes/OptionDukasCopy.cpp b/protocols/Quotes/OptionDukasCopy.cpp
index 1aef56b824..1aef56b824 100644
--- a/plugins/Quotes/OptionDukasCopy.cpp
+++ b/protocols/Quotes/OptionDukasCopy.cpp
diff --git a/plugins/Quotes/OptionDukasCopy.h b/protocols/Quotes/OptionDukasCopy.h
index 0674119e83..0674119e83 100644
--- a/plugins/Quotes/OptionDukasCopy.h
+++ b/protocols/Quotes/OptionDukasCopy.h
diff --git a/plugins/Quotes/QuoteChart.cpp b/protocols/Quotes/QuoteChart.cpp
index 3746540d23..3746540d23 100644
--- a/plugins/Quotes/QuoteChart.cpp
+++ b/protocols/Quotes/QuoteChart.cpp
diff --git a/plugins/Quotes/QuoteChart.h b/protocols/Quotes/QuoteChart.h
index 1b40f428b5..1b40f428b5 100644
--- a/plugins/Quotes/QuoteChart.h
+++ b/protocols/Quotes/QuoteChart.h
diff --git a/plugins/Quotes/QuoteInfoDlg.cpp b/protocols/Quotes/QuoteInfoDlg.cpp
index 88253ec45d..88253ec45d 100644
--- a/plugins/Quotes/QuoteInfoDlg.cpp
+++ b/protocols/Quotes/QuoteInfoDlg.cpp
diff --git a/plugins/Quotes/QuoteInfoDlg.h b/protocols/Quotes/QuoteInfoDlg.h
index c4a1999a4c..c4a1999a4c 100644
--- a/plugins/Quotes/QuoteInfoDlg.h
+++ b/protocols/Quotes/QuoteInfoDlg.h
diff --git a/plugins/Quotes/QuotesProviderBase.cpp b/protocols/Quotes/QuotesProviderBase.cpp
index c92c748a02..c92c748a02 100644
--- a/plugins/Quotes/QuotesProviderBase.cpp
+++ b/protocols/Quotes/QuotesProviderBase.cpp
diff --git a/plugins/Quotes/QuotesProviderBase.h b/protocols/Quotes/QuotesProviderBase.h
index 76db155f4c..76db155f4c 100644
--- a/plugins/Quotes/QuotesProviderBase.h
+++ b/protocols/Quotes/QuotesProviderBase.h
diff --git a/plugins/Quotes/QuotesProviderDukasCopy.cpp b/protocols/Quotes/QuotesProviderDukasCopy.cpp
index a7ffc5331a..a7ffc5331a 100644
--- a/plugins/Quotes/QuotesProviderDukasCopy.cpp
+++ b/protocols/Quotes/QuotesProviderDukasCopy.cpp
diff --git a/plugins/Quotes/QuotesProviderDukasCopy.h b/protocols/Quotes/QuotesProviderDukasCopy.h
index d6ec498bcf..d6ec498bcf 100644
--- a/plugins/Quotes/QuotesProviderDukasCopy.h
+++ b/protocols/Quotes/QuotesProviderDukasCopy.h
diff --git a/plugins/Quotes/QuotesProviderFinance.cpp b/protocols/Quotes/QuotesProviderFinance.cpp
index 99d6127b32..99d6127b32 100644
--- a/plugins/Quotes/QuotesProviderFinance.cpp
+++ b/protocols/Quotes/QuotesProviderFinance.cpp
diff --git a/plugins/Quotes/QuotesProviderFinance.h b/protocols/Quotes/QuotesProviderFinance.h
index f63077071d..f63077071d 100644
--- a/plugins/Quotes/QuotesProviderFinance.h
+++ b/protocols/Quotes/QuotesProviderFinance.h
diff --git a/plugins/Quotes/QuotesProviderGoogle.cpp b/protocols/Quotes/QuotesProviderGoogle.cpp
index 6458180324..6458180324 100644
--- a/plugins/Quotes/QuotesProviderGoogle.cpp
+++ b/protocols/Quotes/QuotesProviderGoogle.cpp
diff --git a/plugins/Quotes/QuotesProviderGoogle.h b/protocols/Quotes/QuotesProviderGoogle.h
index 4289861178..4289861178 100644
--- a/plugins/Quotes/QuotesProviderGoogle.h
+++ b/protocols/Quotes/QuotesProviderGoogle.h
diff --git a/plugins/Quotes/QuotesProviderGoogleFinance.cpp b/protocols/Quotes/QuotesProviderGoogleFinance.cpp
index 8a129b6b8b..8a129b6b8b 100644
--- a/plugins/Quotes/QuotesProviderGoogleFinance.cpp
+++ b/protocols/Quotes/QuotesProviderGoogleFinance.cpp
diff --git a/plugins/Quotes/QuotesProviderGoogleFinance.h b/protocols/Quotes/QuotesProviderGoogleFinance.h
index 075498a4dd..075498a4dd 100644
--- a/plugins/Quotes/QuotesProviderGoogleFinance.h
+++ b/protocols/Quotes/QuotesProviderGoogleFinance.h
diff --git a/plugins/Quotes/QuotesProviderVisitor.h b/protocols/Quotes/QuotesProviderVisitor.h
index 9ae601f2a1..9ae601f2a1 100644
--- a/plugins/Quotes/QuotesProviderVisitor.h
+++ b/protocols/Quotes/QuotesProviderVisitor.h
diff --git a/plugins/Quotes/QuotesProviderVisitorDbSettings.cpp b/protocols/Quotes/QuotesProviderVisitorDbSettings.cpp
index 5caea48685..5caea48685 100644
--- a/plugins/Quotes/QuotesProviderVisitorDbSettings.cpp
+++ b/protocols/Quotes/QuotesProviderVisitorDbSettings.cpp
diff --git a/plugins/Quotes/QuotesProviderVisitorDbSettings.h b/protocols/Quotes/QuotesProviderVisitorDbSettings.h
index 728a436dfa..728a436dfa 100644
--- a/plugins/Quotes/QuotesProviderVisitorDbSettings.h
+++ b/protocols/Quotes/QuotesProviderVisitorDbSettings.h
diff --git a/plugins/Quotes/QuotesProviderVisitorFormatSpecificator.cpp b/protocols/Quotes/QuotesProviderVisitorFormatSpecificator.cpp
index 9e643fe1b6..9e643fe1b6 100644
--- a/plugins/Quotes/QuotesProviderVisitorFormatSpecificator.cpp
+++ b/protocols/Quotes/QuotesProviderVisitorFormatSpecificator.cpp
diff --git a/plugins/Quotes/QuotesProviderVisitorFormatSpecificator.h b/protocols/Quotes/QuotesProviderVisitorFormatSpecificator.h
index 870ab00634..870ab00634 100644
--- a/plugins/Quotes/QuotesProviderVisitorFormatSpecificator.h
+++ b/protocols/Quotes/QuotesProviderVisitorFormatSpecificator.h
diff --git a/plugins/Quotes/QuotesProviderVisitorFormater.cpp b/protocols/Quotes/QuotesProviderVisitorFormater.cpp
index 4b1d73bb05..4b1d73bb05 100644
--- a/plugins/Quotes/QuotesProviderVisitorFormater.cpp
+++ b/protocols/Quotes/QuotesProviderVisitorFormater.cpp
diff --git a/plugins/Quotes/QuotesProviderVisitorFormater.h b/protocols/Quotes/QuotesProviderVisitorFormater.h
index 7c9c222269..7c9c222269 100644
--- a/plugins/Quotes/QuotesProviderVisitorFormater.h
+++ b/protocols/Quotes/QuotesProviderVisitorFormater.h
diff --git a/plugins/Quotes/QuotesProviderVisitorTendency.cpp b/protocols/Quotes/QuotesProviderVisitorTendency.cpp
index 00703521b3..00703521b3 100644
--- a/plugins/Quotes/QuotesProviderVisitorTendency.cpp
+++ b/protocols/Quotes/QuotesProviderVisitorTendency.cpp
diff --git a/plugins/Quotes/QuotesProviderVisitorTendency.h b/protocols/Quotes/QuotesProviderVisitorTendency.h
index fa0f04c5f0..fa0f04c5f0 100644
--- a/plugins/Quotes/QuotesProviderVisitorTendency.h
+++ b/protocols/Quotes/QuotesProviderVisitorTendency.h
diff --git a/plugins/Quotes/QuotesProviderYahoo.cpp b/protocols/Quotes/QuotesProviderYahoo.cpp
index 35edb3207c..35edb3207c 100644
--- a/plugins/Quotes/QuotesProviderYahoo.cpp
+++ b/protocols/Quotes/QuotesProviderYahoo.cpp
diff --git a/plugins/Quotes/QuotesProviderYahoo.h b/protocols/Quotes/QuotesProviderYahoo.h
index feadefbca4..feadefbca4 100644
--- a/plugins/Quotes/QuotesProviderYahoo.h
+++ b/protocols/Quotes/QuotesProviderYahoo.h
diff --git a/plugins/Quotes/QuotesProviders.cpp b/protocols/Quotes/QuotesProviders.cpp
index 5fac2af14f..5fac2af14f 100644
--- a/plugins/Quotes/QuotesProviders.cpp
+++ b/protocols/Quotes/QuotesProviders.cpp
diff --git a/plugins/Quotes/QuotesProviders.h b/protocols/Quotes/QuotesProviders.h
index 02aa5184c9..02aa5184c9 100644
--- a/plugins/Quotes/QuotesProviders.h
+++ b/protocols/Quotes/QuotesProviders.h
diff --git a/plugins/Quotes/SettingsDlg.cpp b/protocols/Quotes/SettingsDlg.cpp
index e5795b51d1..e5795b51d1 100644
--- a/plugins/Quotes/SettingsDlg.cpp
+++ b/protocols/Quotes/SettingsDlg.cpp
diff --git a/plugins/Quotes/SettingsDlg.h b/protocols/Quotes/SettingsDlg.h
index 569d0b7d2c..569d0b7d2c 100644
--- a/plugins/Quotes/SettingsDlg.h
+++ b/protocols/Quotes/SettingsDlg.h
diff --git a/plugins/Quotes/Utility/DukasCopy.py b/protocols/Quotes/Utility/DukasCopy.py
index 2d12d1c4ec..2d12d1c4ec 100644
--- a/plugins/Quotes/Utility/DukasCopy.py
+++ b/protocols/Quotes/Utility/DukasCopy.py
diff --git a/plugins/Quotes/Utility/Dukascopy.xml b/protocols/Quotes/Utility/Dukascopy.xml
index 92890888b9..92890888b9 100644
--- a/plugins/Quotes/Utility/Dukascopy.xml
+++ b/protocols/Quotes/Utility/Dukascopy.xml
diff --git a/plugins/Quotes/Utility/Google.py b/protocols/Quotes/Utility/Google.py
index 35653a77f6..35653a77f6 100644
--- a/plugins/Quotes/Utility/Google.py
+++ b/protocols/Quotes/Utility/Google.py
diff --git a/plugins/Quotes/Utility/GoogleFinance.xml b/protocols/Quotes/Utility/GoogleFinance.xml
index 031afbcdd5..031afbcdd5 100644
--- a/plugins/Quotes/Utility/GoogleFinance.xml
+++ b/protocols/Quotes/Utility/GoogleFinance.xml
diff --git a/plugins/Quotes/Utility/Quotes_Readme.txt b/protocols/Quotes/Utility/Quotes_Readme.txt
index 7c0bf2ca10..7c0bf2ca10 100644
--- a/plugins/Quotes/Utility/Quotes_Readme.txt
+++ b/protocols/Quotes/Utility/Quotes_Readme.txt
diff --git a/plugins/Quotes/Utility/Yahoo.xml b/protocols/Quotes/Utility/Yahoo.xml
index 1c2a156d89..1c2a156d89 100644
--- a/plugins/Quotes/Utility/Yahoo.xml
+++ b/protocols/Quotes/Utility/Yahoo.xml
diff --git a/plugins/Quotes/Utility/google.xml b/protocols/Quotes/Utility/google.xml
index 9363addced..9363addced 100644
--- a/plugins/Quotes/Utility/google.xml
+++ b/protocols/Quotes/Utility/google.xml
diff --git a/plugins/Quotes/Version.rc b/protocols/Quotes/Version.rc
index a5fcb30231..a5fcb30231 100644
--- a/plugins/Quotes/Version.rc
+++ b/protocols/Quotes/Version.rc
diff --git a/plugins/Quotes/WinCtrlHelper.cpp b/protocols/Quotes/WinCtrlHelper.cpp
index dba445958e..dba445958e 100644
--- a/plugins/Quotes/WinCtrlHelper.cpp
+++ b/protocols/Quotes/WinCtrlHelper.cpp
diff --git a/plugins/Quotes/WinCtrlHelper.h b/protocols/Quotes/WinCtrlHelper.h
index d7f8957a86..d7f8957a86 100644
--- a/plugins/Quotes/WinCtrlHelper.h
+++ b/protocols/Quotes/WinCtrlHelper.h
diff --git a/plugins/Quotes/WorkingThread.cpp b/protocols/Quotes/WorkingThread.cpp
index bc4d80b734..bc4d80b734 100644
--- a/plugins/Quotes/WorkingThread.cpp
+++ b/protocols/Quotes/WorkingThread.cpp
diff --git a/plugins/Quotes/WorkingThread.h b/protocols/Quotes/WorkingThread.h
index a77734bb85..a77734bb85 100644
--- a/plugins/Quotes/WorkingThread.h
+++ b/protocols/Quotes/WorkingThread.h
diff --git a/plugins/Quotes/XMLEngineMI.cpp b/protocols/Quotes/XMLEngineMI.cpp
index 7e2adfb7d9..7e2adfb7d9 100644
--- a/plugins/Quotes/XMLEngineMI.cpp
+++ b/protocols/Quotes/XMLEngineMI.cpp
diff --git a/plugins/Quotes/XMLEngineMI.h b/protocols/Quotes/XMLEngineMI.h
index 5e5a51232f..5e5a51232f 100644
--- a/plugins/Quotes/XMLEngineMI.h
+++ b/protocols/Quotes/XMLEngineMI.h
diff --git a/plugins/Quotes/dllmain.cpp b/protocols/Quotes/dllmain.cpp
index 9a1be15de5..9a1be15de5 100644
--- a/plugins/Quotes/dllmain.cpp
+++ b/protocols/Quotes/dllmain.cpp
diff --git a/plugins/Quotes/proto_Quotes/proto_Quotes.rc b/protocols/Quotes/proto_Quotes/proto_Quotes.rc
index b9ce00b0cd..b9ce00b0cd 100644
--- a/plugins/Quotes/proto_Quotes/proto_Quotes.rc
+++ b/protocols/Quotes/proto_Quotes/proto_Quotes.rc
diff --git a/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj b/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj
index 13a3acc0bc..13a3acc0bc 100644
--- a/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj
+++ b/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj
diff --git a/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters b/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters
index 6da0285fe9..6da0285fe9 100644
--- a/plugins/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters
+++ b/protocols/Quotes/proto_Quotes/proto_Quotes_10.vcxproj.filters
diff --git a/plugins/Quotes/res/CurrencyConverter.ico b/protocols/Quotes/res/CurrencyConverter.ico
index 67ac2095f5..67ac2095f5 100644
--- a/plugins/Quotes/res/CurrencyConverter.ico
+++ b/protocols/Quotes/res/CurrencyConverter.ico
diff --git a/plugins/Quotes/res/Export quotes.ico b/protocols/Quotes/res/Export quotes.ico
index 31c7aa2ba1..31c7aa2ba1 100644
--- a/plugins/Quotes/res/Export quotes.ico
+++ b/protocols/Quotes/res/Export quotes.ico
diff --git a/plugins/Quotes/res/Import quotes.ico b/protocols/Quotes/res/Import quotes.ico
index 506aa62af3..506aa62af3 100644
--- a/plugins/Quotes/res/Import quotes.ico
+++ b/protocols/Quotes/res/Import quotes.ico
diff --git a/plugins/Quotes/res/Refresh.ico b/protocols/Quotes/res/Refresh.ico
index 2dbcfd3878..2dbcfd3878 100644
--- a/plugins/Quotes/res/Refresh.ico
+++ b/protocols/Quotes/res/Refresh.ico
diff --git a/plugins/Quotes/res/Section.ico b/protocols/Quotes/res/Section.ico
index f59105b665..f59105b665 100644
--- a/plugins/Quotes/res/Section.ico
+++ b/protocols/Quotes/res/Section.ico
diff --git a/plugins/Quotes/res/down.ico b/protocols/Quotes/res/down.ico
index 9dfe185cbe..9dfe185cbe 100644
--- a/plugins/Quotes/res/down.ico
+++ b/protocols/Quotes/res/down.ico
diff --git a/plugins/Quotes/res/main.ico b/protocols/Quotes/res/main.ico
index 4d32e57495..4d32e57495 100644
--- a/plugins/Quotes/res/main.ico
+++ b/protocols/Quotes/res/main.ico
diff --git a/plugins/Quotes/res/notchanged.ico b/protocols/Quotes/res/notchanged.ico
index e1d9ee3a09..e1d9ee3a09 100644
--- a/plugins/Quotes/res/notchanged.ico
+++ b/protocols/Quotes/res/notchanged.ico
diff --git a/plugins/Quotes/res/proto_na.ico b/protocols/Quotes/res/proto_na.ico
index c8888adb80..c8888adb80 100644
--- a/plugins/Quotes/res/proto_na.ico
+++ b/protocols/Quotes/res/proto_na.ico
diff --git a/plugins/Quotes/res/proto_occupied.ico b/protocols/Quotes/res/proto_occupied.ico
index 3f54c740d1..3f54c740d1 100644
--- a/plugins/Quotes/res/proto_occupied.ico
+++ b/protocols/Quotes/res/proto_occupied.ico
diff --git a/plugins/Quotes/res/proto_offline.ico b/protocols/Quotes/res/proto_offline.ico
index cd99c072bf..cd99c072bf 100644
--- a/plugins/Quotes/res/proto_offline.ico
+++ b/protocols/Quotes/res/proto_offline.ico
diff --git a/plugins/Quotes/res/proto_online.ico b/protocols/Quotes/res/proto_online.ico
index 29e500e2bb..29e500e2bb 100644
--- a/plugins/Quotes/res/proto_online.ico
+++ b/protocols/Quotes/res/proto_online.ico
diff --git a/plugins/Quotes/res/quote.ico b/protocols/Quotes/res/quote.ico
index 832ed12f52..832ed12f52 100644
--- a/plugins/Quotes/res/quote.ico
+++ b/protocols/Quotes/res/quote.ico
diff --git a/plugins/Quotes/res/swap.ico b/protocols/Quotes/res/swap.ico
index 1bff71b764..1bff71b764 100644
--- a/plugins/Quotes/res/swap.ico
+++ b/protocols/Quotes/res/swap.ico
diff --git a/plugins/Quotes/res/up.ico b/protocols/Quotes/res/up.ico
index a75899cd3d..a75899cd3d 100644
--- a/plugins/Quotes/res/up.ico
+++ b/protocols/Quotes/res/up.ico
diff --git a/plugins/Quotes/resource.h b/protocols/Quotes/resource.h
index 50ee0a637b..50ee0a637b 100644
--- a/plugins/Quotes/resource.h
+++ b/protocols/Quotes/resource.h
diff --git a/plugins/Quotes/stdafx.cpp b/protocols/Quotes/stdafx.cpp
index e4738d8f60..e4738d8f60 100644
--- a/plugins/Quotes/stdafx.cpp
+++ b/protocols/Quotes/stdafx.cpp
diff --git a/plugins/Quotes/stdafx.h b/protocols/Quotes/stdafx.h
index 19c85a3303..19c85a3303 100644
--- a/plugins/Quotes/stdafx.h
+++ b/protocols/Quotes/stdafx.h
diff --git a/plugins/Quotes/targetver.h b/protocols/Quotes/targetver.h
index f583181dfd..f583181dfd 100644
--- a/plugins/Quotes/targetver.h
+++ b/protocols/Quotes/targetver.h
diff --git a/plugins/Quotes/version.h b/protocols/Quotes/version.h
index 956486d4d5..956486d4d5 100644
--- a/plugins/Quotes/version.h
+++ b/protocols/Quotes/version.h
diff --git a/plugins/Twitter/LICENSE.txt b/protocols/Twitter/LICENSE.txt
index 818433ecc0..818433ecc0 100644
--- a/plugins/Twitter/LICENSE.txt
+++ b/protocols/Twitter/LICENSE.txt
diff --git a/plugins/Twitter/README.txt b/protocols/Twitter/README.txt
index b229b10796..b229b10796 100644
--- a/plugins/Twitter/README.txt
+++ b/protocols/Twitter/README.txt
diff --git a/plugins/Twitter/chat.cpp b/protocols/Twitter/chat.cpp
index 4e659c2aa8..4e659c2aa8 100644
--- a/plugins/Twitter/chat.cpp
+++ b/protocols/Twitter/chat.cpp
diff --git a/plugins/Twitter/common.h b/protocols/Twitter/common.h
index 751c1d22d6..751c1d22d6 100644
--- a/plugins/Twitter/common.h
+++ b/protocols/Twitter/common.h
diff --git a/plugins/Twitter/connection.cpp b/protocols/Twitter/connection.cpp
index 83660a8256..83660a8256 100644
--- a/plugins/Twitter/connection.cpp
+++ b/protocols/Twitter/connection.cpp
diff --git a/plugins/Twitter/contacts.cpp b/protocols/Twitter/contacts.cpp
index 03aad22601..03aad22601 100644
--- a/plugins/Twitter/contacts.cpp
+++ b/protocols/Twitter/contacts.cpp
diff --git a/plugins/Twitter/http.cpp b/protocols/Twitter/http.cpp
index 63218ca616..63218ca616 100644
--- a/plugins/Twitter/http.cpp
+++ b/protocols/Twitter/http.cpp
diff --git a/plugins/Twitter/http.h b/protocols/Twitter/http.h
index 04f5468b30..04f5468b30 100644
--- a/plugins/Twitter/http.h
+++ b/protocols/Twitter/http.h
diff --git a/plugins/Twitter/icons/twitter.ico b/protocols/Twitter/icons/twitter.ico
index 2b6eaa1eae..2b6eaa1eae 100644
--- a/plugins/Twitter/icons/twitter.ico
+++ b/protocols/Twitter/icons/twitter.ico
diff --git a/plugins/Twitter/main.cpp b/protocols/Twitter/main.cpp
index d28cc30b65..d28cc30b65 100644
--- a/plugins/Twitter/main.cpp
+++ b/protocols/Twitter/main.cpp
diff --git a/plugins/Twitter/proto.cpp b/protocols/Twitter/proto.cpp
index 44bd6a3ebc..44bd6a3ebc 100644
--- a/plugins/Twitter/proto.cpp
+++ b/protocols/Twitter/proto.cpp
diff --git a/plugins/Twitter/proto.h b/protocols/Twitter/proto.h
index af7a43d321..af7a43d321 100644
--- a/plugins/Twitter/proto.h
+++ b/protocols/Twitter/proto.h
diff --git a/plugins/Twitter/resource.h b/protocols/Twitter/resource.h
index 21fc21c049..21fc21c049 100644
--- a/plugins/Twitter/resource.h
+++ b/protocols/Twitter/resource.h
diff --git a/plugins/Twitter/stubs.cpp b/protocols/Twitter/stubs.cpp
index 331a4cdeac..331a4cdeac 100644
--- a/plugins/Twitter/stubs.cpp
+++ b/protocols/Twitter/stubs.cpp
diff --git a/plugins/Twitter/theme.cpp b/protocols/Twitter/theme.cpp
index f35b3a5aa1..f35b3a5aa1 100644
--- a/plugins/Twitter/theme.cpp
+++ b/protocols/Twitter/theme.cpp
diff --git a/plugins/Twitter/theme.h b/protocols/Twitter/theme.h
index e74f5da2e3..e74f5da2e3 100644
--- a/plugins/Twitter/theme.h
+++ b/protocols/Twitter/theme.h
diff --git a/plugins/Twitter/tinyjson.hpp b/protocols/Twitter/tinyjson.hpp
index 19e1210d84..19e1210d84 100644
--- a/plugins/Twitter/tinyjson.hpp
+++ b/protocols/Twitter/tinyjson.hpp
diff --git a/plugins/Twitter/twitter.cpp b/protocols/Twitter/twitter.cpp
index 9512292707..9512292707 100644
--- a/plugins/Twitter/twitter.cpp
+++ b/protocols/Twitter/twitter.cpp
diff --git a/plugins/Twitter/twitter.h b/protocols/Twitter/twitter.h
index 06f8aca954..06f8aca954 100644
--- a/plugins/Twitter/twitter.h
+++ b/protocols/Twitter/twitter.h
diff --git a/plugins/Twitter/twitter.rc b/protocols/Twitter/twitter.rc
index 0c32e19b59..0c32e19b59 100644
--- a/plugins/Twitter/twitter.rc
+++ b/protocols/Twitter/twitter.rc
diff --git a/plugins/Twitter/twitter.sln b/protocols/Twitter/twitter.sln
index af7c8278cd..af7c8278cd 100644
--- a/plugins/Twitter/twitter.sln
+++ b/protocols/Twitter/twitter.sln
diff --git a/plugins/Twitter/twitter.vcxproj b/protocols/Twitter/twitter.vcxproj
index 54d1255118..d529d1dcbb 100644
--- a/plugins/Twitter/twitter.vcxproj
+++ b/protocols/Twitter/twitter.vcxproj
@@ -47,7 +47,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\..\..\boost_1_49_0;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\boost_1_49_0;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -65,7 +65,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\..\..\boost_1_49_0;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\..\..\boost_1_49_0;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
diff --git a/plugins/Twitter/twitter.vcxproj.filters b/protocols/Twitter/twitter.vcxproj.filters
index 70ac860513..70ac860513 100644
--- a/plugins/Twitter/twitter.vcxproj.filters
+++ b/protocols/Twitter/twitter.vcxproj.filters
diff --git a/plugins/Twitter/ui.cpp b/protocols/Twitter/ui.cpp
index b3e68542df..b3e68542df 100644
--- a/plugins/Twitter/ui.cpp
+++ b/protocols/Twitter/ui.cpp
diff --git a/plugins/Twitter/ui.h b/protocols/Twitter/ui.h
index f036f8d55d..f036f8d55d 100644
--- a/plugins/Twitter/ui.h
+++ b/protocols/Twitter/ui.h
diff --git a/plugins/Twitter/utility.cpp b/protocols/Twitter/utility.cpp
index 221e413253..221e413253 100644
--- a/plugins/Twitter/utility.cpp
+++ b/protocols/Twitter/utility.cpp
diff --git a/plugins/Twitter/utility.h b/protocols/Twitter/utility.h
index b68a4fcb9d..b68a4fcb9d 100644
--- a/plugins/Twitter/utility.h
+++ b/protocols/Twitter/utility.h
diff --git a/plugins/Twitter/version.h b/protocols/Twitter/version.h
index b27c53811e..b27c53811e 100644
--- a/plugins/Twitter/version.h
+++ b/protocols/Twitter/version.h
diff --git a/plugins/YAMN/ChangeLog.txt b/protocols/YAMN/ChangeLog.txt
index 6a85810ab2..6a85810ab2 100644
--- a/plugins/YAMN/ChangeLog.txt
+++ b/protocols/YAMN/ChangeLog.txt
diff --git a/plugins/YAMN/YAMN_10.sln b/protocols/YAMN/YAMN_10.sln
index 77f7c38c95..77f7c38c95 100644
--- a/plugins/YAMN/YAMN_10.sln
+++ b/protocols/YAMN/YAMN_10.sln
diff --git a/plugins/YAMN/YAMN_10.vcxproj b/protocols/YAMN/YAMN_10.vcxproj
index 392fff1ec0..37e0d9f984 100644
--- a/plugins/YAMN/YAMN_10.vcxproj
+++ b/protocols/YAMN/YAMN_10.vcxproj
@@ -75,7 +75,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -101,7 +101,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -127,7 +127,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -153,7 +153,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\include;..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/plugins/YAMN/YAMN_10.vcxproj.filters b/protocols/YAMN/YAMN_10.vcxproj.filters
index 9ad0a75aab..9ad0a75aab 100644
--- a/plugins/YAMN/YAMN_10.vcxproj.filters
+++ b/protocols/YAMN/YAMN_10.vcxproj.filters
diff --git a/plugins/YAMN/YAMNopts.cpp b/protocols/YAMN/YAMNopts.cpp
index 99a8091366..99a8091366 100644
--- a/plugins/YAMN/YAMNopts.cpp
+++ b/protocols/YAMN/YAMNopts.cpp
diff --git a/plugins/YAMN/account.cpp b/protocols/YAMN/account.cpp
index d1de8b8e4c..d1de8b8e4c 100644
--- a/plugins/YAMN/account.cpp
+++ b/protocols/YAMN/account.cpp
diff --git a/plugins/YAMN/browser/badconnect.cpp b/protocols/YAMN/browser/badconnect.cpp
index cb3de50c5d..cb3de50c5d 100644
--- a/plugins/YAMN/browser/badconnect.cpp
+++ b/protocols/YAMN/browser/badconnect.cpp
diff --git a/plugins/YAMN/browser/m_browser.h b/protocols/YAMN/browser/m_browser.h
index 8b05e3d84a..8b05e3d84a 100644
--- a/plugins/YAMN/browser/m_browser.h
+++ b/protocols/YAMN/browser/m_browser.h
diff --git a/plugins/YAMN/browser/mailbrowser.cpp b/protocols/YAMN/browser/mailbrowser.cpp
index 82f4d7eac0..82f4d7eac0 100644
--- a/plugins/YAMN/browser/mailbrowser.cpp
+++ b/protocols/YAMN/browser/mailbrowser.cpp
diff --git a/plugins/YAMN/debug.cpp b/protocols/YAMN/debug.cpp
index 9b9793a965..9b9793a965 100644
--- a/plugins/YAMN/debug.cpp
+++ b/protocols/YAMN/debug.cpp
diff --git a/plugins/YAMN/debug.h b/protocols/YAMN/debug.h
index d2b6764406..d2b6764406 100644
--- a/plugins/YAMN/debug.h
+++ b/protocols/YAMN/debug.h
diff --git a/plugins/YAMN/docs/InstallScript.xml b/protocols/YAMN/docs/InstallScript.xml
index 33d8ac9dfd..33d8ac9dfd 100644
--- a/plugins/YAMN/docs/InstallScript.xml
+++ b/protocols/YAMN/docs/InstallScript.xml
diff --git a/plugins/YAMN/docs/YAMN-License.txt b/protocols/YAMN/docs/YAMN-License.txt
index 7f1161073d..7f1161073d 100644
--- a/plugins/YAMN/docs/YAMN-License.txt
+++ b/protocols/YAMN/docs/YAMN-License.txt
diff --git a/plugins/YAMN/docs/YAMN-Readme.developers.txt b/protocols/YAMN/docs/YAMN-Readme.developers.txt
index fdb338707c..fdb338707c 100644
--- a/plugins/YAMN/docs/YAMN-Readme.developers.txt
+++ b/protocols/YAMN/docs/YAMN-Readme.developers.txt
diff --git a/plugins/YAMN/docs/YAMN-Readme.txt b/protocols/YAMN/docs/YAMN-Readme.txt
index 901ad22f73..901ad22f73 100644
--- a/plugins/YAMN/docs/YAMN-Readme.txt
+++ b/protocols/YAMN/docs/YAMN-Readme.txt
diff --git a/plugins/YAMN/docs/language.pop3.txt b/protocols/YAMN/docs/language.pop3.txt
index 03fb78ec79..03fb78ec79 100644
--- a/plugins/YAMN/docs/language.pop3.txt
+++ b/protocols/YAMN/docs/language.pop3.txt
diff --git a/plugins/YAMN/docs/language.txt b/protocols/YAMN/docs/language.txt
index 72d1fcda8b..72d1fcda8b 100644
--- a/plugins/YAMN/docs/language.txt
+++ b/protocols/YAMN/docs/language.txt
diff --git a/plugins/YAMN/filter/Base/AggressiveOptimize.h b/protocols/YAMN/filter/Base/AggressiveOptimize.h
index 1bf0e19c2c..1bf0e19c2c 100644
--- a/plugins/YAMN/filter/Base/AggressiveOptimize.h
+++ b/protocols/YAMN/filter/Base/AggressiveOptimize.h
diff --git a/plugins/YAMN/filter/Base/Base.dsp b/protocols/YAMN/filter/Base/Base.dsp
index 7231712a74..7231712a74 100644
--- a/plugins/YAMN/filter/Base/Base.dsp
+++ b/protocols/YAMN/filter/Base/Base.dsp
diff --git a/plugins/YAMN/filter/Base/Base.mak b/protocols/YAMN/filter/Base/Base.mak
index 75ec59db8a..75ec59db8a 100644
--- a/plugins/YAMN/filter/Base/Base.mak
+++ b/protocols/YAMN/filter/Base/Base.mak
diff --git a/plugins/YAMN/filter/Base/debug.cpp b/protocols/YAMN/filter/Base/debug.cpp
index 654ece7b57..654ece7b57 100644
--- a/plugins/YAMN/filter/Base/debug.cpp
+++ b/protocols/YAMN/filter/Base/debug.cpp
diff --git a/plugins/YAMN/filter/Base/docs/base-readme.txt b/protocols/YAMN/filter/Base/docs/base-readme.txt
index 2e79bbbdd8..2e79bbbdd8 100644
--- a/plugins/YAMN/filter/Base/docs/base-readme.txt
+++ b/protocols/YAMN/filter/Base/docs/base-readme.txt
diff --git a/plugins/YAMN/filter/Base/maindll.cpp b/protocols/YAMN/filter/Base/maindll.cpp
index d6a645bd14..d6a645bd14 100644
--- a/plugins/YAMN/filter/Base/maindll.cpp
+++ b/protocols/YAMN/filter/Base/maindll.cpp
diff --git a/plugins/YAMN/filter/Simple/AggressiveOptimize.h b/protocols/YAMN/filter/Simple/AggressiveOptimize.h
index 1bf0e19c2c..1bf0e19c2c 100644
--- a/plugins/YAMN/filter/Simple/AggressiveOptimize.h
+++ b/protocols/YAMN/filter/Simple/AggressiveOptimize.h
diff --git a/plugins/YAMN/filter/Simple/docs/simple-readme.txt b/protocols/YAMN/filter/Simple/docs/simple-readme.txt
index 34c0842c87..34c0842c87 100644
--- a/plugins/YAMN/filter/Simple/docs/simple-readme.txt
+++ b/protocols/YAMN/filter/Simple/docs/simple-readme.txt
diff --git a/plugins/YAMN/filter/Simple/maindll.cpp b/protocols/YAMN/filter/Simple/maindll.cpp
index 62aa87b28d..62aa87b28d 100644
--- a/plugins/YAMN/filter/Simple/maindll.cpp
+++ b/protocols/YAMN/filter/Simple/maindll.cpp
diff --git a/plugins/YAMN/filter/Simple/simple.dsp b/protocols/YAMN/filter/Simple/simple.dsp
index dc6d52e6c1..dc6d52e6c1 100644
--- a/plugins/YAMN/filter/Simple/simple.dsp
+++ b/protocols/YAMN/filter/Simple/simple.dsp
diff --git a/plugins/YAMN/filter/Simple/simple.mak b/protocols/YAMN/filter/Simple/simple.mak
index 085dc22e33..085dc22e33 100644
--- a/plugins/YAMN/filter/Simple/simple.mak
+++ b/protocols/YAMN/filter/Simple/simple.mak
diff --git a/plugins/YAMN/filter/readme.txt b/protocols/YAMN/filter/readme.txt
index a46db0236a..a46db0236a 100644
--- a/plugins/YAMN/filter/readme.txt
+++ b/protocols/YAMN/filter/readme.txt
diff --git a/plugins/YAMN/filterplugin.cpp b/protocols/YAMN/filterplugin.cpp
index 8f61003293..8f61003293 100644
--- a/plugins/YAMN/filterplugin.cpp
+++ b/protocols/YAMN/filterplugin.cpp
diff --git a/plugins/YAMN/icons/iconttbup.ico b/protocols/YAMN/icons/iconttbup.ico
index ad18c56822..ad18c56822 100644
--- a/plugins/YAMN/icons/iconttbup.ico
+++ b/protocols/YAMN/icons/iconttbup.ico
diff --git a/plugins/YAMN/icons/icoyamn1.ico b/protocols/YAMN/icons/icoyamn1.ico
index d3959b4fd7..d3959b4fd7 100644
--- a/plugins/YAMN/icons/icoyamn1.ico
+++ b/protocols/YAMN/icons/icoyamn1.ico
diff --git a/plugins/YAMN/icons/icoyamn2.ico b/protocols/YAMN/icons/icoyamn2.ico
index dfada56b5f..dfada56b5f 100644
--- a/plugins/YAMN/icons/icoyamn2.ico
+++ b/protocols/YAMN/icons/icoyamn2.ico
diff --git a/plugins/YAMN/icons/proto_YAMN.rc b/protocols/YAMN/icons/proto_YAMN.rc
index e20bd50bda..e20bd50bda 100644
--- a/plugins/YAMN/icons/proto_YAMN.rc
+++ b/protocols/YAMN/icons/proto_YAMN.rc
diff --git a/plugins/YAMN/icons/proto_YAMN_10.vcxproj b/protocols/YAMN/icons/proto_YAMN_10.vcxproj
index a2f1f3c3af..a2f1f3c3af 100644
--- a/plugins/YAMN/icons/proto_YAMN_10.vcxproj
+++ b/protocols/YAMN/icons/proto_YAMN_10.vcxproj
diff --git a/plugins/YAMN/icons/proto_YAMN_10.vcxproj.filters b/protocols/YAMN/icons/proto_YAMN_10.vcxproj.filters
index ae56e318a4..ae56e318a4 100644
--- a/plugins/YAMN/icons/proto_YAMN_10.vcxproj.filters
+++ b/protocols/YAMN/icons/proto_YAMN_10.vcxproj.filters
diff --git a/plugins/YAMN/icons/resource.h b/protocols/YAMN/icons/resource.h
index af36adfdae..af36adfdae 100644
--- a/plugins/YAMN/icons/resource.h
+++ b/protocols/YAMN/icons/resource.h
diff --git a/plugins/YAMN/include/IcoLib.h b/protocols/YAMN/include/IcoLib.h
index a911ba571d..a911ba571d 100644
--- a/plugins/YAMN/include/IcoLib.h
+++ b/protocols/YAMN/include/IcoLib.h
diff --git a/plugins/YAMN/mails/decode.cpp b/protocols/YAMN/mails/decode.cpp
index 867ed7ff25..867ed7ff25 100644
--- a/plugins/YAMN/mails/decode.cpp
+++ b/protocols/YAMN/mails/decode.cpp
diff --git a/plugins/YAMN/mails/m_decode.h b/protocols/YAMN/mails/m_decode.h
index e6d2b52fae..e6d2b52fae 100644
--- a/plugins/YAMN/mails/m_decode.h
+++ b/protocols/YAMN/mails/m_decode.h
diff --git a/plugins/YAMN/mails/mails.cpp b/protocols/YAMN/mails/mails.cpp
index af0f3d2329..af0f3d2329 100644
--- a/plugins/YAMN/mails/mails.cpp
+++ b/protocols/YAMN/mails/mails.cpp
diff --git a/plugins/YAMN/mails/mime.cpp b/protocols/YAMN/mails/mime.cpp
index 2a66b80e2b..2a66b80e2b 100644
--- a/plugins/YAMN/mails/mime.cpp
+++ b/protocols/YAMN/mails/mime.cpp
diff --git a/plugins/YAMN/mails/test/header.txt b/protocols/YAMN/mails/test/header.txt
index 55a4d86d65..55a4d86d65 100644
--- a/plugins/YAMN/mails/test/header.txt
+++ b/protocols/YAMN/mails/test/header.txt
diff --git a/plugins/YAMN/mails/test/header2.txt b/protocols/YAMN/mails/test/header2.txt
index 3ba81a2bd0..3ba81a2bd0 100644
--- a/plugins/YAMN/mails/test/header2.txt
+++ b/protocols/YAMN/mails/test/header2.txt
diff --git a/plugins/YAMN/mails/test/readme.txt b/protocols/YAMN/mails/test/readme.txt
index 35a30b255a..35a30b255a 100644
--- a/plugins/YAMN/mails/test/readme.txt
+++ b/protocols/YAMN/mails/test/readme.txt
diff --git a/plugins/YAMN/mails/test/test.cpp b/protocols/YAMN/mails/test/test.cpp
index f8dcd14e89..f8dcd14e89 100644
--- a/plugins/YAMN/mails/test/test.cpp
+++ b/protocols/YAMN/mails/test/test.cpp
diff --git a/plugins/YAMN/mails/test/test.dsp b/protocols/YAMN/mails/test/test.dsp
index 6d01b3669a..6d01b3669a 100644
--- a/plugins/YAMN/mails/test/test.dsp
+++ b/protocols/YAMN/mails/test/test.dsp
diff --git a/plugins/YAMN/mails/test/test.dsw b/protocols/YAMN/mails/test/test.dsw
index e25096d17d..e25096d17d 100644
--- a/plugins/YAMN/mails/test/test.dsw
+++ b/protocols/YAMN/mails/test/test.dsw
diff --git a/plugins/YAMN/main.cpp b/protocols/YAMN/main.cpp
index 6076a49c51..6076a49c51 100644
--- a/plugins/YAMN/main.cpp
+++ b/protocols/YAMN/main.cpp
diff --git a/plugins/YAMN/main.h b/protocols/YAMN/main.h
index 1ec690873d..1ec690873d 100644
--- a/plugins/YAMN/main.h
+++ b/protocols/YAMN/main.h
diff --git a/plugins/YAMN/mingw/base.dev b/protocols/YAMN/mingw/base.dev
index 42e2fab4f2..42e2fab4f2 100644
--- a/plugins/YAMN/mingw/base.dev
+++ b/protocols/YAMN/mingw/base.dev
diff --git a/plugins/YAMN/mingw/base.win b/protocols/YAMN/mingw/base.win
index 3af9e7aa60..3af9e7aa60 100644
--- a/plugins/YAMN/mingw/base.win
+++ b/protocols/YAMN/mingw/base.win
diff --git a/plugins/YAMN/mingw/simple.dev b/protocols/YAMN/mingw/simple.dev
index 617324b551..617324b551 100644
--- a/plugins/YAMN/mingw/simple.dev
+++ b/protocols/YAMN/mingw/simple.dev
diff --git a/plugins/YAMN/mingw/simple.win b/protocols/YAMN/mingw/simple.win
index fc9e3c611e..fc9e3c611e 100644
--- a/plugins/YAMN/mingw/simple.win
+++ b/protocols/YAMN/mingw/simple.win
diff --git a/plugins/YAMN/mingw/yamn-2in1.dev b/protocols/YAMN/mingw/yamn-2in1.dev
index 615e63f7ac..615e63f7ac 100644
--- a/plugins/YAMN/mingw/yamn-2in1.dev
+++ b/protocols/YAMN/mingw/yamn-2in1.dev
diff --git a/plugins/YAMN/mingw/yamn-2in1.win b/protocols/YAMN/mingw/yamn-2in1.win
index 5b90f86916..5b90f86916 100644
--- a/plugins/YAMN/mingw/yamn-2in1.win
+++ b/protocols/YAMN/mingw/yamn-2in1.win
diff --git a/plugins/YAMN/mingw/yamn-w9x.dev b/protocols/YAMN/mingw/yamn-w9x.dev
index b652000edf..b652000edf 100644
--- a/plugins/YAMN/mingw/yamn-w9x.dev
+++ b/protocols/YAMN/mingw/yamn-w9x.dev
diff --git a/plugins/YAMN/mingw/yamn-w9x.win b/protocols/YAMN/mingw/yamn-w9x.win
index 0e741d564e..0e741d564e 100644
--- a/plugins/YAMN/mingw/yamn-w9x.win
+++ b/protocols/YAMN/mingw/yamn-w9x.win
diff --git a/plugins/YAMN/mingw/yamn.dev b/protocols/YAMN/mingw/yamn.dev
index d726894665..d726894665 100644
--- a/plugins/YAMN/mingw/yamn.dev
+++ b/protocols/YAMN/mingw/yamn.dev
diff --git a/plugins/YAMN/mingw/yamn.win b/protocols/YAMN/mingw/yamn.win
index d396e45fca..d396e45fca 100644
--- a/plugins/YAMN/mingw/yamn.win
+++ b/protocols/YAMN/mingw/yamn.win
diff --git a/plugins/YAMN/proto/md5.c b/protocols/YAMN/proto/md5.c
index 25546d2a65..25546d2a65 100644
--- a/plugins/YAMN/proto/md5.c
+++ b/protocols/YAMN/proto/md5.c
diff --git a/plugins/YAMN/proto/md5.h b/protocols/YAMN/proto/md5.h
index e264f686db..e264f686db 100644
--- a/plugins/YAMN/proto/md5.h
+++ b/protocols/YAMN/proto/md5.h
diff --git a/plugins/YAMN/proto/netclient.h b/protocols/YAMN/proto/netclient.h
index 2414dbdef1..2414dbdef1 100644
--- a/plugins/YAMN/proto/netclient.h
+++ b/protocols/YAMN/proto/netclient.h
diff --git a/plugins/YAMN/proto/netlib.cpp b/protocols/YAMN/proto/netlib.cpp
index b7c1864ffa..b7c1864ffa 100644
--- a/plugins/YAMN/proto/netlib.cpp
+++ b/protocols/YAMN/proto/netlib.cpp
diff --git a/plugins/YAMN/proto/netlib.h b/protocols/YAMN/proto/netlib.h
index 90ad3613a5..90ad3613a5 100644
--- a/plugins/YAMN/proto/netlib.h
+++ b/protocols/YAMN/proto/netlib.h
diff --git a/plugins/YAMN/proto/pop3/pop3.cpp b/protocols/YAMN/proto/pop3/pop3.cpp
index 05e85d7156..05e85d7156 100644
--- a/plugins/YAMN/proto/pop3/pop3.cpp
+++ b/protocols/YAMN/proto/pop3/pop3.cpp
diff --git a/plugins/YAMN/proto/pop3/pop3.h b/protocols/YAMN/proto/pop3/pop3.h
index 1f7f2ea737..1f7f2ea737 100644
--- a/plugins/YAMN/proto/pop3/pop3.h
+++ b/protocols/YAMN/proto/pop3/pop3.h
diff --git a/plugins/YAMN/proto/pop3/pop3comm.cpp b/protocols/YAMN/proto/pop3/pop3comm.cpp
index dcd38ee2c8..dcd38ee2c8 100644
--- a/plugins/YAMN/proto/pop3/pop3comm.cpp
+++ b/protocols/YAMN/proto/pop3/pop3comm.cpp
diff --git a/plugins/YAMN/proto/pop3/pop3comm.h b/protocols/YAMN/proto/pop3/pop3comm.h
index c7eb01b5a1..c7eb01b5a1 100644
--- a/plugins/YAMN/proto/pop3/pop3comm.h
+++ b/protocols/YAMN/proto/pop3/pop3comm.h
diff --git a/plugins/YAMN/proto/pop3/pop3opt.cpp b/protocols/YAMN/proto/pop3/pop3opt.cpp
index bcbf78e380..bcbf78e380 100644
--- a/plugins/YAMN/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/proto/pop3/pop3opt.cpp
diff --git a/plugins/YAMN/proto/pop3/pop3opt.h b/protocols/YAMN/proto/pop3/pop3opt.h
index c828c221e0..c828c221e0 100644
--- a/plugins/YAMN/proto/pop3/pop3opt.h
+++ b/protocols/YAMN/proto/pop3/pop3opt.h
diff --git a/plugins/YAMN/protoplugin.cpp b/protocols/YAMN/protoplugin.cpp
index 479b54ce67..479b54ce67 100644
--- a/plugins/YAMN/protoplugin.cpp
+++ b/protocols/YAMN/protoplugin.cpp
diff --git a/plugins/YAMN/resources/YAMN.rc b/protocols/YAMN/resources/YAMN.rc
index 54320549e4..54320549e4 100644
--- a/plugins/YAMN/resources/YAMN.rc
+++ b/protocols/YAMN/resources/YAMN.rc
diff --git a/plugins/YAMN/resources/iconeutral.ico b/protocols/YAMN/resources/iconeutral.ico
index 9304f4334a..9304f4334a 100644
--- a/plugins/YAMN/resources/iconeutral.ico
+++ b/protocols/YAMN/resources/iconeutral.ico
diff --git a/plugins/YAMN/resources/iconttbdown.ico b/protocols/YAMN/resources/iconttbdown.ico
index 206eba2c76..206eba2c76 100644
--- a/plugins/YAMN/resources/iconttbdown.ico
+++ b/protocols/YAMN/resources/iconttbdown.ico
diff --git a/plugins/YAMN/resources/icooffline.ico b/protocols/YAMN/resources/icooffline.ico
index db5b2e18fa..db5b2e18fa 100644
--- a/plugins/YAMN/resources/icooffline.ico
+++ b/protocols/YAMN/resources/icooffline.ico
diff --git a/plugins/YAMN/resources/icoyamn3.ico b/protocols/YAMN/resources/icoyamn3.ico
index ca11f0f4f4..ca11f0f4f4 100644
--- a/plugins/YAMN/resources/icoyamn3.ico
+++ b/protocols/YAMN/resources/icoyamn3.ico
diff --git a/plugins/YAMN/resources/resource.h b/protocols/YAMN/resources/resource.h
index 8bfd74c9a3..8bfd74c9a3 100644
--- a/plugins/YAMN/resources/resource.h
+++ b/protocols/YAMN/resources/resource.h
diff --git a/plugins/YAMN/resources/yamn.bmp b/protocols/YAMN/resources/yamn.bmp
index 91a9e34ddf..91a9e34ddf 100644
--- a/plugins/YAMN/resources/yamn.bmp
+++ b/protocols/YAMN/resources/yamn.bmp
diff --git a/plugins/YAMN/resources/yamn_ver.rc b/protocols/YAMN/resources/yamn_ver.rc
index e9fb345412..e9fb345412 100644
--- a/plugins/YAMN/resources/yamn_ver.rc
+++ b/protocols/YAMN/resources/yamn_ver.rc
diff --git a/plugins/YAMN/services.cpp b/protocols/YAMN/services.cpp
index b0b524eddc..b0b524eddc 100644
--- a/plugins/YAMN/services.cpp
+++ b/protocols/YAMN/services.cpp
diff --git a/plugins/YAMN/synchro.cpp b/protocols/YAMN/synchro.cpp
index e510d8bac9..e510d8bac9 100644
--- a/plugins/YAMN/synchro.cpp
+++ b/protocols/YAMN/synchro.cpp
diff --git a/plugins/YAMN/version.h b/protocols/YAMN/version.h
index e658cfee0c..e658cfee0c 100644
--- a/plugins/YAMN/version.h
+++ b/protocols/YAMN/version.h
diff --git a/plugins/YAMN/yamn.cpp b/protocols/YAMN/yamn.cpp
index c1ffda847a..c1ffda847a 100644
--- a/plugins/YAMN/yamn.cpp
+++ b/protocols/YAMN/yamn.cpp
diff --git a/plugins/YAMN/yamn.h b/protocols/YAMN/yamn.h
index 3a7a7f86f0..3a7a7f86f0 100644
--- a/plugins/YAMN/yamn.h
+++ b/protocols/YAMN/yamn.h