diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd2dec98..b4b1123f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(pip)
 set(_PIP_MAJOR    1)
-set(_PIP_MINOR    21)
+set(_PIP_MINOR    22)
 set(_PIP_REVISION 0)
-set(_PIP_SUFFIX   beta)
+set(_PIP_SUFFIX   )
 set(_PIP_COMPANY  SHS)
 set(_PIP_DOMAIN   org.SHS)
 
@@ -57,16 +57,27 @@ macro(gather_src DIR CPP H H_P)
 	list(APPEND ${H_P} ${PHS})
 endmacro()
 
-set(PIP_SRC_MAIN       "src_main")
-set(PIP_SRC_CRYPT      "src_crypt")
-set(PIP_SRC_COMPRESS   "src_compress")
-set(PIP_SRC_USB        "src_usb")
-set(PIP_SRC_FFTW       "src_fftw")
-set(PIP_SRC_OPENCL     "src_opencl")
-set(PIP_SRC_IO_UTILS   "src_io_utils")
-set(PIP_SRC_CONCURRENT "src_concurrent")
-set(PIP_SRC_CLOUD      "src_cloud")
-set(PIP_SRC_DIRS "src_main" "src_crypt" "src_compress" "src_usb" "src_fftw" "src_opencl" "src_io_utils" "src_concurrent" "src_cloud")
+set(PIP_SRC_MAIN       "lib/main")
+set(PIP_SRC_CONSOLE    "lib/console")
+set(PIP_SRC_CRYPT      "lib/crypt")
+set(PIP_SRC_COMPRESS   "lib/compress")
+set(PIP_SRC_USB        "lib/usb")
+set(PIP_SRC_FFTW       "lib/fftw")
+set(PIP_SRC_OPENCL     "lib/opencl")
+set(PIP_SRC_IO_UTILS   "lib/io_utils")
+set(PIP_SRC_CONCURRENT "lib/concurrent")
+set(PIP_SRC_CLOUD      "lib/cloud")
+set(PIP_SRC_DIRS ${PIP_SRC_MAIN}
+	${PIP_SRC_CONSOLE}
+	${PIP_SRC_CRYPT}
+	${PIP_SRC_COMPRESS}
+	${PIP_SRC_USB}
+	${PIP_SRC_FFTW}
+	${PIP_SRC_OPENCL}
+	${PIP_SRC_IO_UTILS}
+	${PIP_SRC_CONCURRENT}
+	${PIP_SRC_CLOUD}  
+)
 set(PIP_LIBS_TARGETS pip)
 set(LIBS_MAIN)
 set(LIBS_STATUS)
@@ -178,6 +189,9 @@ endforeach(F)
 # Crypt lib
 gather_src("${PIP_SRC_CRYPT}" CPP_LIB_CRYPT HDRS PHDRS)
 
+# Console lib
+gather_src("${PIP_SRC_CONSOLE}" CPP_LIB_CONSOLE HDRS PHDRS)
+
 # Compress lib
 gather_src("${PIP_SRC_COMPRESS}" CPP_LIB_COMPRESS HDRS PHDRS)
 
@@ -400,6 +414,19 @@ if (NOT CROSSTOOLS)
 		endif()
 
 
+		# Add console library
+		import_version(pip_console pip)
+		set_deploy_property(pip_console ${PIP_LIB_TYPE}
+			LABEL "PIP console support"
+			FULLNAME "${_PIP_DOMAIN}.pip_console"
+			COMPANY "${_PIP_COMPANY}"
+			INFO "Platform-Independent Primitives")
+		make_rc(pip_console _RC)
+		add_library(pip_console ${PIP_LIB_TYPE} ${CPP_LIB_CONSOLE} ${_RC})
+		target_link_libraries(pip_console pip)
+		list(APPEND PIP_LIBS_TARGETS pip_console)
+
+
 		# Check if PIP support cryptographic encryption/decryption using sodium library
 		find_library(sodium_FOUND sodium)
 		if(sodium_FOUND)
@@ -517,7 +544,7 @@ if (NOT CROSSTOOLS)
 				include_directories(${OpenCL_INCLUDE_DIRS})
 			endif()
 			add_definitions(-DPIP_OPENCL)
-			pip_resources(CL_RES "src_opencl/resources.conf")
+			pip_resources(CL_RES "${PIP_SRC_OPENCL}/resources.conf")
 			add_library(pip_opencl ${PIP_LIB_TYPE} ${CPP_LIB_OPENCL} ${CL_RES} ${_RC})
 			add_dependencies(pip_opencl pip_rc)
 			if(${CMAKE_VERSION} VERSION_LESS "3.7.0")
diff --git a/esp32_component/esp-idf/components/pip/CMakeLists.txt b/esp32_component/esp-idf/components/pip/CMakeLists.txt
index a1cb3f95..751927f8 100644
--- a/esp32_component/esp-idf/components/pip/CMakeLists.txt
+++ b/esp32_component/esp-idf/components/pip/CMakeLists.txt
@@ -1,20 +1,20 @@
 set(COMPONENT_SRCS "main.cpp")
-set(COMPONENT_ADD_INCLUDEDIRS "pip/src_main")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/auxiliary")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/code")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/console")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/containers")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/core")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/crypt")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/geo")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/io_devices")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/io_utils")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/math")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/opencl")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/resources")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/system")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/thread")
-list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/src_main/introspection")
+set(COMPONENT_ADD_INCLUDEDIRS "pip/lib/main")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/auxiliary")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/code")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/console")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/containers")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/core")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/crypt")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/geo")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/io_devices")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/io_utils")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/math")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/opencl")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/resources")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/system")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/thread")
+list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/introspection")
 set(COMPONENT_PRIV_REQUIRES pthread lwip freertos vfs spiffs)
 register_component()
 set(PIP_FREERTOS ON)
diff --git a/src_cloud/piccloudclient.cpp b/lib/cloud/piccloudclient.cpp
similarity index 100%
rename from src_cloud/piccloudclient.cpp
rename to lib/cloud/piccloudclient.cpp
diff --git a/src_cloud/piccloudserver.cpp b/lib/cloud/piccloudserver.cpp
similarity index 100%
rename from src_cloud/piccloudserver.cpp
rename to lib/cloud/piccloudserver.cpp
diff --git a/src_cloud/piccloudtcp.cpp b/lib/cloud/piccloudtcp.cpp
similarity index 100%
rename from src_cloud/piccloudtcp.cpp
rename to lib/cloud/piccloudtcp.cpp
diff --git a/src_compress/picompress.cpp b/lib/compress/picompress.cpp
similarity index 100%
rename from src_compress/picompress.cpp
rename to lib/compress/picompress.cpp
diff --git a/src_concurrent/executor.cpp b/lib/concurrent/executor.cpp
similarity index 100%
rename from src_concurrent/executor.cpp
rename to lib/concurrent/executor.cpp
diff --git a/src_concurrent/piconditionlock.cpp b/lib/concurrent/piconditionlock.cpp
similarity index 100%
rename from src_concurrent/piconditionlock.cpp
rename to lib/concurrent/piconditionlock.cpp
diff --git a/src_concurrent/piconditionvar.cpp b/lib/concurrent/piconditionvar.cpp
similarity index 100%
rename from src_concurrent/piconditionvar.cpp
rename to lib/concurrent/piconditionvar.cpp
diff --git a/src_concurrent/test/BlockingDequeueUnitTest.cpp b/lib/concurrent/test/BlockingDequeueUnitTest.cpp
similarity index 100%
rename from src_concurrent/test/BlockingDequeueUnitTest.cpp
rename to lib/concurrent/test/BlockingDequeueUnitTest.cpp
diff --git a/src_concurrent/test/ConditionLockIntegrationTest.cpp b/lib/concurrent/test/ConditionLockIntegrationTest.cpp
similarity index 100%
rename from src_concurrent/test/ConditionLockIntegrationTest.cpp
rename to lib/concurrent/test/ConditionLockIntegrationTest.cpp
diff --git a/src_concurrent/test/ConditionVariableIntegrationTest.cpp b/lib/concurrent/test/ConditionVariableIntegrationTest.cpp
similarity index 100%
rename from src_concurrent/test/ConditionVariableIntegrationTest.cpp
rename to lib/concurrent/test/ConditionVariableIntegrationTest.cpp
diff --git a/src_concurrent/test/ExecutorIntegrationTest.cpp b/lib/concurrent/test/ExecutorIntegrationTest.cpp
similarity index 100%
rename from src_concurrent/test/ExecutorIntegrationTest.cpp
rename to lib/concurrent/test/ExecutorIntegrationTest.cpp
diff --git a/src_concurrent/test/testutil.h b/lib/concurrent/test/testutil.h
similarity index 100%
rename from src_concurrent/test/testutil.h
rename to lib/concurrent/test/testutil.h
diff --git a/src_main/console/piconsole.cpp b/lib/console/piconsole.cpp
similarity index 97%
rename from src_main/console/piconsole.cpp
rename to lib/console/piconsole.cpp
index 02742fad..8202826b 100644
--- a/src_main/console/piconsole.cpp
+++ b/lib/console/piconsole.cpp
@@ -1,1168 +1,1168 @@
-/*
-	PIP - Platform Independent Primitives
-	Console output/input
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "piconsole.h"
-#include "piincludes_p.h"
-#include "pipeer.h"
-#include "pidiagnostics.h"
-#include "pisystemmonitor.h"
-#ifndef WINDOWS
-#  include <sys/ioctl.h>
-#  include <fcntl.h>
-#  include <termios.h>
-#else
-#  include <wincon.h>
-#  define COMMON_LVB_UNDERSCORE 0x8000
-#endif
-
-
-/** \class PIConsole
- * \brief Console output class
- * \details
- * \section PIConsole_sec0 Synopsis
- * This class provides output to console with automatic alignment and update.
- * It supports tabs, keyboard listening, formats and colors.
- *
- * \section PIConsole_sec1 Layout
- * %PIConsole works with variable pointers. You should add your variables with
- * functions \a addVariable() which receives label name, pointer to variable
- * and optional column and format. Columns count is dynamically increased if
- * new column used. E.g. if you add variable to empty tab to column 3, columns
- * count will be increased to 3, but two firsts columns will be empty. Each column
- * filled from top to bottom, but you can add just string with function
- * \a addString() or add empty line with function \a addEmptyLine(). Layout scheme:
- * \image html piconsole_layout.png
- *
- * \section PIConsole_sec2 Keyboard usage
- * %PIConsole should to be single in application. %PIConsole aggregate PIKbdListener
- * which grab keyboard and automatic switch tabs by theirs bind keys. If there is no
- * tab binded to pressed key external function "slot" will be called
- *
- **/
-
-
-PRIVATE_DEFINITION_START(PIConsole)
-#ifdef WINDOWS
-void getWinCurCoord() {GetConsoleScreenBufferInfo(hOut, &csbi); ccoord = csbi.dwCursorPosition;}
-COORD & getWinCoord(int dx = 0, int dy = 0) {getWinCurCoord(); ccoord.X += dx; ccoord.Y += dy; return ccoord;}
-void * hOut;
-CONSOLE_SCREEN_BUFFER_INFO sbi, csbi;
-CONSOLE_CURSOR_INFO curinfo;
-COORD ccoord, ulcoord;
-WORD dattr;
-DWORD smode, written;
-#endif
-PRIVATE_DEFINITION_END(PIConsole)
-
-
-PIConsole::PIConsole(bool startNow, PIKbdListener::KBFunc slot): PIThread() {
-	setName("console");
-	setPriority(piLow);
-	needLockRun(true);
-	ret_func = slot;
-	num_format = systime_format = 0;
-	vid = 0;
-	cur_tab = width = height = pwidth = pheight = max_y = 0;
-	def_align = Nothing;
-	tabs.reserve(16);
-#ifdef WINDOWS
-	PRIVATE->ulcoord.X = 0;
-	PRIVATE->hOut = GetStdHandle(STD_OUTPUT_HANDLE);
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
-	PRIVATE->dattr = PRIVATE->sbi.wAttributes;
-	width = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
-	height = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
-	PRIVATE->ulcoord.Y = PRIVATE->sbi.srWindow.Top;
-	GetConsoleMode(PRIVATE->hOut, &PRIVATE->smode);
-	GetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
-#else
-#  ifdef FREERTOS
-	width = 80;
-	height = 24;
-#  else
-	winsize ws;
-	ioctl(0, TIOCGWINSZ, &ws);
-	width = ws.ws_col;
-	height = ws.ws_row;
-#  endif
-#endif
-	addTab("main");
-	listener = new PIKbdListener(key_event, this);
-	peer_timer = new PITimer();
-	peer_timer->setName("__S__.PIConsole.peer_timer");
-	peer = 0;
-	server_mode = pause_ = false;
-	state = Disconnected;
-	peer_timer->addDelimiter(20);
-	peer_timer->setName("__S__PIConsole::peer_timer");
-	CONNECT2(void, void * , int, peer_timer, tickEvent, this, peerTimer);
-	if (startNow) start();
-}
-
-
-PIConsole::~PIConsole() {
-	stopPeer();
-	if (isRunning())
-		stop();
-	clearTabs(false);
-	delete listener;
-	delete peer_timer;
-#ifdef WINDOWS
-	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
-	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
-#endif
-}
-
-
-int PIConsole::addTab(const PIString & name, char bind_key) {
-	if (isRunning()) lock();
-	tabs.push_back(Tab(name, bind_key));
-	cur_tab = tabs.size() - 1;
-	if (isRunning()) unlock();
-	return tabs.size();
-}
-
-
-void PIConsole::removeTab(uint index) {
-	if (index >= tabs.size()) return;
-	if (isRunning()) lock();
-	tabs.remove(index);
-	if (cur_tab >= tabs.size()) cur_tab = tabs.size() - 1;
-	if (isRunning()) unlock();
-}
-
-
-void PIConsole::removeTab(const PIString & name) {
-	uint index = tabs.size() + 1;
-	for (uint i = 0; i < tabs.size(); ++i) {
-		if (tabs[i].name == name) {
-			index = i;
-			break;
-		}
-	}
-	removeTab(index);
-}
-
-
-void PIConsole::clearTab(uint index) {
-	if (index >= tabs.size()) return;
-	lock();
-	tabs[index].columns.clear();
-	if (cur_tab == index) {
-		clearScreen();
-		fillLabels();
-	}
-	if (cur_tab >= tabs.size()) cur_tab = tabs.size() - 1;
-	unlock();
-}
-
-
-void PIConsole::clearTab(const PIString & name) {
-	uint index = tabs.size() + 1;
-	for (uint i = 0; i < tabs.size(); ++i) {
-		if (tabs[i].name == name) {
-			index = i;
-			break;
-		}
-	}
-	clearTab(index);
-}
-
-
-void PIConsole::update() {
-	lock();
-	fillLabels();
-	unlock();
-}
-
-
-bool PIConsole::setTab(uint index) {
-	if (index >= tabs.size())
-		return false;
-	if (!isRunning()) {
-		cur_tab = index;
-		return true;
-	}
-	lock();
-	PICout::__mutex__().lock();
-	cur_tab = index;
-	clearScreen();
-	fillLabels();
-	PICout::__mutex__().unlock();
-	unlock();
-	return true;
-}
-
-
-bool PIConsole::setTab(const PIString & name) {
-	uint index = tabs.size() + 1;
-	for (uint i = 0; i < tabs.size(); ++i) {
-		if (tabs[i].name == name) {
-			index = i;
-			break;
-		}
-	}
-	return setTab(index);
-}
-
-
-bool PIConsole::setTabBindKey(uint index, char bind_key) {
-	if (index >= tabs.size())
-		return false;
-	tabs[index].key = bind_key;
-	return true;
-}
-
-
-bool PIConsole::setTabBindKey(const PIString & name, char bind_key) {
-	uint index =tabs.size() + 1;
-	for (uint i = 0; i < tabs.size(); ++i) {
-		if (tabs[i].name == name) {
-			index = i;
-			break;
-		}
-	}
-	return setTabBindKey(index, bind_key);
-}
-
-
-void PIConsole::key_event(PIKbdListener::KeyEvent key, void * t) {
-	PIConsole * p = (PIConsole * )t;
-	int ct = p->cur_tab;
-	if (key.key == PIKbdListener::LeftArrow) {
-		do {
-			ct--;
-			if (ct < 0) return;
-		} while (p->tabs[ct].key == 0);
-		p->setTab(ct);
-		return;
-	}
-	if (key.key == PIKbdListener::RightArrow) {
-		do {
-			ct++;
-			if (ct >= p->tabs.size_s()) return;
-		} while (p->tabs[ct].key == 0);
-		p->setTab(ct);
-		return;
-	}
-	for (uint i = 0; i < p->tabsCount(); ++i) {
-		if (p->tabs[i].key == key.key) {
-			p->setTab(i);
-			return;
-		}
-	}
-	if (p->ret_func != 0) p->ret_func(key, t);
-	p->keyPressed(key, t);
-}
-
-
-int PIConsole::couts(const PIString & v) {
-	return printf("%s", v.data());
-}
-
-
-int PIConsole::couts(const char * v) {
-	return printf("%s", v);
-}
-
-
-void PIConsole::clearVariables(bool clearScreen) {
-	if (isRunning()) lock();
-	if (clearScreen && isRunning()) {
-		toUpperLeft();
-		clearScreenLower();
-	}
-	columns().clear();
-	if (isRunning()) unlock();
-}
-
-
-void PIConsole::stop(bool clear) {
-	PIThread::stop(true);
-	if (clear) clearScreen();
-	moveTo(0, max_y + 4);
-	showCursor();
-	couts(fstr(Normal));
-#ifdef WINDOWS
-	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
-	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
-#endif
-	fflush(0);
-}
-
-
-PIString PIConsole::fstr(FormatFlags f) {
-	num_format = systime_format = 0;
-	if (f[PIConsole::Dec]) num_format = 0;
-	if (f[PIConsole::Hex]) num_format = 1;
-	if (f[PIConsole::Oct]) num_format = 2;
-	if (f[PIConsole::Bin]) num_format = 4;
-	if (f[PIConsole::Scientific]) num_format = 3;
-	if (f[PIConsole::SystemTimeSplit]) systime_format = 0;
-	if (f[PIConsole::SystemTimeSeconds]) systime_format = 1;
-
-#ifdef WINDOWS
-	WORD attr = 0;
-
-	if (f[PIConsole::Inverse]) {
-		if (f[PIConsole::Red]) attr |= BACKGROUND_RED;
-		if (f[PIConsole::Green]) attr |= BACKGROUND_GREEN;
-		if (f[PIConsole::Blue]) attr |= BACKGROUND_BLUE;
-		if (f[PIConsole::Yellow]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN);
-		if (f[PIConsole::Magenta]) attr |= (BACKGROUND_RED | BACKGROUND_BLUE);
-		if (f[PIConsole::Cyan]) attr |= (BACKGROUND_GREEN | BACKGROUND_BLUE);
-		if (f[PIConsole::White]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE);
-		if (f[PIConsole::BackRed]) attr |= FOREGROUND_RED;
-		if (f[PIConsole::BackGreen]) attr |= FOREGROUND_GREEN;
-		if (f[PIConsole::BackBlue]) attr |= FOREGROUND_BLUE;
-		if (f[PIConsole::BackYellow]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN);
-		if (f[PIConsole::BackMagenta]) attr |= (FOREGROUND_RED | FOREGROUND_BLUE);
-		if (f[PIConsole::BackCyan]) attr |= (FOREGROUND_GREEN | FOREGROUND_BLUE);
-		if (f[PIConsole::BackWhite]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
-		if ((attr & BACKGROUND_RED) + (attr & BACKGROUND_GREEN) + (attr & BACKGROUND_BLUE) == 0)
-			attr |= FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
-	} else {
-		if (f[PIConsole::Red]) attr |= FOREGROUND_RED;
-		if (f[PIConsole::Green]) attr |= FOREGROUND_GREEN;
-		if (f[PIConsole::Blue]) attr |= FOREGROUND_BLUE;
-		if (f[PIConsole::Yellow]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN);
-		if (f[PIConsole::Magenta]) attr |= (FOREGROUND_RED | FOREGROUND_BLUE);
-		if (f[PIConsole::Cyan]) attr |= (FOREGROUND_GREEN | FOREGROUND_BLUE);
-		if (f[PIConsole::White]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
-		if (f[PIConsole::BackRed]) attr |= BACKGROUND_RED;
-		if (f[PIConsole::BackGreen]) attr |= BACKGROUND_GREEN;
-		if (f[PIConsole::BackBlue]) attr |= BACKGROUND_BLUE;
-		if (f[PIConsole::BackYellow]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN);
-		if (f[PIConsole::BackMagenta]) attr |= (BACKGROUND_RED | BACKGROUND_BLUE);
-		if (f[PIConsole::BackCyan]) attr |= (BACKGROUND_GREEN | BACKGROUND_BLUE);
-		if (f[PIConsole::BackWhite]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE);
-		if ((attr & FOREGROUND_RED) + (attr & FOREGROUND_GREEN) + (attr & FOREGROUND_BLUE) == 0)
-			attr |= FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
-	}
-	if (f[PIConsole::Bold]) attr |= FOREGROUND_INTENSITY;
-	if (f[PIConsole::Underline]) attr |= COMMON_LVB_UNDERSCORE;
-
-	SetConsoleTextAttribute(PRIVATE->hOut, attr);
-	return PIString();
-#else
-	PIString ts("\e[0");
-
-	if (f[PIConsole::Bold]) ts += ";1";
-	if (f[PIConsole::Faint]) ts += ";2";
-	if (f[PIConsole::Italic]) ts += ";3";
-	if (f[PIConsole::Underline]) ts += ";4";
-	if (f[PIConsole::Blink]) ts += ";5";
-	if (f[PIConsole::Inverse]) ts += ";7";
-
-	if (f[PIConsole::Black]) ts += ";30";
-	if (f[PIConsole::Red]) ts += ";31";
-	if (f[PIConsole::Green]) ts += ";32";
-	if (f[PIConsole::Yellow]) ts += ";33";
-	if (f[PIConsole::Blue]) ts += ";34";
-	if (f[PIConsole::Magenta]) ts += ";35";
-	if (f[PIConsole::Cyan]) ts += ";36";
-	if (f[PIConsole::White]) ts += ";37";
-
-	if (f[PIConsole::BackBlack]) ts += ";40";
-	if (f[PIConsole::BackRed]) ts += ";41";
-	if (f[PIConsole::BackGreen]) ts += ";42";
-	if (f[PIConsole::BackYellow]) ts += ";43";
-	if (f[PIConsole::BackBlue]) ts += ";44";
-	if (f[PIConsole::BackMagenta]) ts += ";45";
-	if (f[PIConsole::BackCyan]) ts += ";46";
-	if (f[PIConsole::BackWhite]) ts += ";47";
-
-	return ts + "m";
-#endif
-}
-
-
-inline int PIConsole::couts(const bool v) {return (v ? printf("true") : printf("false"));}
-inline int PIConsole::couts(const char v) {return printf("%c", v);}
-inline int PIConsole::couts(const short v) {
-	switch (num_format) {case (1): return printf("0x%.4hX", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 2)); break; default: return printf("%hd", v); break;}
-}
-inline int PIConsole::couts(const int v) {
-	switch (num_format) {case (1): return printf("0x%.8X", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 4)); break; default: return printf("%d", v); break;}
-}
-inline int PIConsole::couts(const long v) {
-	switch (num_format) {case (1): return printf("0x%.16lX", v); break; case (2): return printf("%lo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%ld", v); break;}
-}
-inline int PIConsole::couts(const llong v) {
-	switch (num_format) {case (1): return printf("0x%.16llX", v); break; case (2): return printf("%llo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%lld", v); break;}
-}
-inline int PIConsole::couts(const uchar v) {
-	switch (num_format) {case (1): return printf("0x%.2X", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 1)); break; default: return printf("%u", v); break;}
-}
-inline int PIConsole::couts(const ushort v) {
-	switch (num_format) {case (1): return printf("0x%.4hX", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 2)); break; default: return printf("%hu", v); break;}
-}
-inline int PIConsole::couts(const uint v) {
-	switch (num_format) {case (1): return printf("0x%.8X", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 4)); break; default: return printf("%u", v); break;}
-}
-inline int PIConsole::couts(const ulong v) {
-	switch (num_format) {case (1): return printf("0x%.16lX", v); break; case (2): return printf("%lo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%lu", v); break;}
-}
-inline int PIConsole::couts(const ullong v) {
-	switch (num_format) {case (1): return printf("0x%.16llX", v); break; case (2): return printf("%llo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%llu", v); break;}
-}
-inline int PIConsole::couts(const float v) {
-	switch (num_format) {case (3): return printf("%e", v); break; default: return printf("%.5g", v); break;}
-}
-inline int PIConsole::couts(const double v) {
-	switch (num_format) {case (3): return printf("%le", v); break; default: return printf("%.5lg", v); break;}
-}
-inline int PIConsole::couts(const PISystemTime & v) {
-	switch (systime_format) {case (1): return printf("%.6lg", v.toSeconds()); break;
-		default: return couts(v.seconds) + printf(" s, ") + couts(v.nanoseconds) + printf(" ns"); break;}
-}
-
-
-void PIConsole::toUpperLeft() {
-#ifdef WINDOWS
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ulcoord);
-#else
-	printf("\e[H");
-#endif
-}
-
-void PIConsole::moveRight(int n) {
-#ifdef WINDOWS
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->getWinCoord(n));
-#else
-	if (n > 0) printf("\e[%dC", n);
-#endif
-}
-
-void PIConsole::moveLeft(int n) {
-#ifdef WINDOWS
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->getWinCoord(-n));
-#else
-	if (n > 0) printf("\e[%dD", n);
-#endif
-}
-
-void PIConsole::moveTo(int x, int y) {
-#ifdef WINDOWS
-	PRIVATE->ccoord.X = x;
-	PRIVATE->ccoord.Y = PRIVATE->ulcoord.Y + y;
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
-#else
-	printf("\e[%d;%dH", y, x);
-#endif
-}
-
-void PIConsole::clearScreen() {
-#ifdef WINDOWS
-	couts(fstr(Normal));
-	toUpperLeft();
-	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
-#else
-	couts(fstr(Normal)); printf("\e[H\e[J");
-#endif
-}
-
-void PIConsole::clearScreenLower() {
-#ifdef WINDOWS
-	couts(fstr(Normal));
-	PRIVATE->getWinCurCoord();
-	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-#else
-	couts(fstr(Normal)); printf("\e[J");
-#endif
-}
-
-void PIConsole::clearLine() {
-#ifdef WINDOWS
-	PRIVATE->getWinCurCoord();
-	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-#else
-	printf("\e[K");
-#endif
-}
-
-void PIConsole::newLine() {
-#ifdef WINDOWS
-	PRIVATE->getWinCurCoord();
-	PRIVATE->ccoord.X = 0; PRIVATE->ccoord.Y++;
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
-#else
-	printf("\eE");
-#endif
-}
-
-void PIConsole::hideCursor() {
-#ifdef WINDOWS
-	PRIVATE->curinfo.bVisible = false;
-	SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
-#else
-	printf("\e[?25l");
-#endif
-}
-
-void PIConsole::showCursor() {
-#ifdef WINDOWS
-	PRIVATE->curinfo.bVisible = true; SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
-#else
-	printf("\e[?25h");
-#endif
-}
-
-
-void PIConsole::begin() {
-#ifdef WINDOWS
-	SetConsoleMode(PRIVATE->hOut, ENABLE_WRAP_AT_EOL_OUTPUT);
-#endif
-	max_y = 0;
-	PICout::__mutex__().lock();
-	clearScreen();
-	hideCursor();
-	fillLabels();
-	PICout::__mutex__().unlock();
-}
-
-
-void PIConsole::run() {
-	if (pause_) return;
-	uint cx, clen = 0;
-	int j;
-#ifdef WINDOWS
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
-	width = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
-	height = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
-#else
-#  ifdef FREERTOS
-	width = 80;
-	height = 24;
-#  else
-	winsize ws;
-	ioctl(0, TIOCGWINSZ, &ws);
-	width = ws.ws_col;
-	height = ws.ws_row;
-#  endif
-#endif
-	//fflush(0); return;
-	PICout::__mutex__().lock();
-	if (pwidth != width || pheight != height) {
-		clearScreen();
-		fillLabels();
-	}
-	pwidth = width;
-	pheight = height;
-	col_cnt = columns().size();
-	col_wid = (col_cnt > 0) ? width / col_cnt : width;
-	for (uint i = 0; i < col_cnt; ++i) {
-		PIVector<Variable> & cvars(tabs[cur_tab].columns[i].variables);
-		cx = col_wid * i;
-		toUpperLeft();
-		if (max_y < cvars.size()) max_y = cvars.size();
-		j = 0;
-		piForeachC (Variable & tv_, cvars) {
-			if (j > height - 3) continue;
-			j++;
-			moveRight(cx);
-			if (tv_.type == 15) {
-				newLine();
-				continue;
-			}
-			moveRight(tv_.offset);
-			const void * ptr = 0;
-			if (tv_.remote) {
-				if (tv_.type == 0) {
-					rstr.clear();
-					rba = tv_.rdata;
-					rba >> rstr;
-					rstr.trim();
-					ptr = &rstr;
-				} else
-					ptr = tv_.rdata.data();
-			} else
-				ptr = tv_.ptr;
-			switch (tv_.type) {
-				case 0: clen = printValue(ptr != 0 ? *(const PIString*)ptr : PIString(), tv_.format); break;
-				case 1: clen = printValue(ptr != 0 ? *(const bool*)ptr : false, tv_.format); break;
-				case 2: clen = printValue(ptr != 0 ? *(const int*)ptr : 0, tv_.format); break;
-				case 3: clen = printValue(ptr != 0 ? *(const long*)ptr : 0l, tv_.format); break;
-				case 4: clen = printValue(ptr != 0 ? *(const char*)ptr : char(0), tv_.format); break;
-				case 5: clen = printValue(ptr != 0 ? *(const float*)ptr : 0.f, tv_.format); break;
-				case 6: clen = printValue(ptr != 0 ? *(const double*)ptr : 0., tv_.format); break;
-				case 7: clen = printValue(ptr != 0 ? *(const short*)ptr : short(0), tv_.format); break;
-				case 8: clen = printValue(ptr != 0 ? *(const uint*)ptr : 0u, tv_.format); break;
-				case 9: clen = printValue(ptr != 0 ? *(const ulong*)ptr : 0ul, tv_.format); break;
-				case 10: clen = printValue(ptr != 0 ? *(const ushort*)ptr : ushort(0), tv_.format); break;
-				case 11: clen = printValue(ptr != 0 ? *(const uchar*)ptr : uchar(0), tv_.format); break;
-				case 12: clen = printValue(ptr != 0 ? *(const llong*)ptr : 0l, tv_.format); break;
-				case 13: clen = printValue(ptr != 0 ? *(const ullong*)ptr: 0ull, tv_.format); break;
-				case 20: clen = printValue(ptr != 0 ? *(const PISystemTime*)ptr: PISystemTime(), tv_.format); break;
-				case 14: clen = printValue(bitsValue(ptr, tv_.bitFrom, tv_.bitCount), tv_.format); break;
-			}
-			if (clen + tv_.offset < (uint)col_wid) {
-				PIString ts = PIString(
-			#if defined(QNX) || defined(FREE_BSD)
-							col_wid - clen - tv_.offset - 1, ' ');
-#else
-							col_wid - clen - tv_.offset, ' ');
-#endif
-				printf("%s", ts.data());
-			}
-			newLine();
-		}
-	}
-#ifdef WINDOWS
-	moveTo(0, max_y + 1);
-#else
-	moveTo(0, max_y + 2);
-#endif
-	fflush(0);
-	PICout::__mutex__().unlock();
-}
-
-
-void PIConsole::fillLabels() {
-	if (!isRunning()) return;
-	uint cx, cy, mx = 0, dx;
-#ifdef WINDOWS
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
-	width = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
-	height = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
-#else
-#  ifdef FREERTOS
-	width = 80;
-	height = 24;
-#  else
-	winsize ws;
-	ioctl(0, TIOCGWINSZ, &ws);
-	width = ws.ws_col;
-	height = ws.ws_row;
-#  endif
-#endif
-	max_y = 0;
-	col_cnt = columns().size();
-	col_wid = (col_cnt > 0) ? width / col_cnt : width;
-	for (uint i = 0; i < col_cnt; ++i) {
-		Column & ccol(tabs[cur_tab].columns[i]);
-		PIVector<Variable> & cvars(ccol.variables);
-		if (ccol.alignment != Nothing) {
-			mx = 0;
-			piForeachC (Variable & j, cvars)
-					if (!j.isEmpty())
-					if (mx < j.name.size())
-					mx = j.name.size();
-			mx += 2;
-		}
-		cx = col_wid * i;
-		cy = 1;
-		toUpperLeft();
-		for (uint j = 0; j < cvars.size(); ++j) {
-			if (int(j) > height - 3) continue;
-			if (max_y < j) max_y = j;
-			moveRight(cx);
-			Variable & tv_(cvars[j]);
-			cvars[j].nx = cx;
-			cvars[j].ny = cy;
-			if (tv_.name.isEmpty()) {
-				cvars[j].offset = 0;
-				clearLine();
-				newLine();
-				cy++;
-				continue;
-			}
-			clearLine();
-			//piCout << tv_.name << tv_.type << tv_.ptr;
-			if (tv_.type == 15) {
-				cvars[j].offset = cvars[j].name.length();
-				cvars[j].nx += cvars[j].offset;
-				printLine(tv_.name, cx, tv_.format);
-				newLine();
-				cy++;
-				continue;
-			}
-			if (!tv_.isEmpty()) {
-				switch (ccol.alignment) {
-					case Nothing:
-						cvars[j].offset = (tv_.name + ": ").length();
-						cvars[j].nx += cvars[j].offset;
-						printValue(tv_.name + ": ", tv_.format);
-					break;
-					case Left:
-						cvars[j].offset = mx;
-						cvars[j].nx += cvars[j].offset;
-						printValue(tv_.name + ": ", tv_.format);
-					break;
-					case Right:
-						cvars[j].offset = mx;
-						cvars[j].nx += cvars[j].offset;
-						dx = mx - (tv_.name + ": ").length();
-						moveRight(dx);
-						printValue(tv_.name + ": ", tv_.format);
-						moveLeft(dx);
-					break;
-				}
-			}
-			newLine();
-			cy++;
-		}
-	}
-#ifdef WINDOWS
-	moveTo(0, max_y + 1);
-#else
-	moveTo(0, max_y + 2);
-#endif
-	if (!tabs[cur_tab].status.isEmpty()) {
-		printValue(tabs[cur_tab].status);
-		newLine();
-	}
-	status();
-}
-
-
-void PIConsole::status() {
-	Tab * ctab;
-	for (uint i = 0; i < tabsCount(); ++i) {
-		ctab = &tabs[i];
-		if (ctab->key == 0) continue;
-		printValue(ctab->key, PIConsole::White | PIConsole::Bold);
-		if (i == cur_tab)
-			printValue(ctab->name + " ", PIConsole::BackYellow | PIConsole::Black);
-		else
-			printValue(ctab->name + " ", PIConsole::Cyan | PIConsole::Inverse);
-		printValue(" ");
-	}
-	newLine();
-}
-
-
-int PIConsole::bitsValue(const void * src, int offset, int count) const {
-	int ret = 0, stbyte = offset / 8, cbit = offset - stbyte * 8;
-	char cbyte = reinterpret_cast<const char * >(src)[stbyte];
-	for (int i = 0; i < count; i++) {
-		ret |= ((cbyte >> cbit & 1) << i);
-		cbit++;
-		if (cbit == 8) {
-			cbit = 0;
-			stbyte++;
-			cbyte = reinterpret_cast<const char * >(src)[stbyte];
-		}
-	}
-	return ret;
-}
-
-
-const char * PIConsole::toBin(const void * d, int s) {
-	binstr.clear();
-	uchar cc, b;
-	for (int i = 0; i < s; ++i) {
-		cc = ((const uchar *)d)[i];
-		b = 1;
-		for (int j = 0; j < 8; ++j) {
-			binstr << (cc & b ? "1" : "0");
-			b <<= 1;
-		}
-		if (i < s - 1) binstr << " ";
-	}
-	binstr.reverse();
-	return binstr.data();
-}
-
-
-#define ADD_VAR_BODY vid++; tv.id = vid; tv.name = name; tv.bitFrom = tv.bitCount = 0; tv.format = format; tv.remote = false; checkColumn(col);
-
-void PIConsole::addString(const PIString & name, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 15; tv.size = 0; tv.ptr = 0; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const PIString * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 0; tv.size = 0; tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const bool * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 1; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const int * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 2; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const long * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 3; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const char * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 4; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const float * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 5; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const double * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 6; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const short * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 7; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const uint * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 8; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const ulong * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 9; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const ushort * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 10; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const uchar * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 11; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const llong * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 12; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const ullong * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 13; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-void PIConsole::addVariable(const PIString & name, const PISystemTime * ptr, int col, FormatFlags format) {
-	ADD_VAR_BODY tv.type = 20; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
-/** \brief Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
- * \details This function add to column "column" next lines:
- * * "<name> diagnostics"
- * * "Received count": \a PIDiagnostics::receiveCount
- * * "Invalid  count": \a PIDiagnostics::wrongCount
- * * "Sended   count": \a PIDiagnostics::sendCount
- * * "Immediate Frequency, Hz": \a PIDiagnostics::immediateFrequency
- * * "Integral  Frequency, Hz": \a PIDiagnostics::integralFrequency
- * * "Receive speed": \a PIDiagnostics::receiveSpeed
- * * "Send    speed": \a PIDiagnostics::sendSpeed
- * * "Quality": \a PIDiagnostics::quality
- * */
-void PIConsole::addVariable(const PIString & name, const PIDiagnostics * ptr, int col, FormatFlags format) {
-	addString(name + " diagnostics", col, format | PIConsole::Bold);
-//	addVariable("Received count", ptr->receiveCount_ptr(), col, format);
-//	addVariable("Invalid  count", ptr->wrongCount_ptr(), col, format);
-//	addVariable("Sended   count", ptr->sendCount_ptr(), col, format);
-//	addVariable("Immediate Frequency, Hz", ptr->immediateFrequency_ptr(), col, format);
-//	addVariable("Integral  Frequency, Hz", ptr->integralFrequency_ptr(), col, format);
-//	addVariable("Receive speed", ptr->receiveSpeed_ptr(), col, format);
-//	addVariable("Send    speed", ptr->sendSpeed_ptr(), col, format);
-//	addVariable("Quality", ptr->quality_ptr(), col, format);
-}
-void PIConsole::addVariable(const PIString & name, const PISystemMonitor * ptr, int col, FormatFlags format) {
-	addString("monitor " + name, col, format | PIConsole::Bold);
-	//addVariable("PID", &(ptr->statistic().ID), col, format);
-	//addVariable("state", &(ptr->statistic().state), col, format);
-	//addVariable("threads", &(ptr->statistic().threads), col, format);
-	//addVariable("priority", &(ptr->statistic().priority), col, format);
-	//addVariable("memory physical", &(ptr->statistic().physical_memsize_readable), col, format);
-	//addVariable("memory shared", &(ptr->statistic().share_memsize_readable), col, format);
-	//addVariable("cpu load kernel", &(ptr->statistic().cpu_load_system), col, format);
-	//addVariable("cpu load user", &(ptr->statistic().cpu_load_user), col, format);
-}
-void PIConsole::addBitVariable(const PIString & name, const void * ptr, int fromBit, int bitCount, int col, FormatFlags format) {
-	vid++; tv.id = vid; tv.size = sizeof(ullong); tv.name = name; tv.bitFrom = fromBit; tv.bitCount = bitCount; tv.type = 14; tv.ptr = ptr; tv.format = format;
-	checkColumn(col); column(col).push_back(tv);}
-void PIConsole::addEmptyLine(int col, uint count) {
-	tv.id = 0; tv.size = 0; tv.name = ""; tv.type = 0; tv.ptr = 0; tv.format = Normal;
-	for (uint i = 0; i < count; ++i) {
-		checkColumn(col);
-		column(col).push_back(tv);
-	}
-}
-
-
-PIString PIConsole::getString(int x, int y) {
-	bool run = isRunning();
-	if (run) PIThread::stop(true);
-	listener->setActive(false);
-	msleep(50);
-#ifdef WINDOWS
-	moveTo(x - 1, y - 1);
-#else
-	moveTo(x, y);
-#endif
-	showCursor();
-	PIByteArray ba(4096);
-#ifdef CC_VC
-	int ret = scanf_s(" %s", ba.data());
-#else
-	int ret = scanf(" %s", ba.data());
-#endif
-	listener->setActive(true);
-	if (run) start();
-	if (ret >= 1) return PIString(ba);
-	else return PIString();
-}
-
-
-PIString PIConsole::getString(const PIString & name) {
-	piForeachC (Column & i, tabs[cur_tab].columns)
-			piForeachC (Variable & j, i.variables)
-			if (j.name == name)
-			return getString(j.nx + 1, j.ny);
-	return PIString();
-}
-
-
-#define PRINT_VAR_BODY couts(fstr(format)); int ret = couts(value); couts(fstr(PIConsole::Dec)); return ret;
-
-inline void PIConsole::printLine(const PIString & value, int dx, FormatFlags format) {
-	int i = width - value.length() - dx;
-#if defined(QNX) || defined(FREE_BSD)
-	--i;
-#endif
-	PIString ts = fstr(format);
-	couts(ts);
-	if (i >= 0) ts = value + PIString(i, ' ');
-	else ts = value.left(value.size() + i);
-	couts(ts);
-	couts(fstr(Dec));
-}
-inline int PIConsole::printValue(const PIString & value, FormatFlags format) {
-	couts(fstr(format));
-	int ret = couts(value);
-	fstr(PIConsole::Dec);
-	return ret;
-}
-inline int PIConsole::printValue(const char * value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const bool value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const int value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const long value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const llong value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const float value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const double value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const char value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const short value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const uchar value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const ushort value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const uint value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const ulong value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const ullong value, FormatFlags format) {PRINT_VAR_BODY}
-inline int PIConsole::printValue(const PISystemTime & value, FormatFlags format) {PRINT_VAR_BODY}
-
-
-
-void PIConsole::startServer(const PIString & name) {
-	stopPeer();
-	server_mode = true;
-	peer = new PIPeer("_rcs_:" + name);
-	CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
-	CONNECT1(void, const PIString & , peer, peerDisconnectedEvent, this, peerDisconnectedEvent);
-	peer_timer->start(50.);
-	serverSendInfo();
-}
-
-
-void PIConsole::stopPeer() {
-	remote_clients.clear();
-	peer_timer->stop();
-	if (peer != 0) delete peer;
-	peer = 0;
-	state = Disconnected;
-}
-
-
-PIStringList PIConsole::clients() const {
-	PIStringList sl;
-	if (peer == 0) return sl;
-	piForeachC (PIPeer::PeerInfo & i, peer->allPeers()) {
-		if (i.name.left(6) != "_rcc_:") continue;
-		sl << i.name.right(i.name.length() - 6);
-	}
-	return sl;
-}
-
-
-void PIConsole::listenServers() {
-	stopPeer();
-	server_mode = false;
-	server_name.clear();
-	randomize();
-	peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(randomi()));
-	CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
-	peer_timer->start(100.);
-}
-
-
-PIStringList PIConsole::availableServers() const {
-	PIStringList sl;
-	if (peer == 0) return sl;
-	piForeachC (PIPeer::PeerInfo & i, peer->allPeers()) {
-		if (i.name.left(6) != "_rcs_:") continue;
-		sl << i.name.right(i.name.length() - 6);
-	}
-	return sl;
-}
-
-
-void PIConsole::connectToServer(const PIString & name) {
-	if (peer == 0) listenServers();
-	server_name = name;
-}
-
-
-void PIConsole::disconnect() {
-	stopPeer();
-}
-
-
-void PIConsole::serverSendInfo() {
-	if (peer == 0) return;
-	PIByteArray ba;
-	ba << int(0xAA);
-	peer->sendToAll(ba);
-}
-
-
-void PIConsole::serverSendData() {
-	if (peer == 0) return;
-	PIByteArray ba;
-	PIVector<VariableContent> content;
-	piForeach (Tab & t, tabs)
-			piForeach (Column & c, t.columns)
-			piForeach (Variable & v, c.variables)
-			if (!v.isEmpty() && v.id > 0) {
-		VariableContent vc;
-		vc.id = v.id;
-		v.writeData(vc.rdata);
-		content << vc;
-	}
-	piForeach (RemoteClient & rc, remote_clients) {
-		ba.clear();
-		switch (rc.state) {
-			case FetchingData:
-				ba << int(0xCC) << tabs;
-				//piCout << "server send const data" << rc.name << ba.size_s();
-			break;
-			case Committing:
-				ba << int(0xDD);
-			break;
-			case Connected:
-				ba << int(0xEE) << content;
-				//piCout << "send data" << ba.size();
-			break;
-			default: break;
-		}
-		if (!ba.isEmpty())
-			peer->send(rc.name, ba);
-	}
-}
-
-
-PIConsole::RemoteClient & PIConsole::remoteClient(const PIString & fname) {
-	piForeach (RemoteClient & i, remote_clients)
-			if (i.name == fname)
-			return i;
-	remote_clients << RemoteClient(fname);
-	return remote_clients.back();
-}
-
-
-void PIConsole::peerReceived(const PIString & from, const PIByteArray & data) {
-	int type;
-	PIByteArray ba(data);
-	ba >> type;
-	//piCout << "rec packet from" << from << "type" << PICoutManipulators::Hex << type;
-	if (server_mode) {
-		if (from.left(5) != "_rcc_") return;
-		//PIString rcn = from.right(from.length() - 6);
-		RemoteClient & rc(remoteClient(from));
-		switch (type) {
-			case 0xBB: // fetch const data request
-				//piCout << "fetch data request from" << from << rc.state;
-				if (rc.state != Connected)
-					rc.state = FetchingData;
-			break;
-			case 0xCC: // const data commit
-				//piCout << "commit from" << from;
-				if (rc.state != Connected)
-					rc.state = Connected;
-			break;
-			default: break;
-		}
-	} else {
-		PIVector<VariableContent> content;
-		PIMap<int, Variable * > vids;
-		if (from.left(5) != "_rcs_") return;
-		//PIString rcn = from.right(from.length() - 6);
-		switch (type) {
-			case 0xAA: // new server
-				//piCout << "new server" << rcn;
-			break;
-			case 0xCC: // const data
-				//piCout << "received const data";
-				state = Committing;
-				ba >> tabs;
-				cur_tab = tabs.isEmpty() ? -1 : 0;
-				piForeach (Tab & t, tabs)
-						piForeach (Column & c, t.columns)
-						piForeach (Variable & v, c.variables)
-						v.remote = true;
-			break;
-			case 0xDD: // const data commit
-				//piCout << "received commit";
-				state = Connected;
-			break;
-			case 0xEE: // dynamic data
-				//piCout << "received data" << ba.size_s();
-				piForeach (Tab & t, tabs)
-						piForeach (Column & c, t.columns)
-						piForeach (Variable & v, c.variables)
-						if (!v.isEmpty() && v.id > 0)
-						vids[v.id] = &v;
-				ba >> content;
-				piForeach (VariableContent & vc, content) {
-					if (vc.id <= 0) continue;
-					Variable * v = vids.at(vc.id);
-					if (v == 0) continue;
-					//piCout << "read" << v->name << vc.rdata.size_s();
-					v->rdata = vc.rdata;
-				}
-			break;
-			default: break;
-		}
-	}
-}
-
-
-void PIConsole::peerTimer(void * data, int delim) {
-	if (peer == 0) return;
-	//piCout << "timer" << delim;
-	if (server_mode) {
-		if (delim == 20)
-			serverSendInfo();
-		else
-			serverSendData();
-	} else {
-		if (delim != 1 || server_name.isEmpty()) return;
-		const PIPeer::PeerInfo * p = peer->getPeerByName("_rcs_:" + server_name);
-		if (p == 0) return;
-		PIByteArray ba;
-		switch (state) {
-			case Disconnected:
-				peer_tm.reset();
-				ba << int(0xBB);
-				//piCout << "send to" << server_name << "fetch request disc";
-				peer->send(p, ba);
-				state = FetchingData;
-			break;
-			case FetchingData:
-				if (peer_tm.elapsed_s() < 3.)
-					return;
-				peer_tm.reset();
-				ba << int(0xBB);
-				//piCout << "send to" << server_name << "fetch request fd";
-				peer->send(p, ba);
-			break;
-			case Committing:
-				peer_tm.reset();
-				ba << int(0xCC);
-				//piCout << "send to" << server_name << "committing";
-				state = Connected;
-				peer->send(p, ba);
-			break;
-			default: break;
-		};
-	}
-}
-
-
-void PIConsole::peerDisconnectedEvent(const PIString & name) {
-	for (int i = 0; i < remote_clients.size_s(); ++i)
-		if (remote_clients[i].name == name) {
-			remote_clients.remove(i);
-			--i;
-		}
-}
+/*
+	PIP - Platform Independent Primitives
+	Console output/input
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "piconsole.h"
+#include "piincludes_p.h"
+#include "pipeer.h"
+#include "pidiagnostics.h"
+#include "pisystemmonitor.h"
+#ifndef WINDOWS
+#  include <sys/ioctl.h>
+#  include <fcntl.h>
+#  include <termios.h>
+#else
+#  include <wincon.h>
+#  define COMMON_LVB_UNDERSCORE 0x8000
+#endif
+
+
+/** \class PIConsole
+ * \brief Console output class
+ * \details
+ * \section PIConsole_sec0 Synopsis
+ * This class provides output to console with automatic alignment and update.
+ * It supports tabs, keyboard listening, formats and colors.
+ *
+ * \section PIConsole_sec1 Layout
+ * %PIConsole works with variable pointers. You should add your variables with
+ * functions \a addVariable() which receives label name, pointer to variable
+ * and optional column and format. Columns count is dynamically increased if
+ * new column used. E.g. if you add variable to empty tab to column 3, columns
+ * count will be increased to 3, but two firsts columns will be empty. Each column
+ * filled from top to bottom, but you can add just string with function
+ * \a addString() or add empty line with function \a addEmptyLine(). Layout scheme:
+ * \image html piconsole_layout.png
+ *
+ * \section PIConsole_sec2 Keyboard usage
+ * %PIConsole should to be single in application. %PIConsole aggregate PIKbdListener
+ * which grab keyboard and automatic switch tabs by theirs bind keys. If there is no
+ * tab binded to pressed key external function "slot" will be called
+ *
+ **/
+
+
+PRIVATE_DEFINITION_START(PIConsole)
+#ifdef WINDOWS
+void getWinCurCoord() {GetConsoleScreenBufferInfo(hOut, &csbi); ccoord = csbi.dwCursorPosition;}
+COORD & getWinCoord(int dx = 0, int dy = 0) {getWinCurCoord(); ccoord.X += dx; ccoord.Y += dy; return ccoord;}
+void * hOut;
+CONSOLE_SCREEN_BUFFER_INFO sbi, csbi;
+CONSOLE_CURSOR_INFO curinfo;
+COORD ccoord, ulcoord;
+WORD dattr;
+DWORD smode, written;
+#endif
+PRIVATE_DEFINITION_END(PIConsole)
+
+
+PIConsole::PIConsole(bool startNow, PIKbdListener::KBFunc slot): PIThread() {
+	setName("console");
+	setPriority(piLow);
+	needLockRun(true);
+	ret_func = slot;
+	num_format = systime_format = 0;
+	vid = 0;
+	cur_tab = width = height = pwidth = pheight = max_y = 0;
+	def_align = Nothing;
+	tabs.reserve(16);
+#ifdef WINDOWS
+	PRIVATE->ulcoord.X = 0;
+	PRIVATE->hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
+	PRIVATE->dattr = PRIVATE->sbi.wAttributes;
+	width = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
+	height = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
+	PRIVATE->ulcoord.Y = PRIVATE->sbi.srWindow.Top;
+	GetConsoleMode(PRIVATE->hOut, &PRIVATE->smode);
+	GetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
+#else
+#  ifdef FREERTOS
+	width = 80;
+	height = 24;
+#  else
+	winsize ws;
+	ioctl(0, TIOCGWINSZ, &ws);
+	width = ws.ws_col;
+	height = ws.ws_row;
+#  endif
+#endif
+	addTab("main");
+	listener = new PIKbdListener(key_event, this);
+	peer_timer = new PITimer();
+	peer_timer->setName("__S__.PIConsole.peer_timer");
+	peer = 0;
+	server_mode = pause_ = false;
+	state = Disconnected;
+	peer_timer->addDelimiter(20);
+	peer_timer->setName("__S__PIConsole::peer_timer");
+	CONNECT2(void, void * , int, peer_timer, tickEvent, this, peerTimer);
+	if (startNow) start();
+}
+
+
+PIConsole::~PIConsole() {
+	stopPeer();
+	if (isRunning())
+		stop();
+	clearTabs(false);
+	delete listener;
+	delete peer_timer;
+#ifdef WINDOWS
+	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
+	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
+#endif
+}
+
+
+int PIConsole::addTab(const PIString & name, char bind_key) {
+	if (isRunning()) lock();
+	tabs.push_back(Tab(name, bind_key));
+	cur_tab = tabs.size() - 1;
+	if (isRunning()) unlock();
+	return tabs.size();
+}
+
+
+void PIConsole::removeTab(uint index) {
+	if (index >= tabs.size()) return;
+	if (isRunning()) lock();
+	tabs.remove(index);
+	if (cur_tab >= tabs.size()) cur_tab = tabs.size() - 1;
+	if (isRunning()) unlock();
+}
+
+
+void PIConsole::removeTab(const PIString & name) {
+	uint index = tabs.size() + 1;
+	for (uint i = 0; i < tabs.size(); ++i) {
+		if (tabs[i].name == name) {
+			index = i;
+			break;
+		}
+	}
+	removeTab(index);
+}
+
+
+void PIConsole::clearTab(uint index) {
+	if (index >= tabs.size()) return;
+	lock();
+	tabs[index].columns.clear();
+	if (cur_tab == index) {
+		clearScreen();
+		fillLabels();
+	}
+	if (cur_tab >= tabs.size()) cur_tab = tabs.size() - 1;
+	unlock();
+}
+
+
+void PIConsole::clearTab(const PIString & name) {
+	uint index = tabs.size() + 1;
+	for (uint i = 0; i < tabs.size(); ++i) {
+		if (tabs[i].name == name) {
+			index = i;
+			break;
+		}
+	}
+	clearTab(index);
+}
+
+
+void PIConsole::update() {
+	lock();
+	fillLabels();
+	unlock();
+}
+
+
+bool PIConsole::setTab(uint index) {
+	if (index >= tabs.size())
+		return false;
+	if (!isRunning()) {
+		cur_tab = index;
+		return true;
+	}
+	lock();
+	PICout::__mutex__().lock();
+	cur_tab = index;
+	clearScreen();
+	fillLabels();
+	PICout::__mutex__().unlock();
+	unlock();
+	return true;
+}
+
+
+bool PIConsole::setTab(const PIString & name) {
+	uint index = tabs.size() + 1;
+	for (uint i = 0; i < tabs.size(); ++i) {
+		if (tabs[i].name == name) {
+			index = i;
+			break;
+		}
+	}
+	return setTab(index);
+}
+
+
+bool PIConsole::setTabBindKey(uint index, char bind_key) {
+	if (index >= tabs.size())
+		return false;
+	tabs[index].key = bind_key;
+	return true;
+}
+
+
+bool PIConsole::setTabBindKey(const PIString & name, char bind_key) {
+	uint index =tabs.size() + 1;
+	for (uint i = 0; i < tabs.size(); ++i) {
+		if (tabs[i].name == name) {
+			index = i;
+			break;
+		}
+	}
+	return setTabBindKey(index, bind_key);
+}
+
+
+void PIConsole::key_event(PIKbdListener::KeyEvent key, void * t) {
+	PIConsole * p = (PIConsole * )t;
+	int ct = p->cur_tab;
+	if (key.key == PIKbdListener::LeftArrow) {
+		do {
+			ct--;
+			if (ct < 0) return;
+		} while (p->tabs[ct].key == 0);
+		p->setTab(ct);
+		return;
+	}
+	if (key.key == PIKbdListener::RightArrow) {
+		do {
+			ct++;
+			if (ct >= p->tabs.size_s()) return;
+		} while (p->tabs[ct].key == 0);
+		p->setTab(ct);
+		return;
+	}
+	for (uint i = 0; i < p->tabsCount(); ++i) {
+		if (p->tabs[i].key == key.key) {
+			p->setTab(i);
+			return;
+		}
+	}
+	if (p->ret_func != 0) p->ret_func(key, t);
+	p->keyPressed(key, t);
+}
+
+
+int PIConsole::couts(const PIString & v) {
+	return printf("%s", v.data());
+}
+
+
+int PIConsole::couts(const char * v) {
+	return printf("%s", v);
+}
+
+
+void PIConsole::clearVariables(bool clearScreen) {
+	if (isRunning()) lock();
+	if (clearScreen && isRunning()) {
+		toUpperLeft();
+		clearScreenLower();
+	}
+	columns().clear();
+	if (isRunning()) unlock();
+}
+
+
+void PIConsole::stop(bool clear) {
+	PIThread::stop(true);
+	if (clear) clearScreen();
+	moveTo(0, max_y + 4);
+	showCursor();
+	couts(fstr(Normal));
+#ifdef WINDOWS
+	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
+	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
+#endif
+	fflush(0);
+}
+
+
+PIString PIConsole::fstr(FormatFlags f) {
+	num_format = systime_format = 0;
+	if (f[PIConsole::Dec]) num_format = 0;
+	if (f[PIConsole::Hex]) num_format = 1;
+	if (f[PIConsole::Oct]) num_format = 2;
+	if (f[PIConsole::Bin]) num_format = 4;
+	if (f[PIConsole::Scientific]) num_format = 3;
+	if (f[PIConsole::SystemTimeSplit]) systime_format = 0;
+	if (f[PIConsole::SystemTimeSeconds]) systime_format = 1;
+
+#ifdef WINDOWS
+	WORD attr = 0;
+
+	if (f[PIConsole::Inverse]) {
+		if (f[PIConsole::Red]) attr |= BACKGROUND_RED;
+		if (f[PIConsole::Green]) attr |= BACKGROUND_GREEN;
+		if (f[PIConsole::Blue]) attr |= BACKGROUND_BLUE;
+		if (f[PIConsole::Yellow]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN);
+		if (f[PIConsole::Magenta]) attr |= (BACKGROUND_RED | BACKGROUND_BLUE);
+		if (f[PIConsole::Cyan]) attr |= (BACKGROUND_GREEN | BACKGROUND_BLUE);
+		if (f[PIConsole::White]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE);
+		if (f[PIConsole::BackRed]) attr |= FOREGROUND_RED;
+		if (f[PIConsole::BackGreen]) attr |= FOREGROUND_GREEN;
+		if (f[PIConsole::BackBlue]) attr |= FOREGROUND_BLUE;
+		if (f[PIConsole::BackYellow]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN);
+		if (f[PIConsole::BackMagenta]) attr |= (FOREGROUND_RED | FOREGROUND_BLUE);
+		if (f[PIConsole::BackCyan]) attr |= (FOREGROUND_GREEN | FOREGROUND_BLUE);
+		if (f[PIConsole::BackWhite]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
+		if ((attr & BACKGROUND_RED) + (attr & BACKGROUND_GREEN) + (attr & BACKGROUND_BLUE) == 0)
+			attr |= FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
+	} else {
+		if (f[PIConsole::Red]) attr |= FOREGROUND_RED;
+		if (f[PIConsole::Green]) attr |= FOREGROUND_GREEN;
+		if (f[PIConsole::Blue]) attr |= FOREGROUND_BLUE;
+		if (f[PIConsole::Yellow]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN);
+		if (f[PIConsole::Magenta]) attr |= (FOREGROUND_RED | FOREGROUND_BLUE);
+		if (f[PIConsole::Cyan]) attr |= (FOREGROUND_GREEN | FOREGROUND_BLUE);
+		if (f[PIConsole::White]) attr |= (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);
+		if (f[PIConsole::BackRed]) attr |= BACKGROUND_RED;
+		if (f[PIConsole::BackGreen]) attr |= BACKGROUND_GREEN;
+		if (f[PIConsole::BackBlue]) attr |= BACKGROUND_BLUE;
+		if (f[PIConsole::BackYellow]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN);
+		if (f[PIConsole::BackMagenta]) attr |= (BACKGROUND_RED | BACKGROUND_BLUE);
+		if (f[PIConsole::BackCyan]) attr |= (BACKGROUND_GREEN | BACKGROUND_BLUE);
+		if (f[PIConsole::BackWhite]) attr |= (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE);
+		if ((attr & FOREGROUND_RED) + (attr & FOREGROUND_GREEN) + (attr & FOREGROUND_BLUE) == 0)
+			attr |= FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
+	}
+	if (f[PIConsole::Bold]) attr |= FOREGROUND_INTENSITY;
+	if (f[PIConsole::Underline]) attr |= COMMON_LVB_UNDERSCORE;
+
+	SetConsoleTextAttribute(PRIVATE->hOut, attr);
+	return PIString();
+#else
+	PIString ts("\e[0");
+
+	if (f[PIConsole::Bold]) ts += ";1";
+	if (f[PIConsole::Faint]) ts += ";2";
+	if (f[PIConsole::Italic]) ts += ";3";
+	if (f[PIConsole::Underline]) ts += ";4";
+	if (f[PIConsole::Blink]) ts += ";5";
+	if (f[PIConsole::Inverse]) ts += ";7";
+
+	if (f[PIConsole::Black]) ts += ";30";
+	if (f[PIConsole::Red]) ts += ";31";
+	if (f[PIConsole::Green]) ts += ";32";
+	if (f[PIConsole::Yellow]) ts += ";33";
+	if (f[PIConsole::Blue]) ts += ";34";
+	if (f[PIConsole::Magenta]) ts += ";35";
+	if (f[PIConsole::Cyan]) ts += ";36";
+	if (f[PIConsole::White]) ts += ";37";
+
+	if (f[PIConsole::BackBlack]) ts += ";40";
+	if (f[PIConsole::BackRed]) ts += ";41";
+	if (f[PIConsole::BackGreen]) ts += ";42";
+	if (f[PIConsole::BackYellow]) ts += ";43";
+	if (f[PIConsole::BackBlue]) ts += ";44";
+	if (f[PIConsole::BackMagenta]) ts += ";45";
+	if (f[PIConsole::BackCyan]) ts += ";46";
+	if (f[PIConsole::BackWhite]) ts += ";47";
+
+	return ts + "m";
+#endif
+}
+
+
+inline int PIConsole::couts(const bool v) {return (v ? printf("true") : printf("false"));}
+inline int PIConsole::couts(const char v) {return printf("%c", v);}
+inline int PIConsole::couts(const short v) {
+	switch (num_format) {case (1): return printf("0x%.4hX", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 2)); break; default: return printf("%hd", v); break;}
+}
+inline int PIConsole::couts(const int v) {
+	switch (num_format) {case (1): return printf("0x%.8X", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 4)); break; default: return printf("%d", v); break;}
+}
+inline int PIConsole::couts(const long v) {
+	switch (num_format) {case (1): return printf("0x%.16lX", v); break; case (2): return printf("%lo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%ld", v); break;}
+}
+inline int PIConsole::couts(const llong v) {
+	switch (num_format) {case (1): return printf("0x%.16llX", v); break; case (2): return printf("%llo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%lld", v); break;}
+}
+inline int PIConsole::couts(const uchar v) {
+	switch (num_format) {case (1): return printf("0x%.2X", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 1)); break; default: return printf("%u", v); break;}
+}
+inline int PIConsole::couts(const ushort v) {
+	switch (num_format) {case (1): return printf("0x%.4hX", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 2)); break; default: return printf("%hu", v); break;}
+}
+inline int PIConsole::couts(const uint v) {
+	switch (num_format) {case (1): return printf("0x%.8X", v); break; case (2): return printf("%o", v); break; case (4): return printf("%s", toBin(&v, 4)); break; default: return printf("%u", v); break;}
+}
+inline int PIConsole::couts(const ulong v) {
+	switch (num_format) {case (1): return printf("0x%.16lX", v); break; case (2): return printf("%lo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%lu", v); break;}
+}
+inline int PIConsole::couts(const ullong v) {
+	switch (num_format) {case (1): return printf("0x%.16llX", v); break; case (2): return printf("%llo", v); break; case (4): return printf("%s", toBin(&v, sizeof(v))); break; default: return printf("%llu", v); break;}
+}
+inline int PIConsole::couts(const float v) {
+	switch (num_format) {case (3): return printf("%e", v); break; default: return printf("%.5g", v); break;}
+}
+inline int PIConsole::couts(const double v) {
+	switch (num_format) {case (3): return printf("%le", v); break; default: return printf("%.5lg", v); break;}
+}
+inline int PIConsole::couts(const PISystemTime & v) {
+	switch (systime_format) {case (1): return printf("%.6lg", v.toSeconds()); break;
+		default: return couts(v.seconds) + printf(" s, ") + couts(v.nanoseconds) + printf(" ns"); break;}
+}
+
+
+void PIConsole::toUpperLeft() {
+#ifdef WINDOWS
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ulcoord);
+#else
+	printf("\e[H");
+#endif
+}
+
+void PIConsole::moveRight(int n) {
+#ifdef WINDOWS
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->getWinCoord(n));
+#else
+	if (n > 0) printf("\e[%dC", n);
+#endif
+}
+
+void PIConsole::moveLeft(int n) {
+#ifdef WINDOWS
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->getWinCoord(-n));
+#else
+	if (n > 0) printf("\e[%dD", n);
+#endif
+}
+
+void PIConsole::moveTo(int x, int y) {
+#ifdef WINDOWS
+	PRIVATE->ccoord.X = x;
+	PRIVATE->ccoord.Y = PRIVATE->ulcoord.Y + y;
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
+#else
+	printf("\e[%d;%dH", y, x);
+#endif
+}
+
+void PIConsole::clearScreen() {
+#ifdef WINDOWS
+	couts(fstr(Normal));
+	toUpperLeft();
+	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
+	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
+#else
+	couts(fstr(Normal)); printf("\e[H\e[J");
+#endif
+}
+
+void PIConsole::clearScreenLower() {
+#ifdef WINDOWS
+	couts(fstr(Normal));
+	PRIVATE->getWinCurCoord();
+	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+#else
+	couts(fstr(Normal)); printf("\e[J");
+#endif
+}
+
+void PIConsole::clearLine() {
+#ifdef WINDOWS
+	PRIVATE->getWinCurCoord();
+	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+#else
+	printf("\e[K");
+#endif
+}
+
+void PIConsole::newLine() {
+#ifdef WINDOWS
+	PRIVATE->getWinCurCoord();
+	PRIVATE->ccoord.X = 0; PRIVATE->ccoord.Y++;
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
+#else
+	printf("\eE");
+#endif
+}
+
+void PIConsole::hideCursor() {
+#ifdef WINDOWS
+	PRIVATE->curinfo.bVisible = false;
+	SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
+#else
+	printf("\e[?25l");
+#endif
+}
+
+void PIConsole::showCursor() {
+#ifdef WINDOWS
+	PRIVATE->curinfo.bVisible = true; SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
+#else
+	printf("\e[?25h");
+#endif
+}
+
+
+void PIConsole::begin() {
+#ifdef WINDOWS
+	SetConsoleMode(PRIVATE->hOut, ENABLE_WRAP_AT_EOL_OUTPUT);
+#endif
+	max_y = 0;
+	PICout::__mutex__().lock();
+	clearScreen();
+	hideCursor();
+	fillLabels();
+	PICout::__mutex__().unlock();
+}
+
+
+void PIConsole::run() {
+	if (pause_) return;
+	uint cx, clen = 0;
+	int j;
+#ifdef WINDOWS
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
+	width = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
+	height = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
+#else
+#  ifdef FREERTOS
+	width = 80;
+	height = 24;
+#  else
+	winsize ws;
+	ioctl(0, TIOCGWINSZ, &ws);
+	width = ws.ws_col;
+	height = ws.ws_row;
+#  endif
+#endif
+	//fflush(0); return;
+	PICout::__mutex__().lock();
+	if (pwidth != width || pheight != height) {
+		clearScreen();
+		fillLabels();
+	}
+	pwidth = width;
+	pheight = height;
+	col_cnt = columns().size();
+	col_wid = (col_cnt > 0) ? width / col_cnt : width;
+	for (uint i = 0; i < col_cnt; ++i) {
+		PIVector<Variable> & cvars(tabs[cur_tab].columns[i].variables);
+		cx = col_wid * i;
+		toUpperLeft();
+		if (max_y < cvars.size()) max_y = cvars.size();
+		j = 0;
+		piForeachC (Variable & tv_, cvars) {
+			if (j > height - 3) continue;
+			j++;
+			moveRight(cx);
+			if (tv_.type == 15) {
+				newLine();
+				continue;
+			}
+			moveRight(tv_.offset);
+			const void * ptr = 0;
+			if (tv_.remote) {
+				if (tv_.type == 0) {
+					rstr.clear();
+					rba = tv_.rdata;
+					rba >> rstr;
+					rstr.trim();
+					ptr = &rstr;
+				} else
+					ptr = tv_.rdata.data();
+			} else
+				ptr = tv_.ptr;
+			switch (tv_.type) {
+				case 0: clen = printValue(ptr != 0 ? *(const PIString*)ptr : PIString(), tv_.format); break;
+				case 1: clen = printValue(ptr != 0 ? *(const bool*)ptr : false, tv_.format); break;
+				case 2: clen = printValue(ptr != 0 ? *(const int*)ptr : 0, tv_.format); break;
+				case 3: clen = printValue(ptr != 0 ? *(const long*)ptr : 0l, tv_.format); break;
+				case 4: clen = printValue(ptr != 0 ? *(const char*)ptr : char(0), tv_.format); break;
+				case 5: clen = printValue(ptr != 0 ? *(const float*)ptr : 0.f, tv_.format); break;
+				case 6: clen = printValue(ptr != 0 ? *(const double*)ptr : 0., tv_.format); break;
+				case 7: clen = printValue(ptr != 0 ? *(const short*)ptr : short(0), tv_.format); break;
+				case 8: clen = printValue(ptr != 0 ? *(const uint*)ptr : 0u, tv_.format); break;
+				case 9: clen = printValue(ptr != 0 ? *(const ulong*)ptr : 0ul, tv_.format); break;
+				case 10: clen = printValue(ptr != 0 ? *(const ushort*)ptr : ushort(0), tv_.format); break;
+				case 11: clen = printValue(ptr != 0 ? *(const uchar*)ptr : uchar(0), tv_.format); break;
+				case 12: clen = printValue(ptr != 0 ? *(const llong*)ptr : 0l, tv_.format); break;
+				case 13: clen = printValue(ptr != 0 ? *(const ullong*)ptr: 0ull, tv_.format); break;
+				case 20: clen = printValue(ptr != 0 ? *(const PISystemTime*)ptr: PISystemTime(), tv_.format); break;
+				case 14: clen = printValue(bitsValue(ptr, tv_.bitFrom, tv_.bitCount), tv_.format); break;
+			}
+			if (clen + tv_.offset < (uint)col_wid) {
+				PIString ts = PIString(
+			#if defined(QNX) || defined(FREE_BSD)
+							col_wid - clen - tv_.offset - 1, ' ');
+#else
+							col_wid - clen - tv_.offset, ' ');
+#endif
+				printf("%s", ts.data());
+			}
+			newLine();
+		}
+	}
+#ifdef WINDOWS
+	moveTo(0, max_y + 1);
+#else
+	moveTo(0, max_y + 2);
+#endif
+	fflush(0);
+	PICout::__mutex__().unlock();
+}
+
+
+void PIConsole::fillLabels() {
+	if (!isRunning()) return;
+	uint cx, cy, mx = 0, dx;
+#ifdef WINDOWS
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
+	width = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
+	height = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
+#else
+#  ifdef FREERTOS
+	width = 80;
+	height = 24;
+#  else
+	winsize ws;
+	ioctl(0, TIOCGWINSZ, &ws);
+	width = ws.ws_col;
+	height = ws.ws_row;
+#  endif
+#endif
+	max_y = 0;
+	col_cnt = columns().size();
+	col_wid = (col_cnt > 0) ? width / col_cnt : width;
+	for (uint i = 0; i < col_cnt; ++i) {
+		Column & ccol(tabs[cur_tab].columns[i]);
+		PIVector<Variable> & cvars(ccol.variables);
+		if (ccol.alignment != Nothing) {
+			mx = 0;
+			piForeachC (Variable & j, cvars)
+					if (!j.isEmpty())
+					if (mx < j.name.size())
+					mx = j.name.size();
+			mx += 2;
+		}
+		cx = col_wid * i;
+		cy = 1;
+		toUpperLeft();
+		for (uint j = 0; j < cvars.size(); ++j) {
+			if (int(j) > height - 3) continue;
+			if (max_y < j) max_y = j;
+			moveRight(cx);
+			Variable & tv_(cvars[j]);
+			cvars[j].nx = cx;
+			cvars[j].ny = cy;
+			if (tv_.name.isEmpty()) {
+				cvars[j].offset = 0;
+				clearLine();
+				newLine();
+				cy++;
+				continue;
+			}
+			clearLine();
+			//piCout << tv_.name << tv_.type << tv_.ptr;
+			if (tv_.type == 15) {
+				cvars[j].offset = cvars[j].name.length();
+				cvars[j].nx += cvars[j].offset;
+				printLine(tv_.name, cx, tv_.format);
+				newLine();
+				cy++;
+				continue;
+			}
+			if (!tv_.isEmpty()) {
+				switch (ccol.alignment) {
+					case Nothing:
+						cvars[j].offset = (tv_.name + ": ").length();
+						cvars[j].nx += cvars[j].offset;
+						printValue(tv_.name + ": ", tv_.format);
+					break;
+					case Left:
+						cvars[j].offset = mx;
+						cvars[j].nx += cvars[j].offset;
+						printValue(tv_.name + ": ", tv_.format);
+					break;
+					case Right:
+						cvars[j].offset = mx;
+						cvars[j].nx += cvars[j].offset;
+						dx = mx - (tv_.name + ": ").length();
+						moveRight(dx);
+						printValue(tv_.name + ": ", tv_.format);
+						moveLeft(dx);
+					break;
+				}
+			}
+			newLine();
+			cy++;
+		}
+	}
+#ifdef WINDOWS
+	moveTo(0, max_y + 1);
+#else
+	moveTo(0, max_y + 2);
+#endif
+	if (!tabs[cur_tab].status.isEmpty()) {
+		printValue(tabs[cur_tab].status);
+		newLine();
+	}
+	status();
+}
+
+
+void PIConsole::status() {
+	Tab * ctab;
+	for (uint i = 0; i < tabsCount(); ++i) {
+		ctab = &tabs[i];
+		if (ctab->key == 0) continue;
+		printValue(ctab->key, PIConsole::White | PIConsole::Bold);
+		if (i == cur_tab)
+			printValue(ctab->name + " ", PIConsole::BackYellow | PIConsole::Black);
+		else
+			printValue(ctab->name + " ", PIConsole::Cyan | PIConsole::Inverse);
+		printValue(" ");
+	}
+	newLine();
+}
+
+
+int PIConsole::bitsValue(const void * src, int offset, int count) const {
+	int ret = 0, stbyte = offset / 8, cbit = offset - stbyte * 8;
+	char cbyte = reinterpret_cast<const char * >(src)[stbyte];
+	for (int i = 0; i < count; i++) {
+		ret |= ((cbyte >> cbit & 1) << i);
+		cbit++;
+		if (cbit == 8) {
+			cbit = 0;
+			stbyte++;
+			cbyte = reinterpret_cast<const char * >(src)[stbyte];
+		}
+	}
+	return ret;
+}
+
+
+const char * PIConsole::toBin(const void * d, int s) {
+	binstr.clear();
+	uchar cc, b;
+	for (int i = 0; i < s; ++i) {
+		cc = ((const uchar *)d)[i];
+		b = 1;
+		for (int j = 0; j < 8; ++j) {
+			binstr << (cc & b ? "1" : "0");
+			b <<= 1;
+		}
+		if (i < s - 1) binstr << " ";
+	}
+	binstr.reverse();
+	return binstr.data();
+}
+
+
+#define ADD_VAR_BODY vid++; tv.id = vid; tv.name = name; tv.bitFrom = tv.bitCount = 0; tv.format = format; tv.remote = false; checkColumn(col);
+
+void PIConsole::addString(const PIString & name, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 15; tv.size = 0; tv.ptr = 0; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const PIString * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 0; tv.size = 0; tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const bool * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 1; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const int * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 2; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const long * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 3; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const char * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 4; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const float * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 5; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const double * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 6; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const short * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 7; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const uint * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 8; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const ulong * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 9; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const ushort * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 10; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const uchar * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 11; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const llong * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 12; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const ullong * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 13; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+void PIConsole::addVariable(const PIString & name, const PISystemTime * ptr, int col, FormatFlags format) {
+	ADD_VAR_BODY tv.type = 20; tv.size = sizeof(*ptr); tv.ptr = ptr; column(col).push_back(tv);}
+/** \brief Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+ * \details This function add to column "column" next lines:
+ * * "<name> diagnostics"
+ * * "Received count": \a PIDiagnostics::receiveCount
+ * * "Invalid  count": \a PIDiagnostics::wrongCount
+ * * "Sended   count": \a PIDiagnostics::sendCount
+ * * "Immediate Frequency, Hz": \a PIDiagnostics::immediateFrequency
+ * * "Integral  Frequency, Hz": \a PIDiagnostics::integralFrequency
+ * * "Receive speed": \a PIDiagnostics::receiveSpeed
+ * * "Send    speed": \a PIDiagnostics::sendSpeed
+ * * "Quality": \a PIDiagnostics::quality
+ * */
+void PIConsole::addVariable(const PIString & name, const PIDiagnostics * ptr, int col, FormatFlags format) {
+	addString(name + " diagnostics", col, format | PIConsole::Bold);
+//	addVariable("Received count", ptr->receiveCount_ptr(), col, format);
+//	addVariable("Invalid  count", ptr->wrongCount_ptr(), col, format);
+//	addVariable("Sended   count", ptr->sendCount_ptr(), col, format);
+//	addVariable("Immediate Frequency, Hz", ptr->immediateFrequency_ptr(), col, format);
+//	addVariable("Integral  Frequency, Hz", ptr->integralFrequency_ptr(), col, format);
+//	addVariable("Receive speed", ptr->receiveSpeed_ptr(), col, format);
+//	addVariable("Send    speed", ptr->sendSpeed_ptr(), col, format);
+//	addVariable("Quality", ptr->quality_ptr(), col, format);
+}
+void PIConsole::addVariable(const PIString & name, const PISystemMonitor * ptr, int col, FormatFlags format) {
+	addString("monitor " + name, col, format | PIConsole::Bold);
+	//addVariable("PID", &(ptr->statistic().ID), col, format);
+	//addVariable("state", &(ptr->statistic().state), col, format);
+	//addVariable("threads", &(ptr->statistic().threads), col, format);
+	//addVariable("priority", &(ptr->statistic().priority), col, format);
+	//addVariable("memory physical", &(ptr->statistic().physical_memsize_readable), col, format);
+	//addVariable("memory shared", &(ptr->statistic().share_memsize_readable), col, format);
+	//addVariable("cpu load kernel", &(ptr->statistic().cpu_load_system), col, format);
+	//addVariable("cpu load user", &(ptr->statistic().cpu_load_user), col, format);
+}
+void PIConsole::addBitVariable(const PIString & name, const void * ptr, int fromBit, int bitCount, int col, FormatFlags format) {
+	vid++; tv.id = vid; tv.size = sizeof(ullong); tv.name = name; tv.bitFrom = fromBit; tv.bitCount = bitCount; tv.type = 14; tv.ptr = ptr; tv.format = format;
+	checkColumn(col); column(col).push_back(tv);}
+void PIConsole::addEmptyLine(int col, uint count) {
+	tv.id = 0; tv.size = 0; tv.name = ""; tv.type = 0; tv.ptr = 0; tv.format = Normal;
+	for (uint i = 0; i < count; ++i) {
+		checkColumn(col);
+		column(col).push_back(tv);
+	}
+}
+
+
+PIString PIConsole::getString(int x, int y) {
+	bool run = isRunning();
+	if (run) PIThread::stop(true);
+	listener->setActive(false);
+	msleep(50);
+#ifdef WINDOWS
+	moveTo(x - 1, y - 1);
+#else
+	moveTo(x, y);
+#endif
+	showCursor();
+	PIByteArray ba(4096);
+#ifdef CC_VC
+	int ret = scanf_s(" %s", ba.data());
+#else
+	int ret = scanf(" %s", ba.data());
+#endif
+	listener->setActive(true);
+	if (run) start();
+	if (ret >= 1) return PIString(ba);
+	else return PIString();
+}
+
+
+PIString PIConsole::getString(const PIString & name) {
+	piForeachC (Column & i, tabs[cur_tab].columns)
+			piForeachC (Variable & j, i.variables)
+			if (j.name == name)
+			return getString(j.nx + 1, j.ny);
+	return PIString();
+}
+
+
+#define PRINT_VAR_BODY couts(fstr(format)); int ret = couts(value); couts(fstr(PIConsole::Dec)); return ret;
+
+inline void PIConsole::printLine(const PIString & value, int dx, FormatFlags format) {
+	int i = width - value.length() - dx;
+#if defined(QNX) || defined(FREE_BSD)
+	--i;
+#endif
+	PIString ts = fstr(format);
+	couts(ts);
+	if (i >= 0) ts = value + PIString(i, ' ');
+	else ts = value.left(value.size() + i);
+	couts(ts);
+	couts(fstr(Dec));
+}
+inline int PIConsole::printValue(const PIString & value, FormatFlags format) {
+	couts(fstr(format));
+	int ret = couts(value);
+	fstr(PIConsole::Dec);
+	return ret;
+}
+inline int PIConsole::printValue(const char * value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const bool value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const int value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const long value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const llong value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const float value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const double value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const char value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const short value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const uchar value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const ushort value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const uint value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const ulong value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const ullong value, FormatFlags format) {PRINT_VAR_BODY}
+inline int PIConsole::printValue(const PISystemTime & value, FormatFlags format) {PRINT_VAR_BODY}
+
+
+
+void PIConsole::startServer(const PIString & name) {
+	stopPeer();
+	server_mode = true;
+	peer = new PIPeer("_rcs_:" + name);
+	CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
+	CONNECT1(void, const PIString & , peer, peerDisconnectedEvent, this, peerDisconnectedEvent);
+	peer_timer->start(50.);
+	serverSendInfo();
+}
+
+
+void PIConsole::stopPeer() {
+	remote_clients.clear();
+	peer_timer->stop();
+	if (peer != 0) delete peer;
+	peer = 0;
+	state = Disconnected;
+}
+
+
+PIStringList PIConsole::clients() const {
+	PIStringList sl;
+	if (peer == 0) return sl;
+	piForeachC (PIPeer::PeerInfo & i, peer->allPeers()) {
+		if (i.name.left(6) != "_rcc_:") continue;
+		sl << i.name.right(i.name.length() - 6);
+	}
+	return sl;
+}
+
+
+void PIConsole::listenServers() {
+	stopPeer();
+	server_mode = false;
+	server_name.clear();
+	randomize();
+	peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(randomi()));
+	CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
+	peer_timer->start(100.);
+}
+
+
+PIStringList PIConsole::availableServers() const {
+	PIStringList sl;
+	if (peer == 0) return sl;
+	piForeachC (PIPeer::PeerInfo & i, peer->allPeers()) {
+		if (i.name.left(6) != "_rcs_:") continue;
+		sl << i.name.right(i.name.length() - 6);
+	}
+	return sl;
+}
+
+
+void PIConsole::connectToServer(const PIString & name) {
+	if (peer == 0) listenServers();
+	server_name = name;
+}
+
+
+void PIConsole::disconnect() {
+	stopPeer();
+}
+
+
+void PIConsole::serverSendInfo() {
+	if (peer == 0) return;
+	PIByteArray ba;
+	ba << int(0xAA);
+	peer->sendToAll(ba);
+}
+
+
+void PIConsole::serverSendData() {
+	if (peer == 0) return;
+	PIByteArray ba;
+	PIVector<VariableContent> content;
+	piForeach (Tab & t, tabs)
+			piForeach (Column & c, t.columns)
+			piForeach (Variable & v, c.variables)
+			if (!v.isEmpty() && v.id > 0) {
+		VariableContent vc;
+		vc.id = v.id;
+		v.writeData(vc.rdata);
+		content << vc;
+	}
+	piForeach (RemoteClient & rc, remote_clients) {
+		ba.clear();
+		switch (rc.state) {
+			case FetchingData:
+				ba << int(0xCC) << tabs;
+				//piCout << "server send const data" << rc.name << ba.size_s();
+			break;
+			case Committing:
+				ba << int(0xDD);
+			break;
+			case Connected:
+				ba << int(0xEE) << content;
+				//piCout << "send data" << ba.size();
+			break;
+			default: break;
+		}
+		if (!ba.isEmpty())
+			peer->send(rc.name, ba);
+	}
+}
+
+
+PIConsole::RemoteClient & PIConsole::remoteClient(const PIString & fname) {
+	piForeach (RemoteClient & i, remote_clients)
+			if (i.name == fname)
+			return i;
+	remote_clients << RemoteClient(fname);
+	return remote_clients.back();
+}
+
+
+void PIConsole::peerReceived(const PIString & from, const PIByteArray & data) {
+	int type;
+	PIByteArray ba(data);
+	ba >> type;
+	//piCout << "rec packet from" << from << "type" << PICoutManipulators::Hex << type;
+	if (server_mode) {
+		if (from.left(5) != "_rcc_") return;
+		//PIString rcn = from.right(from.length() - 6);
+		RemoteClient & rc(remoteClient(from));
+		switch (type) {
+			case 0xBB: // fetch const data request
+				//piCout << "fetch data request from" << from << rc.state;
+				if (rc.state != Connected)
+					rc.state = FetchingData;
+			break;
+			case 0xCC: // const data commit
+				//piCout << "commit from" << from;
+				if (rc.state != Connected)
+					rc.state = Connected;
+			break;
+			default: break;
+		}
+	} else {
+		PIVector<VariableContent> content;
+		PIMap<int, Variable * > vids;
+		if (from.left(5) != "_rcs_") return;
+		//PIString rcn = from.right(from.length() - 6);
+		switch (type) {
+			case 0xAA: // new server
+				//piCout << "new server" << rcn;
+			break;
+			case 0xCC: // const data
+				//piCout << "received const data";
+				state = Committing;
+				ba >> tabs;
+				cur_tab = tabs.isEmpty() ? -1 : 0;
+				piForeach (Tab & t, tabs)
+						piForeach (Column & c, t.columns)
+						piForeach (Variable & v, c.variables)
+						v.remote = true;
+			break;
+			case 0xDD: // const data commit
+				//piCout << "received commit";
+				state = Connected;
+			break;
+			case 0xEE: // dynamic data
+				//piCout << "received data" << ba.size_s();
+				piForeach (Tab & t, tabs)
+						piForeach (Column & c, t.columns)
+						piForeach (Variable & v, c.variables)
+						if (!v.isEmpty() && v.id > 0)
+						vids[v.id] = &v;
+				ba >> content;
+				piForeach (VariableContent & vc, content) {
+					if (vc.id <= 0) continue;
+					Variable * v = vids.at(vc.id);
+					if (v == 0) continue;
+					//piCout << "read" << v->name << vc.rdata.size_s();
+					v->rdata = vc.rdata;
+				}
+			break;
+			default: break;
+		}
+	}
+}
+
+
+void PIConsole::peerTimer(void * data, int delim) {
+	if (peer == 0) return;
+	//piCout << "timer" << delim;
+	if (server_mode) {
+		if (delim == 20)
+			serverSendInfo();
+		else
+			serverSendData();
+	} else {
+		if (delim != 1 || server_name.isEmpty()) return;
+		const PIPeer::PeerInfo * p = peer->getPeerByName("_rcs_:" + server_name);
+		if (p == 0) return;
+		PIByteArray ba;
+		switch (state) {
+			case Disconnected:
+				peer_tm.reset();
+				ba << int(0xBB);
+				//piCout << "send to" << server_name << "fetch request disc";
+				peer->send(p, ba);
+				state = FetchingData;
+			break;
+			case FetchingData:
+				if (peer_tm.elapsed_s() < 3.)
+					return;
+				peer_tm.reset();
+				ba << int(0xBB);
+				//piCout << "send to" << server_name << "fetch request fd";
+				peer->send(p, ba);
+			break;
+			case Committing:
+				peer_tm.reset();
+				ba << int(0xCC);
+				//piCout << "send to" << server_name << "committing";
+				state = Connected;
+				peer->send(p, ba);
+			break;
+			default: break;
+		};
+	}
+}
+
+
+void PIConsole::peerDisconnectedEvent(const PIString & name) {
+	for (int i = 0; i < remote_clients.size_s(); ++i)
+		if (remote_clients[i].name == name) {
+			remote_clients.remove(i);
+			--i;
+		}
+}
diff --git a/src_main/console/piscreen.cpp b/lib/console/piscreen.cpp
similarity index 96%
rename from src_main/console/piscreen.cpp
rename to lib/console/piscreen.cpp
index db1c2c83..60945d17 100644
--- a/src_main/console/piscreen.cpp
+++ b/lib/console/piscreen.cpp
@@ -1,645 +1,645 @@
-/*
-	PIP - Platform Independent Primitives
-	Console output/input
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "piscreen.h"
-#include "piincludes_p.h"
-#ifndef WINDOWS
-#  include <sys/ioctl.h>
-#  include <fcntl.h>
-#  include <termios.h>
-#else
-#  include <wincon.h>
-#  ifndef COMMON_LVB_UNDERSCORE
-#    define COMMON_LVB_UNDERSCORE 0x8000
-#  endif
-#endif
-
-
-using namespace PIScreenTypes;
-
-
-PRIVATE_DEFINITION_START(PIScreen::SystemConsole)
-#ifdef WINDOWS
-	void * hOut;
-	CONSOLE_SCREEN_BUFFER_INFO sbi, csbi;
-	CONSOLE_CURSOR_INFO curinfo;
-	COORD ccoord, ulcoord, bs, bc;
-	SMALL_RECT srect;
-	WORD dattr;
-	DWORD smode, written;
-	PIVector<CHAR_INFO> chars;
-#endif
-PRIVATE_DEFINITION_END(PIScreen::SystemConsole)
-
-
-PIScreen::SystemConsole::SystemConsole() {
-	width = height = pwidth = pheight = 0;
-	mouse_x = mouse_y = -1;
-	int w, h;
-#ifdef WINDOWS
-	PRIVATE->ulcoord.X = 0;
-	PRIVATE->hOut = GetStdHandle(STD_OUTPUT_HANDLE);
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
-	PRIVATE->dattr = PRIVATE->sbi.wAttributes;
-	w = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
-	h = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
-	PRIVATE->ulcoord.Y = PRIVATE->sbi.srWindow.Top;
-	GetConsoleMode(PRIVATE->hOut, &PRIVATE->smode);
-	GetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
-#else
-#  ifdef FREERTOS
-	w = 80;
-	h = 24;
-#  else
-	winsize ws;
-	ioctl(0, TIOCGWINSZ, &ws);
-	w = ws.ws_col;
-	h = ws.ws_row;
-#  endif
-#endif
-	resize(w, h);
-}
-
-
-PIScreen::SystemConsole::~SystemConsole() {
-#ifdef WINDOWS
-	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
-	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
-#endif
-}
-
-
-void PIScreen::SystemConsole::begin() {
-#ifdef WINDOWS
-	SetConsoleMode(PRIVATE->hOut, ENABLE_WRAP_AT_EOL_OUTPUT);
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
-	PRIVATE->bc.X = 0;
-	PRIVATE->bc.Y = 0;
-#endif
-	clear();
-	hideCursor();
-}
-
-
-void PIScreen::SystemConsole::end() {
-#ifdef WINDOWS
-	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
-#else
-	printf("\e[0m");
-#endif
-	moveTo(0, height);
-	showCursor();
-}
-
-
-void PIScreen::SystemConsole::prepare() {
-	int w, h;
-#ifdef WINDOWS
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->csbi);
-	w = PRIVATE->csbi.srWindow.Right - PRIVATE->csbi.srWindow.Left + 1;
-	h = PRIVATE->csbi.srWindow.Bottom - PRIVATE->csbi.srWindow.Top + 1;
-#else
-#  ifdef FREERTOS
-	w = 80;
-	h = 24;
-#  else
-	winsize ws;
-	ioctl(0, TIOCGWINSZ, &ws);
-	w = ws.ws_col;
-	h = ws.ws_row;
-#  endif
-#endif
-	resize(w, h);
-}
-
-
-void PIScreen::SystemConsole::clear() {
-	for (int i = 0; i < cells.size_s(); ++i)
-		cells[i].fill(Cell());
-}
-
-
-void PIScreen::SystemConsole::resize(int w, int h) {
-	if (w == pwidth && h == pheight) return;
-	width = piMaxi(w, 0);
-	height = piMaxi(h, 0);
-	pwidth = width;
-	pheight = height;
-	cells.resize(height);
-	pcells.resize(height);
-	for (int i = 0; i < height; ++i) {
-		cells[i].resize(width);
-		pcells[i].resize(width, Cell(0));
-	}
-#ifdef WINDOWS
-	PRIVATE->sbi.srWindow = PRIVATE->csbi.srWindow;
-	PRIVATE->chars.resize(width * height);
-#endif
-	for (int i = 0; i < pcells.size_s(); ++i)
-		pcells[i].fill(Cell());
-	clear();
-	clearScreen();
-}
-
-
-void PIScreen::SystemConsole::print() {
-	if (mouse_x >= 0 && mouse_x < width && mouse_y >= 0 && mouse_y < height) {
-		///cells[mouse_y][mouse_x].format.flags ^= Inverse;
-	}
-#ifdef WINDOWS
-	PRIVATE->srect = PRIVATE->sbi.srWindow;
-	int dx0 = -1, dx1 = -1, dy0 = -1, dy1 = -1;
-	for (int j = 0; j < height; ++j) {
-		PIVector<Cell> & ccv(cells[j]);
-		PIVector<Cell> & pcv(pcells[j]);
-		for (int i = 0; i < width; ++i)
-			if (ccv[i] != pcv[i]) {
-				if (dx0 < 0) {
-					dx0 = dx1 = i;
-					dy0 = dy1 = j;
-				} else {
-					dx0 = piMini(dx0, i);
-					dx1 = piMaxi(dx1, i);
-					dy0 = piMini(dy0, j);
-					dy1 = piMaxi(dy1, j);
-				}
-			}
-	}
-	if (dx0 < 0) return;
-	int dw = dx1 - dx0 + 1, dh = dy1 - dy0 + 1;
-	for (int i = 0; i < dw; ++i)
-		for (int j = 0; j < dh; ++j) {
-			int k = j * dw + i;
-			Cell & c(cells[j + dy0][i + dx0]);
-			PRIVATE->chars[k].Char.UnicodeChar = 0;
-			PRIVATE->chars[k].Char.AsciiChar = c.symbol.toConsole1Byte();
-			PRIVATE->chars[k].Attributes = attributes(c);
-		}
-	//piCout << "draw" << dw << dh;
-	PRIVATE->bs.X = dw;
-	PRIVATE->bs.Y = dh;
-	PRIVATE->srect.Left += dx0;
-	PRIVATE->srect.Top += dy0;
-	PRIVATE->srect.Right -= width - dx1 - 1;
-	PRIVATE->srect.Bottom -= height - dy1 - 1;
-	WriteConsoleOutput(PRIVATE->hOut, PRIVATE->chars.data(), PRIVATE->bs, PRIVATE->bc, &PRIVATE->srect);
-#else
-	PIString s;
-	int si = 0, sj = 0;
-	CellFormat prf(0xFFFF);
-	for (int j = 0; j < height; ++j) {
-		PIVector<Cell> & ccv(cells[j]);
-		PIVector<Cell> & pcv(pcells[j]);
-		for (int i = 0; i < width; ++i) {
-			Cell & cc(ccv[i]);
-			Cell & pc(pcv[i]);
-			if (cc != pc) {
-				if (s.isEmpty()) {
-					si = i;
-					sj = j;
-				}
-				if (prf != cc.format) {
-					prf = cc.format;
-					s += formatString(cc);
-				}
-				s += cc.symbol;
-			} else {
-				if (!s.isEmpty()) {
-					moveTo(si, sj);
-					printf("%s", s.data());
-					s.clear();
-				}
-			}
-		}
-		if (!s.isEmpty()) {
-			moveTo(si, sj);
-			printf("%s", s.data());
-			s.clear();
-		}
-	}
-	printf("\e[0m");
-	fflush(0);
-#endif
-	pcells = cells;
-}
-
-
-#ifdef WINDOWS
-#define FOREGROUND_MASK (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)
-#define BACKGROUND_MASK (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE)
-ushort PIScreen::SystemConsole::attributes(const PIScreenTypes::Cell & c) {
-	WORD attr = PRIVATE->dattr;
-	if (c.format.flags & Bold) attr |= FOREGROUND_INTENSITY;
-	else attr &= ~FOREGROUND_INTENSITY;
-	if (c.format.flags & Underline) attr |= COMMON_LVB_UNDERSCORE;
-	else attr &= ~COMMON_LVB_UNDERSCORE;
-	switch (c.format.color_char) {
-	case Black:   attr = (attr & ~FOREGROUND_MASK); break;
-	case Red:     attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_RED; break;
-	case Green:   attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_GREEN; break;
-	case Blue:    attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_BLUE; break;
-	case Cyan:    attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_GREEN | FOREGROUND_BLUE; break;
-	case Magenta: attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_RED | FOREGROUND_BLUE; break;
-	case Yellow:  attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_RED | FOREGROUND_GREEN; break;
-	case White:   attr = attr | FOREGROUND_MASK; break;
-	}
-	switch (c.format.color_back) {
-	case Black:   attr = (attr & ~BACKGROUND_MASK); break;
-	case Red:     attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_RED; break;
-	case Green:   attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_GREEN; break;
-	case Blue:    attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_BLUE; break;
-	case Cyan:    attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_GREEN | BACKGROUND_BLUE; break;
-	case Magenta: attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_RED | BACKGROUND_BLUE; break;
-	case Yellow:  attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_RED | BACKGROUND_GREEN; break;
-	case White:   attr = attr | BACKGROUND_MASK; break;
-	}
-	if ((c.format.flags & Inverse) == Inverse) {
-		uchar f = attr & 0xFF;
-		attr &= 0xFFFFFF00;
-		f = (f << 4) | (f >> 4);
-		attr |= f;
-	}
-	return attr;
-}
-#undef FOREGROUND_MASK
-#undef BACKGROUND_MASK
-
-void PIScreen::SystemConsole::getWinCurCoord() {
-	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->csbi);
-	PRIVATE->ccoord = PRIVATE->csbi.dwCursorPosition;
-}
-
-void PIScreen::SystemConsole::clearLine() {
-	getWinCurCoord();
-	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-}
-
-void PIScreen::SystemConsole::newLine() {
-	getWinCurCoord();
-	PRIVATE->ccoord.X = 0; PRIVATE->ccoord.Y++;
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
-}
-#else // WINDOWS
-PIString PIScreen::SystemConsole::formatString(const PIScreenTypes::Cell & c) {
-	PIString ts("\e[0");
-	switch (c.format.color_char) {
-	case Black:   ts += ";30"; break;
-	case Red:     ts += ";31"; break;
-	case Green:   ts += ";32"; break;
-	case Blue:    ts += ";34"; break;
-	case Cyan:    ts += ";36"; break;
-	case Magenta: ts += ";35"; break;
-	case Yellow:  ts += ";33"; break;
-	case White:   ts += ";37"; break;
-	}
-	switch (c.format.color_back) {
-	case Black:   ts += ";40"; break;
-	case Red:     ts += ";41"; break;
-	case Green:   ts += ";42"; break;
-	case Blue:    ts += ";44"; break;
-	case Cyan:    ts += ";46"; break;
-	case Magenta: ts += ";45"; break;
-	case Yellow:  ts += ";43"; break;
-	case White:   ts += ";47"; break;
-	}
-	if ((c.format.flags & Bold) == Bold) ts += ";1";
-	if ((c.format.flags & Underline) == Underline) ts += ";4";
-	if ((c.format.flags & Blink) == Blink) ts += ";5";
-	if ((c.format.flags & Inverse) == Inverse) ts += ";7";
-	return ts + "m";
-}
-#endif // WINDOWS
-
-
-void PIScreen::SystemConsole::toUpperLeft() {
-#ifdef WINDOWS
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ulcoord);
-#else
-	printf("\e[H");
-#endif
-}
-
-void PIScreen::SystemConsole::moveTo(int x, int y) {
-#ifdef WINDOWS
-	PRIVATE->ccoord.X = x;
-	PRIVATE->ccoord.Y = PRIVATE->ulcoord.Y + y;
-	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
-#else
-	printf("\e[%d;%dH", y + 1, x + 1);
-#endif
-}
-
-void PIScreen::SystemConsole::clearScreen() {
-#ifdef WINDOWS
-	toUpperLeft();
-	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
-#else
-	printf("\e[0m\e[H\e[J");
-#endif
-}
-
-void PIScreen::SystemConsole::clearScreenLower() {
-#ifdef WINDOWS
-	getWinCurCoord();
-	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
-#else
-	printf("\e[0m\e[J");
-#endif
-}
-
-void PIScreen::SystemConsole::hideCursor() {
-#ifdef WINDOWS
-	PRIVATE->curinfo.bVisible = false;
-	SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
-#else
-	printf("\e[?25l");
-#endif
-}
-
-void PIScreen::SystemConsole::showCursor() {
-#ifdef WINDOWS
-	PRIVATE->curinfo.bVisible = true;
-	SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
-#else
-	printf("\e[?25h");
-#endif
-}
-
-
-
-
-PIScreen::PIScreen(bool startNow, PIKbdListener::KBFunc slot): PIThread(), drawer_(console.cells), root("rootTile") {
-	setName("screen");
-	setPriority(piLow);
-	needLockRun(true);
-	mouse_ = false;
-	ret_func = slot;
-	tile_focus = tile_dialog = 0;
-	root.screen = this;
-	listener = new PIKbdListener(key_eventS, this, startNow);
-	CONNECTU(listener, mouseEvent, this, mouse_event);
-	CONNECTU(listener, wheelEvent, this, wheel_event);
-	if (startNow) start();
-}
-
-
-PIScreen::~PIScreen() {
-	if (isRunning())
-		stop();
-	PIThread::waitForFinish(10);
-	listener->waitForFinish(10);
-	delete listener;
-}
-
-
-void PIScreen::setMouseEnabled(bool on) {
-	mouse_ = on;
-	console.mouse_x = console.mouse_y = -1;
-}
-
-
-void PIScreen::key_event(PIKbdListener::KeyEvent key) {
-	/** DEBUG
-	if (ret_func != 0) ret_func(key, t);
-	keyPressed(key, t);
-	return;
-	*/
-	PIScreenTile * rtile = rootTile();
-	if (tile_dialog)
-		rtile = tile_dialog;
-	bool used = nextFocus(rtile, key);
-	if (used) return;
-	if (!used && tile_focus) {
-		if (tile_focus->visible) {
-			if (tile_focus->keyEvent(key))
-				return;
-		}
-	}
-	if (ret_func != 0) ret_func(key, data_);
-	keyPressed(key, data_);
-}
-
-
-PIVector<PIScreenTile * > PIScreen::prepareMouse(PIKbdListener::MouseEvent * e) {
-	PIVector<PIScreenTile * > ret;
-	if (!mouse_ || !e) return ret;
-	console.mouse_x = e->x;
-	console.mouse_y = e->y;
-	PIVector<PIScreenTile * > tl = tilesUnderMouse(e->x, e->y);
-	bool ff = false;
-	piForeachR (PIScreenTile * t, tl) {
-		if (!ff) {
-			if (t->focus_flags[FocusOnMouse] && (e->action == PIKbdListener::MouseButtonPress)) {
-				t->setFocus();
-				ff = true;
-			}
-			if (t->focus_flags[FocusOnWheel] && (e->action == PIKbdListener::MouseWheel)) {
-				t->setFocus();
-				ff = true;
-			}
-		}
-
-	}
-	return tl;
-}
-
-
-PIVector<PIScreenTile * > PIScreen::tilesUnderMouse(int x, int y) {
-	PIVector<PIScreenTile * > ret;
-	if (x < 0 || x >= console.width || y < 0 || y >= console.height) return ret;
-	PIScreenTile * ct = tile_dialog ? tile_dialog : rootTile();
-	bool f = true;
-	while (ct) {
-		if (!f) ret << ct;
-		f = false;
-		ct = ct->childUnderMouse(x, y);
-	}
-	return ret;
-}
-
-
-void PIScreen::mouse_event(PIKbdListener::MouseEvent me) {
-	PIVector<PIScreenTile * > tl = prepareMouse(&me);
-	if (tl.isEmpty()) return;
-	piForeachR (PIScreenTile * t, tl)
-		if (t->mouseEvent(me)) piBreak;
-}
-
-
-void PIScreen::wheel_event(PIKbdListener::WheelEvent we) {
-	PIVector<PIScreenTile * > tl = prepareMouse(&we);
-	if (tl.isEmpty()) return;
-	piForeachR (PIScreenTile * t, tl)
-		if (t->wheelEvent(we)) piBreak;
-
-}
-
-
-bool PIScreen::nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key) {
-	PIVector<PIScreenTile*> vtl = rt->children(true), ftl;
-	piForeach (PIScreenTile * t, vtl) {
-		if (t->focus_flags[CanHasFocus])
-			ftl << t;
-	}
-	int ind = -1;
-	for (int i = 0; i < ftl.size_s(); ++i)
-		if (ftl[i] == tile_focus) {
-			ind = i;
-			break;
-		}
-	if (ind < 0)
-		tile_focus = 0;
-	if (ftl.isEmpty())
-		tile_focus = 0;
-	else {
-		if (tile_focus)
-			if (!tile_focus->visible)
-				tile_focus = 0;
-		int next = tile_focus ? 0 : 1;
-		if (tile_focus) {
-			if (tile_focus->focus_flags[NextByTab] && key.key == PIKbdListener::Tab)
-				next = 1;
-			if (tile_focus->focus_flags[NextByArrowsHorizontal]) {
-				if (key.key == PIKbdListener::LeftArrow) next = -1;
-				if (key.key == PIKbdListener::RightArrow) next = 1;
-			}
-			if (tile_focus->focus_flags[NextByArrowsVertical]) {
-				if (key.key == PIKbdListener::UpArrow) next = -1;
-				if (key.key == PIKbdListener::DownArrow) next = 1;
-			}
-		}
-		//piCout << ftl.size() << ind << next;
-		if (next != 0) {
-			PIVector<PIScreenTile*> tl = rt->children();
-			piForeach (PIScreenTile * t, tl)
-				t->has_focus = false;
-			if (!ftl.isEmpty()) {
-				ind += next;
-				if (ind >= ftl.size_s()) ind = 0;
-				if (ind < 0) ind = ftl.size_s() - 1;
-				tile_focus = ftl[ind];
-				tile_focus->has_focus = true;
-			}
-			return true;
-		}
-	}
-	return false;
-}
-
-
-void PIScreen::tileEventInternal(PIScreenTile * t, TileEvent e) {
-	tileEvent(t, e);
-}
-
-
-void PIScreen::tileRemovedInternal(PIScreenTile * t) {
-	if (tile_dialog == t)
-		tile_dialog = 0;
-}
-
-
-void PIScreen::tileSetFocusInternal(PIScreenTile * t) {
-	PIScreenTile * rt = rootTile();
-	if (tile_dialog)
-		rt = tile_dialog;
-	PIVector<PIScreenTile*> tl = rt->children(), ftl;
-	piForeach (PIScreenTile * i, tl)
-		i->has_focus = false;
-	tile_focus = t;
-	if (!tile_focus) return;
-	if (tile_focus->focus_flags[CanHasFocus])
-		tile_focus->has_focus = true;
-}
-
-
-void PIScreen::setDialogTile(PIScreenTile * t) {
-	tile_dialog = t;
-	if (!tile_dialog) {
-		nextFocus(&root);
-		return;
-	}
-	tile_dialog->setScreen(this);
-	tile_dialog->parent = 0;
-	nextFocus(tile_dialog);
-}
-
-
-void PIScreen::waitForFinish() {
-	WAIT_FOR_EXIT
-	stop();
-}
-
-
-void PIScreen::stop(bool clear) {
-	PIThread::stop(true);
-	if (clear) console.clearScreen();
-#ifndef WINDOWS
-	fflush(0);
-#endif
-}
-
-
-void PIScreen::begin() {
-	listener->start();
-	nextFocus(&root);
-	console.begin();
-}
-
-
-void PIScreen::run() {
-	console.prepare();
-	root.width_ = drawer_.width = console.width;
-	root.height_ = drawer_.height = console.height;
-	root.layout();
-	root.drawEventInternal(&drawer_);
-	if (tile_dialog) {
-		int sw(0), sh(0);
-		tile_dialog->sizeHint(sw, sh);
-		sw = piClampi(sw, tile_dialog->minimumWidth, tile_dialog->maximumWidth);
-		sh = piClampi(sh, tile_dialog->minimumHeight, tile_dialog->maximumHeight);
-		tile_dialog->x_ = (console.width - sw) / 2;
-		tile_dialog->y_ = (console.height - sh) / 2;
-		tile_dialog->width_ = sw;
-		tile_dialog->height_ = sh;
-		tile_dialog->layout();
-		int dx = tile_dialog->x_ - 1, dy = tile_dialog->y_ - 1, dw = tile_dialog->width_, dh = tile_dialog->height_;
-		drawer_.drawFrame(dx, dy, dx + dw + 1, dy + dh + 1, (Color)tile_dialog->back_format.color_char,
-						  (Color)tile_dialog->back_format.color_back, (CharFlags)tile_dialog->back_format.flags);
-		tile_dialog->drawEventInternal(&drawer_);
-	}
-	console.print();
-}
-
-
-void PIScreen::end() {
-	listener->stop();
-	console.end();
-}
-
-
-PIScreenTile * PIScreen::tileByName(const PIString & name) {
-	PIVector<PIScreenTile*> tl(tiles());
-	piForeach (PIScreenTile * t, tl)
-		if (t->name() == name)
-			return t;
-	return 0;
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Console output/input
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "piscreen.h"
+#include "piincludes_p.h"
+#ifndef WINDOWS
+#  include <sys/ioctl.h>
+#  include <fcntl.h>
+#  include <termios.h>
+#else
+#  include <wincon.h>
+#  ifndef COMMON_LVB_UNDERSCORE
+#    define COMMON_LVB_UNDERSCORE 0x8000
+#  endif
+#endif
+
+
+using namespace PIScreenTypes;
+
+
+PRIVATE_DEFINITION_START(PIScreen::SystemConsole)
+#ifdef WINDOWS
+	void * hOut;
+	CONSOLE_SCREEN_BUFFER_INFO sbi, csbi;
+	CONSOLE_CURSOR_INFO curinfo;
+	COORD ccoord, ulcoord, bs, bc;
+	SMALL_RECT srect;
+	WORD dattr;
+	DWORD smode, written;
+	PIVector<CHAR_INFO> chars;
+#endif
+PRIVATE_DEFINITION_END(PIScreen::SystemConsole)
+
+
+PIScreen::SystemConsole::SystemConsole() {
+	width = height = pwidth = pheight = 0;
+	mouse_x = mouse_y = -1;
+	int w, h;
+#ifdef WINDOWS
+	PRIVATE->ulcoord.X = 0;
+	PRIVATE->hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
+	PRIVATE->dattr = PRIVATE->sbi.wAttributes;
+	w = PRIVATE->sbi.srWindow.Right - PRIVATE->sbi.srWindow.Left;
+	h = PRIVATE->sbi.srWindow.Bottom - PRIVATE->sbi.srWindow.Top;
+	PRIVATE->ulcoord.Y = PRIVATE->sbi.srWindow.Top;
+	GetConsoleMode(PRIVATE->hOut, &PRIVATE->smode);
+	GetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
+#else
+#  ifdef FREERTOS
+	w = 80;
+	h = 24;
+#  else
+	winsize ws;
+	ioctl(0, TIOCGWINSZ, &ws);
+	w = ws.ws_col;
+	h = ws.ws_row;
+#  endif
+#endif
+	resize(w, h);
+}
+
+
+PIScreen::SystemConsole::~SystemConsole() {
+#ifdef WINDOWS
+	SetConsoleMode(PRIVATE->hOut, PRIVATE->smode);
+	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
+#endif
+}
+
+
+void PIScreen::SystemConsole::begin() {
+#ifdef WINDOWS
+	SetConsoleMode(PRIVATE->hOut, ENABLE_WRAP_AT_EOL_OUTPUT);
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->sbi);
+	PRIVATE->bc.X = 0;
+	PRIVATE->bc.Y = 0;
+#endif
+	clear();
+	hideCursor();
+}
+
+
+void PIScreen::SystemConsole::end() {
+#ifdef WINDOWS
+	SetConsoleTextAttribute(PRIVATE->hOut, PRIVATE->dattr);
+#else
+	printf("\e[0m");
+#endif
+	moveTo(0, height);
+	showCursor();
+}
+
+
+void PIScreen::SystemConsole::prepare() {
+	int w, h;
+#ifdef WINDOWS
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->csbi);
+	w = PRIVATE->csbi.srWindow.Right - PRIVATE->csbi.srWindow.Left + 1;
+	h = PRIVATE->csbi.srWindow.Bottom - PRIVATE->csbi.srWindow.Top + 1;
+#else
+#  ifdef FREERTOS
+	w = 80;
+	h = 24;
+#  else
+	winsize ws;
+	ioctl(0, TIOCGWINSZ, &ws);
+	w = ws.ws_col;
+	h = ws.ws_row;
+#  endif
+#endif
+	resize(w, h);
+}
+
+
+void PIScreen::SystemConsole::clear() {
+	for (int i = 0; i < cells.size_s(); ++i)
+		cells[i].fill(Cell());
+}
+
+
+void PIScreen::SystemConsole::resize(int w, int h) {
+	if (w == pwidth && h == pheight) return;
+	width = piMaxi(w, 0);
+	height = piMaxi(h, 0);
+	pwidth = width;
+	pheight = height;
+	cells.resize(height);
+	pcells.resize(height);
+	for (int i = 0; i < height; ++i) {
+		cells[i].resize(width);
+		pcells[i].resize(width, Cell(0));
+	}
+#ifdef WINDOWS
+	PRIVATE->sbi.srWindow = PRIVATE->csbi.srWindow;
+	PRIVATE->chars.resize(width * height);
+#endif
+	for (int i = 0; i < pcells.size_s(); ++i)
+		pcells[i].fill(Cell());
+	clear();
+	clearScreen();
+}
+
+
+void PIScreen::SystemConsole::print() {
+	if (mouse_x >= 0 && mouse_x < width && mouse_y >= 0 && mouse_y < height) {
+		///cells[mouse_y][mouse_x].format.flags ^= Inverse;
+	}
+#ifdef WINDOWS
+	PRIVATE->srect = PRIVATE->sbi.srWindow;
+	int dx0 = -1, dx1 = -1, dy0 = -1, dy1 = -1;
+	for (int j = 0; j < height; ++j) {
+		PIVector<Cell> & ccv(cells[j]);
+		PIVector<Cell> & pcv(pcells[j]);
+		for (int i = 0; i < width; ++i)
+			if (ccv[i] != pcv[i]) {
+				if (dx0 < 0) {
+					dx0 = dx1 = i;
+					dy0 = dy1 = j;
+				} else {
+					dx0 = piMini(dx0, i);
+					dx1 = piMaxi(dx1, i);
+					dy0 = piMini(dy0, j);
+					dy1 = piMaxi(dy1, j);
+				}
+			}
+	}
+	if (dx0 < 0) return;
+	int dw = dx1 - dx0 + 1, dh = dy1 - dy0 + 1;
+	for (int i = 0; i < dw; ++i)
+		for (int j = 0; j < dh; ++j) {
+			int k = j * dw + i;
+			Cell & c(cells[j + dy0][i + dx0]);
+			PRIVATE->chars[k].Char.UnicodeChar = 0;
+			PRIVATE->chars[k].Char.AsciiChar = c.symbol.toConsole1Byte();
+			PRIVATE->chars[k].Attributes = attributes(c);
+		}
+	//piCout << "draw" << dw << dh;
+	PRIVATE->bs.X = dw;
+	PRIVATE->bs.Y = dh;
+	PRIVATE->srect.Left += dx0;
+	PRIVATE->srect.Top += dy0;
+	PRIVATE->srect.Right -= width - dx1 - 1;
+	PRIVATE->srect.Bottom -= height - dy1 - 1;
+	WriteConsoleOutput(PRIVATE->hOut, PRIVATE->chars.data(), PRIVATE->bs, PRIVATE->bc, &PRIVATE->srect);
+#else
+	PIString s;
+	int si = 0, sj = 0;
+	CellFormat prf(0xFFFF);
+	for (int j = 0; j < height; ++j) {
+		PIVector<Cell> & ccv(cells[j]);
+		PIVector<Cell> & pcv(pcells[j]);
+		for (int i = 0; i < width; ++i) {
+			Cell & cc(ccv[i]);
+			Cell & pc(pcv[i]);
+			if (cc != pc) {
+				if (s.isEmpty()) {
+					si = i;
+					sj = j;
+				}
+				if (prf != cc.format) {
+					prf = cc.format;
+					s += formatString(cc);
+				}
+				s += cc.symbol;
+			} else {
+				if (!s.isEmpty()) {
+					moveTo(si, sj);
+					printf("%s", s.data());
+					s.clear();
+				}
+			}
+		}
+		if (!s.isEmpty()) {
+			moveTo(si, sj);
+			printf("%s", s.data());
+			s.clear();
+		}
+	}
+	printf("\e[0m");
+	fflush(0);
+#endif
+	pcells = cells;
+}
+
+
+#ifdef WINDOWS
+#define FOREGROUND_MASK (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)
+#define BACKGROUND_MASK (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE)
+ushort PIScreen::SystemConsole::attributes(const PIScreenTypes::Cell & c) {
+	WORD attr = PRIVATE->dattr;
+	if (c.format.flags & Bold) attr |= FOREGROUND_INTENSITY;
+	else attr &= ~FOREGROUND_INTENSITY;
+	if (c.format.flags & Underline) attr |= COMMON_LVB_UNDERSCORE;
+	else attr &= ~COMMON_LVB_UNDERSCORE;
+	switch (c.format.color_char) {
+	case Black:   attr = (attr & ~FOREGROUND_MASK); break;
+	case Red:     attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_RED; break;
+	case Green:   attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_GREEN; break;
+	case Blue:    attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_BLUE; break;
+	case Cyan:    attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_GREEN | FOREGROUND_BLUE; break;
+	case Magenta: attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_RED | FOREGROUND_BLUE; break;
+	case Yellow:  attr = (attr & ~FOREGROUND_MASK) | FOREGROUND_RED | FOREGROUND_GREEN; break;
+	case White:   attr = attr | FOREGROUND_MASK; break;
+	}
+	switch (c.format.color_back) {
+	case Black:   attr = (attr & ~BACKGROUND_MASK); break;
+	case Red:     attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_RED; break;
+	case Green:   attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_GREEN; break;
+	case Blue:    attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_BLUE; break;
+	case Cyan:    attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_GREEN | BACKGROUND_BLUE; break;
+	case Magenta: attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_RED | BACKGROUND_BLUE; break;
+	case Yellow:  attr = (attr & ~BACKGROUND_MASK) | BACKGROUND_RED | BACKGROUND_GREEN; break;
+	case White:   attr = attr | BACKGROUND_MASK; break;
+	}
+	if ((c.format.flags & Inverse) == Inverse) {
+		uchar f = attr & 0xFF;
+		attr &= 0xFFFFFF00;
+		f = (f << 4) | (f >> 4);
+		attr |= f;
+	}
+	return attr;
+}
+#undef FOREGROUND_MASK
+#undef BACKGROUND_MASK
+
+void PIScreen::SystemConsole::getWinCurCoord() {
+	GetConsoleScreenBufferInfo(PRIVATE->hOut, &PRIVATE->csbi);
+	PRIVATE->ccoord = PRIVATE->csbi.dwCursorPosition;
+}
+
+void PIScreen::SystemConsole::clearLine() {
+	getWinCurCoord();
+	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width - PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+}
+
+void PIScreen::SystemConsole::newLine() {
+	getWinCurCoord();
+	PRIVATE->ccoord.X = 0; PRIVATE->ccoord.Y++;
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
+}
+#else // WINDOWS
+PIString PIScreen::SystemConsole::formatString(const PIScreenTypes::Cell & c) {
+	PIString ts("\e[0");
+	switch (c.format.color_char) {
+	case Black:   ts += ";30"; break;
+	case Red:     ts += ";31"; break;
+	case Green:   ts += ";32"; break;
+	case Blue:    ts += ";34"; break;
+	case Cyan:    ts += ";36"; break;
+	case Magenta: ts += ";35"; break;
+	case Yellow:  ts += ";33"; break;
+	case White:   ts += ";37"; break;
+	}
+	switch (c.format.color_back) {
+	case Black:   ts += ";40"; break;
+	case Red:     ts += ";41"; break;
+	case Green:   ts += ";42"; break;
+	case Blue:    ts += ";44"; break;
+	case Cyan:    ts += ";46"; break;
+	case Magenta: ts += ";45"; break;
+	case Yellow:  ts += ";43"; break;
+	case White:   ts += ";47"; break;
+	}
+	if ((c.format.flags & Bold) == Bold) ts += ";1";
+	if ((c.format.flags & Underline) == Underline) ts += ";4";
+	if ((c.format.flags & Blink) == Blink) ts += ";5";
+	if ((c.format.flags & Inverse) == Inverse) ts += ";7";
+	return ts + "m";
+}
+#endif // WINDOWS
+
+
+void PIScreen::SystemConsole::toUpperLeft() {
+#ifdef WINDOWS
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ulcoord);
+#else
+	printf("\e[H");
+#endif
+}
+
+void PIScreen::SystemConsole::moveTo(int x, int y) {
+#ifdef WINDOWS
+	PRIVATE->ccoord.X = x;
+	PRIVATE->ccoord.Y = PRIVATE->ulcoord.Y + y;
+	SetConsoleCursorPosition(PRIVATE->hOut, PRIVATE->ccoord);
+#else
+	printf("\e[%d;%dH", y + 1, x + 1);
+#endif
+}
+
+void PIScreen::SystemConsole::clearScreen() {
+#ifdef WINDOWS
+	toUpperLeft();
+	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
+	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * (height + 1), PRIVATE->ulcoord, &PRIVATE->written);
+#else
+	printf("\e[0m\e[H\e[J");
+#endif
+}
+
+void PIScreen::SystemConsole::clearScreenLower() {
+#ifdef WINDOWS
+	getWinCurCoord();
+	FillConsoleOutputAttribute(PRIVATE->hOut, PRIVATE->dattr, width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+	FillConsoleOutputCharacter(PRIVATE->hOut, ' ', width * height - width * PRIVATE->ccoord.Y + PRIVATE->ccoord.X, PRIVATE->ccoord, &PRIVATE->written);
+#else
+	printf("\e[0m\e[J");
+#endif
+}
+
+void PIScreen::SystemConsole::hideCursor() {
+#ifdef WINDOWS
+	PRIVATE->curinfo.bVisible = false;
+	SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
+#else
+	printf("\e[?25l");
+#endif
+}
+
+void PIScreen::SystemConsole::showCursor() {
+#ifdef WINDOWS
+	PRIVATE->curinfo.bVisible = true;
+	SetConsoleCursorInfo(PRIVATE->hOut, &PRIVATE->curinfo);
+#else
+	printf("\e[?25h");
+#endif
+}
+
+
+
+
+PIScreen::PIScreen(bool startNow, PIKbdListener::KBFunc slot): PIThread(), drawer_(console.cells), root("rootTile") {
+	setName("screen");
+	setPriority(piLow);
+	needLockRun(true);
+	mouse_ = false;
+	ret_func = slot;
+	tile_focus = tile_dialog = 0;
+	root.screen = this;
+	listener = new PIKbdListener(key_eventS, this, startNow);
+	CONNECTU(listener, mouseEvent, this, mouse_event);
+	CONNECTU(listener, wheelEvent, this, wheel_event);
+	if (startNow) start();
+}
+
+
+PIScreen::~PIScreen() {
+	if (isRunning())
+		stop();
+	PIThread::waitForFinish(10);
+	listener->waitForFinish(10);
+	delete listener;
+}
+
+
+void PIScreen::setMouseEnabled(bool on) {
+	mouse_ = on;
+	console.mouse_x = console.mouse_y = -1;
+}
+
+
+void PIScreen::key_event(PIKbdListener::KeyEvent key) {
+	/** DEBUG
+	if (ret_func != 0) ret_func(key, t);
+	keyPressed(key, t);
+	return;
+	*/
+	PIScreenTile * rtile = rootTile();
+	if (tile_dialog)
+		rtile = tile_dialog;
+	bool used = nextFocus(rtile, key);
+	if (used) return;
+	if (!used && tile_focus) {
+		if (tile_focus->visible) {
+			if (tile_focus->keyEvent(key))
+				return;
+		}
+	}
+	if (ret_func != 0) ret_func(key, data_);
+	keyPressed(key, data_);
+}
+
+
+PIVector<PIScreenTile * > PIScreen::prepareMouse(PIKbdListener::MouseEvent * e) {
+	PIVector<PIScreenTile * > ret;
+	if (!mouse_ || !e) return ret;
+	console.mouse_x = e->x;
+	console.mouse_y = e->y;
+	PIVector<PIScreenTile * > tl = tilesUnderMouse(e->x, e->y);
+	bool ff = false;
+	piForeachR (PIScreenTile * t, tl) {
+		if (!ff) {
+			if (t->focus_flags[FocusOnMouse] && (e->action == PIKbdListener::MouseButtonPress)) {
+				t->setFocus();
+				ff = true;
+			}
+			if (t->focus_flags[FocusOnWheel] && (e->action == PIKbdListener::MouseWheel)) {
+				t->setFocus();
+				ff = true;
+			}
+		}
+
+	}
+	return tl;
+}
+
+
+PIVector<PIScreenTile * > PIScreen::tilesUnderMouse(int x, int y) {
+	PIVector<PIScreenTile * > ret;
+	if (x < 0 || x >= console.width || y < 0 || y >= console.height) return ret;
+	PIScreenTile * ct = tile_dialog ? tile_dialog : rootTile();
+	bool f = true;
+	while (ct) {
+		if (!f) ret << ct;
+		f = false;
+		ct = ct->childUnderMouse(x, y);
+	}
+	return ret;
+}
+
+
+void PIScreen::mouse_event(PIKbdListener::MouseEvent me) {
+	PIVector<PIScreenTile * > tl = prepareMouse(&me);
+	if (tl.isEmpty()) return;
+	piForeachR (PIScreenTile * t, tl)
+		if (t->mouseEvent(me)) piBreak;
+}
+
+
+void PIScreen::wheel_event(PIKbdListener::WheelEvent we) {
+	PIVector<PIScreenTile * > tl = prepareMouse(&we);
+	if (tl.isEmpty()) return;
+	piForeachR (PIScreenTile * t, tl)
+		if (t->wheelEvent(we)) piBreak;
+
+}
+
+
+bool PIScreen::nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key) {
+	PIVector<PIScreenTile*> vtl = rt->children(true), ftl;
+	piForeach (PIScreenTile * t, vtl) {
+		if (t->focus_flags[CanHasFocus])
+			ftl << t;
+	}
+	int ind = -1;
+	for (int i = 0; i < ftl.size_s(); ++i)
+		if (ftl[i] == tile_focus) {
+			ind = i;
+			break;
+		}
+	if (ind < 0)
+		tile_focus = 0;
+	if (ftl.isEmpty())
+		tile_focus = 0;
+	else {
+		if (tile_focus)
+			if (!tile_focus->visible)
+				tile_focus = 0;
+		int next = tile_focus ? 0 : 1;
+		if (tile_focus) {
+			if (tile_focus->focus_flags[NextByTab] && key.key == PIKbdListener::Tab)
+				next = 1;
+			if (tile_focus->focus_flags[NextByArrowsHorizontal]) {
+				if (key.key == PIKbdListener::LeftArrow) next = -1;
+				if (key.key == PIKbdListener::RightArrow) next = 1;
+			}
+			if (tile_focus->focus_flags[NextByArrowsVertical]) {
+				if (key.key == PIKbdListener::UpArrow) next = -1;
+				if (key.key == PIKbdListener::DownArrow) next = 1;
+			}
+		}
+		//piCout << ftl.size() << ind << next;
+		if (next != 0) {
+			PIVector<PIScreenTile*> tl = rt->children();
+			piForeach (PIScreenTile * t, tl)
+				t->has_focus = false;
+			if (!ftl.isEmpty()) {
+				ind += next;
+				if (ind >= ftl.size_s()) ind = 0;
+				if (ind < 0) ind = ftl.size_s() - 1;
+				tile_focus = ftl[ind];
+				tile_focus->has_focus = true;
+			}
+			return true;
+		}
+	}
+	return false;
+}
+
+
+void PIScreen::tileEventInternal(PIScreenTile * t, TileEvent e) {
+	tileEvent(t, e);
+}
+
+
+void PIScreen::tileRemovedInternal(PIScreenTile * t) {
+	if (tile_dialog == t)
+		tile_dialog = 0;
+}
+
+
+void PIScreen::tileSetFocusInternal(PIScreenTile * t) {
+	PIScreenTile * rt = rootTile();
+	if (tile_dialog)
+		rt = tile_dialog;
+	PIVector<PIScreenTile*> tl = rt->children(), ftl;
+	piForeach (PIScreenTile * i, tl)
+		i->has_focus = false;
+	tile_focus = t;
+	if (!tile_focus) return;
+	if (tile_focus->focus_flags[CanHasFocus])
+		tile_focus->has_focus = true;
+}
+
+
+void PIScreen::setDialogTile(PIScreenTile * t) {
+	tile_dialog = t;
+	if (!tile_dialog) {
+		nextFocus(&root);
+		return;
+	}
+	tile_dialog->setScreen(this);
+	tile_dialog->parent = 0;
+	nextFocus(tile_dialog);
+}
+
+
+void PIScreen::waitForFinish() {
+	WAIT_FOR_EXIT
+	stop();
+}
+
+
+void PIScreen::stop(bool clear) {
+	PIThread::stop(true);
+	if (clear) console.clearScreen();
+#ifndef WINDOWS
+	fflush(0);
+#endif
+}
+
+
+void PIScreen::begin() {
+	listener->start();
+	nextFocus(&root);
+	console.begin();
+}
+
+
+void PIScreen::run() {
+	console.prepare();
+	root.width_ = drawer_.width = console.width;
+	root.height_ = drawer_.height = console.height;
+	root.layout();
+	root.drawEventInternal(&drawer_);
+	if (tile_dialog) {
+		int sw(0), sh(0);
+		tile_dialog->sizeHint(sw, sh);
+		sw = piClampi(sw, tile_dialog->minimumWidth, tile_dialog->maximumWidth);
+		sh = piClampi(sh, tile_dialog->minimumHeight, tile_dialog->maximumHeight);
+		tile_dialog->x_ = (console.width - sw) / 2;
+		tile_dialog->y_ = (console.height - sh) / 2;
+		tile_dialog->width_ = sw;
+		tile_dialog->height_ = sh;
+		tile_dialog->layout();
+		int dx = tile_dialog->x_ - 1, dy = tile_dialog->y_ - 1, dw = tile_dialog->width_, dh = tile_dialog->height_;
+		drawer_.drawFrame(dx, dy, dx + dw + 1, dy + dh + 1, (Color)tile_dialog->back_format.color_char,
+						  (Color)tile_dialog->back_format.color_back, (CharFlags)tile_dialog->back_format.flags);
+		tile_dialog->drawEventInternal(&drawer_);
+	}
+	console.print();
+}
+
+
+void PIScreen::end() {
+	listener->stop();
+	console.end();
+}
+
+
+PIScreenTile * PIScreen::tileByName(const PIString & name) {
+	PIVector<PIScreenTile*> tl(tiles());
+	piForeach (PIScreenTile * t, tl)
+		if (t->name() == name)
+			return t;
+	return 0;
+}
+
diff --git a/src_main/console/piscreenconsole.cpp b/lib/console/piscreenconsole.cpp
similarity index 96%
rename from src_main/console/piscreenconsole.cpp
rename to lib/console/piscreenconsole.cpp
index 6ec563b4..6a56825c 100644
--- a/src_main/console/piscreenconsole.cpp
+++ b/lib/console/piscreenconsole.cpp
@@ -1,42 +1,42 @@
-/*
-	PIP - Platform Independent Primitives
-	Tile for PIScreen with PIConsole API
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piscreenconsole.h"
-
-using namespace PIScreenTypes;
-
-
-TileVars::TileVars(const PIString &n) : PIScreenTile(n) {
-	alignment = Left;
-}
-
-
-void TileVars::sizeHint(int &w, int &h) const {
-
-}
-
-void TileVars::drawEvent(PIScreenDrawer *d) {
-
-}
-
-
-PIScreenConsoleTile::PIScreenConsoleTile() {
-
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Tile for PIScreen with PIConsole API
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piscreenconsole.h"
+
+using namespace PIScreenTypes;
+
+
+TileVars::TileVars(const PIString &n) : PIScreenTile(n) {
+	alignment = Left;
+}
+
+
+void TileVars::sizeHint(int &w, int &h) const {
+
+}
+
+void TileVars::drawEvent(PIScreenDrawer *d) {
+
+}
+
+
+PIScreenConsoleTile::PIScreenConsoleTile() {
+
+}
+
diff --git a/src_main/console/piscreendrawer.cpp b/lib/console/piscreendrawer.cpp
similarity index 96%
rename from src_main/console/piscreendrawer.cpp
rename to lib/console/piscreendrawer.cpp
index 56d97726..9cec3ce3 100644
--- a/src_main/console/piscreendrawer.cpp
+++ b/lib/console/piscreendrawer.cpp
@@ -1,271 +1,271 @@
-/*
-	PIP - Platform Independent Primitives
-	Console output/input
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piscreendrawer.h"
-
-// comment for use ascii instead of unicode symbols
-#define USE_UNICODE
-
-using namespace PIScreenTypes;
-
-
-PIScreenDrawer::PIScreenDrawer(PIVector<PIVector<Cell> > & c): cells(c) {
-	arts_[LineVertical] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("│");
-#else
-			PIChar('|');
-#endif
-	
-	arts_[LineHorizontal] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("─");
-#else
-			PIChar('-');
-#endif
-	
-	arts_[Cross] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("┼");
-#else
-			PIChar('+');
-#endif
-	
-	arts_[CornerTopLeft] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("┌");
-#else
-			PIChar('+');
-#endif
-	
-	arts_[CornerTopRight] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("┐");
-#else
-			PIChar('+');
-#endif
-	
-	arts_[CornerBottomLeft] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("└");
-#else
-			PIChar('+');
-#endif
-	
-	arts_[CornerBottomRight] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("┘");
-#else
-			PIChar('+');
-#endif
-
-	arts_[Unchecked] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("☐");
-#else
-			PIChar('O');
-#endif
-
-	arts_[Checked] =
-#ifdef USE_UNICODE
-			PIChar::fromUTF8("☑");
-#else
-			PIChar('0');
-#endif
-}
-
-
-void PIScreenDrawer::clear() {
-	clear(cells);
-}
-
-
-void PIScreenDrawer::drawPixel(int x, int y, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
-	if (x < 0 || x >= width || y < 0 || y >= height) return;
-	cells[y][x].symbol = c;
-	cells[y][x].format.color_char = col_char;
-	cells[y][x].format.color_back = col_back;
-	cells[y][x].format.flags = flags_char;
-}
-
-
-void PIScreenDrawer::drawLine(int x0, int y0, int x1, int y1, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
-	if (x0 == x1 && y0 == y1) drawPixel(x0, y0, c, col_char, col_back, flags_char);
-	Cell cc;
-	cc.symbol = c;
-	cc.format.color_char = col_char;
-	cc.format.color_back = col_back;
-	cc.format.flags = flags_char;
-	int x = 0, y = 0;
-	if (piAbsi(x1 - x0) >= piAbsi(y1 - y0)) {
-		float dy = (y1 - y0) / float(piAbsi(x1 - x0)), cy = y0;
-		int dx = x0 < x1 ? 1 : -1;
-		for (int i = x0; i != x1; i += dx) {
-			x = i; y = piRound(cy);
-			if (x >= 0 && x < width && y >= 0 && y < height)
-				cells[y][x] = cc;
-			cy += dy;
-		}
-		y = piRound(cy);
-		if (x1 >= 0 && x1 < width && y >= 0 && y < height)
-			cells[y][x1] = cc;
-	} else {
-		float dx = (x1 - x0) / float(piAbsi(y1 - y0)), cx = x0;
-		int dy = y0 < y1 ? 1 : -1;
-		for (int i = y0; i != y1; i += dy) {
-			x = piRound(cx); y = i;
-			if (x >= 0 && x < width && y >= 0 && y < height)
-				cells[y][x] = cc;
-			cx += dx;
-		}
-		x = piRound(cx);
-		if (x >= 0 && x < width && y1 >= 0 && y1 < height)
-			cells[y1][x] = cc;
-	}
-}
-
-
-void PIScreenDrawer::drawRect(int x0, int y0, int x1, int y1, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
-	if (x0 == x1 && y0 == y1) drawPixel(x0, y0, c, col_char, col_back, flags_char);
-	Cell cc;
-	cc.symbol = c;
-	cc.format.color_char = col_char;
-	cc.format.color_back = col_back;
-	cc.format.flags = flags_char;
-	int dx = x0 < x1 ? 1 : -1;
-	int dy = y0 < y1 ? 1 : -1;
-	int xs[2] = {x0, x1};
-	int ys[2] = {y0, y1};
-	for (int k = 0; k < 2; ++k) {
-		int j = ys[k];
-		if (j >= 0 && j < height) {
-			PIVector<Cell> & cv(cells[j]);
-			for (int i = x0; i != x1; i += dx)
-				if (i >= 0 && i < width)
-					cv[i] = cc;
-		}
-		j = xs[k];
-		if (j >= 0 && j < width) {
-			for (int i = y0; i != y1; i += dy)
-				if (i >= 0 && i < height)
-					cells[i][j] = cc;
-		}
-	}
-	int i = x1, j = y1;
-	if (i >= 0 && i < width && j >= 0 && j < height)
-		cells[j][i] = cc;
-}
-
-
-void PIScreenDrawer::drawFrame(int x0, int y0, int x1, int y1, Color col_char, Color col_back, CharFlags flags_char) {
-	if (x0 == x1 && y0 == y1) return;
-	Cell cc;
-	cc.format.color_char = col_char;
-	cc.format.color_back = col_back;
-	cc.format.flags = flags_char;
-	int dx = x0 < x1 ? 1 : -1;
-	int dy = y0 < y1 ? 1 : -1;
-	int xs[2] = {x0, x1};
-	int ys[2] = {y0, y1};
-	for (int k = 0; k < 2; ++k) {
-		int j = ys[k];
-		if (j >= 0 && j < height) {
-			PIVector<Cell> & cv(cells[j]);
-			cc.symbol = artChar(LineHorizontal);
-			for (int i = x0 + 1; i != x1; i += dx)
-				if (i >= 0 && i < width)
-					cv[i] = cc;
-		}
-		j = xs[k];
-		if (j >= 0 && j < width) {
-			cc.symbol = artChar(LineVertical);
-			for (int i = y0 + 1; i != y1; i += dy)
-				if (i >= 0 && i < height)
-					cells[i][j] = cc;
-		}
-	}
-	int i = x0, j = y0; cc.symbol = artChar(CornerTopLeft);
-	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-	i = x1, j = y0; cc.symbol = artChar(CornerTopRight);
-	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-	i = x0, j = y1; cc.symbol = artChar(CornerBottomLeft);
-	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-	i = x1, j = y1; cc.symbol = artChar(CornerBottomRight);
-	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
-}
-
-
-void PIScreenDrawer::fillRect(int x0, int y0, int x1, int y1, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
-	if (x0 == x1 && y0 == y1) drawPixel(x0, y0, c, col_char, col_back, flags_char);
-	Cell cc;
-	cc.symbol = c;
-	cc.format.color_char = col_char;
-	cc.format.color_back = col_back;
-	cc.format.flags = flags_char;
-	int dx = x0 < x1 ? 1 : -1;
-	int dy = y0 < y1 ? 1 : -1;
-	for (int j = y0; j != y1; j += dy)
-		if (j >= 0 && j < height) {
-			PIVector<Cell> & cv(cells[j]);
-			for (int i = x0; i != x1; i += dx)
-				if (i >= 0 && i < width)
-					cv[i] = cc;
-		}
-}
-
-
-void PIScreenDrawer::fillRect(int x0, int y0, int x1, int y1, PIVector<PIVector<Cell> > & content) {
-	if (x0 > x1) piSwap(x0, x1);
-	if (y0 > y1) piSwap(y0, y1);
-	int w = x1 - x0;
-	int h = y1 - y0;
-	for (int j = 0; j < h; ++j)
-		if (j < piMini(height, content.size_s())) {
-			if ((j + y0) >= 0 && (j + y0) < height) {
-				PIVector<Cell> & cv(cells[y0 + j]);
-				PIVector<Cell> & contv(content[j]);
-				for (int i = 0; i < piMini(w, contv.size_s()); ++i)
-					if ((i + x0) >= 0 && (i + x0) < width)
-						cv[x0 + i] = contv[i];
-			}
-		}
-}
-
-
-void PIScreenDrawer::clear(PIVector<PIVector<Cell> > & cells) {
-	for (int i = 0; i < cells.size_s(); ++i)
-		cells[i].fill(Cell());
-}
-
-
-void PIScreenDrawer::drawText(int x, int y, const PIString & s, Color col_char, Color col_back, CharFlags flags_char) {
-	if (x < 0 || x >= width || y < 0 || y >= height) return;
-	PIVector<Cell> & cv(cells[y]);
-	Cell cc;
-	cc.format.color_char = col_char;
-	cc.format.color_back = col_back;
-	cc.format.flags = flags_char;
-	for (int i = 0; i < s.size_s(); ++i) {
-		int j = i + x;
-		if (j >= 0 && j < width) {
-			cc.symbol = s[i];
-			cv[j] = cc;
-		}
-	}
-}
+/*
+	PIP - Platform Independent Primitives
+	Console output/input
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piscreendrawer.h"
+
+// comment for use ascii instead of unicode symbols
+#define USE_UNICODE
+
+using namespace PIScreenTypes;
+
+
+PIScreenDrawer::PIScreenDrawer(PIVector<PIVector<Cell> > & c): cells(c) {
+	arts_[LineVertical] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("│");
+#else
+			PIChar('|');
+#endif
+	
+	arts_[LineHorizontal] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("─");
+#else
+			PIChar('-');
+#endif
+	
+	arts_[Cross] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("┼");
+#else
+			PIChar('+');
+#endif
+	
+	arts_[CornerTopLeft] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("┌");
+#else
+			PIChar('+');
+#endif
+	
+	arts_[CornerTopRight] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("┐");
+#else
+			PIChar('+');
+#endif
+	
+	arts_[CornerBottomLeft] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("└");
+#else
+			PIChar('+');
+#endif
+	
+	arts_[CornerBottomRight] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("┘");
+#else
+			PIChar('+');
+#endif
+
+	arts_[Unchecked] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("☐");
+#else
+			PIChar('O');
+#endif
+
+	arts_[Checked] =
+#ifdef USE_UNICODE
+			PIChar::fromUTF8("☑");
+#else
+			PIChar('0');
+#endif
+}
+
+
+void PIScreenDrawer::clear() {
+	clear(cells);
+}
+
+
+void PIScreenDrawer::drawPixel(int x, int y, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
+	if (x < 0 || x >= width || y < 0 || y >= height) return;
+	cells[y][x].symbol = c;
+	cells[y][x].format.color_char = col_char;
+	cells[y][x].format.color_back = col_back;
+	cells[y][x].format.flags = flags_char;
+}
+
+
+void PIScreenDrawer::drawLine(int x0, int y0, int x1, int y1, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
+	if (x0 == x1 && y0 == y1) drawPixel(x0, y0, c, col_char, col_back, flags_char);
+	Cell cc;
+	cc.symbol = c;
+	cc.format.color_char = col_char;
+	cc.format.color_back = col_back;
+	cc.format.flags = flags_char;
+	int x = 0, y = 0;
+	if (piAbsi(x1 - x0) >= piAbsi(y1 - y0)) {
+		float dy = (y1 - y0) / float(piAbsi(x1 - x0)), cy = y0;
+		int dx = x0 < x1 ? 1 : -1;
+		for (int i = x0; i != x1; i += dx) {
+			x = i; y = piRound(cy);
+			if (x >= 0 && x < width && y >= 0 && y < height)
+				cells[y][x] = cc;
+			cy += dy;
+		}
+		y = piRound(cy);
+		if (x1 >= 0 && x1 < width && y >= 0 && y < height)
+			cells[y][x1] = cc;
+	} else {
+		float dx = (x1 - x0) / float(piAbsi(y1 - y0)), cx = x0;
+		int dy = y0 < y1 ? 1 : -1;
+		for (int i = y0; i != y1; i += dy) {
+			x = piRound(cx); y = i;
+			if (x >= 0 && x < width && y >= 0 && y < height)
+				cells[y][x] = cc;
+			cx += dx;
+		}
+		x = piRound(cx);
+		if (x >= 0 && x < width && y1 >= 0 && y1 < height)
+			cells[y1][x] = cc;
+	}
+}
+
+
+void PIScreenDrawer::drawRect(int x0, int y0, int x1, int y1, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
+	if (x0 == x1 && y0 == y1) drawPixel(x0, y0, c, col_char, col_back, flags_char);
+	Cell cc;
+	cc.symbol = c;
+	cc.format.color_char = col_char;
+	cc.format.color_back = col_back;
+	cc.format.flags = flags_char;
+	int dx = x0 < x1 ? 1 : -1;
+	int dy = y0 < y1 ? 1 : -1;
+	int xs[2] = {x0, x1};
+	int ys[2] = {y0, y1};
+	for (int k = 0; k < 2; ++k) {
+		int j = ys[k];
+		if (j >= 0 && j < height) {
+			PIVector<Cell> & cv(cells[j]);
+			for (int i = x0; i != x1; i += dx)
+				if (i >= 0 && i < width)
+					cv[i] = cc;
+		}
+		j = xs[k];
+		if (j >= 0 && j < width) {
+			for (int i = y0; i != y1; i += dy)
+				if (i >= 0 && i < height)
+					cells[i][j] = cc;
+		}
+	}
+	int i = x1, j = y1;
+	if (i >= 0 && i < width && j >= 0 && j < height)
+		cells[j][i] = cc;
+}
+
+
+void PIScreenDrawer::drawFrame(int x0, int y0, int x1, int y1, Color col_char, Color col_back, CharFlags flags_char) {
+	if (x0 == x1 && y0 == y1) return;
+	Cell cc;
+	cc.format.color_char = col_char;
+	cc.format.color_back = col_back;
+	cc.format.flags = flags_char;
+	int dx = x0 < x1 ? 1 : -1;
+	int dy = y0 < y1 ? 1 : -1;
+	int xs[2] = {x0, x1};
+	int ys[2] = {y0, y1};
+	for (int k = 0; k < 2; ++k) {
+		int j = ys[k];
+		if (j >= 0 && j < height) {
+			PIVector<Cell> & cv(cells[j]);
+			cc.symbol = artChar(LineHorizontal);
+			for (int i = x0 + 1; i != x1; i += dx)
+				if (i >= 0 && i < width)
+					cv[i] = cc;
+		}
+		j = xs[k];
+		if (j >= 0 && j < width) {
+			cc.symbol = artChar(LineVertical);
+			for (int i = y0 + 1; i != y1; i += dy)
+				if (i >= 0 && i < height)
+					cells[i][j] = cc;
+		}
+	}
+	int i = x0, j = y0; cc.symbol = artChar(CornerTopLeft);
+	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
+	i = x1, j = y0; cc.symbol = artChar(CornerTopRight);
+	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
+	i = x0, j = y1; cc.symbol = artChar(CornerBottomLeft);
+	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
+	i = x1, j = y1; cc.symbol = artChar(CornerBottomRight);
+	if (i >= 0 && i < width && j >= 0 && j < height) cells[j][i] = cc;
+}
+
+
+void PIScreenDrawer::fillRect(int x0, int y0, int x1, int y1, const PIChar & c, Color col_char, Color col_back, CharFlags flags_char) {
+	if (x0 == x1 && y0 == y1) drawPixel(x0, y0, c, col_char, col_back, flags_char);
+	Cell cc;
+	cc.symbol = c;
+	cc.format.color_char = col_char;
+	cc.format.color_back = col_back;
+	cc.format.flags = flags_char;
+	int dx = x0 < x1 ? 1 : -1;
+	int dy = y0 < y1 ? 1 : -1;
+	for (int j = y0; j != y1; j += dy)
+		if (j >= 0 && j < height) {
+			PIVector<Cell> & cv(cells[j]);
+			for (int i = x0; i != x1; i += dx)
+				if (i >= 0 && i < width)
+					cv[i] = cc;
+		}
+}
+
+
+void PIScreenDrawer::fillRect(int x0, int y0, int x1, int y1, PIVector<PIVector<Cell> > & content) {
+	if (x0 > x1) piSwap(x0, x1);
+	if (y0 > y1) piSwap(y0, y1);
+	int w = x1 - x0;
+	int h = y1 - y0;
+	for (int j = 0; j < h; ++j)
+		if (j < piMini(height, content.size_s())) {
+			if ((j + y0) >= 0 && (j + y0) < height) {
+				PIVector<Cell> & cv(cells[y0 + j]);
+				PIVector<Cell> & contv(content[j]);
+				for (int i = 0; i < piMini(w, contv.size_s()); ++i)
+					if ((i + x0) >= 0 && (i + x0) < width)
+						cv[x0 + i] = contv[i];
+			}
+		}
+}
+
+
+void PIScreenDrawer::clear(PIVector<PIVector<Cell> > & cells) {
+	for (int i = 0; i < cells.size_s(); ++i)
+		cells[i].fill(Cell());
+}
+
+
+void PIScreenDrawer::drawText(int x, int y, const PIString & s, Color col_char, Color col_back, CharFlags flags_char) {
+	if (x < 0 || x >= width || y < 0 || y >= height) return;
+	PIVector<Cell> & cv(cells[y]);
+	Cell cc;
+	cc.format.color_char = col_char;
+	cc.format.color_back = col_back;
+	cc.format.flags = flags_char;
+	for (int i = 0; i < s.size_s(); ++i) {
+		int j = i + x;
+		if (j >= 0 && j < width) {
+			cc.symbol = s[i];
+			cv[j] = cc;
+		}
+	}
+}
diff --git a/src_main/console/piscreentile.cpp b/lib/console/piscreentile.cpp
similarity index 96%
rename from src_main/console/piscreentile.cpp
rename to lib/console/piscreentile.cpp
index e4f1ff07..f24ebf17 100644
--- a/src_main/console/piscreentile.cpp
+++ b/lib/console/piscreentile.cpp
@@ -1,250 +1,250 @@
-/*
-	PIP - Platform Independent Primitives
-	Basic PIScreen tile
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piscreentile.h"
-#include "piscreendrawer.h"
-
-
-using namespace PIScreenTypes;
-
-
-PIScreenTile::PIScreenTile(const PIString & n, Direction d, SizePolicy p): PIObject(n) {
-	direction = d;
-	size_policy = p;
-	focus_flags = 0;
-	screen = 0;
-	minimumWidth = minimumHeight = x_ = y_ = width_ = height_ = pw = ph = 0;
-	maximumWidth = maximumHeight = 65535;
-	marginLeft = marginRight = marginTop = marginBottom = spacing = 0;
-	parent = 0;
-	back_symbol = ' ';
-	visible = true;
-	has_focus = false;
-}
-
-
-PIScreenTile::~PIScreenTile() {
-	//piCout << this << "~";
-	if (screen)
-		screen->tileRemovedInternal(this);
-	setScreen(0);
-	deleteChildren();
-	if (!parent) return;
-	parent->tiles.removeOne(this);
-}
-
-
-void PIScreenTile::addTile(PIScreenTile * t) {
-	if (t == 0) return;
-	if (tiles.contains(t)) return;
-	tiles << t;
-	t->parent = this;
-	t->setScreen(screen);
-}
-
-
-void PIScreenTile::takeTile(PIScreenTile * t) {
-	if (!tiles.contains(t)) return;
-	tiles.removeOne(t);
-	t->parent = 0;
-	t->setScreen(0);
-}
-
-
-void PIScreenTile::removeTile(PIScreenTile * t) {
-	if (!tiles.contains(t)) return;
-	tiles.removeOne(t);
-	t->parent = 0;
-	t->setScreen(0);
-	delete t;
-}
-
-
-PIVector<PIScreenTile * > PIScreenTile::children(bool only_visible) {
-	PIVector<PIScreenTile * > ret;
-	piForeach (PIScreenTile * t, tiles)
-		if (t->visible || !only_visible)
-			ret << t << t->children(only_visible);
-	return ret;
-}
-
-
-PIScreenTile * PIScreenTile::childUnderMouse(int x, int y) {
-	piForeach (PIScreenTile * t, tiles) {
-		if (!t->visible) continue;
-		if (x >= t->x_ && (x - t->x_) < t->width_ &&
-			y >= t->y_ && (y - t->y_) < t->height_) {
-			return t;
-		}
-	}
-	return 0;
-}
-
-
-void PIScreenTile::raiseEvent(TileEvent e) {
-	if (!screen) return;
-	screen->tileEventInternal(this, e);
-}
-
-
-void PIScreenTile::setScreen(PIScreenBase * s) {
-	screen = s;
-	piForeach (PIScreenTile * t, tiles)
-		t->setScreen(s);
-}
-
-
-void PIScreenTile::deleteChildren() {
-	piForeach (PIScreenTile * t, tiles) {
-		t->parent = 0;
-		delete t;
-	}
-	tiles.clear();
-}
-
-
-void PIScreenTile::setFocus() {
-	if (!screen || !focus_flags[CanHasFocus]) return;
-	screen->tileSetFocusInternal(this);
-}
-
-
-void PIScreenTile::drawEventInternal(PIScreenDrawer * d) {
-	if (!visible) {
-		return;
-	}
-	d->fillRect(x_, y_, x_ + width_, y_ + height_, back_symbol, (Color)back_format.color_char, (Color)back_format.color_back, back_format.flags);
-	drawEvent(d);
-	piForeach (PIScreenTile * t, tiles)
-		t->drawEventInternal(d);
-}
-
-
-void PIScreenTile::sizeHint(int & w, int & h) const {
-	w = 0;
-	h = 0;
-	if (tiles.isEmpty()) return;
-	int sl = spacing * (tiles.size_s() - 1);
-	if (direction == Horizontal) w += sl;
-	else h += sl;
-	piForeachC (PIScreenTile * t, tiles) {
-		if (!t->visible) continue;
-		int cw(0), ch(0);
-		t->sizeHint(cw, ch);
-		cw = piClampi(cw, t->minimumWidth, t->maximumWidth);
-		ch = piClampi(ch, t->minimumHeight, t->maximumHeight);
-		if (direction == Horizontal) {
-			w += cw; h = piMaxi(h, ch);
-		} else {
-			h += ch; w = piMaxi(w, cw);
-		}
-	}
-	w += marginLeft + marginRight;
-	h += marginTop + marginBottom;
-}
-
-
-void PIScreenTile::layout() {
-	if (tiles.isEmpty() || !visible) return;
-	int as(0), ts(0), ts2(0), ecnt(0), pcnt(0);
-	ts = (direction == Horizontal) ? (width_ - marginLeft - marginRight) : (height_ - marginTop - marginBottom);
-	ts2 = (direction != Horizontal) ? (width_ - marginLeft - marginRight) : (height_ - marginTop - marginBottom);
-	ts -= spacing * (tiles.size_s() - 1);
-	PIVector<int> hints(tiles.size_s());
-	PIVector<float> asizes(tiles.size_s());
-	for (int i = 0; i < tiles.size_s(); ++i) {
-		PIScreenTile * t(tiles[i]);
-		int cw(0), ch(0), cs(0);
-		if (t->visible && t->needLayout()) {
-			t->sizeHint(cw, ch);
-			cw = piClampi(cw, t->minimumWidth, t->maximumWidth);
-			ch = piClampi(ch, t->minimumHeight, t->maximumHeight);
-			if (t->size_policy == Expanding) ++ecnt;
-			if (t->size_policy == Preferred) ++pcnt;
-			cs = (direction == Horizontal) ? cw : ch;
-			as += cs;
-		}
-		hints[i] = cs;
-		asizes[i] = 0.f;
-	}
-	if (as <= ts) {
-		int acnt(0);
-		SizePolicy pol = Fixed;
-		if (ecnt > 0) {
-			acnt = ecnt;
-			pol = Expanding;
-		} else if (pcnt > 0) {
-			acnt = pcnt;
-			pol = Preferred;
-		}
-		if (acnt > 0) {
-			float add_a = float(ts - as), add_s = add_a / acnt, add_da(0.);
-			asizes.fill(add_s);
-			PISet<int> max_tl;
-			for (int i = 0; i < tiles.size_s(); ++i) {
-				if (tiles[i]->size_policy == pol && tiles[i]->visible && tiles[i]->needLayout()) {
-					float maxs = (direction == Horizontal) ? tiles[i]->maximumWidth : tiles[i]->maximumHeight;
-					if (hints[i] + asizes[i] > maxs) {
-						max_tl << i;
-						float pas = asizes[i];
-						asizes[i] = maxs - hints[i];
-						acnt--;
-						if (acnt > 0) {
-							pas = (pas - asizes[i]) / acnt;
-							for (int j = 0; j < tiles.size_s(); ++j) {
-								if (i == j) continue;
-								if (max_tl[j]) continue;
-								if (tiles[j]->size_policy == pol && tiles[j]->visible && tiles[j]->needLayout())
-									asizes[j] += pas;
-							}
-						}
-					}
-				}
-			}
-			for (int i = 0; i < tiles.size_s(); ++i) {
-				if (tiles[i]->size_policy == pol && tiles[i]->visible && tiles[i]->needLayout()) {
-					int a = piRound(asizes[i] + add_da);
-					add_da += asizes[i] - a;
-					hints[i] += a;
-				}
-			}
-		}
-	}
-	int cx = x_ + marginLeft, cy = y_ + marginTop;
-	for (int i = 0; i < tiles.size_s(); ++i) {
-		PIScreenTile * t = tiles[i];
-		if (!t->visible || !t->needLayout()) continue;
-		t->x_ = cx;
-		t->y_ = cy;
-		if (direction == Horizontal) {
-			t->width_ = hints[i];
-			t->height_ = ts2;
-			cx += hints[i] + spacing;
-		} else {
-			t->width_ = ts2;
-			t->height_ = hints[i];
-			cy += hints[i] + spacing;
-		}
-		if (t->pw != t->width_ || t->ph != t->height_)
-			t->resizeEvent(t->width_, t->height_);
-		t->pw = t->width_;
-		t->ph = t->height_;
-		t->layout();
-	}
-}
+/*
+	PIP - Platform Independent Primitives
+	Basic PIScreen tile
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piscreentile.h"
+#include "piscreendrawer.h"
+
+
+using namespace PIScreenTypes;
+
+
+PIScreenTile::PIScreenTile(const PIString & n, Direction d, SizePolicy p): PIObject(n) {
+	direction = d;
+	size_policy = p;
+	focus_flags = 0;
+	screen = 0;
+	minimumWidth = minimumHeight = x_ = y_ = width_ = height_ = pw = ph = 0;
+	maximumWidth = maximumHeight = 65535;
+	marginLeft = marginRight = marginTop = marginBottom = spacing = 0;
+	parent = 0;
+	back_symbol = ' ';
+	visible = true;
+	has_focus = false;
+}
+
+
+PIScreenTile::~PIScreenTile() {
+	//piCout << this << "~";
+	if (screen)
+		screen->tileRemovedInternal(this);
+	setScreen(0);
+	deleteChildren();
+	if (!parent) return;
+	parent->tiles.removeOne(this);
+}
+
+
+void PIScreenTile::addTile(PIScreenTile * t) {
+	if (t == 0) return;
+	if (tiles.contains(t)) return;
+	tiles << t;
+	t->parent = this;
+	t->setScreen(screen);
+}
+
+
+void PIScreenTile::takeTile(PIScreenTile * t) {
+	if (!tiles.contains(t)) return;
+	tiles.removeOne(t);
+	t->parent = 0;
+	t->setScreen(0);
+}
+
+
+void PIScreenTile::removeTile(PIScreenTile * t) {
+	if (!tiles.contains(t)) return;
+	tiles.removeOne(t);
+	t->parent = 0;
+	t->setScreen(0);
+	delete t;
+}
+
+
+PIVector<PIScreenTile * > PIScreenTile::children(bool only_visible) {
+	PIVector<PIScreenTile * > ret;
+	piForeach (PIScreenTile * t, tiles)
+		if (t->visible || !only_visible)
+			ret << t << t->children(only_visible);
+	return ret;
+}
+
+
+PIScreenTile * PIScreenTile::childUnderMouse(int x, int y) {
+	piForeach (PIScreenTile * t, tiles) {
+		if (!t->visible) continue;
+		if (x >= t->x_ && (x - t->x_) < t->width_ &&
+			y >= t->y_ && (y - t->y_) < t->height_) {
+			return t;
+		}
+	}
+	return 0;
+}
+
+
+void PIScreenTile::raiseEvent(TileEvent e) {
+	if (!screen) return;
+	screen->tileEventInternal(this, e);
+}
+
+
+void PIScreenTile::setScreen(PIScreenBase * s) {
+	screen = s;
+	piForeach (PIScreenTile * t, tiles)
+		t->setScreen(s);
+}
+
+
+void PIScreenTile::deleteChildren() {
+	piForeach (PIScreenTile * t, tiles) {
+		t->parent = 0;
+		delete t;
+	}
+	tiles.clear();
+}
+
+
+void PIScreenTile::setFocus() {
+	if (!screen || !focus_flags[CanHasFocus]) return;
+	screen->tileSetFocusInternal(this);
+}
+
+
+void PIScreenTile::drawEventInternal(PIScreenDrawer * d) {
+	if (!visible) {
+		return;
+	}
+	d->fillRect(x_, y_, x_ + width_, y_ + height_, back_symbol, (Color)back_format.color_char, (Color)back_format.color_back, back_format.flags);
+	drawEvent(d);
+	piForeach (PIScreenTile * t, tiles)
+		t->drawEventInternal(d);
+}
+
+
+void PIScreenTile::sizeHint(int & w, int & h) const {
+	w = 0;
+	h = 0;
+	if (tiles.isEmpty()) return;
+	int sl = spacing * (tiles.size_s() - 1);
+	if (direction == Horizontal) w += sl;
+	else h += sl;
+	piForeachC (PIScreenTile * t, tiles) {
+		if (!t->visible) continue;
+		int cw(0), ch(0);
+		t->sizeHint(cw, ch);
+		cw = piClampi(cw, t->minimumWidth, t->maximumWidth);
+		ch = piClampi(ch, t->minimumHeight, t->maximumHeight);
+		if (direction == Horizontal) {
+			w += cw; h = piMaxi(h, ch);
+		} else {
+			h += ch; w = piMaxi(w, cw);
+		}
+	}
+	w += marginLeft + marginRight;
+	h += marginTop + marginBottom;
+}
+
+
+void PIScreenTile::layout() {
+	if (tiles.isEmpty() || !visible) return;
+	int as(0), ts(0), ts2(0), ecnt(0), pcnt(0);
+	ts = (direction == Horizontal) ? (width_ - marginLeft - marginRight) : (height_ - marginTop - marginBottom);
+	ts2 = (direction != Horizontal) ? (width_ - marginLeft - marginRight) : (height_ - marginTop - marginBottom);
+	ts -= spacing * (tiles.size_s() - 1);
+	PIVector<int> hints(tiles.size_s());
+	PIVector<float> asizes(tiles.size_s());
+	for (int i = 0; i < tiles.size_s(); ++i) {
+		PIScreenTile * t(tiles[i]);
+		int cw(0), ch(0), cs(0);
+		if (t->visible && t->needLayout()) {
+			t->sizeHint(cw, ch);
+			cw = piClampi(cw, t->minimumWidth, t->maximumWidth);
+			ch = piClampi(ch, t->minimumHeight, t->maximumHeight);
+			if (t->size_policy == Expanding) ++ecnt;
+			if (t->size_policy == Preferred) ++pcnt;
+			cs = (direction == Horizontal) ? cw : ch;
+			as += cs;
+		}
+		hints[i] = cs;
+		asizes[i] = 0.f;
+	}
+	if (as <= ts) {
+		int acnt(0);
+		SizePolicy pol = Fixed;
+		if (ecnt > 0) {
+			acnt = ecnt;
+			pol = Expanding;
+		} else if (pcnt > 0) {
+			acnt = pcnt;
+			pol = Preferred;
+		}
+		if (acnt > 0) {
+			float add_a = float(ts - as), add_s = add_a / acnt, add_da(0.);
+			asizes.fill(add_s);
+			PISet<int> max_tl;
+			for (int i = 0; i < tiles.size_s(); ++i) {
+				if (tiles[i]->size_policy == pol && tiles[i]->visible && tiles[i]->needLayout()) {
+					float maxs = (direction == Horizontal) ? tiles[i]->maximumWidth : tiles[i]->maximumHeight;
+					if (hints[i] + asizes[i] > maxs) {
+						max_tl << i;
+						float pas = asizes[i];
+						asizes[i] = maxs - hints[i];
+						acnt--;
+						if (acnt > 0) {
+							pas = (pas - asizes[i]) / acnt;
+							for (int j = 0; j < tiles.size_s(); ++j) {
+								if (i == j) continue;
+								if (max_tl[j]) continue;
+								if (tiles[j]->size_policy == pol && tiles[j]->visible && tiles[j]->needLayout())
+									asizes[j] += pas;
+							}
+						}
+					}
+				}
+			}
+			for (int i = 0; i < tiles.size_s(); ++i) {
+				if (tiles[i]->size_policy == pol && tiles[i]->visible && tiles[i]->needLayout()) {
+					int a = piRound(asizes[i] + add_da);
+					add_da += asizes[i] - a;
+					hints[i] += a;
+				}
+			}
+		}
+	}
+	int cx = x_ + marginLeft, cy = y_ + marginTop;
+	for (int i = 0; i < tiles.size_s(); ++i) {
+		PIScreenTile * t = tiles[i];
+		if (!t->visible || !t->needLayout()) continue;
+		t->x_ = cx;
+		t->y_ = cy;
+		if (direction == Horizontal) {
+			t->width_ = hints[i];
+			t->height_ = ts2;
+			cx += hints[i] + spacing;
+		} else {
+			t->width_ = ts2;
+			t->height_ = hints[i];
+			cy += hints[i] + spacing;
+		}
+		if (t->pw != t->width_ || t->ph != t->height_)
+			t->resizeEvent(t->width_, t->height_);
+		t->pw = t->width_;
+		t->ph = t->height_;
+		t->layout();
+	}
+}
diff --git a/src_main/console/piscreentiles.cpp b/lib/console/piscreentiles.cpp
similarity index 96%
rename from src_main/console/piscreentiles.cpp
rename to lib/console/piscreentiles.cpp
index ddfd3c41..2a085642 100644
--- a/src_main/console/piscreentiles.cpp
+++ b/lib/console/piscreentiles.cpp
@@ -1,714 +1,714 @@
-/*
-	PIP - Platform Independent Primitives
-	Various tiles for PIScreen
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piscreentiles.h"
-#include "piscreendrawer.h"
-
-
-using namespace PIScreenTypes;
-
-
-TileSimple::TileSimple(const PIString & n): PIScreenTile(n) {
-	alignment = Left;
-}
-
-
-TileSimple::TileSimple(const TileSimple::Row & r): PIScreenTile() {
-	alignment = Left;
-	content << r;
-}
-
-
-void TileSimple::sizeHint(int & w, int & h) const {
-	w = h = 0;
-	piForeachC (Row & r, content)
-		w = piMaxi(w, r.first.size_s());
-	h = content.size_s();
-}
-
-
-void TileSimple::drawEvent(PIScreenDrawer * d) {
-	for (int i = 0; i < content.size_s(); ++i) {
-		Row & r(content[i]);
-		int rx = 0;
-		switch (alignment) {
-		case Left: rx = x_; break;
-		case Center: rx = x_ + (width_ - r.first.size_s()) / 2; break;
-		case Right: rx = x_ + width_ - r.first.size_s(); break;
-		};
-		d->drawText(rx, y_ + i, r.first, (Color)r.second.color_char, (Color)r.second.color_back, r.second.flags);
-	}
-}
-
-
-
-
-TileScrollBar::TileScrollBar(const PIString & n) {
-	direction = Vertical;
-	thickness = 1;
-	minimum_ = value_ = 0;
-	maximum_ = 100;
-}
-
-
-void TileScrollBar::setMinimum(int v) {
-	minimum_ = v;
-	_check();
-}
-
-
-void TileScrollBar::setMaximum(int v) {
-	maximum_ = v;
-	_check();
-}
-
-
-void TileScrollBar::setValue(int v) {
-	value_ = v;
-	_check();
-}
-
-
-void TileScrollBar::_check() {
-	value_ = piClampi(value_, minimum_, maximum_);
-}
-
-
-void TileScrollBar::sizeHint(int & w, int & h) const {
-	w = h = 0;
-	if (direction == Vertical) {
-		w = thickness;
-		h = 255;
-	} else {
-		h = thickness;
-		w = 255;
-	}
-}
-
-
-void TileScrollBar::drawEvent(PIScreenDrawer * d) {
-	line_char = d->artChar(direction == Vertical ? PIScreenDrawer::LineVertical : PIScreenDrawer::LineHorizontal);
-	d->fillRect(x_, y_, x_ + width_, y_ + height_, line_char, Green);
-	if (value_ >= minimum_ && value_ <= maximum_) {
-		if (direction == Vertical) {
-			int c = piRoundf((float(value_ - minimum_) / (maximum_ - minimum_)) * (height_ - 1));
-			d->drawLine(x_, y_ + c, x_ + width_ - 1, y_ + c, ' ', Green, Green);
-		} else {
-			int c = piRoundf((float(value_ - minimum_) / (maximum_ - minimum_)) * (width_ - 1));
-			d->drawLine(x_ + c, y_, x_ + c, y_ + height_ - 1, ' ', Green, Green);
-		}
-	}
-}
-
-
-bool TileScrollBar::mouseEvent(PIKbdListener::MouseEvent me) {
-	return true;
-}
-
-
-
-
-TileList::TileList(const PIString & n): PIScreenTile(n) {
-	alignment = Left;
-	focus_flags = CanHasFocus | NextByArrowsHorizontal | NextByTab | FocusOnMouseOrWheel;
-	lhei = offset = cur = 0;
-	mouse_sel = false;
-	selection_mode = NoSelection;
-	scroll = new TileScrollBar();
-	scroll->size_policy = Ignore;
-	addTile(scroll);
-}
-
-
-void TileList::sizeHint(int & w, int & h) const {
-	w = h = 0;
-	piForeachC (Row & r, content)
-		w = piMaxi(w, r.first.size_s());
-	h = 3;
-}
-
-
-void TileList::resizeEvent(int w, int h) {
-	scroll->x_ = x_ + width_ - 1;
-	scroll->y_ = y_;
-	scroll->width_ = 1;
-	scroll->height_ = height_;
-}
-
-
-void TileList::drawEvent(PIScreenDrawer * d) {
-	lhei = height_ - 2;
-	int is = piClampi(offset, 0, piMaxi(0, content.size_s() - 1)), ie = piClampi(offset + lhei, 0, content.size_s());
-	if (is > 0) d->drawText(x_, y_, PIString(" /\\ ").repeat(width_ / 4), Green, Default, Bold);
-	if (ie < content.size_s()) d->drawText(x_, y_ + height_ - 1, PIString(" \\/ ").repeat(width_ / 4), Green, Default, Bold);
-	//piCout << is << ie << offset << lhei << content.size_s();
-	for (int i = is; i < ie; ++i) {
-		Row & r(content[i]);
-		bool sel = i == cur && has_focus;
-		if (sel) {
-			int cy = y_ + i - is + 1;
-			d->drawLine(x_, cy, x_ + width_ - 2, cy, ' ', Default, Blue);
-		}
-		int rx(0);
-		switch (alignment) {
-		case Left: rx = x_; break;
-		case Center: rx = x_ + (width_ - 1 - r.first.size_s()) / 2; break;
-		case Right: rx = x_ + width_ - 1 - r.first.size_s(); break;
-		};
-		CharFlags cf = r.second.flags;
-		Color cc = (Color)r.second.color_char;
-		if (selected[i]) {
-			cf |= Bold;
-			cc = Yellow;
-		}
-		d->drawText(rx, y_ + i - is + 1, r.first, cc, sel ? Blue : Default, cf);
-	}
-	scroll->setMaximum(piMaxi(0, content.size_s() - 1));
-	scroll->setValue(cur);
-}
-
-
-bool TileList::keyEvent(PIKbdListener::KeyEvent key) {
-	lhei = height_ - 2;
-	int oo(0), osp = piMini(3, lhei / 4);
-	switch (key.key) {
-	case PIKbdListener::PageUp:
-		cur -= lhei / 2;
-		oo -= lhei / 2;
-	case PIKbdListener::UpArrow:
-		cur--;
-		oo--;
-		if (key.modifiers[PIKbdListener::Ctrl]) {
-			cur -= 4;
-			oo -= 4;
-		}
-		if (cur < 0) cur = 0;
-		if (cur - offset < osp) offset += oo;
-		if (offset < 0) offset = 0;
-		return true;
-	case PIKbdListener::Space:
-		if (cur < 0 || cur >= content.size_s()) return true;
-		switch (selection_mode) {
-		case NoSelection: return false;
-		case SingleSelection:
-			if (selected.isEmpty()) selected << cur;
-			else {
-				bool add = !selected[cur];
-				selected.clear();
-				if (add) selected << cur;
-			}
-			raiseEvent(TileEvent(SelectionChanged));
-			return true;
-		case MultiSelection:
-			if (selected[cur]) selected.remove(cur);
-			else selected << cur;
-			raiseEvent(TileEvent(SelectionChanged));
-			break;
-		}
-	case PIKbdListener::PageDown:
-		if (key.key == PIKbdListener::PageDown) {
-			cur += lhei / 2;
-			oo += lhei / 2;
-		}
-	case PIKbdListener::DownArrow:
-		cur++;
-		oo++;
-		if (key.modifiers[PIKbdListener::Ctrl]) {
-			cur += 4;
-			oo += 4;
-		}
-		if (cur >= content.size_s()) cur = content.size_s() - 1;
-		if (cur - offset >= lhei - osp) offset += oo;
-		if (offset >= content.size_s() - lhei) offset = content.size_s() - lhei;
-		if (offset < 0) offset = 0;
-		return true;
-	case PIKbdListener::Home:
-		cur = offset = 0;
-		return true;
-	case PIKbdListener::End:
-		cur = content.size_s() - 1;
-		offset = content.size_s() - lhei;
-		if (offset < 0) offset = 0;
-		return true;
-	case PIKbdListener::Return:
-		if (cur >= 0 && cur < content.size_s())
-			raiseEvent(TileEvent(RowPressed, cur));
-		return true;
-	case '*':
-		if (selection_mode == TileList::MultiSelection) {
-			PISet<int> nsel;
-			for (int i = 0; i < content.size_s(); ++i)
-				if (!selected[i]) nsel << i;
-			selected = nsel;
-		}
-		raiseEvent(TileEvent(SelectionChanged));
-		return true;
-	case 'A':
-		if (selection_mode == TileList::MultiSelection) {
-			selected.clear();
-			for (int i = 0; i < content.size_s(); ++i)
-				selected << i;
-		}
-		raiseEvent(TileEvent(SelectionChanged));
-		return true;
-	}
-	return PIScreenTile::keyEvent(key);
-}
-
-
-bool TileList::mouseEvent(PIKbdListener::MouseEvent me) {
-	if (me.action == PIKbdListener::MouseButtonRelease) return true;
-	int mp = me.y - y() - 1 + offset;
-	if (mp < 0 || mp >= content.size_s()) return true;
-	cur = mp;
-	switch (me.action) {
-	case PIKbdListener::MouseButtonPress:
-		mouse_sel = !selected.contains(cur);
-		break;
-	case PIKbdListener::MouseButtonDblClick:
-		keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
-		return true;
-	default: break;
-	}
-	if (me.buttons[PIKbdListener::MouseRight]) {
-		switch (selection_mode) {
-		case SingleSelection:
-			selected.clear();
-			selected << cur;
-			raiseEvent(TileEvent(SelectionChanged));
-			break;
-		case MultiSelection:
-			if (mouse_sel) selected << cur;
-			else selected.remove(cur);
-			raiseEvent(TileEvent(SelectionChanged));
-			break;
-		default: break;
-		}
-	}
-	return true;
-}
-
-
-bool TileList::wheelEvent(PIKbdListener::WheelEvent we) {
-	keyEvent(PIKbdListener::KeyEvent(we.direction ? PIKbdListener::PageUp : PIKbdListener::PageDown));
-	return true;
-}
-
-
-
-
-TileButton::TileButton(const PIString & n): PIScreenTile(n) {
-	focus_flags = CanHasFocus | NextByTab | NextByArrowsAll | FocusOnMouse;
-}
-
-
-void TileButton::sizeHint(int & w, int & h) const {
-	w = text.size_s() + 2;
-	h = 1;
-}
-
-
-void TileButton::drawEvent(PIScreenDrawer * d) {
-	Color cb = has_focus ? Blue : Cyan;
-	Color ct = has_focus ? White : Black;
-	int ff = has_focus ? Bold : 0;
-	d->fillRect(x_, y_, x_ + width_, y_ + 1, ' ', Default, cb);
-	d->drawText(x_, y_, "[", ct, Transparent, ff);
-	d->drawText(x_ + (width_ - text.size_s()) / 2, y_, text, ct, Transparent, ff);
-	d->drawText(x_ + width_ - 1, y_, "]", ct, Transparent, ff);
-}
-
-
-bool TileButton::keyEvent(PIKbdListener::KeyEvent key) {
-	if (key.key == PIKbdListener::Space || key.key == PIKbdListener::Return) {
-		raiseEvent(TileEvent(ButtonClicked));
-		return true;
-	}
-	return PIScreenTile::keyEvent(key);
-}
-
-
-bool TileButton::mouseEvent(PIKbdListener::MouseEvent me) {
-	if (me.action != PIKbdListener::MouseButtonRelease) return true;
-	keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
-	return true;
-}
-
-
-
-
-TileButtons::TileButtons(const PIString & n): PIScreenTile(n) {
-	focus_flags = CanHasFocus | NextByTab | FocusOnMouse;
-	direction = Horizontal;
-	alignment = PIScreenTypes::Center;
-	cur = 0;
-}
-
-
-void TileButtons::sizeHint(int & w, int & h) const {
-	w = h = 0;
-	if (direction == Horizontal) {
-		piForeachC (Button & b, content)
-			w += b.first.size_s() + 4;
-		w += piMaxi(0, content.size_s() - 1) * 2;
-		h += 1;
-	} else {
-		piForeachC (Button & b, content)
-			w = piMaxi(w, b.first.size_s() + 4);
-		h += content.size_s();
-		h += piMaxi(0, content.size_s() - 1);
-	}
-}
-
-
-void TileButtons::drawEvent(PIScreenDrawer * d) {
-	int cx = x_, cy = y_, shw, shh;
-	sizeHint(shw, shh);
-	btn_rects.resize(content.size());
-	int dx = 0;
-	switch (alignment) {
-	case PIScreenTypes::Center: dx = (width_ - shw) / 2; break;
-	case PIScreenTypes::Right: dx = width_ - shw; break;
-	default: break;
-	}
-	if (direction == PIScreenTypes::Horizontal)
-		cx += dx;
-	for (int i = 0; i < content.size_s(); ++i) {
-		Color cb = Cyan;
-		Color ct = Black;
-		int ff = 0;
-		if (i == cur && has_focus) {
-			cb = Blue;
-			ct = White;
-			ff = Bold;
-		}
-		Button & b(content[i]);
-		int cw = b.first.size_s() + 2, xo(0);
-		if (direction == Vertical) {
-			cw = width_ - 2;
-			xo = (cw - b.first.size_s()) / 2 - 1;
-		}
-		btn_rects[i] = Rect(cx, cy, cx + cw + 2, cy + 1);
-		d->fillRect(cx, cy, cx + cw + 2, cy + 1, ' ', Default, cb);
-		d->drawText(cx, cy, "[", ct, Transparent, ff);
-		d->drawText(cx + xo + 2, cy, b.first, ct, Transparent, ff);
-		d->drawText(cx + cw + 1, cy, "]", ct, Transparent, ff);
-		if (direction == Horizontal)
-			cx += b.first.size_s() + 6;
-		else
-			cy += 2;
-	}
-}
-
-
-bool TileButtons::keyEvent(PIKbdListener::KeyEvent key) {
-	switch (key.key) {
-	case PIKbdListener::LeftArrow:
-	case PIKbdListener::UpArrow:
-		cur--;
-		if (cur < 0) cur = 0;
-		return true;
-	case PIKbdListener::RightArrow:
-	case PIKbdListener::DownArrow:
-		cur++;
-		if (cur >= content.size_s()) cur = content.size_s() - 1;
-		return true;
-	case PIKbdListener::Space:
-	case PIKbdListener::Return:
-		raiseEvent(TileEvent(ButtonSelected, cur));
-		return true;
-	};
-	return PIScreenTile::keyEvent(key);
-}
-
-
-bool TileButtons::mouseEvent(PIKbdListener::MouseEvent me) {
-	if (me.action == PIKbdListener::MouseMove || me.action == PIKbdListener::MouseButtonPress) {
-		for (int i = 0; i < btn_rects.size_s(); ++i)
-			if (me.x >= btn_rects[i].x0 && me.x < btn_rects[i].x1 &&
-				me.y >= btn_rects[i].y0 && me.y < btn_rects[i].y1) {
-				cur = i;
-				break;
-			}
-		return true;
-	}
-	if (me.action != PIKbdListener::MouseButtonRelease) return true;
-	keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
-	return true;
-}
-
-
-
-
-TileCheck::TileCheck(const PIString & n): PIScreenTile(n) {
-	focus_flags = CanHasFocus | NextByTab | NextByArrowsAll | FocusOnMouse;
-	toggled = false;
-}
-
-
-void TileCheck::sizeHint(int & w, int & h) const {
-	w = text.size_s() + 4;
-	h = 1;
-}
-
-
-void TileCheck::drawEvent(PIScreenDrawer * d) {
-	Color cb = has_focus ? Blue : Cyan;
-	Color ct = has_focus ? White : Black;
-	int ff = has_focus ? Bold : 0;
-	PIString cs("[ ]");
-	if (toggled) cs[1] = '*';
-	d->fillRect(x_, y_, x_ + width_, y_ + 1, ' ', Default, cb);
-	d->drawText(x_, y_, cs, ct, Transparent, ff);
-	d->drawText(x_ + 4, y_, text, ct, Transparent, ff);
-}
-
-
-bool TileCheck::keyEvent(PIKbdListener::KeyEvent key) {
-	if (key.key == PIKbdListener::Space || key.key == PIKbdListener::Return) {
-		toggled = !toggled;
-		raiseEvent(TileEvent(Toggled, toggled));
-		return true;
-	}
-	return PIScreenTile::keyEvent(key);
-}
-
-
-bool TileCheck::mouseEvent(PIKbdListener::MouseEvent me) {
-	if (me.action == PIKbdListener::MouseButtonPress) {
-		keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
-		return true;
-	}
-	return false;
-}
-
-
-
-
-TileProgress::TileProgress(const PIString & n): PIScreenTile(n) {
-	maximum = 100.;
-	value = 0.;
-	suffix = " %";
-}
-
-
-void TileProgress::sizeHint(int & w, int & h) const {
-	w = 20;
-	h = 1;
-}
-
-
-void TileProgress::drawEvent(PIScreenDrawer * d) {
-	int v = maximum == 0. ? 0 : piClampd(piRoundd(value / maximum * 100.), 0, 100);
-	PIString s = prefix + PIString::fromNumber(piRoundd(value)) + suffix;
-	int w = piRoundd(v / 100. * width_), sx = (width_ - s.size_s()) / 2;
-	d->fillRect(x_, y_, x_ + width_, y_ + 1, ' ', Default, Cyan);
-	d->fillRect(x_, y_, x_ + w, y_ + 1, ' ', Default, Blue);
-	if (w < sx)
-		d->drawText(x_ + sx, y_, s, Black, Transparent);
-	else if (w >= sx + s.size_s())
-		d->drawText(x_ + sx, y_, s, White, Transparent);
-	else {
-		int fw = w - sx;
-		d->drawText(x_ + sx, y_, s.left(fw), White, Transparent);
-		d->drawText(x_ + sx + fw, y_, s.cutLeft(fw), Black, Transparent);
-	}
-}
-
-
-
-
-TilePICout::TilePICout(const PIString & n): TileList(n) {
-	max_lines = 1024;
-	selection_mode = TileList::SingleSelection;
-	PICout::setOutputDevices(PICout::Buffer);
-	PICout::setBufferActive(true);
-}
-
-
-void TilePICout::drawEvent(PIScreenDrawer * d) {
-	PIString out = PICout::buffer(true);
-	if (!out.isEmpty()) {
-		PIStringList l = out.split("\n");
-		bool scroll = (cur == content.size_s() - 1) || !has_focus;
-		piForeachC (PIString & s, l)
-			content << TileList::Row(s.trimmed(), format);
-		if (content.size_s() > max_lines)
-			content.remove(0, content.size_s() - max_lines);
-		if (scroll) {
-			offset = piMaxi(0, content.size_s() - lhei);
-			cur = content.size_s() - 1;
-		}
-	}
-	TileList::drawEvent(d);
-}
-
-
-bool TilePICout::keyEvent(PIKbdListener::KeyEvent key) {
-	if (key.key == 'C') {
-		content.clear();
-		cur = offset = 0;
-		return true;
-	}
-	return TileList::keyEvent(key);
-}
-
-
-
-
-TileInput::TileInput(const PIString & n): PIScreenTile(n) {
-	focus_flags = CanHasFocus | NextByTab | FocusOnMouse;
-	back_format.color_back = White;
-	format.color_char = Black;
-	format.color_back = White;
-	max_length = 1024;
-	cur = offset = 0;
-	inv = false;
-}
-
-
-void TileInput::sizeHint(int & w, int & h) const {
-	w = 32;
-	h = 1;
-}
-
-
-void TileInput::drawEvent(PIScreenDrawer * d) {
-	PIString ps = text.mid(offset, width_ - 2);
-	d->drawText(x_ + 1, y_, ps, (Color)format.color_char, Transparent, (CharFlags)format.flags);
-	if (offset > 0)
-		d->drawText(x_, y_, "<", Green, Black, Bold);
-	if (text.size_s() - offset >= width_ - 2)
-		d->drawText(x_ + width_ - 1, y_, ">", Green, Black, Bold);
-	if (!has_focus) return;
-	Color cb = (Color)format.color_char, cc = (Color)format.color_back;
-	if (tm_blink.elapsed_m() >= 650) {
-		tm_blink.reset();
-		inv = !inv;
-	}
-	if (inv) piSwap(cb, cc);
-	d->drawText(x_ + 1 + cur - offset, y_, text.mid(cur, 1).expandLeftTo(1, ' '), cc, cb, (CharFlags)format.flags);
-}
-
-
-bool TileInput::keyEvent(PIKbdListener::KeyEvent key) {
-	int lwid = piMaxi(0, width_ - 2);
-	int oo(0), osp = piMini(3, lwid / 4);
-	lwid--;
-	switch (key.key) {
-	case PIKbdListener::LeftArrow:
-		cur--;
-		oo--;
-		if (key.modifiers[PIKbdListener::Ctrl]) {
-			cur -= 4;
-			oo -= 4;
-		}
-		if (cur < 0) cur = 0;
-		if (cur - offset < osp) offset += oo;
-		if (offset < 0) offset = 0;
-		reserCursor();
-		return true;
-	case PIKbdListener::RightArrow:
-		cur++;
-		oo++;
-		if (key.modifiers[PIKbdListener::Ctrl]) {
-			cur += 4;
-			oo += 4;
-		}
-		if (cur > text.size_s()) cur = text.size_s();
-		if (cur - offset >= lwid - osp) offset += oo;
-		if (offset >= text.size_s() - lwid) offset = text.size_s() - lwid;
-		if (offset < 0) offset = 0;
-		reserCursor();
-		return true;
-	case PIKbdListener::Home:
-		cur = offset = 0;
-		reserCursor();
-		return true;
-	case PIKbdListener::End:
-		cur = text.size_s();
-		offset = text.size_s() - lwid;
-		if (offset < 0) offset = 0;
-		reserCursor();
-		return true;
-	case PIKbdListener::Backspace:
-		if (cur > text.size_s() || text.isEmpty())
-			return true;
-		text.remove(cur - 1, 1);
-		cur--;
-		if (cur > text.size_s()) cur = text.size_s();
-		if (cur - offset >= lwid - osp) offset += oo;
-		if (offset >= text.size_s() - lwid) offset = text.size_s() - lwid;
-		if (offset < 0) offset = 0;
-		reserCursor();
-		return true;
-	case PIKbdListener::Delete:
-		if (cur >= text.size_s() || text.isEmpty())
-			return true;
-		text.remove(cur, 1);
-		if (cur < 0) cur = 0;
-		if (cur > text.size_s()) cur = text.size_s();
-		if (cur - offset < osp) offset += oo;
-		if (offset < 0) offset = 0;
-		reserCursor();
-		return true;
-	case PIKbdListener::UpArrow:
-	case PIKbdListener::DownArrow:
-	case PIKbdListener::PageUp:
-	case PIKbdListener::PageDown:
-	case PIKbdListener::Insert:
-	case PIKbdListener::Return:
-	case PIKbdListener::Esc:
-	case PIKbdListener::F1:
-	case PIKbdListener::F2:
-	case PIKbdListener::F3:
-	case PIKbdListener::F4:
-	case PIKbdListener::F5:
-	case PIKbdListener::F6:
-	case PIKbdListener::F7:
-	case PIKbdListener::F8:
-	case PIKbdListener::F9:
-	case PIKbdListener::F10:
-	case PIKbdListener::F11:
-	case PIKbdListener::F12:
-		break;
-	default:
-		PIChar tc
-#ifdef WINDOWS
-				= PIChar(key.key);
-#else
-				= PIChar::fromUTF8((char *)&(key.key));
-#endif
-		text.insert(cur, tc);
-		cur++;
-		oo++;
-		if (cur - offset >= lwid - osp) offset += oo;
-		if (offset >= text.size_s() - lwid) offset = text.size_s() - lwid;
-		if (offset < 0) offset = 0;
-		reserCursor();
-		return true;
-	}
-	return PIScreenTile::keyEvent(key);
-}
-
-
-void TileInput::reserCursor() {
-	tm_blink.reset();
-	inv = false;
-}
+/*
+	PIP - Platform Independent Primitives
+	Various tiles for PIScreen
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piscreentiles.h"
+#include "piscreendrawer.h"
+
+
+using namespace PIScreenTypes;
+
+
+TileSimple::TileSimple(const PIString & n): PIScreenTile(n) {
+	alignment = Left;
+}
+
+
+TileSimple::TileSimple(const TileSimple::Row & r): PIScreenTile() {
+	alignment = Left;
+	content << r;
+}
+
+
+void TileSimple::sizeHint(int & w, int & h) const {
+	w = h = 0;
+	piForeachC (Row & r, content)
+		w = piMaxi(w, r.first.size_s());
+	h = content.size_s();
+}
+
+
+void TileSimple::drawEvent(PIScreenDrawer * d) {
+	for (int i = 0; i < content.size_s(); ++i) {
+		Row & r(content[i]);
+		int rx = 0;
+		switch (alignment) {
+		case Left: rx = x_; break;
+		case Center: rx = x_ + (width_ - r.first.size_s()) / 2; break;
+		case Right: rx = x_ + width_ - r.first.size_s(); break;
+		};
+		d->drawText(rx, y_ + i, r.first, (Color)r.second.color_char, (Color)r.second.color_back, r.second.flags);
+	}
+}
+
+
+
+
+TileScrollBar::TileScrollBar(const PIString & n) {
+	direction = Vertical;
+	thickness = 1;
+	minimum_ = value_ = 0;
+	maximum_ = 100;
+}
+
+
+void TileScrollBar::setMinimum(int v) {
+	minimum_ = v;
+	_check();
+}
+
+
+void TileScrollBar::setMaximum(int v) {
+	maximum_ = v;
+	_check();
+}
+
+
+void TileScrollBar::setValue(int v) {
+	value_ = v;
+	_check();
+}
+
+
+void TileScrollBar::_check() {
+	value_ = piClampi(value_, minimum_, maximum_);
+}
+
+
+void TileScrollBar::sizeHint(int & w, int & h) const {
+	w = h = 0;
+	if (direction == Vertical) {
+		w = thickness;
+		h = 255;
+	} else {
+		h = thickness;
+		w = 255;
+	}
+}
+
+
+void TileScrollBar::drawEvent(PIScreenDrawer * d) {
+	line_char = d->artChar(direction == Vertical ? PIScreenDrawer::LineVertical : PIScreenDrawer::LineHorizontal);
+	d->fillRect(x_, y_, x_ + width_, y_ + height_, line_char, Green);
+	if (value_ >= minimum_ && value_ <= maximum_) {
+		if (direction == Vertical) {
+			int c = piRoundf((float(value_ - minimum_) / (maximum_ - minimum_)) * (height_ - 1));
+			d->drawLine(x_, y_ + c, x_ + width_ - 1, y_ + c, ' ', Green, Green);
+		} else {
+			int c = piRoundf((float(value_ - minimum_) / (maximum_ - minimum_)) * (width_ - 1));
+			d->drawLine(x_ + c, y_, x_ + c, y_ + height_ - 1, ' ', Green, Green);
+		}
+	}
+}
+
+
+bool TileScrollBar::mouseEvent(PIKbdListener::MouseEvent me) {
+	return true;
+}
+
+
+
+
+TileList::TileList(const PIString & n): PIScreenTile(n) {
+	alignment = Left;
+	focus_flags = CanHasFocus | NextByArrowsHorizontal | NextByTab | FocusOnMouseOrWheel;
+	lhei = offset = cur = 0;
+	mouse_sel = false;
+	selection_mode = NoSelection;
+	scroll = new TileScrollBar();
+	scroll->size_policy = Ignore;
+	addTile(scroll);
+}
+
+
+void TileList::sizeHint(int & w, int & h) const {
+	w = h = 0;
+	piForeachC (Row & r, content)
+		w = piMaxi(w, r.first.size_s());
+	h = 3;
+}
+
+
+void TileList::resizeEvent(int w, int h) {
+	scroll->x_ = x_ + width_ - 1;
+	scroll->y_ = y_;
+	scroll->width_ = 1;
+	scroll->height_ = height_;
+}
+
+
+void TileList::drawEvent(PIScreenDrawer * d) {
+	lhei = height_ - 2;
+	int is = piClampi(offset, 0, piMaxi(0, content.size_s() - 1)), ie = piClampi(offset + lhei, 0, content.size_s());
+	if (is > 0) d->drawText(x_, y_, PIString(" /\\ ").repeat(width_ / 4), Green, Default, Bold);
+	if (ie < content.size_s()) d->drawText(x_, y_ + height_ - 1, PIString(" \\/ ").repeat(width_ / 4), Green, Default, Bold);
+	//piCout << is << ie << offset << lhei << content.size_s();
+	for (int i = is; i < ie; ++i) {
+		Row & r(content[i]);
+		bool sel = i == cur && has_focus;
+		if (sel) {
+			int cy = y_ + i - is + 1;
+			d->drawLine(x_, cy, x_ + width_ - 2, cy, ' ', Default, Blue);
+		}
+		int rx(0);
+		switch (alignment) {
+		case Left: rx = x_; break;
+		case Center: rx = x_ + (width_ - 1 - r.first.size_s()) / 2; break;
+		case Right: rx = x_ + width_ - 1 - r.first.size_s(); break;
+		};
+		CharFlags cf = r.second.flags;
+		Color cc = (Color)r.second.color_char;
+		if (selected[i]) {
+			cf |= Bold;
+			cc = Yellow;
+		}
+		d->drawText(rx, y_ + i - is + 1, r.first, cc, sel ? Blue : Default, cf);
+	}
+	scroll->setMaximum(piMaxi(0, content.size_s() - 1));
+	scroll->setValue(cur);
+}
+
+
+bool TileList::keyEvent(PIKbdListener::KeyEvent key) {
+	lhei = height_ - 2;
+	int oo(0), osp = piMini(3, lhei / 4);
+	switch (key.key) {
+	case PIKbdListener::PageUp:
+		cur -= lhei / 2;
+		oo -= lhei / 2;
+	case PIKbdListener::UpArrow:
+		cur--;
+		oo--;
+		if (key.modifiers[PIKbdListener::Ctrl]) {
+			cur -= 4;
+			oo -= 4;
+		}
+		if (cur < 0) cur = 0;
+		if (cur - offset < osp) offset += oo;
+		if (offset < 0) offset = 0;
+		return true;
+	case PIKbdListener::Space:
+		if (cur < 0 || cur >= content.size_s()) return true;
+		switch (selection_mode) {
+		case NoSelection: return false;
+		case SingleSelection:
+			if (selected.isEmpty()) selected << cur;
+			else {
+				bool add = !selected[cur];
+				selected.clear();
+				if (add) selected << cur;
+			}
+			raiseEvent(TileEvent(SelectionChanged));
+			return true;
+		case MultiSelection:
+			if (selected[cur]) selected.remove(cur);
+			else selected << cur;
+			raiseEvent(TileEvent(SelectionChanged));
+			break;
+		}
+	case PIKbdListener::PageDown:
+		if (key.key == PIKbdListener::PageDown) {
+			cur += lhei / 2;
+			oo += lhei / 2;
+		}
+	case PIKbdListener::DownArrow:
+		cur++;
+		oo++;
+		if (key.modifiers[PIKbdListener::Ctrl]) {
+			cur += 4;
+			oo += 4;
+		}
+		if (cur >= content.size_s()) cur = content.size_s() - 1;
+		if (cur - offset >= lhei - osp) offset += oo;
+		if (offset >= content.size_s() - lhei) offset = content.size_s() - lhei;
+		if (offset < 0) offset = 0;
+		return true;
+	case PIKbdListener::Home:
+		cur = offset = 0;
+		return true;
+	case PIKbdListener::End:
+		cur = content.size_s() - 1;
+		offset = content.size_s() - lhei;
+		if (offset < 0) offset = 0;
+		return true;
+	case PIKbdListener::Return:
+		if (cur >= 0 && cur < content.size_s())
+			raiseEvent(TileEvent(RowPressed, cur));
+		return true;
+	case '*':
+		if (selection_mode == TileList::MultiSelection) {
+			PISet<int> nsel;
+			for (int i = 0; i < content.size_s(); ++i)
+				if (!selected[i]) nsel << i;
+			selected = nsel;
+		}
+		raiseEvent(TileEvent(SelectionChanged));
+		return true;
+	case 'A':
+		if (selection_mode == TileList::MultiSelection) {
+			selected.clear();
+			for (int i = 0; i < content.size_s(); ++i)
+				selected << i;
+		}
+		raiseEvent(TileEvent(SelectionChanged));
+		return true;
+	}
+	return PIScreenTile::keyEvent(key);
+}
+
+
+bool TileList::mouseEvent(PIKbdListener::MouseEvent me) {
+	if (me.action == PIKbdListener::MouseButtonRelease) return true;
+	int mp = me.y - y() - 1 + offset;
+	if (mp < 0 || mp >= content.size_s()) return true;
+	cur = mp;
+	switch (me.action) {
+	case PIKbdListener::MouseButtonPress:
+		mouse_sel = !selected.contains(cur);
+		break;
+	case PIKbdListener::MouseButtonDblClick:
+		keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
+		return true;
+	default: break;
+	}
+	if (me.buttons[PIKbdListener::MouseRight]) {
+		switch (selection_mode) {
+		case SingleSelection:
+			selected.clear();
+			selected << cur;
+			raiseEvent(TileEvent(SelectionChanged));
+			break;
+		case MultiSelection:
+			if (mouse_sel) selected << cur;
+			else selected.remove(cur);
+			raiseEvent(TileEvent(SelectionChanged));
+			break;
+		default: break;
+		}
+	}
+	return true;
+}
+
+
+bool TileList::wheelEvent(PIKbdListener::WheelEvent we) {
+	keyEvent(PIKbdListener::KeyEvent(we.direction ? PIKbdListener::PageUp : PIKbdListener::PageDown));
+	return true;
+}
+
+
+
+
+TileButton::TileButton(const PIString & n): PIScreenTile(n) {
+	focus_flags = CanHasFocus | NextByTab | NextByArrowsAll | FocusOnMouse;
+}
+
+
+void TileButton::sizeHint(int & w, int & h) const {
+	w = text.size_s() + 2;
+	h = 1;
+}
+
+
+void TileButton::drawEvent(PIScreenDrawer * d) {
+	Color cb = has_focus ? Blue : Cyan;
+	Color ct = has_focus ? White : Black;
+	int ff = has_focus ? Bold : 0;
+	d->fillRect(x_, y_, x_ + width_, y_ + 1, ' ', Default, cb);
+	d->drawText(x_, y_, "[", ct, Transparent, ff);
+	d->drawText(x_ + (width_ - text.size_s()) / 2, y_, text, ct, Transparent, ff);
+	d->drawText(x_ + width_ - 1, y_, "]", ct, Transparent, ff);
+}
+
+
+bool TileButton::keyEvent(PIKbdListener::KeyEvent key) {
+	if (key.key == PIKbdListener::Space || key.key == PIKbdListener::Return) {
+		raiseEvent(TileEvent(ButtonClicked));
+		return true;
+	}
+	return PIScreenTile::keyEvent(key);
+}
+
+
+bool TileButton::mouseEvent(PIKbdListener::MouseEvent me) {
+	if (me.action != PIKbdListener::MouseButtonRelease) return true;
+	keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
+	return true;
+}
+
+
+
+
+TileButtons::TileButtons(const PIString & n): PIScreenTile(n) {
+	focus_flags = CanHasFocus | NextByTab | FocusOnMouse;
+	direction = Horizontal;
+	alignment = PIScreenTypes::Center;
+	cur = 0;
+}
+
+
+void TileButtons::sizeHint(int & w, int & h) const {
+	w = h = 0;
+	if (direction == Horizontal) {
+		piForeachC (Button & b, content)
+			w += b.first.size_s() + 4;
+		w += piMaxi(0, content.size_s() - 1) * 2;
+		h += 1;
+	} else {
+		piForeachC (Button & b, content)
+			w = piMaxi(w, b.first.size_s() + 4);
+		h += content.size_s();
+		h += piMaxi(0, content.size_s() - 1);
+	}
+}
+
+
+void TileButtons::drawEvent(PIScreenDrawer * d) {
+	int cx = x_, cy = y_, shw, shh;
+	sizeHint(shw, shh);
+	btn_rects.resize(content.size());
+	int dx = 0;
+	switch (alignment) {
+	case PIScreenTypes::Center: dx = (width_ - shw) / 2; break;
+	case PIScreenTypes::Right: dx = width_ - shw; break;
+	default: break;
+	}
+	if (direction == PIScreenTypes::Horizontal)
+		cx += dx;
+	for (int i = 0; i < content.size_s(); ++i) {
+		Color cb = Cyan;
+		Color ct = Black;
+		int ff = 0;
+		if (i == cur && has_focus) {
+			cb = Blue;
+			ct = White;
+			ff = Bold;
+		}
+		Button & b(content[i]);
+		int cw = b.first.size_s() + 2, xo(0);
+		if (direction == Vertical) {
+			cw = width_ - 2;
+			xo = (cw - b.first.size_s()) / 2 - 1;
+		}
+		btn_rects[i] = Rect(cx, cy, cx + cw + 2, cy + 1);
+		d->fillRect(cx, cy, cx + cw + 2, cy + 1, ' ', Default, cb);
+		d->drawText(cx, cy, "[", ct, Transparent, ff);
+		d->drawText(cx + xo + 2, cy, b.first, ct, Transparent, ff);
+		d->drawText(cx + cw + 1, cy, "]", ct, Transparent, ff);
+		if (direction == Horizontal)
+			cx += b.first.size_s() + 6;
+		else
+			cy += 2;
+	}
+}
+
+
+bool TileButtons::keyEvent(PIKbdListener::KeyEvent key) {
+	switch (key.key) {
+	case PIKbdListener::LeftArrow:
+	case PIKbdListener::UpArrow:
+		cur--;
+		if (cur < 0) cur = 0;
+		return true;
+	case PIKbdListener::RightArrow:
+	case PIKbdListener::DownArrow:
+		cur++;
+		if (cur >= content.size_s()) cur = content.size_s() - 1;
+		return true;
+	case PIKbdListener::Space:
+	case PIKbdListener::Return:
+		raiseEvent(TileEvent(ButtonSelected, cur));
+		return true;
+	};
+	return PIScreenTile::keyEvent(key);
+}
+
+
+bool TileButtons::mouseEvent(PIKbdListener::MouseEvent me) {
+	if (me.action == PIKbdListener::MouseMove || me.action == PIKbdListener::MouseButtonPress) {
+		for (int i = 0; i < btn_rects.size_s(); ++i)
+			if (me.x >= btn_rects[i].x0 && me.x < btn_rects[i].x1 &&
+				me.y >= btn_rects[i].y0 && me.y < btn_rects[i].y1) {
+				cur = i;
+				break;
+			}
+		return true;
+	}
+	if (me.action != PIKbdListener::MouseButtonRelease) return true;
+	keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
+	return true;
+}
+
+
+
+
+TileCheck::TileCheck(const PIString & n): PIScreenTile(n) {
+	focus_flags = CanHasFocus | NextByTab | NextByArrowsAll | FocusOnMouse;
+	toggled = false;
+}
+
+
+void TileCheck::sizeHint(int & w, int & h) const {
+	w = text.size_s() + 4;
+	h = 1;
+}
+
+
+void TileCheck::drawEvent(PIScreenDrawer * d) {
+	Color cb = has_focus ? Blue : Cyan;
+	Color ct = has_focus ? White : Black;
+	int ff = has_focus ? Bold : 0;
+	PIString cs("[ ]");
+	if (toggled) cs[1] = '*';
+	d->fillRect(x_, y_, x_ + width_, y_ + 1, ' ', Default, cb);
+	d->drawText(x_, y_, cs, ct, Transparent, ff);
+	d->drawText(x_ + 4, y_, text, ct, Transparent, ff);
+}
+
+
+bool TileCheck::keyEvent(PIKbdListener::KeyEvent key) {
+	if (key.key == PIKbdListener::Space || key.key == PIKbdListener::Return) {
+		toggled = !toggled;
+		raiseEvent(TileEvent(Toggled, toggled));
+		return true;
+	}
+	return PIScreenTile::keyEvent(key);
+}
+
+
+bool TileCheck::mouseEvent(PIKbdListener::MouseEvent me) {
+	if (me.action == PIKbdListener::MouseButtonPress) {
+		keyEvent(PIKbdListener::KeyEvent(PIKbdListener::Return));
+		return true;
+	}
+	return false;
+}
+
+
+
+
+TileProgress::TileProgress(const PIString & n): PIScreenTile(n) {
+	maximum = 100.;
+	value = 0.;
+	suffix = " %";
+}
+
+
+void TileProgress::sizeHint(int & w, int & h) const {
+	w = 20;
+	h = 1;
+}
+
+
+void TileProgress::drawEvent(PIScreenDrawer * d) {
+	int v = maximum == 0. ? 0 : piClampd(piRoundd(value / maximum * 100.), 0, 100);
+	PIString s = prefix + PIString::fromNumber(piRoundd(value)) + suffix;
+	int w = piRoundd(v / 100. * width_), sx = (width_ - s.size_s()) / 2;
+	d->fillRect(x_, y_, x_ + width_, y_ + 1, ' ', Default, Cyan);
+	d->fillRect(x_, y_, x_ + w, y_ + 1, ' ', Default, Blue);
+	if (w < sx)
+		d->drawText(x_ + sx, y_, s, Black, Transparent);
+	else if (w >= sx + s.size_s())
+		d->drawText(x_ + sx, y_, s, White, Transparent);
+	else {
+		int fw = w - sx;
+		d->drawText(x_ + sx, y_, s.left(fw), White, Transparent);
+		d->drawText(x_ + sx + fw, y_, s.cutLeft(fw), Black, Transparent);
+	}
+}
+
+
+
+
+TilePICout::TilePICout(const PIString & n): TileList(n) {
+	max_lines = 1024;
+	selection_mode = TileList::SingleSelection;
+	PICout::setOutputDevices(PICout::Buffer);
+	PICout::setBufferActive(true);
+}
+
+
+void TilePICout::drawEvent(PIScreenDrawer * d) {
+	PIString out = PICout::buffer(true);
+	if (!out.isEmpty()) {
+		PIStringList l = out.split("\n");
+		bool scroll = (cur == content.size_s() - 1) || !has_focus;
+		piForeachC (PIString & s, l)
+			content << TileList::Row(s.trimmed(), format);
+		if (content.size_s() > max_lines)
+			content.remove(0, content.size_s() - max_lines);
+		if (scroll) {
+			offset = piMaxi(0, content.size_s() - lhei);
+			cur = content.size_s() - 1;
+		}
+	}
+	TileList::drawEvent(d);
+}
+
+
+bool TilePICout::keyEvent(PIKbdListener::KeyEvent key) {
+	if (key.key == 'C') {
+		content.clear();
+		cur = offset = 0;
+		return true;
+	}
+	return TileList::keyEvent(key);
+}
+
+
+
+
+TileInput::TileInput(const PIString & n): PIScreenTile(n) {
+	focus_flags = CanHasFocus | NextByTab | FocusOnMouse;
+	back_format.color_back = White;
+	format.color_char = Black;
+	format.color_back = White;
+	max_length = 1024;
+	cur = offset = 0;
+	inv = false;
+}
+
+
+void TileInput::sizeHint(int & w, int & h) const {
+	w = 32;
+	h = 1;
+}
+
+
+void TileInput::drawEvent(PIScreenDrawer * d) {
+	PIString ps = text.mid(offset, width_ - 2);
+	d->drawText(x_ + 1, y_, ps, (Color)format.color_char, Transparent, (CharFlags)format.flags);
+	if (offset > 0)
+		d->drawText(x_, y_, "<", Green, Black, Bold);
+	if (text.size_s() - offset >= width_ - 2)
+		d->drawText(x_ + width_ - 1, y_, ">", Green, Black, Bold);
+	if (!has_focus) return;
+	Color cb = (Color)format.color_char, cc = (Color)format.color_back;
+	if (tm_blink.elapsed_m() >= 650) {
+		tm_blink.reset();
+		inv = !inv;
+	}
+	if (inv) piSwap(cb, cc);
+	d->drawText(x_ + 1 + cur - offset, y_, text.mid(cur, 1).expandLeftTo(1, ' '), cc, cb, (CharFlags)format.flags);
+}
+
+
+bool TileInput::keyEvent(PIKbdListener::KeyEvent key) {
+	int lwid = piMaxi(0, width_ - 2);
+	int oo(0), osp = piMini(3, lwid / 4);
+	lwid--;
+	switch (key.key) {
+	case PIKbdListener::LeftArrow:
+		cur--;
+		oo--;
+		if (key.modifiers[PIKbdListener::Ctrl]) {
+			cur -= 4;
+			oo -= 4;
+		}
+		if (cur < 0) cur = 0;
+		if (cur - offset < osp) offset += oo;
+		if (offset < 0) offset = 0;
+		reserCursor();
+		return true;
+	case PIKbdListener::RightArrow:
+		cur++;
+		oo++;
+		if (key.modifiers[PIKbdListener::Ctrl]) {
+			cur += 4;
+			oo += 4;
+		}
+		if (cur > text.size_s()) cur = text.size_s();
+		if (cur - offset >= lwid - osp) offset += oo;
+		if (offset >= text.size_s() - lwid) offset = text.size_s() - lwid;
+		if (offset < 0) offset = 0;
+		reserCursor();
+		return true;
+	case PIKbdListener::Home:
+		cur = offset = 0;
+		reserCursor();
+		return true;
+	case PIKbdListener::End:
+		cur = text.size_s();
+		offset = text.size_s() - lwid;
+		if (offset < 0) offset = 0;
+		reserCursor();
+		return true;
+	case PIKbdListener::Backspace:
+		if (cur > text.size_s() || text.isEmpty())
+			return true;
+		text.remove(cur - 1, 1);
+		cur--;
+		if (cur > text.size_s()) cur = text.size_s();
+		if (cur - offset >= lwid - osp) offset += oo;
+		if (offset >= text.size_s() - lwid) offset = text.size_s() - lwid;
+		if (offset < 0) offset = 0;
+		reserCursor();
+		return true;
+	case PIKbdListener::Delete:
+		if (cur >= text.size_s() || text.isEmpty())
+			return true;
+		text.remove(cur, 1);
+		if (cur < 0) cur = 0;
+		if (cur > text.size_s()) cur = text.size_s();
+		if (cur - offset < osp) offset += oo;
+		if (offset < 0) offset = 0;
+		reserCursor();
+		return true;
+	case PIKbdListener::UpArrow:
+	case PIKbdListener::DownArrow:
+	case PIKbdListener::PageUp:
+	case PIKbdListener::PageDown:
+	case PIKbdListener::Insert:
+	case PIKbdListener::Return:
+	case PIKbdListener::Esc:
+	case PIKbdListener::F1:
+	case PIKbdListener::F2:
+	case PIKbdListener::F3:
+	case PIKbdListener::F4:
+	case PIKbdListener::F5:
+	case PIKbdListener::F6:
+	case PIKbdListener::F7:
+	case PIKbdListener::F8:
+	case PIKbdListener::F9:
+	case PIKbdListener::F10:
+	case PIKbdListener::F11:
+	case PIKbdListener::F12:
+		break;
+	default:
+		PIChar tc
+#ifdef WINDOWS
+				= PIChar(key.key);
+#else
+				= PIChar::fromUTF8((char *)&(key.key));
+#endif
+		text.insert(cur, tc);
+		cur++;
+		oo++;
+		if (cur - offset >= lwid - osp) offset += oo;
+		if (offset >= text.size_s() - lwid) offset = text.size_s() - lwid;
+		if (offset < 0) offset = 0;
+		reserCursor();
+		return true;
+	}
+	return PIScreenTile::keyEvent(key);
+}
+
+
+void TileInput::reserCursor() {
+	tm_blink.reset();
+	inv = false;
+}
diff --git a/src_main/console/piterminal.cpp b/lib/console/piterminal.cpp
similarity index 96%
rename from src_main/console/piterminal.cpp
rename to lib/console/piterminal.cpp
index d8dfacb3..2c0da013 100644
--- a/src_main/console/piterminal.cpp
+++ b/lib/console/piterminal.cpp
@@ -1,920 +1,920 @@
-/*
-	PIP - Platform Independent Primitives
-	Virtual terminal
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "piincludes_p.h"
-#include "piterminal.h"
-#include "pisharedmemory.h"
-#ifndef FREERTOS
-#ifdef WINDOWS
-#  include <windows.h>
-#  include <wincon.h>
-#  include <winuser.h>
-#else
-#  include "piprocess.h"
-#  include <csignal>
-#  include <fcntl.h>
-#  include <sys/ioctl.h>
-#  if defined(QNX) || defined(BLACKBERRY)
-#    include <unix.h>
-#  else
-#    ifdef MAC_OS
-#      include <util.h>
-#    else
-#      include <pty.h>
-#    endif
-#  endif
-#  ifdef ANDROID
-#    if __ANDROID_API__ >= 23
-#      define HAS_FORKPTY
-#    endif
-#  else
-#    define HAS_FORKPTY
-#  endif
-#endif
-
-
-//extern PIMutex PICout::__mutex__;
-
-#ifdef WINDOWS
-#  define PIPE_BUFFER_SIZE 1024
-enum PITerminalAuxMessageType {
-	mtKey = 1,
-	mtResize,
-	mtScroll
-};
-struct PITerminalAuxData {
-	int cursor_x;
-	int cursor_y;
-	int size_x;
-	int size_y;
-	int cells_size;
-};
-#else
-#  define BUFFER_SIZE 4096
-enum DECType {
-	CKM = 1
-};
-#endif
-
-
-PRIVATE_DEFINITION_START(PITerminal)
-#ifdef WINDOWS
-	PISharedMemory * shm;
-	HANDLE hConBuf;
-	STARTUPINFOA si;
-	PROCESS_INFORMATION pi;
-	HANDLE pipe;
-#else
-	PIString shell;
-	PIByteArray read_buf, tmp_buf;
-	PIScreenTypes::CellFormat cur_format, line_format;
-	int term_type;
-	int fd, cur_x, cur_y;
-	int save_cur_x, save_cur_y;
-	int win_y0, win_y1;
-	pid_t pid;
-	PIString esc_seq;
-	bool is_esc_seq, last_read;
-	PIMap<int, bool> DEC;
-	PIVector<PIVector<PIScreenTypes::Cell> > cells_save;
-#endif
-PRIVATE_DEFINITION_END(PITerminal)
-
-
-#ifdef WINDOWS
-int writePipe(HANDLE pipe, const PIByteArray & ba) {
-	DWORD wrote[2];
-	int sz = ba.size_s();
-	WriteFile(pipe, &sz, 4, &(wrote[0]), 0);
-	WriteFile(pipe, ba.data(), ba.size_s(), &(wrote[1]), 0);
-	//piCout << "send" << ba.size_s();
-	return int(wrote[0] + wrote[1]);
-}
-#endif
-
-
-PITerminal::PITerminal(): PIThread() {
-	setName("terminal");
-	initPrivate();
-	cursor_blink = false;
-	cursor_x = cursor_y = 0;
-	dsize_x = 80;
-	dsize_y = 24;
-#ifdef WINDOWS
-	PRIVATE->shm = 0;
-#endif
-}
-
-
-PITerminal::~PITerminal() {
-	if (isRunning())
-		stop();
-	PIThread::waitForFinish(10);
-	destroy();
-#ifdef WINDOWS
-	if (PRIVATE->shm) delete PRIVATE->shm;
-#endif
-}
-
-
-void PITerminal::write(const PIByteArray & d) {
-#ifdef WINDOWS
-	PIByteArray msg;
-	PIVector<PIKbdListener::KeyEvent> ke;
-	for (int i = 0; i < d.size_s(); ++i)
-		ke << PIKbdListener::KeyEvent(d[i]);
-	msg << int(mtKey) << ke;
-	writePipe(PRIVATE->pipe, msg);
-#else
-#  ifdef HAS_FORKPTY
-	if (PRIVATE->fd == 0) return;
-	//ssize_t wrote = 0;
-	//wrote =
-	::write(PRIVATE->fd, d.data(), d.size_s());
-	//piCout << "wrote" << wrote << d;
-#  endif
-#endif
-	cursor_tm.reset();
-	cursor_blink = true;
-}
-
-
-void PITerminal::write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers m) {
-	PIByteArray ba;
-#ifdef WINDOWS
-	switch (k) {
-	case PIKbdListener::Tab:    ba << uchar('\t'); break;
-	case PIKbdListener::Return: ba << uchar('\r') << uchar('\n'); break;
-	case PIKbdListener::Space:  ba << uchar(' '); break;
-	default: break;
-	}
-	//piCout << "write" << ba.size();
-	if (!ba.isEmpty()) write(ba);
-	else {
-		PIByteArray msg;
-		PIVector<PIKbdListener::KeyEvent> ke;
-		ke << PIKbdListener::KeyEvent(k, m);
-		msg << int(mtKey) << ke;
-		writePipe(PRIVATE->pipe, msg);
-	}
-#else
-	int term = PRIVATE->term_type;
-	int flags = 0;
-	switch (k) {
-	case PIKbdListener::Tab:        ba << uchar('\t'); break;
-	case PIKbdListener::Return:     ba << uchar('\n'); break;
-	case PIKbdListener::Esc:        ba << uchar('\e'); break;
-	case PIKbdListener::Space:      ba << uchar(' ');  break;
-	case PIKbdListener::Backspace:  ba << uchar(0x7f); break;
-	case PIKbdListener::UpArrow:    
-	case PIKbdListener::DownArrow:  
-	case PIKbdListener::RightArrow: 
-	case PIKbdListener::LeftArrow:  if (PRIVATE->DEC.value(CKM, false)) flags = 1;
-	/*case PIKbdListener::Home:       //break;
-	case PIKbdListener::End:        //break;
-	case PIKbdListener::PageUp:     //ba << uchar('\e') << uchar('[') << uchar('5') << uchar('~'); break;
-	case PIKbdListener::PageDown:   //ba << uchar('\e') << uchar('[') << uchar('6') << uchar('~'); break;
-	case PIKbdListener::Insert:     //ba << uchar('\e') << uchar('[') << uchar('2') << uchar('~'); break;
-	case PIKbdListener::Delete:     //ba << uchar('\e') << uchar('[') << uchar('3') << uchar('~'); break;
-	case PIKbdListener::F1:         //break;
-	case PIKbdListener::F2:         //break;
-	case PIKbdListener::F3:         //break;
-	case PIKbdListener::F4:         //break;
-	case PIKbdListener::F5:         //break;
-	case PIKbdListener::F6:         //break;
-	case PIKbdListener::F7:         //break;
-	case PIKbdListener::F8:         //break;
-	case PIKbdListener::F9:         //break;
-	case PIKbdListener::F10:        //break;
-	case PIKbdListener::F11:        //break;
-	case PIKbdListener::F12:        //break;
-	*/
-	default: {
-		//piCout << flags;
-		//int mod = 0;
-		if (m[PIKbdListener::Shift]) m |= 1;
-		if (m[PIKbdListener::Alt])   m |= 2;
-		if (m[PIKbdListener::Ctrl])  m |= 4;
-		for (int i = 0; ; ++i) {
-			const PIKbdListener::EscSeq & e(PIKbdListener::esc_seq[i]);
-			if (!e.seq) break;
-			//piCout << "search" << rc[1] << esc_seq[i].seq;
-			if (e.key == k && e.mod == m) {
-				if (((e.vt & term) == term) || (((e.flags & flags) == flags) && (flags != 0))) {
-					//piCout << "found key" << PIString(e.seq).replaceAll("\e", "\\e");
-					PIByteArray d = ("\e" + PIString(e.seq)).toByteArray();
-					write(d);
-					break;
-				}
-			}
-		}
-		} break;
-	}
-	//piCout << "write" << ba.size();
-	if (!ba.isEmpty()) write(ba);
-#endif
-	cursor_tm.reset();
-	cursor_blink = true;
-}
-
-
-void PITerminal::write(PIKbdListener::KeyEvent ke) {
-	if (isSpecialKey(ke.key)) write((PIKbdListener::SpecialKey)ke.key, ke.modifiers);
-	else {
-		PIByteArray ba;
-#ifdef WINDOWS
-		ba << uchar(PIChar(ke.key).toConsole1Byte());
-#else
-		ba = PIString(PIChar(ke.key)).toUTF8();
-#endif
-		write(ba);
-	}
-}
-
-
-PIVector<PIVector<PIScreenTypes::Cell> > PITerminal::content() {
-	readConsole();
-	PIVector<PIVector<PIScreenTypes::Cell> > ret = cells;
-	if (cursor_blink && cursor_visible)
-		if (cursor_x >= 0 && cursor_x < size_x)
-			if (cursor_y >= 0 && cursor_y < size_y)
-				ret[cursor_y][cursor_x].format.flags ^= PIScreenTypes::Inverse;
-	return ret;
-}
-
-
-bool PITerminal::isSpecialKey(int k) {
-	switch (k) {
-	case PIKbdListener::Tab:
-	case PIKbdListener::Return:
-	case PIKbdListener::Esc:
-	case PIKbdListener::Space:
-	case PIKbdListener::Backspace:
-	case PIKbdListener::UpArrow:
-	case PIKbdListener::DownArrow:
-	case PIKbdListener::RightArrow:
-	case PIKbdListener::LeftArrow:
-	case PIKbdListener::Home:
-	case PIKbdListener::End:
-	case PIKbdListener::PageUp:
-	case PIKbdListener::PageDown:
-	case PIKbdListener::Insert:
-	case PIKbdListener::Delete:
-	case PIKbdListener::F1:
-	case PIKbdListener::F2:
-	case PIKbdListener::F3:
-	case PIKbdListener::F4:
-	case PIKbdListener::F5:
-	case PIKbdListener::F6:
-	case PIKbdListener::F7:
-	case PIKbdListener::F8:
-	case PIKbdListener::F9:
-	case PIKbdListener::F10:
-	case PIKbdListener::F11:
-	case PIKbdListener::F12: return true;
-	default: return false;
-	}
-	return false;
-}
-
-
-void PITerminal::initPrivate() {
-#ifdef WINDOWS
-	PRIVATE->hConBuf = INVALID_HANDLE_VALUE;
-	PRIVATE->pipe = INVALID_HANDLE_VALUE;
-	PRIVATE->pi.hProcess = 0;
-#else
-	PRIVATE->shell = "/bin/bash";
-	PRIVATE->read_buf.reserve(BUFFER_SIZE);
-	PRIVATE->read_buf.fill(0);
-	PRIVATE->fd = PRIVATE->cur_x = PRIVATE->cur_y = 0;
-	PRIVATE->save_cur_x = PRIVATE->save_cur_y = 0;
-	PRIVATE->pid = 0;
-	PRIVATE->term_type = 0;
-	PRIVATE->is_esc_seq = false;
-	PRIVATE->last_read = true;
-	PRIVATE->esc_seq.clear();
-	PRIVATE->cur_format = PIScreenTypes::CellFormat();
-#endif
-	cursor_blink = cursor_visible = true;
-	size_x = size_y = 0;
-}
-
-
-void PITerminal::readConsole() {
-#ifdef WINDOWS
-	if (!PRIVATE->shm) return;
-	PITerminalAuxData data;
-	PRIVATE->shm->read(&data, sizeof(data));
-	if (data.cells_size <= 4) return;
-	cursor_x = data.cursor_x;
-	cursor_y = data.cursor_y;
-	size_x = data.size_x;
-	size_y = data.size_y;
-	PIByteArray ba;
-	ba.resize(data.cells_size);
-	PRIVATE->shm->read(ba.data(), ba.size_s(), sizeof(data));
-	ba >> cells;
-#endif
-	//piCout << cursor_x << cursor_y;
-}
-
-
-void PITerminal::getCursor(int & x, int & y) {
-#ifdef WINDOWS
-	if (!PRIVATE->shm) return;
-	int sz = 0;
-	PRIVATE->shm->read(&sz, 4);
-#else
-	x = PRIVATE->cur_x;
-	y = PRIVATE->cur_y;
-#endif
-}
-
-
-uchar PITerminal::invertColor(uchar c) {
-	switch ((PIScreenTypes::Color)c) {
-	case PIScreenTypes::Black: return PIScreenTypes::White;
-	case PIScreenTypes::Red: return PIScreenTypes::Cyan;
-	case PIScreenTypes::Green: return PIScreenTypes::Magenta;
-	case PIScreenTypes::Blue: return PIScreenTypes::Yellow;
-	case PIScreenTypes::Cyan: return PIScreenTypes::Red;
-	case PIScreenTypes::Magenta: return PIScreenTypes::Green;
-	case PIScreenTypes::Yellow: return PIScreenTypes::Blue;
-	case PIScreenTypes::White: return PIScreenTypes::Black;
-	default: break;
-	}
-	return PIScreenTypes::White;
-}
-
-
-void PITerminal::run() {
-	getCursor(cursor_x, cursor_y);
-	if (cursor_tm.elapsed_m() >= 500) {
-		cursor_tm.reset();
-		cursor_blink = !cursor_blink;
-	}
-#ifndef WINDOWS
-#  ifdef HAS_FORKPTY
-	if (PRIVATE->fd == 0) return;
-	PRIVATE->tmp_buf.resize(BUFFER_SIZE);
-	int readed = ::read(PRIVATE->fd, PRIVATE->tmp_buf.data(), BUFFER_SIZE - PRIVATE->read_buf.size_s());
-	bool used = false;
-	if (readed > 0) {
-		PRIVATE->last_read = true;
-		//piCoutObj << "readed" << readed << PIString(PRIVATE->tmp_buf.resized(readed)).replaceAll("\e", "\\e");
-		//piCoutObj << "readed" << readed << (PRIVATE->tmp_buf.resized(readed));
-		PRIVATE->read_buf.append(PRIVATE->tmp_buf.resized(readed));
-		for (;;) {
-			int ind = -1;
-			for (int i = PRIVATE->read_buf.size_s() - 1; i >= 0; --i)
-				if (PRIVATE->read_buf[i] == uchar('\n') || PRIVATE->read_buf[i] == uchar('\e')) {
-					ind = i;
-					break;
-				}
-			if (ind <= 0) break;
-			used = true;
-			parseInput(PIString((const char *)PRIVATE->read_buf.data(), ind));
-			PRIVATE->read_buf.remove(0, ind);
-		}
-		bool parse = PRIVATE->read_buf.size_s() >= BUFFER_SIZE;
-		if (PRIVATE->read_buf.size_s() == 1)
-			if (PRIVATE->read_buf[0] < 0x80)
-				parse = true;
-		if (parse) {
-			parseInput(PIString(PRIVATE->read_buf));
-			PRIVATE->read_buf.clear();
-		}
-		//printf("%s", PRIVATE->read_buf.data());
-	}
-	if (!used && !PRIVATE->last_read && !PRIVATE->read_buf.isEmpty()) {
-		parseInput(PIString(PRIVATE->read_buf));
-		PRIVATE->read_buf.clear();
-	}
-	PRIVATE->last_read = false;
-#  endif
-#endif
-}
-
-
-#ifndef WINDOWS
-void PITerminal::parseInput(const PIString & s) {
-	//piCoutObj << s.replaceAll("\e", "\\e");
-	//printf("%s", s.data());
-	for (int i = 0; i < s.size_s(); ++i) {
-		if (s[i].unicode16Code() == 0) break;
-		if (PRIVATE->is_esc_seq) {
-			if (s[i] == '\e') {
-				applyEscSeq(PRIVATE->esc_seq);
-				PRIVATE->esc_seq.clear();
-				PRIVATE->is_esc_seq = true;
-			} else {
-				PRIVATE->esc_seq += s[i];
-				if (isCompleteEscSeq(PRIVATE->esc_seq)) {
-					PRIVATE->is_esc_seq = false;
-					applyEscSeq(PRIVATE->esc_seq);
-					//piCoutObj << PRIVATE->esc_seq;
-				}
-			}
-		} else {
-			if (s[i] == '\e') {
-				PRIVATE->esc_seq.clear();
-				PRIVATE->is_esc_seq = true;
-			} else {
-				if (s[i] == '\a') continue;
-				if (s[i] == '\b') {
-					moveCursor(-1, 0);
-					continue;
-				}
-				if (s[i] == '\r') continue;
-				if (s[i] == '\n') {
-					//piCoutObj << "new line";
-					for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i].format = PRIVATE->cur_format;
-					PRIVATE->line_format = PRIVATE->cur_format;
-					PRIVATE->cur_x = 0;
-					moveCursor(0, 1);
-					continue;
-				}
-				//piCoutObj << "char" << s[i] << s[i].unicode16Code() << "at" << PRIVATE->cur_x << PRIVATE->cur_y;
-				cells[PRIVATE->cur_y][PRIVATE->cur_x].symbol = s[i];
-				cells[PRIVATE->cur_y][PRIVATE->cur_x].format = PRIVATE->cur_format;
-				moveCursor(1, 0);
-			}
-		}
-	}
-}
-
-
-bool PITerminal::isCompleteEscSeq(const PIString & es) {
-	if (es.size_s() < 2) return false;
-	if (es.front() == ']') {
-		if (es.back().toAscii() == '\\' || es.back().toAscii() == '\a') return true;
-	} else {
-		if (es.back().toAscii() >= 64 && es.back().toAscii() <= 126) return true;
-	}
-	return false;
-}
-
-
-void PITerminal::applyEscSeq(PIString es) {
-	piCoutObj << es;
-	if (es.size_s() < 2) return;
-//	PIScreenTypes::Cell line_cell = PIScreenTypes::Cell(' ', PRIVATE->line_format);
-	PIScreenTypes::Cell def_cell = PIScreenTypes::Cell(' ', PRIVATE->cur_format);
-	if (es[1] == '?' && es.size_s() >= 2) {
-		char a = es.takeRight(1)[0].toAscii();
-		bool val = false;
-		if (a == 'l') val = false;
-		if (a == 'h') val = true;
-		int dec = es.mid(2).toInt();
-		piCoutObj << "DEC" << dec << val;
-		PRIVATE->DEC[dec] = val;
-		switch (dec) {
-		case 25: cursor_visible = val; break;
-		case 1049:
-			if (val) {
-				PRIVATE->save_cur_x = PRIVATE->cur_x;
-				PRIVATE->save_cur_y = PRIVATE->cur_y;
-			} else {
-				PRIVATE->cur_x = PRIVATE->save_cur_x;
-				PRIVATE->cur_y = PRIVATE->save_cur_y;
-			}
-		case 1047:
-			if (val) {
-				PRIVATE->cells_save = cells;
-				for (int i = 0; i < size_y; ++i) cells[i].fill(def_cell);
-			} else {
-				cells = PRIVATE->cells_save;
-			}
-			break;
-		}
-	}
-	if (es[0] == '[') { // CSI
-		if (es.back() == 'm') {
-			es.cutLeft(1).cutRight(1);
-			if (es.isEmpty()) {
-				PRIVATE->cur_format = PIScreenTypes::CellFormat();
-				return;
-			}
-			PIStringList args = es.split(";");
-			piForeachC (PIString & a, args) {
-				int av = a.toInt();
-				switch (av) {
-				case 0: PRIVATE->cur_format = PIScreenTypes::CellFormat(); break;
-				case 1: PRIVATE->cur_format.flags |= PIScreenTypes::Bold; break;
-				case 4: PRIVATE->cur_format.flags |= PIScreenTypes::Underline; break;
-				case 5: PRIVATE->cur_format.flags |= PIScreenTypes::Blink; break;
-				case 7: PRIVATE->cur_format.flags |= PIScreenTypes::Inverse; break;
-				default: {
-					bool col = false, target = false;
-					int cid = av % 10;
-					if (av >= 30 && av <= 37) {col = true; target = false;}
-					if (av >= 40 && av <= 47) {col = true; target = true;}
-					if (col) {
-						int cfl = 0;
-						switch (cid) {
-						case 0: cfl = PIScreenTypes::Black; break;
-						case 1: cfl = PIScreenTypes::Red; break;
-						case 2: cfl = PIScreenTypes::Green; break;
-						case 3: cfl = PIScreenTypes::Yellow; break;
-						case 4: cfl = PIScreenTypes::Blue; break;
-						case 5: cfl = PIScreenTypes::Magenta; break;
-						case 6: cfl = PIScreenTypes::Cyan; break;
-						case 7: cfl = PIScreenTypes::White; break;
-						}
-						if (target)
-							PRIVATE->cur_format.color_back = cfl;
-						else
-							PRIVATE->cur_format.color_char = cfl;
-						break;
-					}
-					} break;
-				}
-			}
-			/*if ((PRIVATE->cur_format.flags & PIScreenTypes::Inverse) == PIScreenTypes::Inverse) {
-				uchar t = PRIVATE->cur_format.color_char;
-				PRIVATE->cur_format.color_char = PRIVATE->cur_format.color_back;
-				PRIVATE->cur_format.color_back = t;
-			}*/
-		}
-		if (es.back() == 'r') {
-			piCoutObj << es;
-			es.cutLeft(1).cutRight(1);
-			PIStringList args = es.split(";");
-			args.resize(2);
-			int y0(0), y1(0);
-			if (!args[0].isEmpty()) y0 = args[0].toInt() - 1;
-			if (!args[1].isEmpty()) y1 = args[1].toInt() - 1;
-			PRIVATE->win_y0 = piClamp(y0, 0, size_y - 1);
-			PRIVATE->win_y1 = piClamp(y1, 0, size_y - 1);
-		}
-		if (es.back() == 's') {
-			PRIVATE->save_cur_x = PRIVATE->cur_x;
-			PRIVATE->save_cur_y = PRIVATE->cur_y;
-		}
-		if (es.back() == 'u') {
-			PRIVATE->cur_x = PRIVATE->save_cur_x;
-			PRIVATE->cur_y = PRIVATE->save_cur_y;
-		}
-		if (es.back() == 'H' || es.back() == 'f' || es.back() == 'r') {
-			es.cutLeft(1).cutRight(1);
-			PIStringList args = es.split(";");
-			args.resize(2);
-			int x(0), y(0);
-			if (!args[0].isEmpty()) y = args[0].toInt() - 1;
-			if (!args[1].isEmpty()) x = args[1].toInt() - 1;
-			//piCoutObj << x << y;
-			PRIVATE->cur_x = piClamp(x, 0, size_x - 1);
-			PRIVATE->cur_y = piClamp(y, 0, size_y - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'A') { // cursor up
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			PRIVATE->cur_y = piClamp(PRIVATE->cur_y - v, 0, size_y - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'B') { // cursor down
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			PRIVATE->cur_y = piClamp(PRIVATE->cur_y + v, 0, size_y - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'C' || es.back() == 'a') { // cursor forward, next column
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			PRIVATE->cur_x = piClamp(PRIVATE->cur_x + v, 0, size_x - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'D') { // cursor back
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			PRIVATE->cur_x = piClamp(PRIVATE->cur_x - v, 0, size_x - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'G' || es.back() == '`') { // goto column
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt();
-			if (v) PRIVATE->cur_x = piClamp(v - 1, 0, size_x - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'd') { // goto line
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			PRIVATE->cur_x = 0;
-			PRIVATE->cur_y = piClamp(v - 1, 0, size_y - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'E' || es.back() == 'e') { // next line
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			PRIVATE->cur_x = 0;
-			PRIVATE->cur_y = piClamp(PRIVATE->cur_y + v, 0, size_y - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'F') { // previous line
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			PRIVATE->cur_x = 0;
-			PRIVATE->cur_y = piClamp(PRIVATE->cur_y - v, 0, size_y - 1);
-			PRIVATE->line_format = PRIVATE->cur_format;
-		}
-		if (es.back() == 'L') { // insert lines
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = piClamp(size_y - 1, PRIVATE->win_y0, PRIVATE->win_y1); i >= piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1); --i) cells[i] = cells[i - v];
-			for (int j = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1); j < piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1); ++j)
-				for (int i = 0; i < PRIVATE->cur_x; ++i) cells[j][i] = def_cell;
-		}
-		if (es.back() == 'M') { // delete lines
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1); i < piClamp(size_y - v, PRIVATE->win_y0, PRIVATE->win_y1); ++i) cells[i] = cells[i + v];
-			for (int j = piClamp(size_y - v, PRIVATE->win_y0, PRIVATE->win_y1); j < piClamp(size_y, PRIVATE->win_y0, PRIVATE->win_y1); ++j)
-				for (int i = 0; i < PRIVATE->cur_x; ++i) cells[j][i] = def_cell;
-		}
-		if (es.back() == 'P') { // delete characters
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = PRIVATE->cur_x; i < size_x - v; ++i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i + v];
-			for (int i = size_x - v; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-		}
-		if (es.back() == '@') { // delete characters
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt(); if (v == 0) v = 1;
-			for (int i = size_x - 1; i >= PRIVATE->cur_x + v; --i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i - v];
-			for (int i = PRIVATE->cur_x; i < PRIVATE->cur_x + v; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-		}
-		if (es.back() == 'J') { // erase data
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt();
-			switch (v) {
-			case 0:
-				for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-				for (int i = PRIVATE->cur_y + 1; i < size_y; ++i) cells[i].fill(def_cell);
-				break;
-			case 1:
-				for (int i = 0; i <= PRIVATE->cur_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-				for (int i = 0; i < PRIVATE->cur_y; ++i) cells[i].fill(def_cell);
-				break;
-			case 2:
-				for (int i = 0; i < size_y; ++i) cells[i].fill(def_cell);
-				//PRIVATE->cur_x = PRIVATE->cur_y = 0;
-				break;
-			}
-		}
-		if (es.back() == 'K') { // erase in line
-			es.cutLeft(1).cutRight(1);
-			int v = es.toInt();
-			switch (v) {
-			case 0:
-				for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-				break;
-			case 1:
-				for (int i = 0; i <= PRIVATE->cur_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
-				break;
-			case 2:
-				cells[PRIVATE->cur_y].fill(def_cell);
-				break;
-			}
-		}
-	}
-}
-
-
-void PITerminal::moveCursor(int dx, int dy) {
-	PRIVATE->cur_x += dx;
-	PRIVATE->cur_y += dy;
-	if (PRIVATE->cur_x < 0) PRIVATE->cur_x = 0;
-	if (PRIVATE->cur_y < 0) PRIVATE->cur_y = 0;
-	if (PRIVATE->cur_x >= size_x) {
-		PRIVATE->line_format = PRIVATE->cur_format;
-		PRIVATE->cur_x = 0;
-		PRIVATE->cur_y++;
-	}
-	if (PRIVATE->cur_y >= size_y) {
-		int scroll = piMini(PRIVATE->cur_y - size_y + 1, size_y - 1);
-		//piCout << "scroll" << size_x << size_y << size_y - scroll - 1;
-		PRIVATE->cur_y = size_y - 1;
-		for (int y = 0; y < size_y - scroll; ++y)
-			cells[y] = cells[y + scroll];
-		for (int y = size_y - scroll; y < size_y; ++y)
-			cells[y].fill(PIScreenTypes::Cell());
-	}
-}
-
-
-int PITerminal::termType(const PIString & t) {
-	if (t == "xterm") return PIKbdListener::vt_xterm;
-	else if (t == "linux") return PIKbdListener::vt_linux;
-	return PIKbdListener::vt_none;
-}
-#endif
-
-
-bool PITerminal::initialize() {
-	destroy();
-#ifdef WINDOWS
-	/*SECURITY_ATTRIBUTES sa;
-	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-	sa.bInheritHandle = true;
-	sa.lpSecurityDescriptor = 0;
-	if (!CreatePipe(&(PRIVATE->pipe_in[0]), &(PRIVATE->pipe_in[1]), &sa, 0)) {
-		piCoutObj << "CreatePipe error," << errorString();
-		initPrivate();
-		return false;
-	}
-	PRIVATE->hConBuf = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, 0, &sa, CONSOLE_TEXTMODE_BUFFER, 0);
-	if (PRIVATE->hConBuf == INVALID_HANDLE_VALUE) {
-		piCoutObj << "CreateConsoleScreenBuffer error," << errorString();
-		destroy();
-		return false;
-	}*/
-	//CreatePipe(&(PRIVATE->pipe_out[0]), &(PRIVATE->pipe_out[1]), &sa, 0);
-	//SetHandleInformation(PRIVATE->pipe_in[1], HANDLE_FLAG_INHERIT, 0);
-	//SetHandleInformation(PRIVATE->hConBuf, HANDLE_FLAG_INHERIT, 0);
-	//GetStartupInfoA(&PRIVATE->si);
-	memset(&PRIVATE->si, 0, sizeof(PRIVATE->si));
-	PRIVATE->si.cb = sizeof(STARTUPINFO);
-	//PRIVATE->si.dwFlags |= STARTF_USESTDHANDLES;
-	PRIVATE->si.dwFlags |= STARTF_USESHOWWINDOW;
-	PRIVATE->si.dwFlags |= STARTF_USECOUNTCHARS;
-	//PRIVATE->si.hStdInput = PRIVATE->pipe;
-	//PRIVATE->si.hStdOutput = PRIVATE->hConBuf;
-	//PRIVATE->si.hStdError = PRIVATE->hConBuf;
-	PRIVATE->si.wShowWindow = SW_HIDE;
-	PRIVATE->si.dwXCountChars = 80;
-	PRIVATE->si.dwYCountChars = 24;
-
-	memset(&PRIVATE->pi, 0, sizeof(PRIVATE->pi));
-
-	PIString shmh = PIString::fromNumber(randomi() % 10000);
-	PIString pname = "\\\\.\\pipe\\piterm" + shmh;
-	PIString cmd = "piterminal \"" + shmh + "\" \"" + pname + "\"";
-	if(!CreateProcessA(0, (LPSTR)cmd.dataAscii(), 0, 0, false, CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP, 0, 0, &PRIVATE->si, &PRIVATE->pi)) {
-		piCoutObj << "CreateProcess error," << errorString();
-		destroy();
-		return false;
-	}
-	PRIVATE->pipe = CreateNamedPipe((LPSTR)pname.dataAscii(), PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 2, PIPE_BUFFER_SIZE, PIPE_BUFFER_SIZE, 1000, NULL);
-	if (PRIVATE->pipe == INVALID_HANDLE_VALUE) {
-		piCoutObj << "CreateNamedPipe error," << errorString();
-		destroy();
-		return false;
-	}
-	PITimeMeasurer tm;
-	bool ok = false;
-	while (tm.elapsed_m() < 1000) {
-		if (ConnectNamedPipe(PRIVATE->pipe, 0) == TRUE) {
-			ok = true;
-			break;
-		}
-	}
-	if (!ok) {
-		piCoutObj << "ConnectNamedPipe error," << errorString();
-		destroy();
-		return false;
-	}
-	if (PRIVATE->shm) delete PRIVATE->shm;
-	PRIVATE->shm = new PISharedMemory("piterm_aux" + shmh, 1024*1024);
-	CloseHandle(PRIVATE->pi.hThread);
-	resize(dsize_x, dsize_y);
-#else
-#  ifdef HAS_FORKPTY
-	char pty[256]; memset(pty, 0, 256);
-	winsize ws;
-	ws.ws_col = dsize_x;
-	ws.ws_row = dsize_y;
-	PIStringList env = PIProcess::currentEnvironment();
-	piForeachC (PIString & e, env)
-		if (e.startsWith("TERM=")) {
-			PRIVATE->term_type = termType(e.mid(5).trim().toLowerCase());
-			//piCout << PRIVATE->term_type;
-			piBreak;
-		}
-	pid_t fr = forkpty(&(PRIVATE->fd), pty, 0, &ws);
-	//piCoutObj << fr << PRIVATE->fd << pty;
-	if (fr == 0) {
-		char ** argv = new char*[2];
-		argv[0] = new char[PRIVATE->shell.lengthAscii() + 1];
-		memcpy(argv[0], PRIVATE->shell.dataAscii(), PRIVATE->shell.lengthAscii());
-		argv[0][PRIVATE->shell.lengthAscii()] = 0;
-		argv[1] = 0;
-		execvp(PRIVATE->shell.dataAscii(), argv);
-		delete[] argv[0];
-		delete[] argv;
-		exit(0);
-	} else {
-		if (fr < 0 || PRIVATE->fd < 0) {
-			piCoutObj << "forkpty error," << errorString();
-			initPrivate();
-			return false;
-		}
-		PRIVATE->pid = fr;
-		fcntl(PRIVATE->fd, F_SETFL, O_NONBLOCK);
-	/*
-	tcgetattr(PRIVATE->fd, &PRIVATE->desc);
-	PRIVATE->desc.c_oflag = PRIVATE->desc.c_lflag = PRIVATE->desc.c_cflag = 0;
-	PRIVATE->desc.c_iflag = IGNBRK;
-	PRIVATE->desc.c_cflag = CLOCAL | HUPCL;
-	PRIVATE->desc.c_cflag |= (CSIZE & CS8);
-	PRIVATE->desc.c_cflag |= CREAD;
-	PRIVATE->desc.c_cc[VMIN] = 1;
-	PRIVATE->desc.c_cc[VTIME] = 1;
-
-	cfsetispeed(&PRIVATE->desc, B38400);
-	cfsetospeed(&PRIVATE->desc, B38400);
-
-	if (tcsetattr(PRIVATE->fd, TCSANOW, &PRIVATE->desc) < 0) {
-		piCoutObj << "Can`t set attributes for \"" << pty << "\"";
-		destroy();
-		return false;
-	}
-	*/
-		size_x = dsize_x;
-		size_y = dsize_y;
-		resize(size_x, size_y);
-	}
-#  endif
-#endif
-	cursor_blink = false;
-	cursor_tm.reset();
-	start(40);
-	return true;
-}
-
-
-void PITerminal::destroy() {
-	//piCout << "destroy ...";
-	stop();
-	waitForFinish(1000);
-#ifdef WINDOWS
-	if (PRIVATE->pi.hProcess) {
-		//piCout << "term";
-		//TerminateProcess(PRIVATE->pi.hProcess, 0);
-		GenerateConsoleCtrlEvent(CTRL_C_EVENT, PRIVATE->pi.dwProcessId);
-		CloseHandle(PRIVATE->pi.hProcess);
-	}
-	if (PRIVATE->pipe != INVALID_HANDLE_VALUE) CloseHandle(PRIVATE->pipe);
-	if (PRIVATE->hConBuf != INVALID_HANDLE_VALUE) CloseHandle(PRIVATE->hConBuf);
-	//piCout << "destroy" << size_y;
-#else
-#  ifdef HAS_FORKPTY
-	if (PRIVATE->pid != 0)
-		kill(PRIVATE->pid, SIGKILL);
-	if (PRIVATE->fd != 0)
-		::close(PRIVATE->fd);
-#  endif
-#endif
-	initPrivate();
-}
-
-
-bool PITerminal::resize(int cols, int rows) {
-	bool ret = true;
-	dsize_x = cols;
-	dsize_y = rows;
-#ifdef WINDOWS
-	if (PRIVATE->pipe == INVALID_HANDLE_VALUE) return false;
-	PIByteArray msg;
-	msg << int(mtResize) << dsize_x << dsize_y;
-	writePipe(PRIVATE->pipe, msg);
-#else
-#  ifdef HAS_FORKPTY
-	if (PRIVATE->fd == 0) return false;
-	size_x = dsize_x;
-	size_y = dsize_y;
-	//piCout << "resize" << PRIVATE->fd << size_x << size_y;
-	winsize ws;
-	ws.ws_col = cols;
-	ws.ws_row = rows;
-	ioctl(PRIVATE->fd, TIOCSWINSZ, &ws);
-	PRIVATE->win_y0 = 0;
-	PRIVATE->win_y1 = size_y - 1;
-	PRIVATE->cells_save.resize(size_y);
-	for (int i = 0; i < size_y; ++i)
-		PRIVATE->cells_save[i].resize(size_x);
-#  endif
-#endif
-	cells.resize(size_y);
-	for (int i = 0; i < size_y; ++i)
-		cells[i].resize(size_x);
-	return ret;
-}
-
-#endif // FREERTOS
+/*
+	PIP - Platform Independent Primitives
+	Virtual terminal
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "piincludes_p.h"
+#include "piterminal.h"
+#include "pisharedmemory.h"
+#ifndef FREERTOS
+#ifdef WINDOWS
+#  include <windows.h>
+#  include <wincon.h>
+#  include <winuser.h>
+#else
+#  include "piprocess.h"
+#  include <csignal>
+#  include <fcntl.h>
+#  include <sys/ioctl.h>
+#  if defined(QNX) || defined(BLACKBERRY)
+#    include <unix.h>
+#  else
+#    ifdef MAC_OS
+#      include <util.h>
+#    else
+#      include <pty.h>
+#    endif
+#  endif
+#  ifdef ANDROID
+#    if __ANDROID_API__ >= 23
+#      define HAS_FORKPTY
+#    endif
+#  else
+#    define HAS_FORKPTY
+#  endif
+#endif
+
+
+//extern PIMutex PICout::__mutex__;
+
+#ifdef WINDOWS
+#  define PIPE_BUFFER_SIZE 1024
+enum PITerminalAuxMessageType {
+	mtKey = 1,
+	mtResize,
+	mtScroll
+};
+struct PITerminalAuxData {
+	int cursor_x;
+	int cursor_y;
+	int size_x;
+	int size_y;
+	int cells_size;
+};
+#else
+#  define BUFFER_SIZE 4096
+enum DECType {
+	CKM = 1
+};
+#endif
+
+
+PRIVATE_DEFINITION_START(PITerminal)
+#ifdef WINDOWS
+	PISharedMemory * shm;
+	HANDLE hConBuf;
+	STARTUPINFOA si;
+	PROCESS_INFORMATION pi;
+	HANDLE pipe;
+#else
+	PIString shell;
+	PIByteArray read_buf, tmp_buf;
+	PIScreenTypes::CellFormat cur_format, line_format;
+	int term_type;
+	int fd, cur_x, cur_y;
+	int save_cur_x, save_cur_y;
+	int win_y0, win_y1;
+	pid_t pid;
+	PIString esc_seq;
+	bool is_esc_seq, last_read;
+	PIMap<int, bool> DEC;
+	PIVector<PIVector<PIScreenTypes::Cell> > cells_save;
+#endif
+PRIVATE_DEFINITION_END(PITerminal)
+
+
+#ifdef WINDOWS
+int writePipe(HANDLE pipe, const PIByteArray & ba) {
+	DWORD wrote[2];
+	int sz = ba.size_s();
+	WriteFile(pipe, &sz, 4, &(wrote[0]), 0);
+	WriteFile(pipe, ba.data(), ba.size_s(), &(wrote[1]), 0);
+	//piCout << "send" << ba.size_s();
+	return int(wrote[0] + wrote[1]);
+}
+#endif
+
+
+PITerminal::PITerminal(): PIThread() {
+	setName("terminal");
+	initPrivate();
+	cursor_blink = false;
+	cursor_x = cursor_y = 0;
+	dsize_x = 80;
+	dsize_y = 24;
+#ifdef WINDOWS
+	PRIVATE->shm = 0;
+#endif
+}
+
+
+PITerminal::~PITerminal() {
+	if (isRunning())
+		stop();
+	PIThread::waitForFinish(10);
+	destroy();
+#ifdef WINDOWS
+	if (PRIVATE->shm) delete PRIVATE->shm;
+#endif
+}
+
+
+void PITerminal::write(const PIByteArray & d) {
+#ifdef WINDOWS
+	PIByteArray msg;
+	PIVector<PIKbdListener::KeyEvent> ke;
+	for (int i = 0; i < d.size_s(); ++i)
+		ke << PIKbdListener::KeyEvent(d[i]);
+	msg << int(mtKey) << ke;
+	writePipe(PRIVATE->pipe, msg);
+#else
+#  ifdef HAS_FORKPTY
+	if (PRIVATE->fd == 0) return;
+	//ssize_t wrote = 0;
+	//wrote =
+	::write(PRIVATE->fd, d.data(), d.size_s());
+	//piCout << "wrote" << wrote << d;
+#  endif
+#endif
+	cursor_tm.reset();
+	cursor_blink = true;
+}
+
+
+void PITerminal::write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers m) {
+	PIByteArray ba;
+#ifdef WINDOWS
+	switch (k) {
+	case PIKbdListener::Tab:    ba << uchar('\t'); break;
+	case PIKbdListener::Return: ba << uchar('\r') << uchar('\n'); break;
+	case PIKbdListener::Space:  ba << uchar(' '); break;
+	default: break;
+	}
+	//piCout << "write" << ba.size();
+	if (!ba.isEmpty()) write(ba);
+	else {
+		PIByteArray msg;
+		PIVector<PIKbdListener::KeyEvent> ke;
+		ke << PIKbdListener::KeyEvent(k, m);
+		msg << int(mtKey) << ke;
+		writePipe(PRIVATE->pipe, msg);
+	}
+#else
+	int term = PRIVATE->term_type;
+	int flags = 0;
+	switch (k) {
+	case PIKbdListener::Tab:        ba << uchar('\t'); break;
+	case PIKbdListener::Return:     ba << uchar('\n'); break;
+	case PIKbdListener::Esc:        ba << uchar('\e'); break;
+	case PIKbdListener::Space:      ba << uchar(' ');  break;
+	case PIKbdListener::Backspace:  ba << uchar(0x7f); break;
+	case PIKbdListener::UpArrow:    
+	case PIKbdListener::DownArrow:  
+	case PIKbdListener::RightArrow: 
+	case PIKbdListener::LeftArrow:  if (PRIVATE->DEC.value(CKM, false)) flags = 1;
+	/*case PIKbdListener::Home:       //break;
+	case PIKbdListener::End:        //break;
+	case PIKbdListener::PageUp:     //ba << uchar('\e') << uchar('[') << uchar('5') << uchar('~'); break;
+	case PIKbdListener::PageDown:   //ba << uchar('\e') << uchar('[') << uchar('6') << uchar('~'); break;
+	case PIKbdListener::Insert:     //ba << uchar('\e') << uchar('[') << uchar('2') << uchar('~'); break;
+	case PIKbdListener::Delete:     //ba << uchar('\e') << uchar('[') << uchar('3') << uchar('~'); break;
+	case PIKbdListener::F1:         //break;
+	case PIKbdListener::F2:         //break;
+	case PIKbdListener::F3:         //break;
+	case PIKbdListener::F4:         //break;
+	case PIKbdListener::F5:         //break;
+	case PIKbdListener::F6:         //break;
+	case PIKbdListener::F7:         //break;
+	case PIKbdListener::F8:         //break;
+	case PIKbdListener::F9:         //break;
+	case PIKbdListener::F10:        //break;
+	case PIKbdListener::F11:        //break;
+	case PIKbdListener::F12:        //break;
+	*/
+	default: {
+		//piCout << flags;
+		//int mod = 0;
+		if (m[PIKbdListener::Shift]) m |= 1;
+		if (m[PIKbdListener::Alt])   m |= 2;
+		if (m[PIKbdListener::Ctrl])  m |= 4;
+		for (int i = 0; ; ++i) {
+			const PIKbdListener::EscSeq & e(PIKbdListener::esc_seq[i]);
+			if (!e.seq) break;
+			//piCout << "search" << rc[1] << esc_seq[i].seq;
+			if (e.key == k && e.mod == m) {
+				if (((e.vt & term) == term) || (((e.flags & flags) == flags) && (flags != 0))) {
+					//piCout << "found key" << PIString(e.seq).replaceAll("\e", "\\e");
+					PIByteArray d = ("\e" + PIString(e.seq)).toByteArray();
+					write(d);
+					break;
+				}
+			}
+		}
+		} break;
+	}
+	//piCout << "write" << ba.size();
+	if (!ba.isEmpty()) write(ba);
+#endif
+	cursor_tm.reset();
+	cursor_blink = true;
+}
+
+
+void PITerminal::write(PIKbdListener::KeyEvent ke) {
+	if (isSpecialKey(ke.key)) write((PIKbdListener::SpecialKey)ke.key, ke.modifiers);
+	else {
+		PIByteArray ba;
+#ifdef WINDOWS
+		ba << uchar(PIChar(ke.key).toConsole1Byte());
+#else
+		ba = PIString(PIChar(ke.key)).toUTF8();
+#endif
+		write(ba);
+	}
+}
+
+
+PIVector<PIVector<PIScreenTypes::Cell> > PITerminal::content() {
+	readConsole();
+	PIVector<PIVector<PIScreenTypes::Cell> > ret = cells;
+	if (cursor_blink && cursor_visible)
+		if (cursor_x >= 0 && cursor_x < size_x)
+			if (cursor_y >= 0 && cursor_y < size_y)
+				ret[cursor_y][cursor_x].format.flags ^= PIScreenTypes::Inverse;
+	return ret;
+}
+
+
+bool PITerminal::isSpecialKey(int k) {
+	switch (k) {
+	case PIKbdListener::Tab:
+	case PIKbdListener::Return:
+	case PIKbdListener::Esc:
+	case PIKbdListener::Space:
+	case PIKbdListener::Backspace:
+	case PIKbdListener::UpArrow:
+	case PIKbdListener::DownArrow:
+	case PIKbdListener::RightArrow:
+	case PIKbdListener::LeftArrow:
+	case PIKbdListener::Home:
+	case PIKbdListener::End:
+	case PIKbdListener::PageUp:
+	case PIKbdListener::PageDown:
+	case PIKbdListener::Insert:
+	case PIKbdListener::Delete:
+	case PIKbdListener::F1:
+	case PIKbdListener::F2:
+	case PIKbdListener::F3:
+	case PIKbdListener::F4:
+	case PIKbdListener::F5:
+	case PIKbdListener::F6:
+	case PIKbdListener::F7:
+	case PIKbdListener::F8:
+	case PIKbdListener::F9:
+	case PIKbdListener::F10:
+	case PIKbdListener::F11:
+	case PIKbdListener::F12: return true;
+	default: return false;
+	}
+	return false;
+}
+
+
+void PITerminal::initPrivate() {
+#ifdef WINDOWS
+	PRIVATE->hConBuf = INVALID_HANDLE_VALUE;
+	PRIVATE->pipe = INVALID_HANDLE_VALUE;
+	PRIVATE->pi.hProcess = 0;
+#else
+	PRIVATE->shell = "/bin/bash";
+	PRIVATE->read_buf.reserve(BUFFER_SIZE);
+	PRIVATE->read_buf.fill(0);
+	PRIVATE->fd = PRIVATE->cur_x = PRIVATE->cur_y = 0;
+	PRIVATE->save_cur_x = PRIVATE->save_cur_y = 0;
+	PRIVATE->pid = 0;
+	PRIVATE->term_type = 0;
+	PRIVATE->is_esc_seq = false;
+	PRIVATE->last_read = true;
+	PRIVATE->esc_seq.clear();
+	PRIVATE->cur_format = PIScreenTypes::CellFormat();
+#endif
+	cursor_blink = cursor_visible = true;
+	size_x = size_y = 0;
+}
+
+
+void PITerminal::readConsole() {
+#ifdef WINDOWS
+	if (!PRIVATE->shm) return;
+	PITerminalAuxData data;
+	PRIVATE->shm->read(&data, sizeof(data));
+	if (data.cells_size <= 4) return;
+	cursor_x = data.cursor_x;
+	cursor_y = data.cursor_y;
+	size_x = data.size_x;
+	size_y = data.size_y;
+	PIByteArray ba;
+	ba.resize(data.cells_size);
+	PRIVATE->shm->read(ba.data(), ba.size_s(), sizeof(data));
+	ba >> cells;
+#endif
+	//piCout << cursor_x << cursor_y;
+}
+
+
+void PITerminal::getCursor(int & x, int & y) {
+#ifdef WINDOWS
+	if (!PRIVATE->shm) return;
+	int sz = 0;
+	PRIVATE->shm->read(&sz, 4);
+#else
+	x = PRIVATE->cur_x;
+	y = PRIVATE->cur_y;
+#endif
+}
+
+
+uchar PITerminal::invertColor(uchar c) {
+	switch ((PIScreenTypes::Color)c) {
+	case PIScreenTypes::Black: return PIScreenTypes::White;
+	case PIScreenTypes::Red: return PIScreenTypes::Cyan;
+	case PIScreenTypes::Green: return PIScreenTypes::Magenta;
+	case PIScreenTypes::Blue: return PIScreenTypes::Yellow;
+	case PIScreenTypes::Cyan: return PIScreenTypes::Red;
+	case PIScreenTypes::Magenta: return PIScreenTypes::Green;
+	case PIScreenTypes::Yellow: return PIScreenTypes::Blue;
+	case PIScreenTypes::White: return PIScreenTypes::Black;
+	default: break;
+	}
+	return PIScreenTypes::White;
+}
+
+
+void PITerminal::run() {
+	getCursor(cursor_x, cursor_y);
+	if (cursor_tm.elapsed_m() >= 500) {
+		cursor_tm.reset();
+		cursor_blink = !cursor_blink;
+	}
+#ifndef WINDOWS
+#  ifdef HAS_FORKPTY
+	if (PRIVATE->fd == 0) return;
+	PRIVATE->tmp_buf.resize(BUFFER_SIZE);
+	int readed = ::read(PRIVATE->fd, PRIVATE->tmp_buf.data(), BUFFER_SIZE - PRIVATE->read_buf.size_s());
+	bool used = false;
+	if (readed > 0) {
+		PRIVATE->last_read = true;
+		//piCoutObj << "readed" << readed << PIString(PRIVATE->tmp_buf.resized(readed)).replaceAll("\e", "\\e");
+		//piCoutObj << "readed" << readed << (PRIVATE->tmp_buf.resized(readed));
+		PRIVATE->read_buf.append(PRIVATE->tmp_buf.resized(readed));
+		for (;;) {
+			int ind = -1;
+			for (int i = PRIVATE->read_buf.size_s() - 1; i >= 0; --i)
+				if (PRIVATE->read_buf[i] == uchar('\n') || PRIVATE->read_buf[i] == uchar('\e')) {
+					ind = i;
+					break;
+				}
+			if (ind <= 0) break;
+			used = true;
+			parseInput(PIString((const char *)PRIVATE->read_buf.data(), ind));
+			PRIVATE->read_buf.remove(0, ind);
+		}
+		bool parse = PRIVATE->read_buf.size_s() >= BUFFER_SIZE;
+		if (PRIVATE->read_buf.size_s() == 1)
+			if (PRIVATE->read_buf[0] < 0x80)
+				parse = true;
+		if (parse) {
+			parseInput(PIString(PRIVATE->read_buf));
+			PRIVATE->read_buf.clear();
+		}
+		//printf("%s", PRIVATE->read_buf.data());
+	}
+	if (!used && !PRIVATE->last_read && !PRIVATE->read_buf.isEmpty()) {
+		parseInput(PIString(PRIVATE->read_buf));
+		PRIVATE->read_buf.clear();
+	}
+	PRIVATE->last_read = false;
+#  endif
+#endif
+}
+
+
+#ifndef WINDOWS
+void PITerminal::parseInput(const PIString & s) {
+	//piCoutObj << s.replaceAll("\e", "\\e");
+	//printf("%s", s.data());
+	for (int i = 0; i < s.size_s(); ++i) {
+		if (s[i].unicode16Code() == 0) break;
+		if (PRIVATE->is_esc_seq) {
+			if (s[i] == '\e') {
+				applyEscSeq(PRIVATE->esc_seq);
+				PRIVATE->esc_seq.clear();
+				PRIVATE->is_esc_seq = true;
+			} else {
+				PRIVATE->esc_seq += s[i];
+				if (isCompleteEscSeq(PRIVATE->esc_seq)) {
+					PRIVATE->is_esc_seq = false;
+					applyEscSeq(PRIVATE->esc_seq);
+					//piCoutObj << PRIVATE->esc_seq;
+				}
+			}
+		} else {
+			if (s[i] == '\e') {
+				PRIVATE->esc_seq.clear();
+				PRIVATE->is_esc_seq = true;
+			} else {
+				if (s[i] == '\a') continue;
+				if (s[i] == '\b') {
+					moveCursor(-1, 0);
+					continue;
+				}
+				if (s[i] == '\r') continue;
+				if (s[i] == '\n') {
+					//piCoutObj << "new line";
+					for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i].format = PRIVATE->cur_format;
+					PRIVATE->line_format = PRIVATE->cur_format;
+					PRIVATE->cur_x = 0;
+					moveCursor(0, 1);
+					continue;
+				}
+				//piCoutObj << "char" << s[i] << s[i].unicode16Code() << "at" << PRIVATE->cur_x << PRIVATE->cur_y;
+				cells[PRIVATE->cur_y][PRIVATE->cur_x].symbol = s[i];
+				cells[PRIVATE->cur_y][PRIVATE->cur_x].format = PRIVATE->cur_format;
+				moveCursor(1, 0);
+			}
+		}
+	}
+}
+
+
+bool PITerminal::isCompleteEscSeq(const PIString & es) {
+	if (es.size_s() < 2) return false;
+	if (es.front() == ']') {
+		if (es.back().toAscii() == '\\' || es.back().toAscii() == '\a') return true;
+	} else {
+		if (es.back().toAscii() >= 64 && es.back().toAscii() <= 126) return true;
+	}
+	return false;
+}
+
+
+void PITerminal::applyEscSeq(PIString es) {
+	piCoutObj << es;
+	if (es.size_s() < 2) return;
+//	PIScreenTypes::Cell line_cell = PIScreenTypes::Cell(' ', PRIVATE->line_format);
+	PIScreenTypes::Cell def_cell = PIScreenTypes::Cell(' ', PRIVATE->cur_format);
+	if (es[1] == '?' && es.size_s() >= 2) {
+		char a = es.takeRight(1)[0].toAscii();
+		bool val = false;
+		if (a == 'l') val = false;
+		if (a == 'h') val = true;
+		int dec = es.mid(2).toInt();
+		piCoutObj << "DEC" << dec << val;
+		PRIVATE->DEC[dec] = val;
+		switch (dec) {
+		case 25: cursor_visible = val; break;
+		case 1049:
+			if (val) {
+				PRIVATE->save_cur_x = PRIVATE->cur_x;
+				PRIVATE->save_cur_y = PRIVATE->cur_y;
+			} else {
+				PRIVATE->cur_x = PRIVATE->save_cur_x;
+				PRIVATE->cur_y = PRIVATE->save_cur_y;
+			}
+		case 1047:
+			if (val) {
+				PRIVATE->cells_save = cells;
+				for (int i = 0; i < size_y; ++i) cells[i].fill(def_cell);
+			} else {
+				cells = PRIVATE->cells_save;
+			}
+			break;
+		}
+	}
+	if (es[0] == '[') { // CSI
+		if (es.back() == 'm') {
+			es.cutLeft(1).cutRight(1);
+			if (es.isEmpty()) {
+				PRIVATE->cur_format = PIScreenTypes::CellFormat();
+				return;
+			}
+			PIStringList args = es.split(";");
+			piForeachC (PIString & a, args) {
+				int av = a.toInt();
+				switch (av) {
+				case 0: PRIVATE->cur_format = PIScreenTypes::CellFormat(); break;
+				case 1: PRIVATE->cur_format.flags |= PIScreenTypes::Bold; break;
+				case 4: PRIVATE->cur_format.flags |= PIScreenTypes::Underline; break;
+				case 5: PRIVATE->cur_format.flags |= PIScreenTypes::Blink; break;
+				case 7: PRIVATE->cur_format.flags |= PIScreenTypes::Inverse; break;
+				default: {
+					bool col = false, target = false;
+					int cid = av % 10;
+					if (av >= 30 && av <= 37) {col = true; target = false;}
+					if (av >= 40 && av <= 47) {col = true; target = true;}
+					if (col) {
+						int cfl = 0;
+						switch (cid) {
+						case 0: cfl = PIScreenTypes::Black; break;
+						case 1: cfl = PIScreenTypes::Red; break;
+						case 2: cfl = PIScreenTypes::Green; break;
+						case 3: cfl = PIScreenTypes::Yellow; break;
+						case 4: cfl = PIScreenTypes::Blue; break;
+						case 5: cfl = PIScreenTypes::Magenta; break;
+						case 6: cfl = PIScreenTypes::Cyan; break;
+						case 7: cfl = PIScreenTypes::White; break;
+						}
+						if (target)
+							PRIVATE->cur_format.color_back = cfl;
+						else
+							PRIVATE->cur_format.color_char = cfl;
+						break;
+					}
+					} break;
+				}
+			}
+			/*if ((PRIVATE->cur_format.flags & PIScreenTypes::Inverse) == PIScreenTypes::Inverse) {
+				uchar t = PRIVATE->cur_format.color_char;
+				PRIVATE->cur_format.color_char = PRIVATE->cur_format.color_back;
+				PRIVATE->cur_format.color_back = t;
+			}*/
+		}
+		if (es.back() == 'r') {
+			piCoutObj << es;
+			es.cutLeft(1).cutRight(1);
+			PIStringList args = es.split(";");
+			args.resize(2);
+			int y0(0), y1(0);
+			if (!args[0].isEmpty()) y0 = args[0].toInt() - 1;
+			if (!args[1].isEmpty()) y1 = args[1].toInt() - 1;
+			PRIVATE->win_y0 = piClamp(y0, 0, size_y - 1);
+			PRIVATE->win_y1 = piClamp(y1, 0, size_y - 1);
+		}
+		if (es.back() == 's') {
+			PRIVATE->save_cur_x = PRIVATE->cur_x;
+			PRIVATE->save_cur_y = PRIVATE->cur_y;
+		}
+		if (es.back() == 'u') {
+			PRIVATE->cur_x = PRIVATE->save_cur_x;
+			PRIVATE->cur_y = PRIVATE->save_cur_y;
+		}
+		if (es.back() == 'H' || es.back() == 'f' || es.back() == 'r') {
+			es.cutLeft(1).cutRight(1);
+			PIStringList args = es.split(";");
+			args.resize(2);
+			int x(0), y(0);
+			if (!args[0].isEmpty()) y = args[0].toInt() - 1;
+			if (!args[1].isEmpty()) x = args[1].toInt() - 1;
+			//piCoutObj << x << y;
+			PRIVATE->cur_x = piClamp(x, 0, size_x - 1);
+			PRIVATE->cur_y = piClamp(y, 0, size_y - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'A') { // cursor up
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			PRIVATE->cur_y = piClamp(PRIVATE->cur_y - v, 0, size_y - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'B') { // cursor down
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			PRIVATE->cur_y = piClamp(PRIVATE->cur_y + v, 0, size_y - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'C' || es.back() == 'a') { // cursor forward, next column
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			PRIVATE->cur_x = piClamp(PRIVATE->cur_x + v, 0, size_x - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'D') { // cursor back
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			PRIVATE->cur_x = piClamp(PRIVATE->cur_x - v, 0, size_x - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'G' || es.back() == '`') { // goto column
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt();
+			if (v) PRIVATE->cur_x = piClamp(v - 1, 0, size_x - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'd') { // goto line
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			PRIVATE->cur_x = 0;
+			PRIVATE->cur_y = piClamp(v - 1, 0, size_y - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'E' || es.back() == 'e') { // next line
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			PRIVATE->cur_x = 0;
+			PRIVATE->cur_y = piClamp(PRIVATE->cur_y + v, 0, size_y - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'F') { // previous line
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			PRIVATE->cur_x = 0;
+			PRIVATE->cur_y = piClamp(PRIVATE->cur_y - v, 0, size_y - 1);
+			PRIVATE->line_format = PRIVATE->cur_format;
+		}
+		if (es.back() == 'L') { // insert lines
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			for (int i = piClamp(size_y - 1, PRIVATE->win_y0, PRIVATE->win_y1); i >= piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1); --i) cells[i] = cells[i - v];
+			for (int j = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1); j < piClamp(PRIVATE->cur_y + v, PRIVATE->win_y0, PRIVATE->win_y1); ++j)
+				for (int i = 0; i < PRIVATE->cur_x; ++i) cells[j][i] = def_cell;
+		}
+		if (es.back() == 'M') { // delete lines
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			for (int i = piClamp(PRIVATE->cur_y, PRIVATE->win_y0, PRIVATE->win_y1); i < piClamp(size_y - v, PRIVATE->win_y0, PRIVATE->win_y1); ++i) cells[i] = cells[i + v];
+			for (int j = piClamp(size_y - v, PRIVATE->win_y0, PRIVATE->win_y1); j < piClamp(size_y, PRIVATE->win_y0, PRIVATE->win_y1); ++j)
+				for (int i = 0; i < PRIVATE->cur_x; ++i) cells[j][i] = def_cell;
+		}
+		if (es.back() == 'P') { // delete characters
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			for (int i = PRIVATE->cur_x; i < size_x - v; ++i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i + v];
+			for (int i = size_x - v; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+		}
+		if (es.back() == '@') { // delete characters
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt(); if (v == 0) v = 1;
+			for (int i = size_x - 1; i >= PRIVATE->cur_x + v; --i) cells[PRIVATE->cur_y][i] = cells[PRIVATE->cur_y][i - v];
+			for (int i = PRIVATE->cur_x; i < PRIVATE->cur_x + v; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+		}
+		if (es.back() == 'J') { // erase data
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt();
+			switch (v) {
+			case 0:
+				for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+				for (int i = PRIVATE->cur_y + 1; i < size_y; ++i) cells[i].fill(def_cell);
+				break;
+			case 1:
+				for (int i = 0; i <= PRIVATE->cur_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+				for (int i = 0; i < PRIVATE->cur_y; ++i) cells[i].fill(def_cell);
+				break;
+			case 2:
+				for (int i = 0; i < size_y; ++i) cells[i].fill(def_cell);
+				//PRIVATE->cur_x = PRIVATE->cur_y = 0;
+				break;
+			}
+		}
+		if (es.back() == 'K') { // erase in line
+			es.cutLeft(1).cutRight(1);
+			int v = es.toInt();
+			switch (v) {
+			case 0:
+				for (int i = PRIVATE->cur_x; i < size_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+				break;
+			case 1:
+				for (int i = 0; i <= PRIVATE->cur_x; ++i) cells[PRIVATE->cur_y][i] = def_cell;
+				break;
+			case 2:
+				cells[PRIVATE->cur_y].fill(def_cell);
+				break;
+			}
+		}
+	}
+}
+
+
+void PITerminal::moveCursor(int dx, int dy) {
+	PRIVATE->cur_x += dx;
+	PRIVATE->cur_y += dy;
+	if (PRIVATE->cur_x < 0) PRIVATE->cur_x = 0;
+	if (PRIVATE->cur_y < 0) PRIVATE->cur_y = 0;
+	if (PRIVATE->cur_x >= size_x) {
+		PRIVATE->line_format = PRIVATE->cur_format;
+		PRIVATE->cur_x = 0;
+		PRIVATE->cur_y++;
+	}
+	if (PRIVATE->cur_y >= size_y) {
+		int scroll = piMini(PRIVATE->cur_y - size_y + 1, size_y - 1);
+		//piCout << "scroll" << size_x << size_y << size_y - scroll - 1;
+		PRIVATE->cur_y = size_y - 1;
+		for (int y = 0; y < size_y - scroll; ++y)
+			cells[y] = cells[y + scroll];
+		for (int y = size_y - scroll; y < size_y; ++y)
+			cells[y].fill(PIScreenTypes::Cell());
+	}
+}
+
+
+int PITerminal::termType(const PIString & t) {
+	if (t == "xterm") return PIKbdListener::vt_xterm;
+	else if (t == "linux") return PIKbdListener::vt_linux;
+	return PIKbdListener::vt_none;
+}
+#endif
+
+
+bool PITerminal::initialize() {
+	destroy();
+#ifdef WINDOWS
+	/*SECURITY_ATTRIBUTES sa;
+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+	sa.bInheritHandle = true;
+	sa.lpSecurityDescriptor = 0;
+	if (!CreatePipe(&(PRIVATE->pipe_in[0]), &(PRIVATE->pipe_in[1]), &sa, 0)) {
+		piCoutObj << "CreatePipe error," << errorString();
+		initPrivate();
+		return false;
+	}
+	PRIVATE->hConBuf = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, 0, &sa, CONSOLE_TEXTMODE_BUFFER, 0);
+	if (PRIVATE->hConBuf == INVALID_HANDLE_VALUE) {
+		piCoutObj << "CreateConsoleScreenBuffer error," << errorString();
+		destroy();
+		return false;
+	}*/
+	//CreatePipe(&(PRIVATE->pipe_out[0]), &(PRIVATE->pipe_out[1]), &sa, 0);
+	//SetHandleInformation(PRIVATE->pipe_in[1], HANDLE_FLAG_INHERIT, 0);
+	//SetHandleInformation(PRIVATE->hConBuf, HANDLE_FLAG_INHERIT, 0);
+	//GetStartupInfoA(&PRIVATE->si);
+	memset(&PRIVATE->si, 0, sizeof(PRIVATE->si));
+	PRIVATE->si.cb = sizeof(STARTUPINFO);
+	//PRIVATE->si.dwFlags |= STARTF_USESTDHANDLES;
+	PRIVATE->si.dwFlags |= STARTF_USESHOWWINDOW;
+	PRIVATE->si.dwFlags |= STARTF_USECOUNTCHARS;
+	//PRIVATE->si.hStdInput = PRIVATE->pipe;
+	//PRIVATE->si.hStdOutput = PRIVATE->hConBuf;
+	//PRIVATE->si.hStdError = PRIVATE->hConBuf;
+	PRIVATE->si.wShowWindow = SW_HIDE;
+	PRIVATE->si.dwXCountChars = 80;
+	PRIVATE->si.dwYCountChars = 24;
+
+	memset(&PRIVATE->pi, 0, sizeof(PRIVATE->pi));
+
+	PIString shmh = PIString::fromNumber(randomi() % 10000);
+	PIString pname = "\\\\.\\pipe\\piterm" + shmh;
+	PIString cmd = "piterminal \"" + shmh + "\" \"" + pname + "\"";
+	if(!CreateProcessA(0, (LPSTR)cmd.dataAscii(), 0, 0, false, CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP, 0, 0, &PRIVATE->si, &PRIVATE->pi)) {
+		piCoutObj << "CreateProcess error," << errorString();
+		destroy();
+		return false;
+	}
+	PRIVATE->pipe = CreateNamedPipe((LPSTR)pname.dataAscii(), PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, 2, PIPE_BUFFER_SIZE, PIPE_BUFFER_SIZE, 1000, NULL);
+	if (PRIVATE->pipe == INVALID_HANDLE_VALUE) {
+		piCoutObj << "CreateNamedPipe error," << errorString();
+		destroy();
+		return false;
+	}
+	PITimeMeasurer tm;
+	bool ok = false;
+	while (tm.elapsed_m() < 1000) {
+		if (ConnectNamedPipe(PRIVATE->pipe, 0) == TRUE) {
+			ok = true;
+			break;
+		}
+	}
+	if (!ok) {
+		piCoutObj << "ConnectNamedPipe error," << errorString();
+		destroy();
+		return false;
+	}
+	if (PRIVATE->shm) delete PRIVATE->shm;
+	PRIVATE->shm = new PISharedMemory("piterm_aux" + shmh, 1024*1024);
+	CloseHandle(PRIVATE->pi.hThread);
+	resize(dsize_x, dsize_y);
+#else
+#  ifdef HAS_FORKPTY
+	char pty[256]; memset(pty, 0, 256);
+	winsize ws;
+	ws.ws_col = dsize_x;
+	ws.ws_row = dsize_y;
+	PIStringList env = PIProcess::currentEnvironment();
+	piForeachC (PIString & e, env)
+		if (e.startsWith("TERM=")) {
+			PRIVATE->term_type = termType(e.mid(5).trim().toLowerCase());
+			//piCout << PRIVATE->term_type;
+			piBreak;
+		}
+	pid_t fr = forkpty(&(PRIVATE->fd), pty, 0, &ws);
+	//piCoutObj << fr << PRIVATE->fd << pty;
+	if (fr == 0) {
+		char ** argv = new char*[2];
+		argv[0] = new char[PRIVATE->shell.lengthAscii() + 1];
+		memcpy(argv[0], PRIVATE->shell.dataAscii(), PRIVATE->shell.lengthAscii());
+		argv[0][PRIVATE->shell.lengthAscii()] = 0;
+		argv[1] = 0;
+		execvp(PRIVATE->shell.dataAscii(), argv);
+		delete[] argv[0];
+		delete[] argv;
+		exit(0);
+	} else {
+		if (fr < 0 || PRIVATE->fd < 0) {
+			piCoutObj << "forkpty error," << errorString();
+			initPrivate();
+			return false;
+		}
+		PRIVATE->pid = fr;
+		fcntl(PRIVATE->fd, F_SETFL, O_NONBLOCK);
+	/*
+	tcgetattr(PRIVATE->fd, &PRIVATE->desc);
+	PRIVATE->desc.c_oflag = PRIVATE->desc.c_lflag = PRIVATE->desc.c_cflag = 0;
+	PRIVATE->desc.c_iflag = IGNBRK;
+	PRIVATE->desc.c_cflag = CLOCAL | HUPCL;
+	PRIVATE->desc.c_cflag |= (CSIZE & CS8);
+	PRIVATE->desc.c_cflag |= CREAD;
+	PRIVATE->desc.c_cc[VMIN] = 1;
+	PRIVATE->desc.c_cc[VTIME] = 1;
+
+	cfsetispeed(&PRIVATE->desc, B38400);
+	cfsetospeed(&PRIVATE->desc, B38400);
+
+	if (tcsetattr(PRIVATE->fd, TCSANOW, &PRIVATE->desc) < 0) {
+		piCoutObj << "Can`t set attributes for \"" << pty << "\"";
+		destroy();
+		return false;
+	}
+	*/
+		size_x = dsize_x;
+		size_y = dsize_y;
+		resize(size_x, size_y);
+	}
+#  endif
+#endif
+	cursor_blink = false;
+	cursor_tm.reset();
+	start(40);
+	return true;
+}
+
+
+void PITerminal::destroy() {
+	//piCout << "destroy ...";
+	stop();
+	waitForFinish(1000);
+#ifdef WINDOWS
+	if (PRIVATE->pi.hProcess) {
+		//piCout << "term";
+		//TerminateProcess(PRIVATE->pi.hProcess, 0);
+		GenerateConsoleCtrlEvent(CTRL_C_EVENT, PRIVATE->pi.dwProcessId);
+		CloseHandle(PRIVATE->pi.hProcess);
+	}
+	if (PRIVATE->pipe != INVALID_HANDLE_VALUE) CloseHandle(PRIVATE->pipe);
+	if (PRIVATE->hConBuf != INVALID_HANDLE_VALUE) CloseHandle(PRIVATE->hConBuf);
+	//piCout << "destroy" << size_y;
+#else
+#  ifdef HAS_FORKPTY
+	if (PRIVATE->pid != 0)
+		kill(PRIVATE->pid, SIGKILL);
+	if (PRIVATE->fd != 0)
+		::close(PRIVATE->fd);
+#  endif
+#endif
+	initPrivate();
+}
+
+
+bool PITerminal::resize(int cols, int rows) {
+	bool ret = true;
+	dsize_x = cols;
+	dsize_y = rows;
+#ifdef WINDOWS
+	if (PRIVATE->pipe == INVALID_HANDLE_VALUE) return false;
+	PIByteArray msg;
+	msg << int(mtResize) << dsize_x << dsize_y;
+	writePipe(PRIVATE->pipe, msg);
+#else
+#  ifdef HAS_FORKPTY
+	if (PRIVATE->fd == 0) return false;
+	size_x = dsize_x;
+	size_y = dsize_y;
+	//piCout << "resize" << PRIVATE->fd << size_x << size_y;
+	winsize ws;
+	ws.ws_col = cols;
+	ws.ws_row = rows;
+	ioctl(PRIVATE->fd, TIOCSWINSZ, &ws);
+	PRIVATE->win_y0 = 0;
+	PRIVATE->win_y1 = size_y - 1;
+	PRIVATE->cells_save.resize(size_y);
+	for (int i = 0; i < size_y; ++i)
+		PRIVATE->cells_save[i].resize(size_x);
+#  endif
+#endif
+	cells.resize(size_y);
+	for (int i = 0; i < size_y; ++i)
+		cells[i].resize(size_x);
+	return ret;
+}
+
+#endif // FREERTOS
diff --git a/src_crypt/piauth.cpp b/lib/crypt/piauth.cpp
similarity index 100%
rename from src_crypt/piauth.cpp
rename to lib/crypt/piauth.cpp
diff --git a/src_crypt/picrypt.cpp b/lib/crypt/picrypt.cpp
similarity index 100%
rename from src_crypt/picrypt.cpp
rename to lib/crypt/picrypt.cpp
diff --git a/src_fftw/pifft.cpp b/lib/fftw/pifft.cpp
similarity index 100%
rename from src_fftw/pifft.cpp
rename to lib/fftw/pifft.cpp
diff --git a/src_fftw/pifft_p.h b/lib/fftw/pifft_p.h
similarity index 100%
rename from src_fftw/pifft_p.h
rename to lib/fftw/pifft_p.h
diff --git a/src_io_utils/pibroadcast.cpp b/lib/io_utils/pibroadcast.cpp
similarity index 100%
rename from src_io_utils/pibroadcast.cpp
rename to lib/io_utils/pibroadcast.cpp
diff --git a/src_io_utils/piethutilbase.cpp b/lib/io_utils/piethutilbase.cpp
similarity index 100%
rename from src_io_utils/piethutilbase.cpp
rename to lib/io_utils/piethutilbase.cpp
diff --git a/src_io_utils/pistreampacker.cpp b/lib/io_utils/pistreampacker.cpp
similarity index 100%
rename from src_io_utils/pistreampacker.cpp
rename to lib/io_utils/pistreampacker.cpp
diff --git a/src_main/auxiliary/piterminal/CMakeLists.txt b/lib/main/auxiliary/piterminal/CMakeLists.txt
similarity index 72%
rename from src_main/auxiliary/piterminal/CMakeLists.txt
rename to lib/main/auxiliary/piterminal/CMakeLists.txt
index 77ce30f6..81f2d998 100644
--- a/src_main/auxiliary/piterminal/CMakeLists.txt
+++ b/lib/main/auxiliary/piterminal/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_executable(piterminal "main.cpp")
-target_link_libraries(piterminal pip)
-if (DEFINED LIB)
-	install(TARGETS piterminal DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif ()
+add_executable(piterminal "main.cpp")
+target_link_libraries(piterminal pip pip_console)
+if (DEFINED LIB)
+	install(TARGETS piterminal DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+endif ()
diff --git a/src_main/auxiliary/piterminal/main.cpp b/lib/main/auxiliary/piterminal/main.cpp
similarity index 96%
rename from src_main/auxiliary/piterminal/main.cpp
rename to lib/main/auxiliary/piterminal/main.cpp
index 51ee6735..8e077933 100644
--- a/src_main/auxiliary/piterminal/main.cpp
+++ b/lib/main/auxiliary/piterminal/main.cpp
@@ -1,280 +1,280 @@
-/*
-	PIP - Platform Independent Primitives
-	Terminal client for windows, used by PITerminal and pisd
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piincludes_p.h"
-#ifndef WINDOWS
-int main (int argc, char * argv[]) {
-	return 0;
-}
-#else
-#  include "piscreentypes.h"
-#  include "pisharedmemory.h"
-#  include "piterminal.cpp"
-#  include "pifile.h"
-#  include <wincon.h>
-
-
-PIVector<PIVector<PIScreenTypes::Cell> > cells;
-CONSOLE_SCREEN_BUFFER_INFO sbi;
-CHAR_INFO * chars = 0;
-HANDLE console = 0, cstdin = 0, pipe = 0, cmd_proc = 0;
-PITerminalAuxData data_out;
-PIMutex con_mutex;
-int con_w = -1, con_h = -1;
-
-
-PIScreenTypes::Cell CharInfo2Cell(const CHAR_INFO & c) {
-	PIScreenTypes::Cell ret;
-	ret.symbol = PIChar::fromConsole(c.Char.AsciiChar);
-	ret.format.color_char = PIScreenTypes::Black;
-	if ((c.Attributes & (FOREGROUND_RED)) == FOREGROUND_RED) ret.format.color_char = PIScreenTypes::Red;
-	if ((c.Attributes & (FOREGROUND_GREEN)) == FOREGROUND_GREEN) ret.format.color_char = PIScreenTypes::Green;
-	if ((c.Attributes & (FOREGROUND_BLUE)) == FOREGROUND_BLUE) ret.format.color_char = PIScreenTypes::Blue;
-	if ((c.Attributes & (FOREGROUND_GREEN | FOREGROUND_BLUE)) == (FOREGROUND_GREEN | FOREGROUND_BLUE)) ret.format.color_char = PIScreenTypes::Cyan;
-	if ((c.Attributes & (FOREGROUND_RED | FOREGROUND_BLUE)) == (FOREGROUND_RED | FOREGROUND_BLUE)) ret.format.color_char = PIScreenTypes::Magenta;
-	if ((c.Attributes & (FOREGROUND_RED | FOREGROUND_GREEN)) == (FOREGROUND_RED | FOREGROUND_GREEN)) ret.format.color_char = PIScreenTypes::Yellow;
-	if ((c.Attributes & (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)) == (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)) ret.format.color_char = PIScreenTypes::White;
-	ret.format.color_back = PIScreenTypes::Black;
-	if ((c.Attributes & (BACKGROUND_RED)) == (BACKGROUND_RED)) ret.format.color_back = PIScreenTypes::Red;
-	if ((c.Attributes & (BACKGROUND_GREEN)) == (BACKGROUND_GREEN)) ret.format.color_back = PIScreenTypes::Green;
-	if ((c.Attributes & (BACKGROUND_BLUE)) == (BACKGROUND_BLUE)) ret.format.color_back = PIScreenTypes::Blue;
-	if ((c.Attributes & (BACKGROUND_GREEN | BACKGROUND_BLUE)) == (BACKGROUND_GREEN | BACKGROUND_BLUE)) ret.format.color_back = PIScreenTypes::Cyan;
-	if ((c.Attributes & (BACKGROUND_RED | BACKGROUND_BLUE)) == (BACKGROUND_RED | BACKGROUND_BLUE)) ret.format.color_back = PIScreenTypes::Magenta;
-	if ((c.Attributes & (BACKGROUND_RED | BACKGROUND_GREEN)) == (BACKGROUND_RED | BACKGROUND_GREEN)) ret.format.color_back = PIScreenTypes::Yellow;
-	if ((c.Attributes & (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE)) == (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)) ret.format.color_back = PIScreenTypes::White;
-	if ((c.Attributes & (FOREGROUND_INTENSITY)) > 0) ret.format.flags |= PIScreenTypes::Bold;
-	return ret;
-}
-
-
-int SpecialKey2VirtualKeyCode(PIKbdListener::SpecialKey k) {
-	switch (k) {
-	case PIKbdListener::Tab       : return '\t'; break;
-	case PIKbdListener::Return    : return '\n'; break;
-	case PIKbdListener::Space     : return ' '; break;
-	case PIKbdListener::Backspace : return 8  ;
-	case PIKbdListener::PageUp    : return 33 ;
-	case PIKbdListener::PageDown  : return 34 ;
-	case PIKbdListener::End       : return 35 ;
-	case PIKbdListener::Home      : return 36 ;
-	case PIKbdListener::LeftArrow : return 37 ;
-	case PIKbdListener::UpArrow   : return 38 ;
-	case PIKbdListener::RightArrow: return 39 ;
-	case PIKbdListener::DownArrow : return 40 ;
-	case PIKbdListener::Insert    : return 45 ;
-	case PIKbdListener::Delete    : return 46 ;
-	case PIKbdListener::F1        : return 112;
-	case PIKbdListener::F2        : return 113;
-	case PIKbdListener::F3        : return 114;
-	case PIKbdListener::F4        : return 115;
-	case PIKbdListener::F5        : return 116;
-	case PIKbdListener::F6        : return 117;
-	case PIKbdListener::F7        : return 118;
-	case PIKbdListener::F8        : return 119;
-	case PIKbdListener::F9        : return 120;
-	case PIKbdListener::F10       : return 121;
-	case PIKbdListener::F11       : return 122;
-	case PIKbdListener::F12       : return 123;
-	default: break;
-	}
-	return 0;
-}
-
-
-int KeyModifiers2ControlKeyState(PIKbdListener::KeyModifiers m) {
-	int ret(0);
-	if (m[PIKbdListener::Ctrl]) ret |= LEFT_CTRL_PRESSED;
-	if (m[PIKbdListener::Shift]) ret |= SHIFT_PRESSED;
-	if (m[PIKbdListener::Alt]) ret |= LEFT_ALT_PRESSED;
-	return ret;
-}
-
-
-void readConsole(int x, int y, int w, int h) {
-	GetConsoleScreenBufferInfo(console, &sbi);
-	COORD bs, bc;
-	bs.X = w;
-	bs.Y = h;
-	bc.X = bc.Y = 0;
-	memset(chars, 0, w * h * sizeof(CHAR_INFO));
-	ReadConsoleOutput(console, chars, bs, bc, &(sbi.srWindow));
-	for (int i = 0; i < h; ++i)
-		for (int j = 0; j < w; ++j)
-		cells[i][j] = CharInfo2Cell(chars[i * w + j]);
-}
-
-
-void resizeCells(int w, int h) {
-	if (chars) delete[] chars;
-	chars = new CHAR_INFO[w * h];
-	cells.resize(h);
-	for (int i = 0; i < h; ++i)
-		cells[i].resize(w);
-}
-
-
-void resizeConsole(int w, int h) {
-	if (con_w == w && con_h == h) return;
-	con_w = w;
-	con_h = h;
-	GetConsoleScreenBufferInfo(console, &sbi);
-	sbi.srWindow.Left = 0;
-	sbi.srWindow.Right = sbi.srWindow.Left + w - 1;
-	sbi.srWindow.Bottom = sbi.srWindow.Top + h - 1;
-	COORD sz; sz.X = w; sz.Y = h;
-	SetConsoleScreenBufferSize(console, sz);
-	SetConsoleWindowInfo(console, TRUE, &(sbi.srWindow));
-	//system(("mode CON: COLS=" + PIString::fromNumber(w) + " LINES=" + PIString::fromNumber(h)).dataAscii());
-	resizeCells(w, h);
-}
-
-
-class PipeReader: public PIThread {
-public:
-	PipeReader(): PIThread() {
-		wrote = readed = 0;
-		msg_size = 0;
-		start(1);
-	}
-	~PipeReader() {
-		stop();
-	}
-	void run() {
-		in.resize(PIPE_BUFFER_SIZE);
-		ReadFile(pipe, in.data(), in.size_s(), &readed, 0);
-		if (GetLastError() == ERROR_BROKEN_PIPE) {
-			stop();
-			return;
-		}
-		//piCout << errorString();
-		if (readed > 0) {
-			in.resize(readed);
-			stream.append(in);
-			if (msg_size == 0) {
-				if (stream.size_s() < 4) return;
-				stream >> msg_size;
-			}
-			if (stream.size_s() >= msg_size) {
-				msg = PIByteArray(stream.data(), msg_size);
-				stream.remove(0, msg_size);
-				msg_size = 0;
-				parseMessage();
-			}
-			if (msg_size == 0 && stream.size_s() < 4) return;
-		}
-	}
-	void parseMessage() {
-		if (msg.size_s() < 4) return;
-		PIMutexLocker _ml(con_mutex);
-		int type; msg >> type;
-		//piCout << "msg" << type;
-		switch ((PITerminalAuxMessageType)type) {
-		case mtKey: {
-			PIVector<PIKbdListener::KeyEvent> ke;
-			msg >> ke;
-			PIVector<INPUT_RECORD> ir(ke.size() * 2);
-			for (int i = 0; i < ke.size_s(); ++i) {
-				PIKbdListener::KeyEvent k(ke[i]);
-				int j = i+i, z = j+1;
-				ir[j].EventType = KEY_EVENT;
-				ir[j].Event.KeyEvent.wRepeatCount = 1;
-				ir[j].Event.KeyEvent.dwControlKeyState = KeyModifiers2ControlKeyState(k.modifiers);
-				if (PITerminal::isSpecialKey(k.key)) {
-					ir[j].Event.KeyEvent.wVirtualKeyCode = SpecialKey2VirtualKeyCode((PIKbdListener::SpecialKey)k.key);
-					ir[j].Event.KeyEvent.uChar.AsciiChar = PIChar(piMaxi(k.key, 0)).toAscii();
-				} else
-					ir[j].Event.KeyEvent.uChar.UnicodeChar = PIChar(piMaxi(k.key, 0)).toWChar();
-				//piCout << ir[j].Event.KeyEvent.wVirtualKeyCode << int(ir[j].Event.KeyEvent.uChar.AsciiChar);
-				ir[j].Event.KeyEvent.bKeyDown = true;
-				ir[z] = ir[j];
-				ir[z].Event.KeyEvent.bKeyDown = false;
-			}
-			WriteConsoleInput(cstdin, ir.data(), ir.size_s(), &wrote);
-			} break;
-		case mtResize: {
-			int rw, rh;
-			msg >> rw >> rh;
-			resizeConsole(rw, rh);
-			} break;
-		default: break;
-		}
-	}
-	DWORD wrote, readed;
-	int msg_size;
-	PIByteArray in, stream, msg;
-};
-
-
-void getCursor(int & x, int & y) {
-	GetConsoleScreenBufferInfo(console, &sbi);
-	x = sbi.dwCursorPosition.X - sbi.srWindow.Left;
-	y = sbi.dwCursorPosition.Y - sbi.srWindow.Top;
-}
-
-
-int main (int argc, char * argv[]) {
-	//piCout << "start";
-	STARTUPINFO si;
-	PROCESS_INFORMATION pi;
-	memset(&si, 0, sizeof(si));
-	memset(&pi, 0, sizeof(pi));
-	memset(&sbi, 0, sizeof(sbi));
-	PIString shmh, pname;
-	if (argc > 1) shmh = argv[1];
-	if (argc > 2) pname = argv[2];
-	if(!CreateProcessA(0, (LPSTR)"cmd", 0, 0, true, 0, 0, 0, &si, &pi)) {
-		return 1;
-	}
-	PISharedMemory shm("piterm_aux" + shmh, 1024*1024);
-	pipe = CreateFile((LPSTR)pname.dataAscii(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
-	if (pipe == INVALID_HANDLE_VALUE) {
-		return 1;
-	}
-	CloseHandle(pi.hThread);
-	cmd_proc = pi.hProcess;
-	console = GetStdHandle(STD_OUTPUT_HANDLE);
-	cstdin = GetStdHandle(STD_INPUT_HANDLE);
-	resizeConsole(80, 24);
-	PipeReader pipe_reader;
-	pipe_reader.waitForStart();
-	PIByteArray scr;
-	while (true) {
-		//piCout << "loop";
-		if (!pipe_reader.isRunning()) break;
-		con_mutex.lock();
-		getCursor(data_out.cursor_x, data_out.cursor_y);
-		readConsole(0, 0, con_w, con_h);
-		scr.clear();
-		scr << cells;
-		data_out.size_x = con_w;
-		data_out.size_y = con_h;
-		data_out.cells_size = scr.size_s();
-		con_mutex.unlock();
-		shm.write(&data_out, sizeof(data_out));
-		shm.write(scr, sizeof(data_out));
-		piMSleep(25);
-	}
-	//piCout << "exit";
-	TerminateProcess(pi.hProcess, 0);
-	CloseHandle(pi.hProcess);
-	return 0;
-}
-
-
-#endif
+/*
+	PIP - Platform Independent Primitives
+	Terminal client for windows, used by PITerminal and pisd
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piincludes_p.h"
+#ifndef WINDOWS
+int main (int argc, char * argv[]) {
+	return 0;
+}
+#else
+#  include "piscreentypes.h"
+#  include "pisharedmemory.h"
+#  include "../../lib/console/piterminal.cpp"
+#  include "pifile.h"
+#  include <wincon.h>
+
+
+PIVector<PIVector<PIScreenTypes::Cell> > cells;
+CONSOLE_SCREEN_BUFFER_INFO sbi;
+CHAR_INFO * chars = 0;
+HANDLE console = 0, cstdin = 0, pipe = 0, cmd_proc = 0;
+PITerminalAuxData data_out;
+PIMutex con_mutex;
+int con_w = -1, con_h = -1;
+
+
+PIScreenTypes::Cell CharInfo2Cell(const CHAR_INFO & c) {
+	PIScreenTypes::Cell ret;
+	ret.symbol = PIChar::fromConsole(c.Char.AsciiChar);
+	ret.format.color_char = PIScreenTypes::Black;
+	if ((c.Attributes & (FOREGROUND_RED)) == FOREGROUND_RED) ret.format.color_char = PIScreenTypes::Red;
+	if ((c.Attributes & (FOREGROUND_GREEN)) == FOREGROUND_GREEN) ret.format.color_char = PIScreenTypes::Green;
+	if ((c.Attributes & (FOREGROUND_BLUE)) == FOREGROUND_BLUE) ret.format.color_char = PIScreenTypes::Blue;
+	if ((c.Attributes & (FOREGROUND_GREEN | FOREGROUND_BLUE)) == (FOREGROUND_GREEN | FOREGROUND_BLUE)) ret.format.color_char = PIScreenTypes::Cyan;
+	if ((c.Attributes & (FOREGROUND_RED | FOREGROUND_BLUE)) == (FOREGROUND_RED | FOREGROUND_BLUE)) ret.format.color_char = PIScreenTypes::Magenta;
+	if ((c.Attributes & (FOREGROUND_RED | FOREGROUND_GREEN)) == (FOREGROUND_RED | FOREGROUND_GREEN)) ret.format.color_char = PIScreenTypes::Yellow;
+	if ((c.Attributes & (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)) == (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)) ret.format.color_char = PIScreenTypes::White;
+	ret.format.color_back = PIScreenTypes::Black;
+	if ((c.Attributes & (BACKGROUND_RED)) == (BACKGROUND_RED)) ret.format.color_back = PIScreenTypes::Red;
+	if ((c.Attributes & (BACKGROUND_GREEN)) == (BACKGROUND_GREEN)) ret.format.color_back = PIScreenTypes::Green;
+	if ((c.Attributes & (BACKGROUND_BLUE)) == (BACKGROUND_BLUE)) ret.format.color_back = PIScreenTypes::Blue;
+	if ((c.Attributes & (BACKGROUND_GREEN | BACKGROUND_BLUE)) == (BACKGROUND_GREEN | BACKGROUND_BLUE)) ret.format.color_back = PIScreenTypes::Cyan;
+	if ((c.Attributes & (BACKGROUND_RED | BACKGROUND_BLUE)) == (BACKGROUND_RED | BACKGROUND_BLUE)) ret.format.color_back = PIScreenTypes::Magenta;
+	if ((c.Attributes & (BACKGROUND_RED | BACKGROUND_GREEN)) == (BACKGROUND_RED | BACKGROUND_GREEN)) ret.format.color_back = PIScreenTypes::Yellow;
+	if ((c.Attributes & (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE)) == (FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE)) ret.format.color_back = PIScreenTypes::White;
+	if ((c.Attributes & (FOREGROUND_INTENSITY)) > 0) ret.format.flags |= PIScreenTypes::Bold;
+	return ret;
+}
+
+
+int SpecialKey2VirtualKeyCode(PIKbdListener::SpecialKey k) {
+	switch (k) {
+	case PIKbdListener::Tab       : return '\t'; break;
+	case PIKbdListener::Return    : return '\n'; break;
+	case PIKbdListener::Space     : return ' '; break;
+	case PIKbdListener::Backspace : return 8  ;
+	case PIKbdListener::PageUp    : return 33 ;
+	case PIKbdListener::PageDown  : return 34 ;
+	case PIKbdListener::End       : return 35 ;
+	case PIKbdListener::Home      : return 36 ;
+	case PIKbdListener::LeftArrow : return 37 ;
+	case PIKbdListener::UpArrow   : return 38 ;
+	case PIKbdListener::RightArrow: return 39 ;
+	case PIKbdListener::DownArrow : return 40 ;
+	case PIKbdListener::Insert    : return 45 ;
+	case PIKbdListener::Delete    : return 46 ;
+	case PIKbdListener::F1        : return 112;
+	case PIKbdListener::F2        : return 113;
+	case PIKbdListener::F3        : return 114;
+	case PIKbdListener::F4        : return 115;
+	case PIKbdListener::F5        : return 116;
+	case PIKbdListener::F6        : return 117;
+	case PIKbdListener::F7        : return 118;
+	case PIKbdListener::F8        : return 119;
+	case PIKbdListener::F9        : return 120;
+	case PIKbdListener::F10       : return 121;
+	case PIKbdListener::F11       : return 122;
+	case PIKbdListener::F12       : return 123;
+	default: break;
+	}
+	return 0;
+}
+
+
+int KeyModifiers2ControlKeyState(PIKbdListener::KeyModifiers m) {
+	int ret(0);
+	if (m[PIKbdListener::Ctrl]) ret |= LEFT_CTRL_PRESSED;
+	if (m[PIKbdListener::Shift]) ret |= SHIFT_PRESSED;
+	if (m[PIKbdListener::Alt]) ret |= LEFT_ALT_PRESSED;
+	return ret;
+}
+
+
+void readConsole(int x, int y, int w, int h) {
+	GetConsoleScreenBufferInfo(console, &sbi);
+	COORD bs, bc;
+	bs.X = w;
+	bs.Y = h;
+	bc.X = bc.Y = 0;
+	memset(chars, 0, w * h * sizeof(CHAR_INFO));
+	ReadConsoleOutput(console, chars, bs, bc, &(sbi.srWindow));
+	for (int i = 0; i < h; ++i)
+		for (int j = 0; j < w; ++j)
+		cells[i][j] = CharInfo2Cell(chars[i * w + j]);
+}
+
+
+void resizeCells(int w, int h) {
+	if (chars) delete[] chars;
+	chars = new CHAR_INFO[w * h];
+	cells.resize(h);
+	for (int i = 0; i < h; ++i)
+		cells[i].resize(w);
+}
+
+
+void resizeConsole(int w, int h) {
+	if (con_w == w && con_h == h) return;
+	con_w = w;
+	con_h = h;
+	GetConsoleScreenBufferInfo(console, &sbi);
+	sbi.srWindow.Left = 0;
+	sbi.srWindow.Right = sbi.srWindow.Left + w - 1;
+	sbi.srWindow.Bottom = sbi.srWindow.Top + h - 1;
+	COORD sz; sz.X = w; sz.Y = h;
+	SetConsoleScreenBufferSize(console, sz);
+	SetConsoleWindowInfo(console, TRUE, &(sbi.srWindow));
+	//system(("mode CON: COLS=" + PIString::fromNumber(w) + " LINES=" + PIString::fromNumber(h)).dataAscii());
+	resizeCells(w, h);
+}
+
+
+class PipeReader: public PIThread {
+public:
+	PipeReader(): PIThread() {
+		wrote = readed = 0;
+		msg_size = 0;
+		start(1);
+	}
+	~PipeReader() {
+		stop();
+	}
+	void run() {
+		in.resize(PIPE_BUFFER_SIZE);
+		ReadFile(pipe, in.data(), in.size_s(), &readed, 0);
+		if (GetLastError() == ERROR_BROKEN_PIPE) {
+			stop();
+			return;
+		}
+		//piCout << errorString();
+		if (readed > 0) {
+			in.resize(readed);
+			stream.append(in);
+			if (msg_size == 0) {
+				if (stream.size_s() < 4) return;
+				stream >> msg_size;
+			}
+			if (stream.size_s() >= msg_size) {
+				msg = PIByteArray(stream.data(), msg_size);
+				stream.remove(0, msg_size);
+				msg_size = 0;
+				parseMessage();
+			}
+			if (msg_size == 0 && stream.size_s() < 4) return;
+		}
+	}
+	void parseMessage() {
+		if (msg.size_s() < 4) return;
+		PIMutexLocker _ml(con_mutex);
+		int type; msg >> type;
+		//piCout << "msg" << type;
+		switch ((PITerminalAuxMessageType)type) {
+		case mtKey: {
+			PIVector<PIKbdListener::KeyEvent> ke;
+			msg >> ke;
+			PIVector<INPUT_RECORD> ir(ke.size() * 2);
+			for (int i = 0; i < ke.size_s(); ++i) {
+				PIKbdListener::KeyEvent k(ke[i]);
+				int j = i+i, z = j+1;
+				ir[j].EventType = KEY_EVENT;
+				ir[j].Event.KeyEvent.wRepeatCount = 1;
+				ir[j].Event.KeyEvent.dwControlKeyState = KeyModifiers2ControlKeyState(k.modifiers);
+				if (PITerminal::isSpecialKey(k.key)) {
+					ir[j].Event.KeyEvent.wVirtualKeyCode = SpecialKey2VirtualKeyCode((PIKbdListener::SpecialKey)k.key);
+					ir[j].Event.KeyEvent.uChar.AsciiChar = PIChar(piMaxi(k.key, 0)).toAscii();
+				} else
+					ir[j].Event.KeyEvent.uChar.UnicodeChar = PIChar(piMaxi(k.key, 0)).toWChar();
+				//piCout << ir[j].Event.KeyEvent.wVirtualKeyCode << int(ir[j].Event.KeyEvent.uChar.AsciiChar);
+				ir[j].Event.KeyEvent.bKeyDown = true;
+				ir[z] = ir[j];
+				ir[z].Event.KeyEvent.bKeyDown = false;
+			}
+			WriteConsoleInput(cstdin, ir.data(), ir.size_s(), &wrote);
+			} break;
+		case mtResize: {
+			int rw, rh;
+			msg >> rw >> rh;
+			resizeConsole(rw, rh);
+			} break;
+		default: break;
+		}
+	}
+	DWORD wrote, readed;
+	int msg_size;
+	PIByteArray in, stream, msg;
+};
+
+
+void getCursor(int & x, int & y) {
+	GetConsoleScreenBufferInfo(console, &sbi);
+	x = sbi.dwCursorPosition.X - sbi.srWindow.Left;
+	y = sbi.dwCursorPosition.Y - sbi.srWindow.Top;
+}
+
+
+int main (int argc, char * argv[]) {
+	//piCout << "start";
+	STARTUPINFO si;
+	PROCESS_INFORMATION pi;
+	memset(&si, 0, sizeof(si));
+	memset(&pi, 0, sizeof(pi));
+	memset(&sbi, 0, sizeof(sbi));
+	PIString shmh, pname;
+	if (argc > 1) shmh = argv[1];
+	if (argc > 2) pname = argv[2];
+	if(!CreateProcessA(0, (LPSTR)"cmd", 0, 0, true, 0, 0, 0, &si, &pi)) {
+		return 1;
+	}
+	PISharedMemory shm("piterm_aux" + shmh, 1024*1024);
+	pipe = CreateFile((LPSTR)pname.dataAscii(), GENERIC_READ | GENERIC_WRITE, 0, 0, OPEN_EXISTING, 0, 0);
+	if (pipe == INVALID_HANDLE_VALUE) {
+		return 1;
+	}
+	CloseHandle(pi.hThread);
+	cmd_proc = pi.hProcess;
+	console = GetStdHandle(STD_OUTPUT_HANDLE);
+	cstdin = GetStdHandle(STD_INPUT_HANDLE);
+	resizeConsole(80, 24);
+	PipeReader pipe_reader;
+	pipe_reader.waitForStart();
+	PIByteArray scr;
+	while (true) {
+		//piCout << "loop";
+		if (!pipe_reader.isRunning()) break;
+		con_mutex.lock();
+		getCursor(data_out.cursor_x, data_out.cursor_y);
+		readConsole(0, 0, con_w, con_h);
+		scr.clear();
+		scr << cells;
+		data_out.size_x = con_w;
+		data_out.size_y = con_h;
+		data_out.cells_size = scr.size_s();
+		con_mutex.unlock();
+		shm.write(&data_out, sizeof(data_out));
+		shm.write(scr, sizeof(data_out));
+		piMSleep(25);
+	}
+	//piCout << "exit";
+	TerminateProcess(pi.hProcess, 0);
+	CloseHandle(pi.hProcess);
+	return 0;
+}
+
+
+#endif
diff --git a/src_main/cloud/piccloudclient.h b/lib/main/cloud/piccloudclient.h
similarity index 96%
rename from src_main/cloud/piccloudclient.h
rename to lib/main/cloud/piccloudclient.h
index 131555dd..30eea971 100644
--- a/src_main/cloud/piccloudclient.h
+++ b/lib/main/cloud/piccloudclient.h
@@ -1,38 +1,38 @@
-/*! \file piccloudclient.h
- * \brief PICloud Client
-*/
-/*
-	PIP - Platform Independent Primitives
-	PICloud Client
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICCLOUDCLIENT_H
-#define PICCLOUDCLIENT_H
-
-#include "piiodevice.h"
-
-
-class PIP_EXPORT PICloudClient {
-public:
-	//!
-	explicit PICloudClient();
-
-private:
-
-};
-
-#endif // PICCLOUDCLIENT_H
+/*! \file piccloudclient.h
+ * \brief PICloud Client
+*/
+/*
+	PIP - Platform Independent Primitives
+	PICloud Client
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICCLOUDCLIENT_H
+#define PICCLOUDCLIENT_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PICloudClient {
+public:
+	//!
+	explicit PICloudClient();
+
+private:
+
+};
+
+#endif // PICCLOUDCLIENT_H
diff --git a/src_main/cloud/piccloudmodule.h b/lib/main/cloud/piccloudmodule.h
similarity index 100%
rename from src_main/cloud/piccloudmodule.h
rename to lib/main/cloud/piccloudmodule.h
diff --git a/src_main/cloud/piccloudserver.h b/lib/main/cloud/piccloudserver.h
similarity index 96%
rename from src_main/cloud/piccloudserver.h
rename to lib/main/cloud/piccloudserver.h
index 2461ad31..eb65d1de 100644
--- a/src_main/cloud/piccloudserver.h
+++ b/lib/main/cloud/piccloudserver.h
@@ -1,39 +1,39 @@
-/*! \file piccloudserver.h
- * \brief PICloud Server
-*/
-/*
-	PIP - Platform Independent Primitives
-	PICloud Server
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICCLOUDSERVER_H
-#define PICCLOUDSERVER_H
-
-#include "piiodevice.h"
-
-
-class PIP_EXPORT PICloudServer {
-public:
-	//!
-	explicit PICloudServer();
-
-
-private:
-
-};
-
-#endif // PICCLOUDSERVER_H
+/*! \file piccloudserver.h
+ * \brief PICloud Server
+*/
+/*
+	PIP - Platform Independent Primitives
+	PICloud Server
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICCLOUDSERVER_H
+#define PICCLOUDSERVER_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PICloudServer {
+public:
+	//!
+	explicit PICloudServer();
+
+
+private:
+
+};
+
+#endif // PICCLOUDSERVER_H
diff --git a/src_main/cloud/piccloudtcp.h b/lib/main/cloud/piccloudtcp.h
similarity index 96%
rename from src_main/cloud/piccloudtcp.h
rename to lib/main/cloud/piccloudtcp.h
index a78154af..2d0c0703 100644
--- a/src_main/cloud/piccloudtcp.h
+++ b/lib/main/cloud/piccloudtcp.h
@@ -1,38 +1,38 @@
-/*! \file piccloudtcp.h
- * \brief PICloud TCP transport
-*/
-/*
-	PIP - Platform Independent Primitives
-	PICloud TCP transport
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICCLOUDTCP_H
-#define PICCLOUDTCP_H
-
-#include "pistring.h"
-
-class PIP_EXPORT PICloudTCP {
-public:
-	//!
-	PICloudTCP();
-
-
-private:
-
-};
-
-#endif // PICCLOUDTCP_H
+/*! \file piccloudtcp.h
+ * \brief PICloud TCP transport
+*/
+/*
+	PIP - Platform Independent Primitives
+	PICloud TCP transport
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICCLOUDTCP_H
+#define PICCLOUDTCP_H
+
+#include "pistring.h"
+
+class PIP_EXPORT PICloudTCP {
+public:
+	//!
+	PICloudTCP();
+
+
+private:
+
+};
+
+#endif // PICCLOUDTCP_H
diff --git a/src_main/code/picodeinfo.cpp b/lib/main/code/picodeinfo.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/code/picodeinfo.cpp
rename to lib/main/code/picodeinfo.cpp
diff --git a/src_main/code/picodeinfo.h b/lib/main/code/picodeinfo.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/code/picodeinfo.h
rename to lib/main/code/picodeinfo.h
diff --git a/src_main/code/picodemodule.h b/lib/main/code/picodemodule.h
similarity index 100%
rename from src_main/code/picodemodule.h
rename to lib/main/code/picodemodule.h
diff --git a/src_main/code/picodeparser.cpp b/lib/main/code/picodeparser.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/code/picodeparser.cpp
rename to lib/main/code/picodeparser.cpp
diff --git a/src_main/code/picodeparser.h b/lib/main/code/picodeparser.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/code/picodeparser.h
rename to lib/main/code/picodeparser.h
diff --git a/src_main/concurrent/executor.h b/lib/main/concurrent/executor.h
similarity index 97%
rename from src_main/concurrent/executor.h
rename to lib/main/concurrent/executor.h
index 37075a99..92186653 100644
--- a/src_main/concurrent/executor.h
+++ b/lib/main/concurrent/executor.h
@@ -1,63 +1,63 @@
-/*
-	PIP - Platform Independent Primitives
-	
-	Stephan Fomenko
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIP_TESTS_EXECUTOR_H
-#define PIP_TESTS_EXECUTOR_H
-
-#include "piblockingdequeue.h"
-
-/**
- * @brief Thread pools address two different problems: they usually provide improved performance when executing large
- * numbers of asynchronous tasks, due to reduced per-task invocation overhead, and they provide a means of bounding and
- * managing the resources, including threads, consumed when executing a collection of tasks.
- */
-class PIThreadPoolExecutor {
-public:
-	explicit PIThreadPoolExecutor(size_t corePoolSize = 1, PIBlockingDequeue<std::function<void()> >* taskQueue_ = new PIBlockingDequeue<std::function<void()> >());
-
-	virtual ~PIThreadPoolExecutor();
-
-	/**
-	 * @brief Executes the given task sometime in the future. The task execute in an existing pooled thread. If the task
-	 * cannot be submitted for execution, either because this executor has been shutdown or because its capacity has been
-	 * reached.
-	 *
-	 * @param runnable not empty function for thread pool execution
-	 */
-	void execute(const std::function<void()>& runnable);
-
-	void shutdownNow();
-
-	/**
-	 * @brief Initiates an orderly shutdown in which previously submitted tasks are executed, but no new tasks will be
-	 * accepted. Invocation has no additional effect if already shut down. This method does not wait for previously
-	 * submitted tasks to complete execution. Use awaitTermination to do that.
-	 */
-	void shutdown();
-
-	volatile bool isShutdown() const;
-
-	bool awaitTermination(int timeoutMs);
-private:
-	volatile bool isShutdown_;
-	PIBlockingDequeue<std::function<void()> >* taskQueue;
-	PIVector<PIThread*> threadPool;
-};
-
-#endif //PIP_TESTS_EXECUTOR_H
+/*
+	PIP - Platform Independent Primitives
+	
+	Stephan Fomenko
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIP_TESTS_EXECUTOR_H
+#define PIP_TESTS_EXECUTOR_H
+
+#include "piblockingdequeue.h"
+
+/**
+ * @brief Thread pools address two different problems: they usually provide improved performance when executing large
+ * numbers of asynchronous tasks, due to reduced per-task invocation overhead, and they provide a means of bounding and
+ * managing the resources, including threads, consumed when executing a collection of tasks.
+ */
+class PIThreadPoolExecutor {
+public:
+	explicit PIThreadPoolExecutor(size_t corePoolSize = 1, PIBlockingDequeue<std::function<void()> >* taskQueue_ = new PIBlockingDequeue<std::function<void()> >());
+
+	virtual ~PIThreadPoolExecutor();
+
+	/**
+	 * @brief Executes the given task sometime in the future. The task execute in an existing pooled thread. If the task
+	 * cannot be submitted for execution, either because this executor has been shutdown or because its capacity has been
+	 * reached.
+	 *
+	 * @param runnable not empty function for thread pool execution
+	 */
+	void execute(const std::function<void()>& runnable);
+
+	void shutdownNow();
+
+	/**
+	 * @brief Initiates an orderly shutdown in which previously submitted tasks are executed, but no new tasks will be
+	 * accepted. Invocation has no additional effect if already shut down. This method does not wait for previously
+	 * submitted tasks to complete execution. Use awaitTermination to do that.
+	 */
+	void shutdown();
+
+	volatile bool isShutdown() const;
+
+	bool awaitTermination(int timeoutMs);
+private:
+	volatile bool isShutdown_;
+	PIBlockingDequeue<std::function<void()> >* taskQueue;
+	PIVector<PIThread*> threadPool;
+};
+
+#endif //PIP_TESTS_EXECUTOR_H
diff --git a/src_main/concurrent/piblockingdequeue.h b/lib/main/concurrent/piblockingdequeue.h
similarity index 96%
rename from src_main/concurrent/piblockingdequeue.h
rename to lib/main/concurrent/piblockingdequeue.h
index a993dbe8..7ec78f11 100644
--- a/src_main/concurrent/piblockingdequeue.h
+++ b/lib/main/concurrent/piblockingdequeue.h
@@ -1,223 +1,223 @@
-/*
-	PIP - Platform Independent Primitives
-	
-	Stephan Fomenko
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIP_TESTS_PIBLOCKINGDEQUEUE_H
-#define PIP_TESTS_PIBLOCKINGDEQUEUE_H
-
-#include "pideque.h"
-#include "piconditionvar.h"
-
-/**
- * @brief A Queue that supports operations that wait for the queue to become non-empty when retrieving an element, and
- * wait for space to become available in the queue when storing an element.
- */
-template <typename T>
-class PIBlockingDequeue: private PIDeque<T> {
-public:
-
-	/**
-	 * @brief Constructor
-	 */
-	explicit inline PIBlockingDequeue(size_t capacity = SIZE_MAX,
-									  PIConditionVariable* cond_var_add = new PIConditionVariable(),
-									  PIConditionVariable* cond_var_rem = new PIConditionVariable())
-		: cond_var_add(cond_var_add), cond_var_rem(cond_var_rem), max_size(capacity) { }
-
-	/**
-	 * @brief Copy constructor. Initialize queue with copy of other queue elements. Not thread-safe for other queue.
-	 */
-	explicit inline PIBlockingDequeue(const PIDeque<T>& other) : cond_var_add(new PIConditionVariable()), cond_var_rem(new PIConditionVariable()) {
-		mutex.lock();
-		max_size = SIZE_MAX;
-		PIDeque<T>::append(other);
-		mutex.unlock();
-	}
-
-	/**
-	 * @brief Thread-safe copy constructor. Initialize queue with copy of other queue elements.
-	 */
-	inline PIBlockingDequeue(PIBlockingDequeue<T> & other) : cond_var_add(new PIConditionVariable()), cond_var_rem(new PIConditionVariable()) {
-		other.mutex.lock();
-		mutex.lock();
-		max_size = other.max_size;
-		PIDeque<T>::append(static_cast<PIDeque<T>&>(other));
-		mutex.unlock();
-		other.mutex.unlock();
-	}
-
-	~PIBlockingDequeue() {
-		delete cond_var_add;
-		delete cond_var_rem;
-	}
-
-	/**
-	 * @brief Inserts the specified element into this queue, waiting if necessary for space to become available.
-	 *
-	 * @param v the element to add
-	 */
-	void put(const T & v) {
-		mutex.lock();
-		cond_var_rem->wait(mutex, [&]() { return PIDeque<T>::size() < max_size; });
-		PIDeque<T>::push_back(v);
-		mutex.unlock();
-		cond_var_add->notifyOne();
-	}
-
-	/**
-	 * @brief Inserts the specified element at the end of this queue if it is possible to do so immediately without
-	 * exceeding the queue's capacity, returning true upon success and false if this queue is full.
-	 *
-	 * @param v the element to add
-	 * @return true if the element was added to this queue, else false
-	 */
-	bool offer(const T & v) {
-		mutex.lock();
-		if (PIDeque<T>::size() >= max_size) {
-			mutex.unlock();
-			return false;
-		}
-		PIDeque<T>::push_back(v);
-		mutex.unlock();
-		cond_var_add->notifyOne();
-		return true;
-	}
-
-	/**
-	 * @brief Inserts the specified element into this queue, waiting up to the specified wait time if necessary for
-	 * space to become available.
-	 *
-	 * @param v the element to add
-	 * @param timeoutMs how long to wait before giving up, in milliseconds
-	 * @return true if successful, or false if the specified waiting time elapses before space is available
-	 */
-	bool offer(const T & v, int timeoutMs) {
-		mutex.lock();
-		bool isOk = cond_var_rem->waitFor(mutex, timeoutMs, [&]() { return PIDeque<T>::size() < max_size; } );
-		if (isOk) PIDeque<T>::push_back(v);
-		mutex.unlock();
-		if (isOk) cond_var_add->notifyOne();
-		return isOk;
-	}
-
-	/**
-	 * @brief Retrieves and removes the head of this queue, waiting if necessary until an element becomes available.
-	 *
-	 * @return the head of this queue
-	 */
-	T take() {
-		T t;
-		mutex.lock();
-		cond_var_add->wait(mutex, [&]() { return !PIDeque<T>::isEmpty(); });
-		t = T(PIDeque<T>::take_front());
-		mutex.unlock();
-		cond_var_rem->notifyOne();
-		return t;
-	}
-
-	/**
-	 * @brief Retrieves and removes the head of this queue, waiting up to the specified wait time if necessary for an
-	 * element to become available.
-	 *
-	 * @param timeoutMs how long to wait before giving up, in milliseconds
-	 * @param defaultVal value, which returns if the specified waiting time elapses before an element is available
-	 * @return the head of this queue, or defaultVal if the specified waiting time elapses before an element is available
-	 */
-	T poll(int timeoutMs, const T & defaultVal, bool* isOk = nullptr) {
-		T t;
-		mutex.lock();
-		bool isNotEmpty = cond_var_add->waitFor(mutex, timeoutMs, [&]() { return !PIDeque<T>::isEmpty(); });
-		t = isNotEmpty ? T(PIDeque<T>::take_front()) : defaultVal;
-		mutex.unlock();
-		if (isNotEmpty) cond_var_rem->notifyOne();
-		if (isOk != nullptr) *isOk = isNotEmpty;
-		return t;
-	}
-
-	/**
-	 * @brief Returns the number of elements that this queue can ideally (in the absence of memory or resource
-	 * constraints) contains. This is always equal to the initial capacity of this queue less the current size of this queue.
-	 *
-	 * @return the capacity
-	 */
-	size_t capacity() {
-		size_t c;
-		mutex.lock();
-		c = max_size;
-		mutex.unlock();
-		return c;
-	}
-
-	/**
-	 * @brief Returns the number of additional elements that this queue can ideally (in the absence of memory or resource
-	 * constraints) accept. This is always equal to the initial capacity of this queue less the current size of this queue.
-	 *
-	 * @return the remaining capacity
-	 */
-	size_t remainingCapacity() {
-		mutex.lock();
-		size_t c = max_size - PIDeque<T>::size();
-		mutex.unlock();
-		return c;
-	}
-
-	/**
-	 * @brief Returns the number of elements in this collection.
-	 */
-	size_t size() {
-		mutex.lock();
-		size_t s = PIDeque<T>::size();
-		mutex.unlock();
-		return s;
-	}
-
-	/**
-	 * @brief Removes all available elements from this queue and adds them to other given queue.
-	 */
-	size_t drainTo(PIDeque<T>& other, size_t maxCount = SIZE_MAX) {
-		mutex.lock();
-		size_t count = maxCount > PIDeque<T>::size() ? PIDeque<T>::size() : maxCount;
-		for (size_t i = 0; i < count; ++i) other.push_back(PIDeque<T>::take_front());
-		mutex.unlock();
-		return count;
-	}
-
-	/**
-	 * @brief Removes all available elements from this queue and adds them to other given queue.
-	 */
-	size_t drainTo(PIBlockingDequeue<T>& other, size_t maxCount = SIZE_MAX) {
-		mutex.lock();
-		other.mutex.lock();
-		size_t count = maxCount > PIDeque<T>::size() ? PIDeque<T>::size() : maxCount;
-		size_t otherRemainingCapacity = other.max_size - static_cast<PIDeque<T> >(other).size();
-		if (count > otherRemainingCapacity) count = otherRemainingCapacity;
-		for (size_t i = 0; i < count; ++i) other.push_back(PIDeque<T>::take_front());
-		other.mutex.unlock();
-		mutex.unlock();
-		return count;
-	}
-
-private:
-	PIConditionLock mutex;
-	PIConditionVariable* cond_var_add;
-	PIConditionVariable* cond_var_rem;
-	size_t max_size;
-};
-
-
-#endif //PIP_TESTS_PIBLOCKINGDEQUEUE_H
+/*
+	PIP - Platform Independent Primitives
+	
+	Stephan Fomenko
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIP_TESTS_PIBLOCKINGDEQUEUE_H
+#define PIP_TESTS_PIBLOCKINGDEQUEUE_H
+
+#include "pideque.h"
+#include "piconditionvar.h"
+
+/**
+ * @brief A Queue that supports operations that wait for the queue to become non-empty when retrieving an element, and
+ * wait for space to become available in the queue when storing an element.
+ */
+template <typename T>
+class PIBlockingDequeue: private PIDeque<T> {
+public:
+
+	/**
+	 * @brief Constructor
+	 */
+	explicit inline PIBlockingDequeue(size_t capacity = SIZE_MAX,
+									  PIConditionVariable* cond_var_add = new PIConditionVariable(),
+									  PIConditionVariable* cond_var_rem = new PIConditionVariable())
+		: cond_var_add(cond_var_add), cond_var_rem(cond_var_rem), max_size(capacity) { }
+
+	/**
+	 * @brief Copy constructor. Initialize queue with copy of other queue elements. Not thread-safe for other queue.
+	 */
+	explicit inline PIBlockingDequeue(const PIDeque<T>& other) : cond_var_add(new PIConditionVariable()), cond_var_rem(new PIConditionVariable()) {
+		mutex.lock();
+		max_size = SIZE_MAX;
+		PIDeque<T>::append(other);
+		mutex.unlock();
+	}
+
+	/**
+	 * @brief Thread-safe copy constructor. Initialize queue with copy of other queue elements.
+	 */
+	inline PIBlockingDequeue(PIBlockingDequeue<T> & other) : cond_var_add(new PIConditionVariable()), cond_var_rem(new PIConditionVariable()) {
+		other.mutex.lock();
+		mutex.lock();
+		max_size = other.max_size;
+		PIDeque<T>::append(static_cast<PIDeque<T>&>(other));
+		mutex.unlock();
+		other.mutex.unlock();
+	}
+
+	~PIBlockingDequeue() {
+		delete cond_var_add;
+		delete cond_var_rem;
+	}
+
+	/**
+	 * @brief Inserts the specified element into this queue, waiting if necessary for space to become available.
+	 *
+	 * @param v the element to add
+	 */
+	void put(const T & v) {
+		mutex.lock();
+		cond_var_rem->wait(mutex, [&]() { return PIDeque<T>::size() < max_size; });
+		PIDeque<T>::push_back(v);
+		mutex.unlock();
+		cond_var_add->notifyOne();
+	}
+
+	/**
+	 * @brief Inserts the specified element at the end of this queue if it is possible to do so immediately without
+	 * exceeding the queue's capacity, returning true upon success and false if this queue is full.
+	 *
+	 * @param v the element to add
+	 * @return true if the element was added to this queue, else false
+	 */
+	bool offer(const T & v) {
+		mutex.lock();
+		if (PIDeque<T>::size() >= max_size) {
+			mutex.unlock();
+			return false;
+		}
+		PIDeque<T>::push_back(v);
+		mutex.unlock();
+		cond_var_add->notifyOne();
+		return true;
+	}
+
+	/**
+	 * @brief Inserts the specified element into this queue, waiting up to the specified wait time if necessary for
+	 * space to become available.
+	 *
+	 * @param v the element to add
+	 * @param timeoutMs how long to wait before giving up, in milliseconds
+	 * @return true if successful, or false if the specified waiting time elapses before space is available
+	 */
+	bool offer(const T & v, int timeoutMs) {
+		mutex.lock();
+		bool isOk = cond_var_rem->waitFor(mutex, timeoutMs, [&]() { return PIDeque<T>::size() < max_size; } );
+		if (isOk) PIDeque<T>::push_back(v);
+		mutex.unlock();
+		if (isOk) cond_var_add->notifyOne();
+		return isOk;
+	}
+
+	/**
+	 * @brief Retrieves and removes the head of this queue, waiting if necessary until an element becomes available.
+	 *
+	 * @return the head of this queue
+	 */
+	T take() {
+		T t;
+		mutex.lock();
+		cond_var_add->wait(mutex, [&]() { return !PIDeque<T>::isEmpty(); });
+		t = T(PIDeque<T>::take_front());
+		mutex.unlock();
+		cond_var_rem->notifyOne();
+		return t;
+	}
+
+	/**
+	 * @brief Retrieves and removes the head of this queue, waiting up to the specified wait time if necessary for an
+	 * element to become available.
+	 *
+	 * @param timeoutMs how long to wait before giving up, in milliseconds
+	 * @param defaultVal value, which returns if the specified waiting time elapses before an element is available
+	 * @return the head of this queue, or defaultVal if the specified waiting time elapses before an element is available
+	 */
+	T poll(int timeoutMs, const T & defaultVal, bool* isOk = nullptr) {
+		T t;
+		mutex.lock();
+		bool isNotEmpty = cond_var_add->waitFor(mutex, timeoutMs, [&]() { return !PIDeque<T>::isEmpty(); });
+		t = isNotEmpty ? T(PIDeque<T>::take_front()) : defaultVal;
+		mutex.unlock();
+		if (isNotEmpty) cond_var_rem->notifyOne();
+		if (isOk != nullptr) *isOk = isNotEmpty;
+		return t;
+	}
+
+	/**
+	 * @brief Returns the number of elements that this queue can ideally (in the absence of memory or resource
+	 * constraints) contains. This is always equal to the initial capacity of this queue less the current size of this queue.
+	 *
+	 * @return the capacity
+	 */
+	size_t capacity() {
+		size_t c;
+		mutex.lock();
+		c = max_size;
+		mutex.unlock();
+		return c;
+	}
+
+	/**
+	 * @brief Returns the number of additional elements that this queue can ideally (in the absence of memory or resource
+	 * constraints) accept. This is always equal to the initial capacity of this queue less the current size of this queue.
+	 *
+	 * @return the remaining capacity
+	 */
+	size_t remainingCapacity() {
+		mutex.lock();
+		size_t c = max_size - PIDeque<T>::size();
+		mutex.unlock();
+		return c;
+	}
+
+	/**
+	 * @brief Returns the number of elements in this collection.
+	 */
+	size_t size() {
+		mutex.lock();
+		size_t s = PIDeque<T>::size();
+		mutex.unlock();
+		return s;
+	}
+
+	/**
+	 * @brief Removes all available elements from this queue and adds them to other given queue.
+	 */
+	size_t drainTo(PIDeque<T>& other, size_t maxCount = SIZE_MAX) {
+		mutex.lock();
+		size_t count = maxCount > PIDeque<T>::size() ? PIDeque<T>::size() : maxCount;
+		for (size_t i = 0; i < count; ++i) other.push_back(PIDeque<T>::take_front());
+		mutex.unlock();
+		return count;
+	}
+
+	/**
+	 * @brief Removes all available elements from this queue and adds them to other given queue.
+	 */
+	size_t drainTo(PIBlockingDequeue<T>& other, size_t maxCount = SIZE_MAX) {
+		mutex.lock();
+		other.mutex.lock();
+		size_t count = maxCount > PIDeque<T>::size() ? PIDeque<T>::size() : maxCount;
+		size_t otherRemainingCapacity = other.max_size - static_cast<PIDeque<T> >(other).size();
+		if (count > otherRemainingCapacity) count = otherRemainingCapacity;
+		for (size_t i = 0; i < count; ++i) other.push_back(PIDeque<T>::take_front());
+		other.mutex.unlock();
+		mutex.unlock();
+		return count;
+	}
+
+private:
+	PIConditionLock mutex;
+	PIConditionVariable* cond_var_add;
+	PIConditionVariable* cond_var_rem;
+	size_t max_size;
+};
+
+
+#endif //PIP_TESTS_PIBLOCKINGDEQUEUE_H
diff --git a/src_main/concurrent/piconditionlock.h b/lib/main/concurrent/piconditionlock.h
similarity index 95%
rename from src_main/concurrent/piconditionlock.h
rename to lib/main/concurrent/piconditionlock.h
index a06c0b85..2e12e142 100644
--- a/src_main/concurrent/piconditionlock.h
+++ b/lib/main/concurrent/piconditionlock.h
@@ -1,51 +1,51 @@
-/*
-	PIP - Platform Independent Primitives
-	
-	Stephan Fomenko
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef AWRCANFLASHER_PICONDITIONLOCK_H
-#define AWRCANFLASHER_PICONDITIONLOCK_H
-
-#include "pimutex.h"
-
-
-/**
- * @brief Continued
- */
-class PIP_EXPORT PIConditionLock {
-public:
-	explicit PIConditionLock();
-	~PIConditionLock();
-
-	//! \brief lock
-	void lock();
-
-	//! \brief unlock
-	void unlock();
-
-	//! \brief tryLock
-	bool tryLock();
-
-	void * handle();
-
-private:
-	NO_COPY_CLASS(PIConditionLock)
-	PRIVATE_DECLARATION
-};
-
-
-#endif //AWRCANFLASHER_PICONDITIONLOCK_H
+/*
+	PIP - Platform Independent Primitives
+	
+	Stephan Fomenko
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef AWRCANFLASHER_PICONDITIONLOCK_H
+#define AWRCANFLASHER_PICONDITIONLOCK_H
+
+#include "pimutex.h"
+
+
+/**
+ * @brief Continued
+ */
+class PIP_EXPORT PIConditionLock {
+public:
+	explicit PIConditionLock();
+	~PIConditionLock();
+
+	//! \brief lock
+	void lock();
+
+	//! \brief unlock
+	void unlock();
+
+	//! \brief tryLock
+	bool tryLock();
+
+	void * handle();
+
+private:
+	NO_COPY_CLASS(PIConditionLock)
+	PRIVATE_DECLARATION
+};
+
+
+#endif //AWRCANFLASHER_PICONDITIONLOCK_H
diff --git a/src_main/concurrent/piconditionvar.h b/lib/main/concurrent/piconditionvar.h
similarity index 97%
rename from src_main/concurrent/piconditionvar.h
rename to lib/main/concurrent/piconditionvar.h
index 34017980..3da4bef9 100644
--- a/src_main/concurrent/piconditionvar.h
+++ b/lib/main/concurrent/piconditionvar.h
@@ -1,120 +1,120 @@
-/*
-	PIP - Platform Independent Primitives
-	
-	Stephan Fomenko
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIP_TESTS_PICONDITIONVAR_H
-#define PIP_TESTS_PICONDITIONVAR_H
-
-#include "piconditionlock.h"
-#include "pithread.h"
-#include "piinit.h"
-
-
-/**
- * @brief A condition variable is an object able to block the calling thread until notified to resume.
- *
- * It uses a PIConditionLock to lock the thread when one of its wait functions is called. The thread remains
- * blocked until woken up by another thread that calls a notification function on the same PIConditionVariable object.
- */
-class PIP_EXPORT PIConditionVariable {
-public:
-	explicit PIConditionVariable();
-	virtual ~PIConditionVariable();
-
-	/**
-	 * @brief Unblocks one of the threads currently waiting for this condition. If no threads are waiting, the function
-	 * does nothing. If more than one, it is unspecified which of the threads is selected.
-	 */
-	void notifyOne();
-
-	/**
-	 * @brief Unblocks all threads currently waiting for this condition. If no threads are waiting, the function does
-	 * nothing.
-	 */
-	void notifyAll();
-
-	/**
-	 * @brief see wait(PIConditionLock&, const std::function<bool()>&)
-	 */
-	virtual void wait(PIConditionLock& lk);
-
-	/**
-	 * @brief Wait until notified
-	 *
-	 * The execution of the current thread (which shall have locked with lk method PIConditionLock::lock()) is blocked
-	 * until notified.
-	 *
-	 * At the moment of blocking the thread, the function automatically calls lk.unlock() (PIConditionLock::unlock()),
-	 * allowing other locked threads to continue.
-	 *
-	 * Once notified (explicitly, by some other thread), the function unblocks and calls lk.lock() (PIConditionLock::lock()),
-	 * leaving lk in the same state as when the function was called. Then the function returns (notice that this last mutex
-	 * locking may block again the thread before returning).
-	 *
-	 * Generally, the function is notified to wake up by a call in another thread either to member notifyOne() or to
-	 * member notifyAll(). But certain implementations may produce spurious wake-up calls without any of these functions
-	 * being called. Therefore, users of this function shall ensure their condition for resumption is met.
-	 *
-	 * If condition is specified, the function only blocks if condition returns false, and notifications can only unblock
-	 * the thread when it becomes true (which is specially useful to check against spurious wake-up calls).
-	 *
-	 * @param lk lock object used by method wait for data protection
-	 * @param condition A callable object or function that takes no arguments and returns a value that can be evaluated
-	 * as a bool. This is called repeatedly until it evaluates to true.
-	 */
-	virtual void wait(PIConditionLock& lk, const std::function<bool()>& condition);
-
-	/**
-	 * @brief see waitFor(PIConditionLock&, int, const std::function<bool()>&)
-	 */
-	virtual bool waitFor(PIConditionLock& lk, int timeoutMs);
-
-	/**
-	 * @brief Wait for timeout or until notified
-	 *
-	 * The execution of the current thread (which shall have locked with lk method PIConditionLock::lock()) is blocked
-	 * during timeoutMs, or until notified (if the latter happens first).
-	 *
-	 * At the moment of blocking the thread, the function automatically calls lk.lock() (PIConditionLock::lock()), allowing
-	 * other locked threads to continue.
-	 *
-	 * Once notified or once timeoutMs has passed, the function unblocks and calls lk.unlock() (PIConditionLock::unlock()),
-	 * leaving lk in the same state as when the function was called. Then the function returns (notice that this last
-	 * mutex locking may block again the thread before returning).
-	 *
-	 * Generally, the function is notified to wake up by a call in another thread either to member notifyOne() or to
-	 * member notifyAll(). But certain implementations may produce spurious wake-up calls without any of these functions
-	 * being called. Therefore, users of this function shall ensure their condition for resumption is met.
-	 *
-	 * If condition is specified, the function only blocks if condition returns false, and notifications can only unblock
-	 * the thread when it becomes true (which is especially useful to check against spurious wake-up calls).
-	 *
-	 * @param lk lock object used by method wait for data protection
-	 * @param condition A callable object or function that takes no arguments and returns a value that can be evaluated
-	 * as a bool. This is called repeatedly until it evaluates to true.
-	 * @return false if timeout reached or true if wakeup condition is true
-	 */
-	virtual bool waitFor(PIConditionLock& lk, int timeoutMs, const std::function<bool()>& condition);
-
-private:
-	NO_COPY_CLASS(PIConditionVariable)
-	PRIVATE_DECLARATION
-};
-
-
-#endif //PIP_TESTS_PICONDITIONVAR_H
+/*
+	PIP - Platform Independent Primitives
+	
+	Stephan Fomenko
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIP_TESTS_PICONDITIONVAR_H
+#define PIP_TESTS_PICONDITIONVAR_H
+
+#include "piconditionlock.h"
+#include "pithread.h"
+#include "piinit.h"
+
+
+/**
+ * @brief A condition variable is an object able to block the calling thread until notified to resume.
+ *
+ * It uses a PIConditionLock to lock the thread when one of its wait functions is called. The thread remains
+ * blocked until woken up by another thread that calls a notification function on the same PIConditionVariable object.
+ */
+class PIP_EXPORT PIConditionVariable {
+public:
+	explicit PIConditionVariable();
+	virtual ~PIConditionVariable();
+
+	/**
+	 * @brief Unblocks one of the threads currently waiting for this condition. If no threads are waiting, the function
+	 * does nothing. If more than one, it is unspecified which of the threads is selected.
+	 */
+	void notifyOne();
+
+	/**
+	 * @brief Unblocks all threads currently waiting for this condition. If no threads are waiting, the function does
+	 * nothing.
+	 */
+	void notifyAll();
+
+	/**
+	 * @brief see wait(PIConditionLock&, const std::function<bool()>&)
+	 */
+	virtual void wait(PIConditionLock& lk);
+
+	/**
+	 * @brief Wait until notified
+	 *
+	 * The execution of the current thread (which shall have locked with lk method PIConditionLock::lock()) is blocked
+	 * until notified.
+	 *
+	 * At the moment of blocking the thread, the function automatically calls lk.unlock() (PIConditionLock::unlock()),
+	 * allowing other locked threads to continue.
+	 *
+	 * Once notified (explicitly, by some other thread), the function unblocks and calls lk.lock() (PIConditionLock::lock()),
+	 * leaving lk in the same state as when the function was called. Then the function returns (notice that this last mutex
+	 * locking may block again the thread before returning).
+	 *
+	 * Generally, the function is notified to wake up by a call in another thread either to member notifyOne() or to
+	 * member notifyAll(). But certain implementations may produce spurious wake-up calls without any of these functions
+	 * being called. Therefore, users of this function shall ensure their condition for resumption is met.
+	 *
+	 * If condition is specified, the function only blocks if condition returns false, and notifications can only unblock
+	 * the thread when it becomes true (which is specially useful to check against spurious wake-up calls).
+	 *
+	 * @param lk lock object used by method wait for data protection
+	 * @param condition A callable object or function that takes no arguments and returns a value that can be evaluated
+	 * as a bool. This is called repeatedly until it evaluates to true.
+	 */
+	virtual void wait(PIConditionLock& lk, const std::function<bool()>& condition);
+
+	/**
+	 * @brief see waitFor(PIConditionLock&, int, const std::function<bool()>&)
+	 */
+	virtual bool waitFor(PIConditionLock& lk, int timeoutMs);
+
+	/**
+	 * @brief Wait for timeout or until notified
+	 *
+	 * The execution of the current thread (which shall have locked with lk method PIConditionLock::lock()) is blocked
+	 * during timeoutMs, or until notified (if the latter happens first).
+	 *
+	 * At the moment of blocking the thread, the function automatically calls lk.lock() (PIConditionLock::lock()), allowing
+	 * other locked threads to continue.
+	 *
+	 * Once notified or once timeoutMs has passed, the function unblocks and calls lk.unlock() (PIConditionLock::unlock()),
+	 * leaving lk in the same state as when the function was called. Then the function returns (notice that this last
+	 * mutex locking may block again the thread before returning).
+	 *
+	 * Generally, the function is notified to wake up by a call in another thread either to member notifyOne() or to
+	 * member notifyAll(). But certain implementations may produce spurious wake-up calls without any of these functions
+	 * being called. Therefore, users of this function shall ensure their condition for resumption is met.
+	 *
+	 * If condition is specified, the function only blocks if condition returns false, and notifications can only unblock
+	 * the thread when it becomes true (which is especially useful to check against spurious wake-up calls).
+	 *
+	 * @param lk lock object used by method wait for data protection
+	 * @param condition A callable object or function that takes no arguments and returns a value that can be evaluated
+	 * as a bool. This is called repeatedly until it evaluates to true.
+	 * @return false if timeout reached or true if wakeup condition is true
+	 */
+	virtual bool waitFor(PIConditionLock& lk, int timeoutMs, const std::function<bool()>& condition);
+
+private:
+	NO_COPY_CLASS(PIConditionVariable)
+	PRIVATE_DECLARATION
+};
+
+
+#endif //PIP_TESTS_PICONDITIONVAR_H
diff --git a/src_main/console/piconsole.h b/lib/main/console/piconsole.h
similarity index 97%
rename from src_main/console/piconsole.h
rename to lib/main/console/piconsole.h
index 11784834..5e843d1d 100644
--- a/src_main/console/piconsole.h
+++ b/lib/main/console/piconsole.h
@@ -1,461 +1,461 @@
-/*! \file piconsole.h
- * \brief Console output class
-*/
-/*
-	PIP - Platform Independent Primitives
-	Console output/input
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICONSOLE_H
-#define PICONSOLE_H
-
-#include "pikbdlistener.h"
-
-class PIProtocol;
-class PIDiagnostics;
-class PISystemMonitor;
-class PIPeer;
-class PITimer;
-
-class PIP_EXPORT PIConsole: public PIThread
-{
-	PIOBJECT_SUBCLASS(PIConsole, PIThread)
-public:
-
-		//! Constructs %PIConsole with key handler "slot" and if "startNow" start it
-		explicit PIConsole(bool startNow = true, PIKbdListener::KBFunc slot = 0);
-
-	~PIConsole();
-
-
-	//! Variables output format
-	enum Format {
-		Normal /** Default console format */ = 0x01,
-		Bold /** Bold text */ = 0x02,
-		Faint = 0x04,
-		Italic = 0x08,
-		Underline /** Underlined text */ = 0x10,
-		Blink /** Blinked text */ = 0x20,
-		Inverse /** Swap text and background colors */ = 0x40,
-		Black /** Black text */ = 0x100,
-		Red /** Red text */ = 0x200,
-		Green /** Green text */ = 0x400,
-		Yellow /** Yellow text */ = 0x800,
-		Blue /** Blue text */ = 0x1000,
-		Magenta /** Magenta text */ = 0x2000,
-		Cyan /** Cyan text */ = 0x4000,
-		White /** White text */ = 0x8000,
-		BackBlack /** Black background */ = 0x10000,
-		BackRed /** Red background */ = 0x20000,
-		BackGreen /** Green background */ = 0x40000,
-		BackYellow /** Yellow background */ = 0x80000,
-		BackBlue /** Blue background */ = 0x100000,
-		BackMagenta /** Magenta background */ = 0x200000,
-		BackCyan /** Cyan background */ = 0x400000,
-		BackWhite /** White background */ = 0x800000,
-		Dec /** Decimal base for integers */ = 0x1000000,
-		Hex /** Hexadecimal base for integers */ = 0x2000000,
-		Oct /** Octal base for integers */ = 0x4000000,
-		Bin /** Binary base for integers */ = 0x8000000,
-		Scientific /** Scientific representation of floats */ = 0x10000000,
-		SystemTimeSplit /** PISystemTime split representation (* s, * ns) */ = 0x20000000,
-		SystemTimeSeconds /** PISystemTime seconds representation (*.* s) */ = 0x40000000
-	};
-
-	//! Column labels alignment
-	enum Alignment {
-		Nothing /** No alignment */ ,
-		Left /** Labels align left and variables align left */ ,
-		Right /** Labels align right and variables align left */
-	};
-
-	typedef PIFlags<PIConsole::Format> FormatFlags;
-
-	//! Add to current tab to column "column" string "name" with format "format"
-	void addString(const PIString & name, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const PIString * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const char * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const bool * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const short * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const int * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const long * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const llong * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const uchar * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const ushort * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const uint * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const ulong * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const ullong * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const float * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const double * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
-	void addVariable(const PIString & name, const PISystemTime * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	void addVariable(const PIString & name, const PIDiagnostics * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-	void addVariable(const PIString & name, const PISystemMonitor * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" bits field with label "name", pointer "ptr" and format "format"
-	void addBitVariable(const PIString & name, const void * ptr, int fromBit, int bitsCount, int column = 1, FormatFlags format = PIConsole::Normal);
-
-	//! Add to current tab to column "column" "count" empty lines
-	void addEmptyLine(int column = 1, uint count = 1);
-
-	PIString getString(int x, int y);
-	short getShort(int x, int y) {return getString(x, y).toShort();}
-	int getInt(int x, int y) {return getString(x, y).toInt();}
-	float getFloat(int x, int y) {return getString(x, y).toFloat();}
-	double getDouble(int x, int y) {return getString(x, y).toDouble();}
-	PIString getString(const PIString & name);
-	short getShort(const PIString & name) {return getString(name).toShort();}
-	int getInt(const PIString & name) {return getString(name).toInt();}
-	float getFloat(const PIString & name) {return getString(name).toFloat();}
-	double getDouble(const PIString & name) {return getString(name).toDouble();}
-
-
-	//! Returns tabs count
-	uint tabsCount() const {return tabs.size();}
-
-	//! Returns current tab name
-	PIString currentTab() const {return tabs[cur_tab].name;}
-
-	//! Returns current tab index
-	int currentTabIndex() const {return cur_tab;}
-
-	//! Add new tab with name "name", bind key "bind_key" and returns this tab index
-	int addTab(const PIString & name, char bind_key = 0);
-
-	//! Remove tab with index "index"
-	void removeTab(uint index);
-
-	//! Remove tab with name "name"
-	void removeTab(const PIString & name);
-
-	//! Clear content of tab with index "index"
-	void clearTab(uint index);
-
-	//! Clear content of tab with name "name"
-	void clearTab(const PIString & name);
-
-	//! Set current tab to tab with index "index", returns if tab exists
-	bool setTab(uint index);
-
-	//! Set current tab to tab with name "name", returns if tab exists
-	bool setTab(const PIString & name);
-
-	//! Set tab with index "index" bind key to "bind_key", returns if tab exists
-	bool setTabBindKey(uint index, char bind_key);
-
-	//! Set tab with name "name" bind key to "bind_key", returns if tab exists
-	bool setTabBindKey(const PIString & name, char bind_key);
-
-	//! Remove all tabs and if "clearScreen" clear the screen
-	void clearTabs(bool clearScreen = true) {if (clearScreen && isRunning()) {toUpperLeft(); clearScreenLower();} tabs.clear();}
-
-
-	//! Set custom status text of current tab to "str"
-	void addCustomStatus(const PIString & str) {tabs[cur_tab].status = str;}
-
-	//! Clear custom status text of current tab
-	void clearCustomStatus() {tabs[cur_tab].status.clear();}
-
-	//! Returns default alignment
-	Alignment defaultAlignment() const {return def_align;}
-
-	//! Set default alignment to "align"
-	void setDefaultAlignment(Alignment align) {def_align = align;}
-
-	//! Set column "col" alignment to "align"
-	void setColumnAlignment(int col, Alignment align) {if (col < 0 || col >= columns().size_s()) return; column(col).alignment = align;}
-
-	//! Set all columns of all tabs alignment to "align"
-	void setColumnAlignmentToAll(Alignment align) {piForeach (Tab & i, tabs) piForeach (Column & j, i.columns) j.alignment = align; fillLabels();}
-
-
-	//! Directly call function from \a PIKbdListener
-	void enableExitCapture(char key = 'Q') {listener->enableExitCapture(key);}
-
-	//! Directly call function from \a PIKbdListener
-	void disableExitCapture() {listener->disableExitCapture();}
-
-	//! Directly call function from \a PIKbdListener
-	bool exitCaptured() const {return listener->exitCaptured();}
-
-	//! Directly call function from \a PIKbdListener
-	char exitKey() const {return listener->exitKey();}
-
-
-	int windowWidth() const {return width;}
-	int windowHeight() const {return height;}
-
-	PIString fstr(FormatFlags f);
-	void update();
-	void pause(bool yes) {pause_ = yes;}
-
-	// Server functions
-	void startServer(const PIString & name);
-	void stopPeer();
-	bool isServerStarted() const {return peer != 0;}
-	PIStringList clients() const;
-
-	// Client functions
-	void listenServers();
-	PIStringList availableServers() const;
-	PIString selectedServer() const {return server_name;}
-	void connectToServer(const PIString & name);
-	void disconnect();
-	bool isConnected() const {return state == Connected;}
-
-	void toUpperLeft();
-	void moveRight(int n = 1);
-	void moveLeft(int n = 1);
-	void moveTo(int x = 0, int y = 0);
-	void clearScreen();
-	void clearScreenLower();
-	void clearLine();
-	void newLine();
-	void hideCursor();
-	void showCursor();
-
-	EVENT_HANDLER0(void, clearVariables) {clearVariables(true);}
-	EVENT_HANDLER1(void, clearVariables, bool, clearScreen);
-
-	EVENT_HANDLER0(void, waitForFinish) {WAIT_FOR_EXIT}
-	EVENT_HANDLER0(void, start) {start(false);}
-	EVENT_HANDLER1(void, start, bool, wait) {PIThread::start(40); if (wait) waitForFinish();}
-	EVENT_HANDLER0(void, stop) {stop(false);}
-	EVENT_HANDLER1(void, stop, bool, clear);
-
-	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
-
-	//! \handlers
-	//! \{
-
-	//! \fn void waitForFinish()
-	//! \brief block until finished (exit key will be pressed)
-
-	//! \fn void clearVariables(bool clearScreen = true)
-	//! \brief Remove all columns at current tab and if "clearScreen" clear the screen
-
-	//! \fn void start(bool wait = false)
-	//! \brief Start console output and if "wait" block until finished (exit key will be pressed)
-
-	//! \fn void stop(bool clear = false)
-	//! \brief Stop console output and if "clear" clear the screen
-
-	//! \}
-	//! \events
-	//! \{
-
-	//! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data)
-	//! \brief Raise on key "key" pressed, "data" is pointer to %PIConsole object
-
-	//! \}
-
-	private:
-		void begin();
-	void run();
-	void fillLabels();
-	void status();
-	void checkColumn(uint col) {while (columns().size() < col) columns().push_back(Column(def_align));}
-	int bitsValue(const void * src, int offset, int count) const;
-	const char * toBin(const void * d, int s);
-	inline void printLine(const PIString & str, int dx = 0, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const PIString & str, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const char * str, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const bool value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const int value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const long value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const llong value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const float value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const double value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const char value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const short value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const uchar value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const ushort value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const uint value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const ulong value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const ullong value, FormatFlags format = PIConsole::Normal);
-	inline int printValue(const PISystemTime & value, FormatFlags format = PIConsole::Normal);
-	static void key_event(PIKbdListener::KeyEvent key, void * t);
-
-	struct Variable {
-		Variable() {nx = ny = type = offset = bitFrom = bitCount = size = 0; format = Normal; remote = false; ptr = 0; id = 1;}
-		Variable(const Variable & src) {remote = src.remote; name = src.name; format = src.format; type = src.type; offset = src.offset; size = src.size;
-										bitFrom = src.bitFrom; bitCount = src.bitCount; ptr = src.ptr; nx = src.nx; ny = src.ny; rdata = src.rdata; id = src.id;}
-		bool isEmpty() const {return (remote ? false : ptr == 0);}
-		const void * data() {return (remote ? rdata.data() : ptr);}
-		void writeData(PIByteArray & ba) {
-			if (remote) ba << rdata;
-			else {
-				if (type == 0) ba << (*(PIString * )ptr);
-				else ba << PIByteArray::RawData(ptr, size);
-			}
-		}
-		PIString name;
-		FormatFlags format;
-		int nx;
-		int ny;
-		int type;
-		int offset;
-		int bitFrom;
-		int bitCount;
-		int size;
-		int id;
-		bool remote;
-		const void * ptr;
-		PIByteArray rdata;
-		void operator =(const Variable & src) {remote = src.remote; name = src.name; format = src.format; type = src.type; offset = src.offset; size = src.size;
-											   bitFrom = src.bitFrom; bitCount = src.bitCount; ptr = src.ptr; nx = src.nx; ny = src.ny; rdata = src.rdata; id = src.id;}
-	};
-
-	struct VariableContent {
-		int id;
-		PIByteArray rdata;
-	};
-
-	struct Column {
-		Column(Alignment align = PIConsole::Right) {variables.reserve(32); alignment = align;}
-		PIVector<Variable> variables;
-		Alignment alignment;
-		uint size() const {return variables.size();}
-		Variable & operator [](int index) {return variables[index];}
-		const Variable & operator [](int index) const {return variables[index];}
-		void push_back(const Variable & v) {variables.push_back(v);}
-		void operator =(const Column & src) {variables = src.variables; alignment = src.alignment;}
-	};
-
-	struct Tab {
-		Tab(PIString n = "", char k = 0) {columns.reserve(8); name = n; key = k;}
-		PIVector<Column> columns;
-		PIString name;
-		PIString status;
-		char key;
-	};
-
-	enum ConnectedState {Disconnected, FetchingData, Committing, Connected};
-
-	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::VariableContent & v);
-	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::VariableContent & v);
-
-	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Variable & v);
-	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::Variable & v);
-
-	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Column & v);
-	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::Column & v);
-
-	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Tab & v);
-	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::Tab & v);
-
-	PIVector<Column> & columns() {return tabs[cur_tab].columns;}
-	Column & column(int index) {return tabs[cur_tab].columns[index - 1];}
-	int couts(const PIString & v);
-	int couts(const char * v);
-	int couts(const bool v);
-	int couts(const char v);
-	int couts(const short v);
-	int couts(const int v);
-	int couts(const long v);
-	int couts(const llong v);
-	int couts(const uchar v);
-	int couts(const ushort v);
-	int couts(const uint v);
-	int couts(const ulong v);
-	int couts(const ullong v);
-	int couts(const float v);
-	int couts(const double v);
-	int couts(const PISystemTime & v);
-
-	struct RemoteClient;
-
-	void serverSendInfo();
-	void serverSendData();
-	RemoteClient & remoteClient(const PIString & fname);
-	EVENT_HANDLER2(void, peerReceived, const PIString &, from, const PIByteArray &, data);
-	EVENT_HANDLER2(void, peerTimer, void * , data, int, delim);
-	EVENT_HANDLER1(void, peerDisconnectedEvent, const PIString &, name);
-
-	PRIVATE_DECLARATION
-	PIVector<Tab> tabs;
-	PIString binstr, rstr;
-	PIByteArray rba;
-	Variable tv;
-	PIKbdListener * listener;
-	Alignment def_align;
-	PIKbdListener::KBFunc ret_func;
-	int width, height, pwidth, pheight, col_wid, num_format, systime_format;
-	uint max_y;
-	int vid;
-	uint cur_tab, col_cnt;
-
-	PIPeer * peer;
-	PITimer * peer_timer;
-	PITimeMeasurer peer_tm;
-	PIString server_name;
-	bool server_mode, pause_;
-	ConnectedState state;
-
-	struct RemoteClient {
-		RemoteClient(const PIString & n = "") {name = n; state = Disconnected;}
-		PIString name;
-		ConnectedState state;
-	};
-
-	PIVector<RemoteClient> remote_clients;
-
-};
-
-inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::VariableContent & v) {ba << v.id << v.rdata; return ba;}
-inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::VariableContent & v) {ba >> v.id; ba >> v.rdata; return ba;}
-
-inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Variable & v) {ba << v.name << v.id << (int)v.format << v.type << v.size << v.bitFrom << v.bitCount; return ba;}
-inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Variable & v) {ba >> v.name >> v.id >> (int & )v.format >> v.type >> v.size >> v.bitFrom >> v.bitCount; return ba;}
-
-inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Column & v) {ba << (int)v.alignment << v.variables; return ba;}
-inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Column & v) {int a; ba >> a >> v.variables; v.alignment = (PIConsole::Alignment)a; return ba;}
-
-inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Tab & v) {ba << v.name << v.status << (uchar)v.key << v.columns; return ba;}
-inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Tab & v) {ba >> v.name >> v.status >> (uchar&)v.key >> v.columns; return ba;}
-
-#endif // PICONSOLE_H
+/*! \file piconsole.h
+ * \brief Console output class
+*/
+/*
+	PIP - Platform Independent Primitives
+	Console output/input
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICONSOLE_H
+#define PICONSOLE_H
+
+#include "pikbdlistener.h"
+
+class PIProtocol;
+class PIDiagnostics;
+class PISystemMonitor;
+class PIPeer;
+class PITimer;
+
+class PIP_EXPORT PIConsole: public PIThread
+{
+	PIOBJECT_SUBCLASS(PIConsole, PIThread)
+public:
+
+		//! Constructs %PIConsole with key handler "slot" and if "startNow" start it
+		explicit PIConsole(bool startNow = true, PIKbdListener::KBFunc slot = 0);
+
+	~PIConsole();
+
+
+	//! Variables output format
+	enum Format {
+		Normal /** Default console format */ = 0x01,
+		Bold /** Bold text */ = 0x02,
+		Faint = 0x04,
+		Italic = 0x08,
+		Underline /** Underlined text */ = 0x10,
+		Blink /** Blinked text */ = 0x20,
+		Inverse /** Swap text and background colors */ = 0x40,
+		Black /** Black text */ = 0x100,
+		Red /** Red text */ = 0x200,
+		Green /** Green text */ = 0x400,
+		Yellow /** Yellow text */ = 0x800,
+		Blue /** Blue text */ = 0x1000,
+		Magenta /** Magenta text */ = 0x2000,
+		Cyan /** Cyan text */ = 0x4000,
+		White /** White text */ = 0x8000,
+		BackBlack /** Black background */ = 0x10000,
+		BackRed /** Red background */ = 0x20000,
+		BackGreen /** Green background */ = 0x40000,
+		BackYellow /** Yellow background */ = 0x80000,
+		BackBlue /** Blue background */ = 0x100000,
+		BackMagenta /** Magenta background */ = 0x200000,
+		BackCyan /** Cyan background */ = 0x400000,
+		BackWhite /** White background */ = 0x800000,
+		Dec /** Decimal base for integers */ = 0x1000000,
+		Hex /** Hexadecimal base for integers */ = 0x2000000,
+		Oct /** Octal base for integers */ = 0x4000000,
+		Bin /** Binary base for integers */ = 0x8000000,
+		Scientific /** Scientific representation of floats */ = 0x10000000,
+		SystemTimeSplit /** PISystemTime split representation (* s, * ns) */ = 0x20000000,
+		SystemTimeSeconds /** PISystemTime seconds representation (*.* s) */ = 0x40000000
+	};
+
+	//! Column labels alignment
+	enum Alignment {
+		Nothing /** No alignment */ ,
+		Left /** Labels align left and variables align left */ ,
+		Right /** Labels align right and variables align left */
+	};
+
+	typedef PIFlags<PIConsole::Format> FormatFlags;
+
+	//! Add to current tab to column "column" string "name" with format "format"
+	void addString(const PIString & name, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const PIString * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const char * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const bool * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const short * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const int * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const long * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const llong * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const uchar * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const ushort * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const uint * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const ulong * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const ullong * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const float * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const double * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" variable with label "name", pointer "ptr" and format "format"
+	void addVariable(const PIString & name, const PISystemTime * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	void addVariable(const PIString & name, const PIDiagnostics * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+	void addVariable(const PIString & name, const PISystemMonitor * ptr, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" bits field with label "name", pointer "ptr" and format "format"
+	void addBitVariable(const PIString & name, const void * ptr, int fromBit, int bitsCount, int column = 1, FormatFlags format = PIConsole::Normal);
+
+	//! Add to current tab to column "column" "count" empty lines
+	void addEmptyLine(int column = 1, uint count = 1);
+
+	PIString getString(int x, int y);
+	short getShort(int x, int y) {return getString(x, y).toShort();}
+	int getInt(int x, int y) {return getString(x, y).toInt();}
+	float getFloat(int x, int y) {return getString(x, y).toFloat();}
+	double getDouble(int x, int y) {return getString(x, y).toDouble();}
+	PIString getString(const PIString & name);
+	short getShort(const PIString & name) {return getString(name).toShort();}
+	int getInt(const PIString & name) {return getString(name).toInt();}
+	float getFloat(const PIString & name) {return getString(name).toFloat();}
+	double getDouble(const PIString & name) {return getString(name).toDouble();}
+
+
+	//! Returns tabs count
+	uint tabsCount() const {return tabs.size();}
+
+	//! Returns current tab name
+	PIString currentTab() const {return tabs[cur_tab].name;}
+
+	//! Returns current tab index
+	int currentTabIndex() const {return cur_tab;}
+
+	//! Add new tab with name "name", bind key "bind_key" and returns this tab index
+	int addTab(const PIString & name, char bind_key = 0);
+
+	//! Remove tab with index "index"
+	void removeTab(uint index);
+
+	//! Remove tab with name "name"
+	void removeTab(const PIString & name);
+
+	//! Clear content of tab with index "index"
+	void clearTab(uint index);
+
+	//! Clear content of tab with name "name"
+	void clearTab(const PIString & name);
+
+	//! Set current tab to tab with index "index", returns if tab exists
+	bool setTab(uint index);
+
+	//! Set current tab to tab with name "name", returns if tab exists
+	bool setTab(const PIString & name);
+
+	//! Set tab with index "index" bind key to "bind_key", returns if tab exists
+	bool setTabBindKey(uint index, char bind_key);
+
+	//! Set tab with name "name" bind key to "bind_key", returns if tab exists
+	bool setTabBindKey(const PIString & name, char bind_key);
+
+	//! Remove all tabs and if "clearScreen" clear the screen
+	void clearTabs(bool clearScreen = true) {if (clearScreen && isRunning()) {toUpperLeft(); clearScreenLower();} tabs.clear();}
+
+
+	//! Set custom status text of current tab to "str"
+	void addCustomStatus(const PIString & str) {tabs[cur_tab].status = str;}
+
+	//! Clear custom status text of current tab
+	void clearCustomStatus() {tabs[cur_tab].status.clear();}
+
+	//! Returns default alignment
+	Alignment defaultAlignment() const {return def_align;}
+
+	//! Set default alignment to "align"
+	void setDefaultAlignment(Alignment align) {def_align = align;}
+
+	//! Set column "col" alignment to "align"
+	void setColumnAlignment(int col, Alignment align) {if (col < 0 || col >= columns().size_s()) return; column(col).alignment = align;}
+
+	//! Set all columns of all tabs alignment to "align"
+	void setColumnAlignmentToAll(Alignment align) {piForeach (Tab & i, tabs) piForeach (Column & j, i.columns) j.alignment = align; fillLabels();}
+
+
+	//! Directly call function from \a PIKbdListener
+	void enableExitCapture(char key = 'Q') {listener->enableExitCapture(key);}
+
+	//! Directly call function from \a PIKbdListener
+	void disableExitCapture() {listener->disableExitCapture();}
+
+	//! Directly call function from \a PIKbdListener
+	bool exitCaptured() const {return listener->exitCaptured();}
+
+	//! Directly call function from \a PIKbdListener
+	char exitKey() const {return listener->exitKey();}
+
+
+	int windowWidth() const {return width;}
+	int windowHeight() const {return height;}
+
+	PIString fstr(FormatFlags f);
+	void update();
+	void pause(bool yes) {pause_ = yes;}
+
+	// Server functions
+	void startServer(const PIString & name);
+	void stopPeer();
+	bool isServerStarted() const {return peer != 0;}
+	PIStringList clients() const;
+
+	// Client functions
+	void listenServers();
+	PIStringList availableServers() const;
+	PIString selectedServer() const {return server_name;}
+	void connectToServer(const PIString & name);
+	void disconnect();
+	bool isConnected() const {return state == Connected;}
+
+	void toUpperLeft();
+	void moveRight(int n = 1);
+	void moveLeft(int n = 1);
+	void moveTo(int x = 0, int y = 0);
+	void clearScreen();
+	void clearScreenLower();
+	void clearLine();
+	void newLine();
+	void hideCursor();
+	void showCursor();
+
+	EVENT_HANDLER0(void, clearVariables) {clearVariables(true);}
+	EVENT_HANDLER1(void, clearVariables, bool, clearScreen);
+
+	EVENT_HANDLER0(void, waitForFinish) {WAIT_FOR_EXIT}
+	EVENT_HANDLER0(void, start) {start(false);}
+	EVENT_HANDLER1(void, start, bool, wait) {PIThread::start(40); if (wait) waitForFinish();}
+	EVENT_HANDLER0(void, stop) {stop(false);}
+	EVENT_HANDLER1(void, stop, bool, clear);
+
+	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
+
+	//! \handlers
+	//! \{
+
+	//! \fn void waitForFinish()
+	//! \brief block until finished (exit key will be pressed)
+
+	//! \fn void clearVariables(bool clearScreen = true)
+	//! \brief Remove all columns at current tab and if "clearScreen" clear the screen
+
+	//! \fn void start(bool wait = false)
+	//! \brief Start console output and if "wait" block until finished (exit key will be pressed)
+
+	//! \fn void stop(bool clear = false)
+	//! \brief Stop console output and if "clear" clear the screen
+
+	//! \}
+	//! \events
+	//! \{
+
+	//! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data)
+	//! \brief Raise on key "key" pressed, "data" is pointer to %PIConsole object
+
+	//! \}
+
+	private:
+		void begin();
+	void run();
+	void fillLabels();
+	void status();
+	void checkColumn(uint col) {while (columns().size() < col) columns().push_back(Column(def_align));}
+	int bitsValue(const void * src, int offset, int count) const;
+	const char * toBin(const void * d, int s);
+	inline void printLine(const PIString & str, int dx = 0, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const PIString & str, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const char * str, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const bool value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const int value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const long value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const llong value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const float value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const double value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const char value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const short value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const uchar value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const ushort value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const uint value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const ulong value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const ullong value, FormatFlags format = PIConsole::Normal);
+	inline int printValue(const PISystemTime & value, FormatFlags format = PIConsole::Normal);
+	static void key_event(PIKbdListener::KeyEvent key, void * t);
+
+	struct Variable {
+		Variable() {nx = ny = type = offset = bitFrom = bitCount = size = 0; format = Normal; remote = false; ptr = 0; id = 1;}
+		Variable(const Variable & src) {remote = src.remote; name = src.name; format = src.format; type = src.type; offset = src.offset; size = src.size;
+										bitFrom = src.bitFrom; bitCount = src.bitCount; ptr = src.ptr; nx = src.nx; ny = src.ny; rdata = src.rdata; id = src.id;}
+		bool isEmpty() const {return (remote ? false : ptr == 0);}
+		const void * data() {return (remote ? rdata.data() : ptr);}
+		void writeData(PIByteArray & ba) {
+			if (remote) ba << rdata;
+			else {
+				if (type == 0) ba << (*(PIString * )ptr);
+				else ba << PIByteArray::RawData(ptr, size);
+			}
+		}
+		PIString name;
+		FormatFlags format;
+		int nx;
+		int ny;
+		int type;
+		int offset;
+		int bitFrom;
+		int bitCount;
+		int size;
+		int id;
+		bool remote;
+		const void * ptr;
+		PIByteArray rdata;
+		void operator =(const Variable & src) {remote = src.remote; name = src.name; format = src.format; type = src.type; offset = src.offset; size = src.size;
+											   bitFrom = src.bitFrom; bitCount = src.bitCount; ptr = src.ptr; nx = src.nx; ny = src.ny; rdata = src.rdata; id = src.id;}
+	};
+
+	struct VariableContent {
+		int id;
+		PIByteArray rdata;
+	};
+
+	struct Column {
+		Column(Alignment align = PIConsole::Right) {variables.reserve(32); alignment = align;}
+		PIVector<Variable> variables;
+		Alignment alignment;
+		uint size() const {return variables.size();}
+		Variable & operator [](int index) {return variables[index];}
+		const Variable & operator [](int index) const {return variables[index];}
+		void push_back(const Variable & v) {variables.push_back(v);}
+		void operator =(const Column & src) {variables = src.variables; alignment = src.alignment;}
+	};
+
+	struct Tab {
+		Tab(PIString n = "", char k = 0) {columns.reserve(8); name = n; key = k;}
+		PIVector<Column> columns;
+		PIString name;
+		PIString status;
+		char key;
+	};
+
+	enum ConnectedState {Disconnected, FetchingData, Committing, Connected};
+
+	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::VariableContent & v);
+	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::VariableContent & v);
+
+	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Variable & v);
+	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::Variable & v);
+
+	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Column & v);
+	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::Column & v);
+
+	friend PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Tab & v);
+	friend PIByteArray & operator >>(PIByteArray & ba, PIConsole::Tab & v);
+
+	PIVector<Column> & columns() {return tabs[cur_tab].columns;}
+	Column & column(int index) {return tabs[cur_tab].columns[index - 1];}
+	int couts(const PIString & v);
+	int couts(const char * v);
+	int couts(const bool v);
+	int couts(const char v);
+	int couts(const short v);
+	int couts(const int v);
+	int couts(const long v);
+	int couts(const llong v);
+	int couts(const uchar v);
+	int couts(const ushort v);
+	int couts(const uint v);
+	int couts(const ulong v);
+	int couts(const ullong v);
+	int couts(const float v);
+	int couts(const double v);
+	int couts(const PISystemTime & v);
+
+	struct RemoteClient;
+
+	void serverSendInfo();
+	void serverSendData();
+	RemoteClient & remoteClient(const PIString & fname);
+	EVENT_HANDLER2(void, peerReceived, const PIString &, from, const PIByteArray &, data);
+	EVENT_HANDLER2(void, peerTimer, void * , data, int, delim);
+	EVENT_HANDLER1(void, peerDisconnectedEvent, const PIString &, name);
+
+	PRIVATE_DECLARATION
+	PIVector<Tab> tabs;
+	PIString binstr, rstr;
+	PIByteArray rba;
+	Variable tv;
+	PIKbdListener * listener;
+	Alignment def_align;
+	PIKbdListener::KBFunc ret_func;
+	int width, height, pwidth, pheight, col_wid, num_format, systime_format;
+	uint max_y;
+	int vid;
+	uint cur_tab, col_cnt;
+
+	PIPeer * peer;
+	PITimer * peer_timer;
+	PITimeMeasurer peer_tm;
+	PIString server_name;
+	bool server_mode, pause_;
+	ConnectedState state;
+
+	struct RemoteClient {
+		RemoteClient(const PIString & n = "") {name = n; state = Disconnected;}
+		PIString name;
+		ConnectedState state;
+	};
+
+	PIVector<RemoteClient> remote_clients;
+
+};
+
+inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::VariableContent & v) {ba << v.id << v.rdata; return ba;}
+inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::VariableContent & v) {ba >> v.id; ba >> v.rdata; return ba;}
+
+inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Variable & v) {ba << v.name << v.id << (int)v.format << v.type << v.size << v.bitFrom << v.bitCount; return ba;}
+inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Variable & v) {ba >> v.name >> v.id >> (int & )v.format >> v.type >> v.size >> v.bitFrom >> v.bitCount; return ba;}
+
+inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Column & v) {ba << (int)v.alignment << v.variables; return ba;}
+inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Column & v) {int a; ba >> a >> v.variables; v.alignment = (PIConsole::Alignment)a; return ba;}
+
+inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Tab & v) {ba << v.name << v.status << (uchar)v.key << v.columns; return ba;}
+inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Tab & v) {ba >> v.name >> v.status >> (uchar&)v.key >> v.columns; return ba;}
+
+#endif // PICONSOLE_H
diff --git a/src_main/console/piconsolemodule.h b/lib/main/console/piconsolemodule.h
similarity index 100%
rename from src_main/console/piconsolemodule.h
rename to lib/main/console/piconsolemodule.h
diff --git a/src_main/console/pikbdlistener.cpp b/lib/main/console/pikbdlistener.cpp
similarity index 100%
rename from src_main/console/pikbdlistener.cpp
rename to lib/main/console/pikbdlistener.cpp
diff --git a/src_main/console/pikbdlistener.h b/lib/main/console/pikbdlistener.h
similarity index 100%
rename from src_main/console/pikbdlistener.h
rename to lib/main/console/pikbdlistener.h
diff --git a/src_main/console/piscreen.h b/lib/main/console/piscreen.h
similarity index 96%
rename from src_main/console/piscreen.h
rename to lib/main/console/piscreen.h
index de1ce8f4..493fc84e 100644
--- a/src_main/console/piscreen.h
+++ b/lib/main/console/piscreen.h
@@ -1,159 +1,159 @@
-/*! \file piscreen.h
- * \brief Console GUI class
-*/
-/*
-	PIP - Platform Independent Primitives
-	Console GUI
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISCREEN_H
-#define PISCREEN_H
-
-#include "piscreentile.h"
-#include "piscreendrawer.h"
-
-
-class PIP_EXPORT PIScreen: public PIThread, public PIScreenTypes::PIScreenBase
-{
-	PIOBJECT_SUBCLASS(PIScreen, PIThread)
-	class SystemConsole;
-public:
-	
-	//! Constructs %PIScreen with key handler "slot" and if "startNow" start it
-	PIScreen(bool startNow = true, PIKbdListener::KBFunc slot = 0);
-	
-	~PIScreen();
-	
-	//! Directly call function from \a PIKbdListener
-	void enableExitCapture(int key = 'Q') {listener->enableExitCapture(key);}
-	
-	//! Directly call function from \a PIKbdListener
-	void disableExitCapture() {listener->disableExitCapture();}
-	
-	//! Directly call function from \a PIKbdListener
-	bool exitCaptured() const {return listener->exitCaptured();}
-	
-	//! Directly call function from \a PIKbdListener
-	int exitKey() const {return listener->exitKey();}
-	
-	int windowWidth() const {return console.width;}
-	int windowHeight() const {return console.height;}
-
-	bool isMouseEnabled() const {return mouse_;}
-	void setMouseEnabled(bool on);
-	
-	PIScreenTile * rootTile() {return &root;}
-	PIScreenTile * tileByName(const PIString & name);
-	
-	void setDialogTile(PIScreenTile * t);
-	PIScreenTile * dialogTile() const {return tile_dialog;}
-	
-	PIScreenDrawer * drawer() {return &drawer_;}
-	void clear() {drawer_.clear();}
-	void resize(int w, int h) {console.resize(w, h);}
-	
-	EVENT_HANDLER0(void, waitForFinish);
-	EVENT_HANDLER0(void, start) {start(false);}
-	EVENT_HANDLER1(void, start, bool, wait) {PIThread::start(40); if (wait) waitForFinish();}
-	EVENT_HANDLER0(void, stop) {stop(false);}
-	EVENT_HANDLER1(void, stop, bool, clear);
-	
-	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
-	EVENT2(tileEvent, PIScreenTile * , tile, PIScreenTypes::TileEvent, e)
-	
-//! \handlers
-//! \{
-	
-	//! \fn void waitForFinish()
-	//! \brief block until finished (exit key will be pressed)
-	
-	//! \fn void start(bool wait = false)
-	//! \brief Start console output and if "wait" block until finished (exit key will be pressed)
-	
-	//! \fn void stop(bool clear = false)
-	//! \brief Stop console output and if "clear" clear the screen
-	
-//! \}
-//! \events
-//! \{
-	
-	//! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data)
-	//! \brief Raise on key "key" pressed, "data" is pointer to %PIConsole object
-	
-	//! \fn void tileEvent(PIScreenTile * tile, PIScreenTypes::TileEvent e)
-	//! \brief Raise on some event "e" from tile "tile"
-	
-//! \}
-	
-private:
-	class SystemConsole {
-	public:
-		SystemConsole();
-		~SystemConsole();
-		void begin();
-		void end();
-		void prepare();
-		void clear();
-		void print();
-		void resize(int w, int h);
-		void toUpperLeft();
-		void moveTo(int x = 0, int y = 0);
-		void hideCursor();
-		void showCursor();
-		void clearScreen();
-		void clearScreenLower();
-#ifdef WINDOWS
-		void getWinCurCoord();
-		void clearLine();
-		void newLine();
-		ushort attributes(const PIScreenTypes::Cell & c);
-#else
-		PIString formatString(const PIScreenTypes::Cell & c);
-#endif
-		PRIVATE_DECLARATION
-		int width, height, pwidth, pheight;
-		int mouse_x, mouse_y;
-		PIVector<PIVector<PIScreenTypes::Cell> > cells, pcells;
-	};
-
-	void begin();
-	void run();
-	void end();
-	void key_event(PIKbdListener::KeyEvent key);
-	EVENT_HANDLER1(void, mouse_event, PIKbdListener::MouseEvent, me);
-	EVENT_HANDLER1(void, wheel_event, PIKbdListener::WheelEvent, we);
-	static void key_eventS(PIKbdListener::KeyEvent key, void * t) {((PIScreen*)t)->key_event(key);}
-	PIVector<PIScreenTile*> tiles() {return root.children();}
-	PIVector<PIScreenTile*> prepareMouse(PIKbdListener::MouseEvent * e);
-	PIVector<PIScreenTile*> tilesUnderMouse(int x, int y);
-	bool nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key = PIKbdListener::KeyEvent());
-	void tileEventInternal(PIScreenTile * t, PIScreenTypes::TileEvent e);
-	void tileRemovedInternal(PIScreenTile * t);
-	void tileSetFocusInternal(PIScreenTile * t);
-
-	bool mouse_;
-	SystemConsole console;
-	PIScreenDrawer drawer_;
-	PIKbdListener * listener;
-	PIKbdListener::KBFunc ret_func;
-	PIScreenTile root;
-	PIScreenTile * tile_focus, * tile_dialog;
-
-};
-
-
-#endif // PISCREEN_H
+/*! \file piscreen.h
+ * \brief Console GUI class
+*/
+/*
+	PIP - Platform Independent Primitives
+	Console GUI
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISCREEN_H
+#define PISCREEN_H
+
+#include "piscreentile.h"
+#include "piscreendrawer.h"
+
+
+class PIP_EXPORT PIScreen: public PIThread, public PIScreenTypes::PIScreenBase
+{
+	PIOBJECT_SUBCLASS(PIScreen, PIThread)
+	class SystemConsole;
+public:
+	
+	//! Constructs %PIScreen with key handler "slot" and if "startNow" start it
+	PIScreen(bool startNow = true, PIKbdListener::KBFunc slot = 0);
+	
+	~PIScreen();
+	
+	//! Directly call function from \a PIKbdListener
+	void enableExitCapture(int key = 'Q') {listener->enableExitCapture(key);}
+	
+	//! Directly call function from \a PIKbdListener
+	void disableExitCapture() {listener->disableExitCapture();}
+	
+	//! Directly call function from \a PIKbdListener
+	bool exitCaptured() const {return listener->exitCaptured();}
+	
+	//! Directly call function from \a PIKbdListener
+	int exitKey() const {return listener->exitKey();}
+	
+	int windowWidth() const {return console.width;}
+	int windowHeight() const {return console.height;}
+
+	bool isMouseEnabled() const {return mouse_;}
+	void setMouseEnabled(bool on);
+	
+	PIScreenTile * rootTile() {return &root;}
+	PIScreenTile * tileByName(const PIString & name);
+	
+	void setDialogTile(PIScreenTile * t);
+	PIScreenTile * dialogTile() const {return tile_dialog;}
+	
+	PIScreenDrawer * drawer() {return &drawer_;}
+	void clear() {drawer_.clear();}
+	void resize(int w, int h) {console.resize(w, h);}
+	
+	EVENT_HANDLER0(void, waitForFinish);
+	EVENT_HANDLER0(void, start) {start(false);}
+	EVENT_HANDLER1(void, start, bool, wait) {PIThread::start(40); if (wait) waitForFinish();}
+	EVENT_HANDLER0(void, stop) {stop(false);}
+	EVENT_HANDLER1(void, stop, bool, clear);
+	
+	EVENT2(keyPressed, PIKbdListener::KeyEvent, key, void * , data)
+	EVENT2(tileEvent, PIScreenTile * , tile, PIScreenTypes::TileEvent, e)
+	
+//! \handlers
+//! \{
+	
+	//! \fn void waitForFinish()
+	//! \brief block until finished (exit key will be pressed)
+	
+	//! \fn void start(bool wait = false)
+	//! \brief Start console output and if "wait" block until finished (exit key will be pressed)
+	
+	//! \fn void stop(bool clear = false)
+	//! \brief Stop console output and if "clear" clear the screen
+	
+//! \}
+//! \events
+//! \{
+	
+	//! \fn void keyPressed(PIKbdListener::KeyEvent key, void * data)
+	//! \brief Raise on key "key" pressed, "data" is pointer to %PIConsole object
+	
+	//! \fn void tileEvent(PIScreenTile * tile, PIScreenTypes::TileEvent e)
+	//! \brief Raise on some event "e" from tile "tile"
+	
+//! \}
+	
+private:
+	class SystemConsole {
+	public:
+		SystemConsole();
+		~SystemConsole();
+		void begin();
+		void end();
+		void prepare();
+		void clear();
+		void print();
+		void resize(int w, int h);
+		void toUpperLeft();
+		void moveTo(int x = 0, int y = 0);
+		void hideCursor();
+		void showCursor();
+		void clearScreen();
+		void clearScreenLower();
+#ifdef WINDOWS
+		void getWinCurCoord();
+		void clearLine();
+		void newLine();
+		ushort attributes(const PIScreenTypes::Cell & c);
+#else
+		PIString formatString(const PIScreenTypes::Cell & c);
+#endif
+		PRIVATE_DECLARATION
+		int width, height, pwidth, pheight;
+		int mouse_x, mouse_y;
+		PIVector<PIVector<PIScreenTypes::Cell> > cells, pcells;
+	};
+
+	void begin();
+	void run();
+	void end();
+	void key_event(PIKbdListener::KeyEvent key);
+	EVENT_HANDLER1(void, mouse_event, PIKbdListener::MouseEvent, me);
+	EVENT_HANDLER1(void, wheel_event, PIKbdListener::WheelEvent, we);
+	static void key_eventS(PIKbdListener::KeyEvent key, void * t) {((PIScreen*)t)->key_event(key);}
+	PIVector<PIScreenTile*> tiles() {return root.children();}
+	PIVector<PIScreenTile*> prepareMouse(PIKbdListener::MouseEvent * e);
+	PIVector<PIScreenTile*> tilesUnderMouse(int x, int y);
+	bool nextFocus(PIScreenTile * rt, PIKbdListener::KeyEvent key = PIKbdListener::KeyEvent());
+	void tileEventInternal(PIScreenTile * t, PIScreenTypes::TileEvent e);
+	void tileRemovedInternal(PIScreenTile * t);
+	void tileSetFocusInternal(PIScreenTile * t);
+
+	bool mouse_;
+	SystemConsole console;
+	PIScreenDrawer drawer_;
+	PIKbdListener * listener;
+	PIKbdListener::KBFunc ret_func;
+	PIScreenTile root;
+	PIScreenTile * tile_focus, * tile_dialog;
+
+};
+
+
+#endif // PISCREEN_H
diff --git a/src_main/console/piscreenconsole.h b/lib/main/console/piscreenconsole.h
similarity index 96%
rename from src_main/console/piscreenconsole.h
rename to lib/main/console/piscreenconsole.h
index c5a45c02..4b745b1d 100644
--- a/src_main/console/piscreenconsole.h
+++ b/lib/main/console/piscreenconsole.h
@@ -1,77 +1,77 @@
-/*! \file piscreenconsole.h
- * \brief Tile for PIScreen with PIConsole API
- *
- * This file declares TileVars
-*/
-/*
-	PIP - Platform Independent Primitives
-	Tile for PIScreen with PIConsole API
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISCREENCONSOLE_H
-#define PISCREENCONSOLE_H
-
-#include "piscreentiles.h"
-
-/// NOTE: incomplete class
-/// TODO: write TileVars
-
-class PIP_EXPORT TileVars: public PIScreenTile {
-public:
-	TileVars(const PIString & n = PIString());
-protected:
-	struct Variable {
-		Variable() {nx = ny = type = offset = bitFrom = bitCount = size = 0; format = PIScreenTypes::CellFormat(); ptr = 0;}
-		bool isEmpty() const {return (ptr == 0);}
-		PIString name;
-		PIScreenTypes::CellFormat format;
-		int nx;
-		int ny;
-		int type;
-		int offset;
-		int bitFrom;
-		int bitCount;
-		int size;
-		const void * ptr;
-		/*void operator =(const Variable & src) {
-			name = src.name;
-			format = src.format;
-			nx = src.nx;
-			ny = src.ny;
-			type = src.type;
-			offset = src.offset;
-			bitFrom = src.bitFrom;
-			bitCount = src.bitCount;
-			size = src.size;
-			ptr = src.ptr;
-		}*/
-	};
-	PIVector<Variable> variables;
-	PIScreenTypes::Alignment alignment;
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-};
-
-
-
-class PIP_EXPORT PIScreenConsoleTile : public PIScreenTile
-{
-public:
-	PIScreenConsoleTile();
-};
-
-#endif // PISCREENCONSOLE_H
+/*! \file piscreenconsole.h
+ * \brief Tile for PIScreen with PIConsole API
+ *
+ * This file declares TileVars
+*/
+/*
+	PIP - Platform Independent Primitives
+	Tile for PIScreen with PIConsole API
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISCREENCONSOLE_H
+#define PISCREENCONSOLE_H
+
+#include "piscreentiles.h"
+
+/// NOTE: incomplete class
+/// TODO: write TileVars
+
+class PIP_EXPORT TileVars: public PIScreenTile {
+public:
+	TileVars(const PIString & n = PIString());
+protected:
+	struct Variable {
+		Variable() {nx = ny = type = offset = bitFrom = bitCount = size = 0; format = PIScreenTypes::CellFormat(); ptr = 0;}
+		bool isEmpty() const {return (ptr == 0);}
+		PIString name;
+		PIScreenTypes::CellFormat format;
+		int nx;
+		int ny;
+		int type;
+		int offset;
+		int bitFrom;
+		int bitCount;
+		int size;
+		const void * ptr;
+		/*void operator =(const Variable & src) {
+			name = src.name;
+			format = src.format;
+			nx = src.nx;
+			ny = src.ny;
+			type = src.type;
+			offset = src.offset;
+			bitFrom = src.bitFrom;
+			bitCount = src.bitCount;
+			size = src.size;
+			ptr = src.ptr;
+		}*/
+	};
+	PIVector<Variable> variables;
+	PIScreenTypes::Alignment alignment;
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+};
+
+
+
+class PIP_EXPORT PIScreenConsoleTile : public PIScreenTile
+{
+public:
+	PIScreenConsoleTile();
+};
+
+#endif // PISCREENCONSOLE_H
diff --git a/src_main/console/piscreendrawer.h b/lib/main/console/piscreendrawer.h
similarity index 97%
rename from src_main/console/piscreendrawer.h
rename to lib/main/console/piscreendrawer.h
index 08767b19..3efd48fd 100644
--- a/src_main/console/piscreendrawer.h
+++ b/lib/main/console/piscreendrawer.h
@@ -1,68 +1,68 @@
-/*! \file piscreendrawer.h
- * \brief Drawer for PIScreen
-*/
-/*
-	PIP - Platform Independent Primitives
-	Drawer for PIScreen
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISCREENDRAWER_H
-#define PISCREENDRAWER_H
-
-#include "piscreentypes.h"
-#include "pistring.h"
-
-class PIP_EXPORT PIScreenDrawer
-{
-	friend class PIScreen;
-	PIScreenDrawer(PIVector<PIVector<PIScreenTypes::Cell> > & c);
-public:
-	enum ArtChar {
-		LineVertical = 1,
-		LineHorizontal,
-		Cross,
-		CornerTopLeft,
-		CornerTopRight,
-		CornerBottomLeft,
-		CornerBottomRight,
-		Unchecked,
-		Checked
-	};
-	
-	void clear();
-	void clearRect(int x0, int y0, int x1, int y1) {fillRect(x0, y0, x1, y1, ' ');}
-	void drawPixel(int x, int y, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawLine(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawRect(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawFrame(int x0, int y0, int x1, int y1, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void drawText(int x, int y, const PIString & s, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Transparent, PIScreenTypes::CharFlags flags_char = 0);
-	void fillRect(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
-	void fillRect(int x0, int y0, int x1, int y1, PIVector<PIVector<PIScreenTypes::Cell> > & content);
-	
-	PIChar artChar(const ArtChar type) const {return arts_.value(type, PIChar(' '));}
-
-	static void clear(PIVector<PIVector<PIScreenTypes::Cell> > & cells);
-
-private:
-	PIVector<PIVector<PIScreenTypes::Cell> > & cells;
-	int width, height;
-	PIMap<ArtChar, PIChar> arts_;
-	
-};
-
-
-#endif // PISCREENDRAWER_H
+/*! \file piscreendrawer.h
+ * \brief Drawer for PIScreen
+*/
+/*
+	PIP - Platform Independent Primitives
+	Drawer for PIScreen
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISCREENDRAWER_H
+#define PISCREENDRAWER_H
+
+#include "piscreentypes.h"
+#include "pistring.h"
+
+class PIP_EXPORT PIScreenDrawer
+{
+	friend class PIScreen;
+	PIScreenDrawer(PIVector<PIVector<PIScreenTypes::Cell> > & c);
+public:
+	enum ArtChar {
+		LineVertical = 1,
+		LineHorizontal,
+		Cross,
+		CornerTopLeft,
+		CornerTopRight,
+		CornerBottomLeft,
+		CornerBottomRight,
+		Unchecked,
+		Checked
+	};
+	
+	void clear();
+	void clearRect(int x0, int y0, int x1, int y1) {fillRect(x0, y0, x1, y1, ' ');}
+	void drawPixel(int x, int y, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
+	void drawLine(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
+	void drawRect(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
+	void drawFrame(int x0, int y0, int x1, int y1, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
+	void drawText(int x, int y, const PIString & s, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Transparent, PIScreenTypes::CharFlags flags_char = 0);
+	void fillRect(int x0, int y0, int x1, int y1, const PIChar & c, PIScreenTypes::Color col_char = PIScreenTypes::Default, PIScreenTypes::Color col_back = PIScreenTypes::Default, PIScreenTypes::CharFlags flags_char = 0);
+	void fillRect(int x0, int y0, int x1, int y1, PIVector<PIVector<PIScreenTypes::Cell> > & content);
+	
+	PIChar artChar(const ArtChar type) const {return arts_.value(type, PIChar(' '));}
+
+	static void clear(PIVector<PIVector<PIScreenTypes::Cell> > & cells);
+
+private:
+	PIVector<PIVector<PIScreenTypes::Cell> > & cells;
+	int width, height;
+	PIMap<ArtChar, PIChar> arts_;
+	
+};
+
+
+#endif // PISCREENDRAWER_H
diff --git a/src_main/console/piscreentile.h b/lib/main/console/piscreentile.h
similarity index 96%
rename from src_main/console/piscreentile.h
rename to lib/main/console/piscreentile.h
index f8d7e6b1..e9ab7b30 100644
--- a/src_main/console/piscreentile.h
+++ b/lib/main/console/piscreentile.h
@@ -1,106 +1,106 @@
-/*! \file piscreentile.h
- * \brief Basic PIScreen tile
-*/
-/*
-	PIP - Platform Independent Primitives
-	Basic PIScreen tile
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISCREENTILE_H
-#define PISCREENTILE_H
-
-#include "piscreentypes.h"
-#include "pikbdlistener.h"
-
-class PIScreenDrawer;
-
-class PIP_EXPORT PIScreenTile: public PIObject {
-	friend class PIScreen;
-	PIOBJECT_SUBCLASS(PIScreenTile, PIObject)
-public:
-	PIScreenTile(const PIString & n = PIString(), PIScreenTypes::Direction d = PIScreenTypes::Vertical, PIScreenTypes::SizePolicy p = PIScreenTypes::Preferred);
-	virtual ~PIScreenTile();
-	
-	void addTile(PIScreenTile * t);
-	void takeTile(PIScreenTile * t);
-	void removeTile(PIScreenTile * t);
-	PIScreenTile * parentTile() const {return parent;}
-	PIVector<PIScreenTile * > children(bool only_visible = false);
-	PIScreenTile * childUnderMouse(int x, int y);
-	void show() {visible = true;}
-	void hide() {visible = false;}
-	void setFocus();
-	bool hasFocus() const {return has_focus;}
-	void setMargins(int m) {marginLeft = marginRight = marginTop = marginBottom = m;}
-	void setMargins(int l, int r, int t, int b) {marginLeft = l; marginRight = r; marginTop = t; marginBottom = b;}
-
-	int x() const {return x_;}
-	int y() const {return y_;}
-	int width() const {return width_;}
-	int height() const {return height_;}
-	
-	PIScreenTypes::Direction direction;
-	PIScreenTypes::SizePolicy size_policy;
-	PIScreenTypes::FocusFlags focus_flags;
-	PIScreenTypes::CellFormat back_format;
-	PIChar back_symbol;
-	int minimumWidth, minimumHeight;
-	int maximumWidth, maximumHeight;
-	int marginLeft, marginRight, marginTop, marginBottom;
-	int spacing;
-	bool visible;
-	
-protected:
-	
-	//! Returns desired tile size in "w" and "h"
-	virtual void sizeHint(int & w, int & h) const;
-	
-	//! Tile has been resized to "w"x"h"
-	virtual void resizeEvent(int w, int h) {}
-	
-	//! Draw tile with drawer "d" in world-space coordinates
-	virtual void drawEvent(PIScreenDrawer * d) {}
-	
-	//! Return "true" if you process key
-	virtual bool keyEvent(PIKbdListener::KeyEvent key) {return false;}
-
-	//! Return "true" if you process event
-	virtual bool mouseEvent(PIKbdListener::MouseEvent me) {return false;}
-
-	//! Return "true" if you process wheel
-	virtual bool wheelEvent(PIKbdListener::WheelEvent we) {return false;}
-	
-	void raiseEvent(PIScreenTypes::TileEvent e);
-	void setScreen(PIScreenTypes::PIScreenBase * s);
-	void deleteChildren();
-	void drawEventInternal(PIScreenDrawer * d);
-	void layout();
-	bool needLayout() {return size_policy != PIScreenTypes::Ignore;}
-	
-	PIVector<PIScreenTile * > tiles;
-	PIScreenTile * parent;
-	PIScreenTypes::PIScreenBase * screen;
-	int x_, y_, width_, height_;
-	bool has_focus;
-	
-private:
-	int pw, ph;
-	
-};
-
-
-#endif // PISCREENTILE_H
+/*! \file piscreentile.h
+ * \brief Basic PIScreen tile
+*/
+/*
+	PIP - Platform Independent Primitives
+	Basic PIScreen tile
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISCREENTILE_H
+#define PISCREENTILE_H
+
+#include "piscreentypes.h"
+#include "pikbdlistener.h"
+
+class PIScreenDrawer;
+
+class PIP_EXPORT PIScreenTile: public PIObject {
+	friend class PIScreen;
+	PIOBJECT_SUBCLASS(PIScreenTile, PIObject)
+public:
+	PIScreenTile(const PIString & n = PIString(), PIScreenTypes::Direction d = PIScreenTypes::Vertical, PIScreenTypes::SizePolicy p = PIScreenTypes::Preferred);
+	virtual ~PIScreenTile();
+	
+	void addTile(PIScreenTile * t);
+	void takeTile(PIScreenTile * t);
+	void removeTile(PIScreenTile * t);
+	PIScreenTile * parentTile() const {return parent;}
+	PIVector<PIScreenTile * > children(bool only_visible = false);
+	PIScreenTile * childUnderMouse(int x, int y);
+	void show() {visible = true;}
+	void hide() {visible = false;}
+	void setFocus();
+	bool hasFocus() const {return has_focus;}
+	void setMargins(int m) {marginLeft = marginRight = marginTop = marginBottom = m;}
+	void setMargins(int l, int r, int t, int b) {marginLeft = l; marginRight = r; marginTop = t; marginBottom = b;}
+
+	int x() const {return x_;}
+	int y() const {return y_;}
+	int width() const {return width_;}
+	int height() const {return height_;}
+	
+	PIScreenTypes::Direction direction;
+	PIScreenTypes::SizePolicy size_policy;
+	PIScreenTypes::FocusFlags focus_flags;
+	PIScreenTypes::CellFormat back_format;
+	PIChar back_symbol;
+	int minimumWidth, minimumHeight;
+	int maximumWidth, maximumHeight;
+	int marginLeft, marginRight, marginTop, marginBottom;
+	int spacing;
+	bool visible;
+	
+protected:
+	
+	//! Returns desired tile size in "w" and "h"
+	virtual void sizeHint(int & w, int & h) const;
+	
+	//! Tile has been resized to "w"x"h"
+	virtual void resizeEvent(int w, int h) {}
+	
+	//! Draw tile with drawer "d" in world-space coordinates
+	virtual void drawEvent(PIScreenDrawer * d) {}
+	
+	//! Return "true" if you process key
+	virtual bool keyEvent(PIKbdListener::KeyEvent key) {return false;}
+
+	//! Return "true" if you process event
+	virtual bool mouseEvent(PIKbdListener::MouseEvent me) {return false;}
+
+	//! Return "true" if you process wheel
+	virtual bool wheelEvent(PIKbdListener::WheelEvent we) {return false;}
+	
+	void raiseEvent(PIScreenTypes::TileEvent e);
+	void setScreen(PIScreenTypes::PIScreenBase * s);
+	void deleteChildren();
+	void drawEventInternal(PIScreenDrawer * d);
+	void layout();
+	bool needLayout() {return size_policy != PIScreenTypes::Ignore;}
+	
+	PIVector<PIScreenTile * > tiles;
+	PIScreenTile * parent;
+	PIScreenTypes::PIScreenBase * screen;
+	int x_, y_, width_, height_;
+	bool has_focus;
+	
+private:
+	int pw, ph;
+	
+};
+
+
+#endif // PISCREENTILE_H
diff --git a/src_main/console/piscreentiles.h b/lib/main/console/piscreentiles.h
similarity index 96%
rename from src_main/console/piscreentiles.h
rename to lib/main/console/piscreentiles.h
index 08f85d10..b6c41a25 100644
--- a/src_main/console/piscreentiles.h
+++ b/lib/main/console/piscreentiles.h
@@ -1,213 +1,213 @@
-/*! \file piscreentiles.h
- * \brief Various tiles for PIScreen
-*/
-/*
-	PIP - Platform Independent Primitives
-	Various tiles for PIScreen
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISCREENTILES_H
-#define PISCREENTILES_H
-
-#include "piscreentile.h"
-
-
-class PIP_EXPORT TileSimple: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileSimple, PIScreenTile)
-public:
-	typedef PIPair<PIString, PIScreenTypes::CellFormat> Row;
-	TileSimple(const PIString & n = PIString());
-	TileSimple(const Row & r);
-	virtual ~TileSimple() {}
-	PIVector<Row> content;
-	PIScreenTypes::Alignment alignment;
-protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-};
-
-
-class TileList;
-
-class PIP_EXPORT TileScrollBar: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileScrollBar, PIScreenTile)
-	friend class TileList;
-public:
-	TileScrollBar(const PIString & n = PIString());
-	virtual ~TileScrollBar() {}
-	void setMinimum(int v);
-	void setMaximum(int v);
-	void setValue(int v);
-	int minimum() const {return minimum_;}
-	int maximum() const {return maximum_;}
-	int value() const {return value_;}
-	int thickness;
-protected:
-	void _check();
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
-	int minimum_, maximum_, value_;
-	PIChar line_char;
-};
-
-
-class PIP_EXPORT TileList: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileList, PIScreenTile)
-public:
-	TileList(const PIString & n = PIString());
-	virtual ~TileList() {}
-	enum SelectionMode {
-		NoSelection,
-		SingleSelection,
-		MultiSelection
-	};
-	enum EventType {
-		SelectionChanged,
-		RowPressed
-	};
-	typedef PIPair<PIString, PIScreenTypes::CellFormat> Row;
-	PIDeque<Row> content;
-	PIScreenTypes::Alignment alignment;
-	SelectionMode selection_mode;
-	PISet<int> selected;
-	int lhei, cur, offset;
-protected:
-	void sizeHint(int & w, int & h) const;
-	void resizeEvent(int w, int h);
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
-	bool wheelEvent(PIKbdListener::WheelEvent we);
-	TileScrollBar * scroll;
-	bool mouse_sel;
-};
-
-
-class PIP_EXPORT TileButton: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileButton, PIScreenTile)
-public:
-	TileButton(const PIString & n = PIString());
-	virtual ~TileButton() {}
-	enum EventType {
-		ButtonClicked
-	};
-	PIScreenTypes::CellFormat format;
-	PIString text;
-protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
-};
-
-
-
-
-class PIP_EXPORT TileButtons: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileButtons, PIScreenTile)
-public:
-	TileButtons(const PIString & n = PIString());
-	virtual ~TileButtons() {}
-	enum EventType {
-		ButtonSelected
-	};
-	typedef PIPair<PIString, PIScreenTypes::CellFormat> Button;
-	PIScreenTypes::Alignment alignment;
-	PIVector<Button> content;
-	int cur;
-protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
-	struct Rect {
-		Rect(int _x0 = 0, int _y0 = 0, int _x1 = 0, int _y1 = 0): x0(_x0),y0(_y0),x1(_x1),y1(_y1) {}
-		int x0,y0,x1,y1;
-	};
-	PIVector<Rect> btn_rects;
-};
-
-
-class PIP_EXPORT TileCheck: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileCheck, PIScreenTile)
-public:
-	TileCheck(const PIString & n = PIString());
-	virtual ~TileCheck() {}
-	enum EventType {
-		Toggled
-	};
-	PIScreenTypes::CellFormat format;
-	PIString text;
-	bool toggled;
-protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	bool mouseEvent(PIKbdListener::MouseEvent me);
-};
-
-
-class PIP_EXPORT TileProgress: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileProgress, PIScreenTile)
-public:
-	TileProgress(const PIString & n = PIString());
-	virtual ~TileProgress() {}
-	PIScreenTypes::CellFormat format;
-	PIString prefix;
-	PIString suffix;
-	double maximum;
-	double value;
-protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-};
-
-
-class PIP_EXPORT TilePICout: public TileList {
-	PIOBJECT_SUBCLASS(TilePICout, PIScreenTile)
-public:
-	TilePICout(const PIString & n = PIString());
-	virtual ~TilePICout() {}
-	PIScreenTypes::CellFormat format;
-	int max_lines;
-protected:
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-};
-
-
-class PIP_EXPORT TileInput: public PIScreenTile {
-	PIOBJECT_SUBCLASS(TileInput, PIScreenTile)
-public:
-	TileInput(const PIString & n = PIString());
-	virtual ~TileInput() {}
-	PIScreenTypes::CellFormat format;
-	PIString text;
-	int max_length;
-protected:
-	void sizeHint(int & w, int & h) const;
-	void drawEvent(PIScreenDrawer * d);
-	bool keyEvent(PIKbdListener::KeyEvent key);
-	void reserCursor();
-	int cur, offset;
-	bool inv;
-	PITimeMeasurer tm_blink;
-};
-
-
-#endif // PISCREENTILES_H
+/*! \file piscreentiles.h
+ * \brief Various tiles for PIScreen
+*/
+/*
+	PIP - Platform Independent Primitives
+	Various tiles for PIScreen
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISCREENTILES_H
+#define PISCREENTILES_H
+
+#include "piscreentile.h"
+
+
+class PIP_EXPORT TileSimple: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileSimple, PIScreenTile)
+public:
+	typedef PIPair<PIString, PIScreenTypes::CellFormat> Row;
+	TileSimple(const PIString & n = PIString());
+	TileSimple(const Row & r);
+	virtual ~TileSimple() {}
+	PIVector<Row> content;
+	PIScreenTypes::Alignment alignment;
+protected:
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+};
+
+
+class TileList;
+
+class PIP_EXPORT TileScrollBar: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileScrollBar, PIScreenTile)
+	friend class TileList;
+public:
+	TileScrollBar(const PIString & n = PIString());
+	virtual ~TileScrollBar() {}
+	void setMinimum(int v);
+	void setMaximum(int v);
+	void setValue(int v);
+	int minimum() const {return minimum_;}
+	int maximum() const {return maximum_;}
+	int value() const {return value_;}
+	int thickness;
+protected:
+	void _check();
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+	bool mouseEvent(PIKbdListener::MouseEvent me);
+	int minimum_, maximum_, value_;
+	PIChar line_char;
+};
+
+
+class PIP_EXPORT TileList: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileList, PIScreenTile)
+public:
+	TileList(const PIString & n = PIString());
+	virtual ~TileList() {}
+	enum SelectionMode {
+		NoSelection,
+		SingleSelection,
+		MultiSelection
+	};
+	enum EventType {
+		SelectionChanged,
+		RowPressed
+	};
+	typedef PIPair<PIString, PIScreenTypes::CellFormat> Row;
+	PIDeque<Row> content;
+	PIScreenTypes::Alignment alignment;
+	SelectionMode selection_mode;
+	PISet<int> selected;
+	int lhei, cur, offset;
+protected:
+	void sizeHint(int & w, int & h) const;
+	void resizeEvent(int w, int h);
+	void drawEvent(PIScreenDrawer * d);
+	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool mouseEvent(PIKbdListener::MouseEvent me);
+	bool wheelEvent(PIKbdListener::WheelEvent we);
+	TileScrollBar * scroll;
+	bool mouse_sel;
+};
+
+
+class PIP_EXPORT TileButton: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileButton, PIScreenTile)
+public:
+	TileButton(const PIString & n = PIString());
+	virtual ~TileButton() {}
+	enum EventType {
+		ButtonClicked
+	};
+	PIScreenTypes::CellFormat format;
+	PIString text;
+protected:
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool mouseEvent(PIKbdListener::MouseEvent me);
+};
+
+
+
+
+class PIP_EXPORT TileButtons: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileButtons, PIScreenTile)
+public:
+	TileButtons(const PIString & n = PIString());
+	virtual ~TileButtons() {}
+	enum EventType {
+		ButtonSelected
+	};
+	typedef PIPair<PIString, PIScreenTypes::CellFormat> Button;
+	PIScreenTypes::Alignment alignment;
+	PIVector<Button> content;
+	int cur;
+protected:
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool mouseEvent(PIKbdListener::MouseEvent me);
+	struct Rect {
+		Rect(int _x0 = 0, int _y0 = 0, int _x1 = 0, int _y1 = 0): x0(_x0),y0(_y0),x1(_x1),y1(_y1) {}
+		int x0,y0,x1,y1;
+	};
+	PIVector<Rect> btn_rects;
+};
+
+
+class PIP_EXPORT TileCheck: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileCheck, PIScreenTile)
+public:
+	TileCheck(const PIString & n = PIString());
+	virtual ~TileCheck() {}
+	enum EventType {
+		Toggled
+	};
+	PIScreenTypes::CellFormat format;
+	PIString text;
+	bool toggled;
+protected:
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+	bool keyEvent(PIKbdListener::KeyEvent key);
+	bool mouseEvent(PIKbdListener::MouseEvent me);
+};
+
+
+class PIP_EXPORT TileProgress: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileProgress, PIScreenTile)
+public:
+	TileProgress(const PIString & n = PIString());
+	virtual ~TileProgress() {}
+	PIScreenTypes::CellFormat format;
+	PIString prefix;
+	PIString suffix;
+	double maximum;
+	double value;
+protected:
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+};
+
+
+class PIP_EXPORT TilePICout: public TileList {
+	PIOBJECT_SUBCLASS(TilePICout, PIScreenTile)
+public:
+	TilePICout(const PIString & n = PIString());
+	virtual ~TilePICout() {}
+	PIScreenTypes::CellFormat format;
+	int max_lines;
+protected:
+	void drawEvent(PIScreenDrawer * d);
+	bool keyEvent(PIKbdListener::KeyEvent key);
+};
+
+
+class PIP_EXPORT TileInput: public PIScreenTile {
+	PIOBJECT_SUBCLASS(TileInput, PIScreenTile)
+public:
+	TileInput(const PIString & n = PIString());
+	virtual ~TileInput() {}
+	PIScreenTypes::CellFormat format;
+	PIString text;
+	int max_length;
+protected:
+	void sizeHint(int & w, int & h) const;
+	void drawEvent(PIScreenDrawer * d);
+	bool keyEvent(PIKbdListener::KeyEvent key);
+	void reserCursor();
+	int cur, offset;
+	bool inv;
+	PITimeMeasurer tm_blink;
+};
+
+
+#endif // PISCREENTILES_H
diff --git a/src_main/console/piscreentypes.h b/lib/main/console/piscreentypes.h
similarity index 96%
rename from src_main/console/piscreentypes.h
rename to lib/main/console/piscreentypes.h
index 67dd9bd7..34c3349b 100644
--- a/src_main/console/piscreentypes.h
+++ b/lib/main/console/piscreentypes.h
@@ -1,146 +1,146 @@
-/*! \file piscreentypes.h
- * \brief Types for PIScreen
-*/
-/*
-	PIP - Platform Independent Primitives
-	Types for PIScreen
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISCREENTYPES_H
-#define PISCREENTYPES_H
-
-#include "pivariant.h"
-
-class PIScreenTile;
-
-namespace PIScreenTypes {
-	
-	//! Color for chars or background
-	enum PIP_EXPORT Color {
-		Default /** Default */,
-		Black /** Black */,
-		Red /** Red */,
-		Green /** Green */,
-		Blue /** Blue */,
-		Cyan /** Cyan */,
-		Magenta /** Magenta */,
-		Yellow /** Yellow */,
-		White /** White */,
-		Transparent /** Save previous color */
-	};
-	
-	//! Flags for chars
-	enum PIP_EXPORT CharFlag {
-		Bold /** Bold or bright */ = 0x1,
-		Blink /** Blink text */ = 0x2,
-		Underline /** Underline text */ = 0x4,
-		Inverse = 0x08
-	};
-	
-	//! Alignment
-	enum PIP_EXPORT Alignment {
-		Left /** Left */ ,
-		Center /** Center */ ,
-		Right /** Right */
-	};
-	
-	//! Size policy
-	enum PIP_EXPORT SizePolicy {
-		Fixed /** Fixed size */ ,
-		Preferred /** Preferred size */ ,
-		Expanding /** Maximum available size */ ,
-		Ignore /** Ignore layout logic */
-	};
-	
-	//! Direction
-	enum PIP_EXPORT Direction {
-		Horizontal /** Horizontal */ ,
-		Vertical /** Vertical */
-	};
-
-	//! Focus flags
-	enum PIP_EXPORT FocusFlag {
-		CanHasFocus /** Tile can has focus */ = 0x1,
-		NextByTab /** Focus passed to next tile by tab key */ = 0x2,
-		NextByArrowsHorizontal /** Focus passed to next tile by arrow keys left or right */ = 0x4,
-		NextByArrowsVertical /** Focus passed to next tile by arrow keys up or down */ = 0x8,
-		NextByArrowsAll /** Focus passed to next tile by any arrow key */ = NextByArrowsHorizontal | NextByArrowsVertical,
-		FocusOnMouse /** Tile focused on mouse press */ = 0x10,
-		FocusOnWheel /** Tile focused on wheel */ = 0x20,
-		FocusOnMouseOrWheel /** Tile focused on mouse press or wheel */ = FocusOnMouse | FocusOnWheel
-	};
-	
-	typedef PIFlags<CharFlag> CharFlags;
-	typedef PIFlags<FocusFlag> FocusFlags;
-	
-	union PIP_EXPORT CellFormat {
-		CellFormat(ushort f = 0) {raw_format = f;}
-		CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) {
-			color_char = col_char;
-			color_back = col_back;
-			flags = flags_;
-		}
-		ushort raw_format;
-		struct {
-			ushort color_char : 4;
-			ushort color_back : 4;
-			ushort flags : 8;
-		};
-		bool operator ==(const CellFormat & c) const {return raw_format == c.raw_format;}
-		bool operator !=(const CellFormat & c) const {return raw_format != c.raw_format;}
-	};
-	
-	struct PIP_EXPORT Cell {
-		Cell(PIChar c = PIChar(' '), CellFormat f = CellFormat()) {symbol = c; format = f;}
-		CellFormat format;
-		PIChar symbol;
-		bool operator ==(const Cell & c) const {return format == c.format && symbol == c.symbol;}
-		bool operator !=(const Cell & c) const {return format != c.format || symbol != c.symbol;}
-		Cell & operator =(const Cell & c) {
-			symbol = c.symbol;
-			if (c.format.color_back == Transparent) {
-				format.color_char = c.format.color_char;
-				format.flags = c.format.flags;
-			} else format = c.format;
-			return *this;
-		}
-	};
-
-	struct PIP_EXPORT TileEvent {
-		TileEvent(int t = -1, const PIVariant & d = PIVariant()): type(t), data(d) {}
-		int type;
-		PIVariant data;
-	};
-	
-	class PIScreenBase {
-	public:
-		PIScreenBase() {}
-		virtual ~PIScreenBase() {}
-		virtual void tileEventInternal(PIScreenTile * , TileEvent) {}
-		virtual void tileRemovedInternal(PIScreenTile * ) {}
-		virtual void tileSetFocusInternal(PIScreenTile * ) {}
-	};
-
-}
-
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.format.raw_format << v.symbol; return s;}
-
-inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
-
-
-#endif // PISCREENTYPES_H
+/*! \file piscreentypes.h
+ * \brief Types for PIScreen
+*/
+/*
+	PIP - Platform Independent Primitives
+	Types for PIScreen
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISCREENTYPES_H
+#define PISCREENTYPES_H
+
+#include "pivariant.h"
+
+class PIScreenTile;
+
+namespace PIScreenTypes {
+	
+	//! Color for chars or background
+	enum PIP_EXPORT Color {
+		Default /** Default */,
+		Black /** Black */,
+		Red /** Red */,
+		Green /** Green */,
+		Blue /** Blue */,
+		Cyan /** Cyan */,
+		Magenta /** Magenta */,
+		Yellow /** Yellow */,
+		White /** White */,
+		Transparent /** Save previous color */
+	};
+	
+	//! Flags for chars
+	enum PIP_EXPORT CharFlag {
+		Bold /** Bold or bright */ = 0x1,
+		Blink /** Blink text */ = 0x2,
+		Underline /** Underline text */ = 0x4,
+		Inverse = 0x08
+	};
+	
+	//! Alignment
+	enum PIP_EXPORT Alignment {
+		Left /** Left */ ,
+		Center /** Center */ ,
+		Right /** Right */
+	};
+	
+	//! Size policy
+	enum PIP_EXPORT SizePolicy {
+		Fixed /** Fixed size */ ,
+		Preferred /** Preferred size */ ,
+		Expanding /** Maximum available size */ ,
+		Ignore /** Ignore layout logic */
+	};
+	
+	//! Direction
+	enum PIP_EXPORT Direction {
+		Horizontal /** Horizontal */ ,
+		Vertical /** Vertical */
+	};
+
+	//! Focus flags
+	enum PIP_EXPORT FocusFlag {
+		CanHasFocus /** Tile can has focus */ = 0x1,
+		NextByTab /** Focus passed to next tile by tab key */ = 0x2,
+		NextByArrowsHorizontal /** Focus passed to next tile by arrow keys left or right */ = 0x4,
+		NextByArrowsVertical /** Focus passed to next tile by arrow keys up or down */ = 0x8,
+		NextByArrowsAll /** Focus passed to next tile by any arrow key */ = NextByArrowsHorizontal | NextByArrowsVertical,
+		FocusOnMouse /** Tile focused on mouse press */ = 0x10,
+		FocusOnWheel /** Tile focused on wheel */ = 0x20,
+		FocusOnMouseOrWheel /** Tile focused on mouse press or wheel */ = FocusOnMouse | FocusOnWheel
+	};
+	
+	typedef PIFlags<CharFlag> CharFlags;
+	typedef PIFlags<FocusFlag> FocusFlags;
+	
+	union PIP_EXPORT CellFormat {
+		CellFormat(ushort f = 0) {raw_format = f;}
+		CellFormat(Color col_char, Color col_back = Default, CharFlags flags_ = 0) {
+			color_char = col_char;
+			color_back = col_back;
+			flags = flags_;
+		}
+		ushort raw_format;
+		struct {
+			ushort color_char : 4;
+			ushort color_back : 4;
+			ushort flags : 8;
+		};
+		bool operator ==(const CellFormat & c) const {return raw_format == c.raw_format;}
+		bool operator !=(const CellFormat & c) const {return raw_format != c.raw_format;}
+	};
+	
+	struct PIP_EXPORT Cell {
+		Cell(PIChar c = PIChar(' '), CellFormat f = CellFormat()) {symbol = c; format = f;}
+		CellFormat format;
+		PIChar symbol;
+		bool operator ==(const Cell & c) const {return format == c.format && symbol == c.symbol;}
+		bool operator !=(const Cell & c) const {return format != c.format || symbol != c.symbol;}
+		Cell & operator =(const Cell & c) {
+			symbol = c.symbol;
+			if (c.format.color_back == Transparent) {
+				format.color_char = c.format.color_char;
+				format.flags = c.format.flags;
+			} else format = c.format;
+			return *this;
+		}
+	};
+
+	struct PIP_EXPORT TileEvent {
+		TileEvent(int t = -1, const PIVariant & d = PIVariant()): type(t), data(d) {}
+		int type;
+		PIVariant data;
+	};
+	
+	class PIScreenBase {
+	public:
+		PIScreenBase() {}
+		virtual ~PIScreenBase() {}
+		virtual void tileEventInternal(PIScreenTile * , TileEvent) {}
+		virtual void tileRemovedInternal(PIScreenTile * ) {}
+		virtual void tileSetFocusInternal(PIScreenTile * ) {}
+	};
+
+}
+
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIScreenTypes::Cell & v) {s << v.format.raw_format << v.symbol; return s;}
+
+inline PIByteArray & operator >>(PIByteArray & s, PIScreenTypes::Cell & v) {s >> v.format.raw_format >> v.symbol; return s;}
+
+
+#endif // PISCREENTYPES_H
diff --git a/src_main/console/piterminal.h b/lib/main/console/piterminal.h
similarity index 96%
rename from src_main/console/piterminal.h
rename to lib/main/console/piterminal.h
index 9c08244f..040892dd 100644
--- a/src_main/console/piterminal.h
+++ b/lib/main/console/piterminal.h
@@ -1,76 +1,76 @@
-/*! \file piterminal.h
- * \brief Virtual terminal
-*/
-/*
-	PIP - Platform Independent Primitives
-	Virtual terminal
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PITERMINAL_H
-#define PITERMINAL_H
-
-#include "pikbdlistener.h"
-#include "piscreentypes.h"
-
-
-class PIP_EXPORT PITerminal: public PIThread
-{
-	PIOBJECT_SUBCLASS(PITerminal, PIThread)
-public:
-	
-	//! Constructs %PITerminal
-	PITerminal();
-	
-	~PITerminal();
-	
-	int columns() const {return size_x;}
-	int rows() const {return size_y;}
-	bool resize(int cols, int rows);
-
-	void write(const PIByteArray & d);
-	void write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers m);
-	void write(PIKbdListener::KeyEvent ke);
-	PIVector<PIVector<PIScreenTypes::Cell> > content();
-	static bool isSpecialKey(int k);
-
-	bool initialize();
-	void destroy();
-private:
-	void initPrivate();
-	void readConsole();
-	void getCursor(int & x, int & y);
-	uchar invertColor(uchar c);
-	void run();
-#ifndef WINDOWS
-	void parseInput(const PIString & s);
-	bool isCompleteEscSeq(const PIString & es);
-	void applyEscSeq(PIString es);
-	void moveCursor(int dx, int dy);
-	int termType(const PIString & t);
-#endif
-
-	PRIVATE_DECLARATION
-	int dsize_x, dsize_y;
-	int size_x, size_y, cursor_x, cursor_y;
-	bool cursor_blink, cursor_visible;
-	PITimeMeasurer cursor_tm;
-	PIVector<PIVector<PIScreenTypes::Cell> > cells;
-
-};
-
-
-#endif // PITERMINAL_H
+/*! \file piterminal.h
+ * \brief Virtual terminal
+*/
+/*
+	PIP - Platform Independent Primitives
+	Virtual terminal
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PITERMINAL_H
+#define PITERMINAL_H
+
+#include "pikbdlistener.h"
+#include "piscreentypes.h"
+
+
+class PIP_EXPORT PITerminal: public PIThread
+{
+	PIOBJECT_SUBCLASS(PITerminal, PIThread)
+public:
+	
+	//! Constructs %PITerminal
+	PITerminal();
+	
+	~PITerminal();
+	
+	int columns() const {return size_x;}
+	int rows() const {return size_y;}
+	bool resize(int cols, int rows);
+
+	void write(const PIByteArray & d);
+	void write(PIKbdListener::SpecialKey k, PIKbdListener::KeyModifiers m);
+	void write(PIKbdListener::KeyEvent ke);
+	PIVector<PIVector<PIScreenTypes::Cell> > content();
+	static bool isSpecialKey(int k);
+
+	bool initialize();
+	void destroy();
+private:
+	void initPrivate();
+	void readConsole();
+	void getCursor(int & x, int & y);
+	uchar invertColor(uchar c);
+	void run();
+#ifndef WINDOWS
+	void parseInput(const PIString & s);
+	bool isCompleteEscSeq(const PIString & es);
+	void applyEscSeq(PIString es);
+	void moveCursor(int dx, int dy);
+	int termType(const PIString & t);
+#endif
+
+	PRIVATE_DECLARATION
+	int dsize_x, dsize_y;
+	int size_x, size_y, cursor_x, cursor_y;
+	bool cursor_blink, cursor_visible;
+	PITimeMeasurer cursor_tm;
+	PIVector<PIVector<PIScreenTypes::Cell> > cells;
+
+};
+
+
+#endif // PITERMINAL_H
diff --git a/src_main/containers/picontainers.cpp b/lib/main/containers/picontainers.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/containers/picontainers.cpp
rename to lib/main/containers/picontainers.cpp
diff --git a/src_main/containers/picontainers.h b/lib/main/containers/picontainers.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/containers/picontainers.h
rename to lib/main/containers/picontainers.h
diff --git a/src_main/containers/picontainersmodule.h b/lib/main/containers/picontainersmodule.h
similarity index 100%
rename from src_main/containers/picontainersmodule.h
rename to lib/main/containers/picontainersmodule.h
diff --git a/src_main/containers/pideque.h b/lib/main/containers/pideque.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/containers/pideque.h
rename to lib/main/containers/pideque.h
diff --git a/src_main/containers/pimap.h b/lib/main/containers/pimap.h
similarity index 100%
rename from src_main/containers/pimap.h
rename to lib/main/containers/pimap.h
diff --git a/src_main/containers/pipair.h b/lib/main/containers/pipair.h
similarity index 97%
rename from src_main/containers/pipair.h
rename to lib/main/containers/pipair.h
index d8fd8a32..670b240a 100644
--- a/src_main/containers/pipair.h
+++ b/lib/main/containers/pipair.h
@@ -1,55 +1,55 @@
-/*! \file pipair.h
- * \brief pair
- *
- * This file declare PIPair
-*/
-/*
-	PIP - Platform Independent Primitives
-	pair
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIPAIR_H
-#define PIPAIR_H
-
-#include "pibase.h"
-
-class PICout;
-
-template<typename Type0, typename Type1>
-class PIP_EXPORT PIPair {
-public:
-	PIPair() {first = Type0(); second = Type1();}
-	PIPair(const Type0 & value0, const Type1 & value1) {first = value0; second = value1;}
-	Type0 first;
-	Type1 second;
-};
-template<typename Type0, typename Type1>
-inline bool operator <(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return value0.first < value1.first;}
-template<typename Type0, typename Type1>
-inline bool operator ==(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return (value0.first == value1.first) && (value0.second == value1.second);}
-template<typename Type0, typename Type1>
-inline bool operator !=(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return (value0.first != value1.first) || (value0.second != value1.second);}
-
-#ifdef PIP_STD_IOSTREAM
-template<typename Type0, typename Type1>
-inline std::ostream & operator <<(std::ostream & s, const PIPair<Type0, Type1> & v) {s << "(" << v.first << ", " << v.second << ")"; return s;}
-#endif
-
-template<typename Type0, typename Type1>
-inline PICout operator <<(PICout s, const PIPair<Type0, Type1> & v) {s.space(); s.setControl(0, true); s << "(" << v.first << ", " << v.second << ")"; s.restoreControl(); return s;}
-
-#endif // PIPAIR_H
+/*! \file pipair.h
+ * \brief pair
+ *
+ * This file declare PIPair
+*/
+/*
+	PIP - Platform Independent Primitives
+	pair
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIPAIR_H
+#define PIPAIR_H
+
+#include "pibase.h"
+
+class PICout;
+
+template<typename Type0, typename Type1>
+class PIP_EXPORT PIPair {
+public:
+	PIPair() {first = Type0(); second = Type1();}
+	PIPair(const Type0 & value0, const Type1 & value1) {first = value0; second = value1;}
+	Type0 first;
+	Type1 second;
+};
+template<typename Type0, typename Type1>
+inline bool operator <(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return value0.first < value1.first;}
+template<typename Type0, typename Type1>
+inline bool operator ==(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return (value0.first == value1.first) && (value0.second == value1.second);}
+template<typename Type0, typename Type1>
+inline bool operator !=(const PIPair<Type0, Type1> & value0, const PIPair<Type0, Type1> & value1) {return (value0.first != value1.first) || (value0.second != value1.second);}
+
+#ifdef PIP_STD_IOSTREAM
+template<typename Type0, typename Type1>
+inline std::ostream & operator <<(std::ostream & s, const PIPair<Type0, Type1> & v) {s << "(" << v.first << ", " << v.second << ")"; return s;}
+#endif
+
+template<typename Type0, typename Type1>
+inline PICout operator <<(PICout s, const PIPair<Type0, Type1> & v) {s.space(); s.setControl(0, true); s << "(" << v.first << ", " << v.second << ")"; s.restoreControl(); return s;}
+
+#endif // PIPAIR_H
diff --git a/src_main/containers/piqueue.h b/lib/main/containers/piqueue.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/containers/piqueue.h
rename to lib/main/containers/piqueue.h
diff --git a/src_main/containers/piset.h b/lib/main/containers/piset.h
similarity index 100%
rename from src_main/containers/piset.h
rename to lib/main/containers/piset.h
diff --git a/src_main/containers/pistack.h b/lib/main/containers/pistack.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/containers/pistack.h
rename to lib/main/containers/pistack.h
diff --git a/src_main/containers/pivector.h b/lib/main/containers/pivector.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/containers/pivector.h
rename to lib/main/containers/pivector.h
diff --git a/src_main/containers/pivector2d.h b/lib/main/containers/pivector2d.h
similarity index 97%
rename from src_main/containers/pivector2d.h
rename to lib/main/containers/pivector2d.h
index fc8fd467..744316af 100644
--- a/src_main/containers/pivector2d.h
+++ b/lib/main/containers/pivector2d.h
@@ -1,307 +1,307 @@
-/*! \file pivecto2d.h
- * \brief 2D wrapper around PIVector
- *
- * This file declares PIVector
-*/
-/*
-	PIP - Platform Independent Primitives
-	2D wrapper around PIVector
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIVECTOR2D_H
-#define PIVECTOR2D_H
-
-#include "pivector.h"
-
-/*! \brief 2D array,
- * \details This class used to store 2D array of any type elements as plain vector.
- * You can read/write any element via operators [][], first dimension - row, second - column.
- * The first dimension is Row, and you can operate with Row as PIVector<T>: modify any element, assign to another Row and etc.
- * You can't add values to array, but you can modify any elements or create another PIVector2D.
- * PIVector2D has constructors from PIVector<T> and PIVector<PIVector<T> >
- */
-
-template <typename T>
-class PIVector2D {
-public:
-	inline PIVector2D() {rows_ = cols_ = 0;}
-	inline PIVector2D(size_t rows, size_t cols, const T & f = T()) {
-		rows_ = rows;
-		cols_ = cols;
-		mat.resize(rows*cols, f);
-	}
-	inline PIVector2D(size_t rows, size_t cols, const PIVector<T> & v) {
-		mat = v;
-		rows_ = rows;
-		cols_ = cols;
-		mat.resize(rows*cols);
-	}
-	inline PIVector2D(const PIVector<PIVector<T> > & v) {
-		rows_ = v.size();
-		if (rows_) {
-			cols_ = v[0].size();
-			for (size_t i = 0; i < rows_; i++) {
-				mat.append(v[i]);
-			}
-			mat.resize(rows_*cols_);
-		}
-		if (mat.isEmpty()) rows_ = cols_ = 0;
-	}
-
-	inline size_t rows() const {return rows_;}
-	inline size_t cols() const {return cols_;}
-	inline size_t size() const {return mat.size();}
-	inline ssize_t size_s() const {return mat.size_s();}
-	inline size_t length() const {return mat.length();}
-	inline size_t capacity() const {return mat.capacity();}
-	inline bool isEmpty() const {return mat.isEmpty();}
-
-	class Row {
-		friend class PIVector2D<T>;
-	private:
-		inline Row(PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {st_ = p->cols_ * row; sz_ = p->cols_;}
-		PIVector<T> * p_;
-		size_t st_, sz_;
-	public:
-		inline size_t size() const {return sz_;}
-		inline T & operator [](size_t index) {return (*p_)[st_ + index];}
-		inline const T & operator [](size_t index) const {return (*p_)[st_ + index];}
-		inline T * data(size_t index = 0) {return p_->data(st_ + index);}
-		inline const T * data(size_t index = 0) const {return p_->data(st_ + index);}
-		inline Row & operator =(const Row & other) {
-			if (p_ == other.p_ && st_ == other.st_) return *this;
-			size_t sz = piMin<size_t>(sz_, other.sz_);
-			p_->_copyRaw(p_->data(st_), other.data(), sz);
-			return *this;
-		}
-		inline Row & operator =(const PIVector<T> & other) {
-			size_t sz = piMin<size_t>(sz, other.size());
-			p_->_copyRaw(p_->data(st_), other.data(), sz);
-			return *this;
-		}
-		inline PIVector<T> toVector() const {return PIVector<T>(p_->data(st_), sz_);}
-	};
-
-	class Col {
-		friend class PIVector2D<T>;
-	private:
-		inline Col(PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {step_ = p->cols_; row_ = row; sz_ = p->rows_;}
-		PIVector<T> * p_;
-		size_t step_, row_, sz_;
-	public:
-		inline size_t size() const {return sz_;}
-		inline T & operator [](size_t index) {return (*p_)[index * step_ + row_];}
-		inline const T & operator [](size_t index) const {return (*p_)[index * step_ + row_];}
-		inline T * data(size_t index = 0) {return p_->data(index * step_ + row_);}
-		inline const T * data(size_t index = 0) const {return p_->data(index * step_ + row_);}
-		inline Col & operator =(const Col & other) {
-			if (p_ == other.p_ && row_ == other.row_) return *this;
-			size_t sz = piMin<size_t>(sz_, other.sz_);
-			for (int i=0; i<sz; ++i) (*p_)[i * step_ + row_] = other[i];
-			return *this;
-		}
-		inline Row & operator =(const PIVector<T> & other) {
-			size_t sz = piMin<size_t>(sz_, other.size());
-			for (int i=0; i<sz; ++i) (*p_)[i * step_ + row_] = other[i];
-			return *this;
-		}
-		inline PIVector<T> toVector() const {
-			PIVector<T> ret;
-			ret.reserve(sz_);
-			for (size_t i=0; i<sz_; i++) ret << (*p_)[i * step_ + row_];
-			return ret;
-		}
-	};
-
-	class RowConst {
-		friend class PIVector2D<T>;
-	private:
-		inline RowConst(const PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {st_ = p->cols_ * row; sz_ = p->cols_;}
-		const PIVector<T> * p_;
-		size_t st_, sz_;
-	public:
-		inline size_t size() const {return sz_;}
-		inline const T & operator [](size_t index) const {return (*p_)[st_ + index];}
-		inline const T * data(size_t index = 0) const {return p_->data(st_ + index);}
-		inline PIVector<T> toVector() const {return PIVector<T>(p_->data(st_), sz_);}
-	};
-
-	class ColConst {
-		friend class PIVector2D<T>;
-	private:
-		inline ColConst(const PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {step_ = p->cols_; row_ = row; sz_ = p->rows_;}
-		const PIVector<T> * p_;
-		size_t step_, row_, sz_;
-	public:
-		inline size_t size() const {return p_->rows_;}
-		inline const T & operator [](size_t index) const {return (*p_)[index * step_ + row_];}
-		inline const T * data(size_t index = 0) const {return p_->data(index * step_ + row_);}
-		inline PIVector<T> toVector() const {
-			PIVector<T> ret;
-			ret.reserve(sz_);
-			for (int i=0; i<size(); i++) ret << (*p_)[i * step_ + row_];
-			return ret;
-		}
-	};
-
-	inline T & element(size_t row, size_t col) {return mat[row * cols_ + col];}
-	inline const T & element(size_t row, size_t col) const {return mat[row * cols_ + col];}
-	inline Row operator[](size_t index) {return Row(this, index);}
-	inline RowConst operator[](size_t index) const {return RowConst(this, index);}
-	inline T * data(size_t index = 0) {return mat.data(index);}
-	inline const T * data(size_t index = 0) const {return mat.data(index);}
-
-	inline Row row(size_t index) {return Row(this, index);}
-	inline RowConst row(size_t index) const {return RowConst(this, index);}
-	inline Col col(size_t index) {return Col(this, index);}
-	inline ColConst col(size_t index) const {return ColConst(this, index);}
-	inline PIVector2D<T> & setRow(size_t row, const Row & other) {
-		size_t sz = piMin<size_t>(cols_, other.sz_);
-		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
-		return *this;
-	}
-	inline PIVector2D<T> & setRow(size_t row, const RowConst & other) {
-		size_t sz = piMin<size_t>(cols_, other.sz_);
-		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
-		return *this;
-	}
-	inline PIVector2D<T> & setRow(size_t row, const PIVector<T> & other) {
-		size_t sz = piMin<size_t>(cols_, other.size());
-		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
-		return *this;
-	}
-	inline PIVector2D<T> & addRow(const Row & other) {
-		if (cols_ == 0) cols_ = other.sz_;
-		size_t sz = piMin<size_t>(cols_, other.sz_);
-		size_t ps = mat.size();
-		mat.resize(mat.size() + cols_);
-		mat._copyRaw(mat.data(ps), other.data(), sz);
-		rows_++;
-		return *this;
-	}
-	inline PIVector2D<T> & addRow(const RowConst & other) {
-		if (cols_ == 0) cols_ = other.sz_;
-		size_t sz = piMin<size_t>(cols_, other.sz_);
-		size_t ps = mat.size();
-		mat.resize(mat.size() + cols_);
-		mat._copyRaw(mat.data(ps), other.data(), sz);
-		rows_++;
-		return *this;
-	}
-	inline PIVector2D<T> & addRow(const PIVector<T> & other) {
-		if (cols_ == 0) cols_ = other.size();
-		size_t sz = piMin<size_t>(cols_, other.size());
-		size_t ps = mat.size();
-		mat.resize(mat.size() + cols_);
-		mat._copyRaw(mat.data(ps), other.data(), sz);
-		rows_++;
-		return *this;
-	}
-
-	inline PIVector2D<T> & resize(size_t rows, size_t cols, const T & f = T()) {
-		mat.resize(rows*cols_, f);
-		rows_ = rows;
-		int cs = (cols - cols_);
-		if (cs < 0) {
-			for (size_t r=0; r<rows; ++r) {
-				mat.remove(r*cols_ + cols_, -cs);
-			}
-		}
-		mat.resize(rows*cols, f);
-		if (!mat.isEmpty()) {
-			if (cs > 0) {
-				for (size_t r=0; r<rows_; ++r) {
-					for (int i=0; i<cs; ++i)
-						mat.insert(r*cols + cols_, mat.take_back());
-				}
-			}
-		}
-		cols_ = cols;
-		return *this;
-	}
-
-	PIVector<PIVector<T> > toVectors() const {
-		PIVector<PIVector<T> > ret;
-		for(size_t i = 0; i < rows_; ++i)
-			ret << PIVector<T>(mat.data(i*cols_), cols_);
-		return ret;
-	}
-	PIVector<T> toPlainVector() const {return mat;}
-	PIVector<T> & plainVector() {return mat;}
-	const PIVector<T> & plainVector() const {return mat;}
-
-	inline void swap(PIVector2D<T> & other) {
-		mat.swap(other.mat);
-		piSwap<size_t>(rows_, other.rows_);
-		piSwap<size_t>(cols_, other.cols_);
-	}
-
-	inline PIVector2D<T> & _resizeRaw(size_t r, size_t c) {
-		piCout << "Error, \"resizeRaw()\" only allowed for simple type declared with __PIVECTOR_SIMPLE_TYPE__ macro!";
-		assert(0);
-		return *this;
-	}
-
-	inline void clear() {
-		rows_ = cols_ = 0;
-		mat.clear();
-	}
-
-protected:
-	size_t rows_, cols_;
-	PIVector<T> mat;
-};
-
-
-template<typename T>
-inline PICout operator <<(PICout s, const PIVector2D<T> & v) {
-	s.setControl(0, true);
-	s << "{";
-	for (size_t i = 0; i < v.rows(); ++i) {
-		s << "{ ";
-		for (size_t j = 0; j < v.cols(); ++j) {
-			s << v[i][j];
-			if (j < v.cols() - 1) s << ", ";
-		}
-		s << " }";
-		if (i < v.rows() - 1) s << PICoutManipulators::NewLine ;
-	}
-	if (v.isEmpty()) s << "{ }";
-	s << "}";
-	s.restoreControl();
-	return s;
-}
-
-#define __PIVECTOR2D_SIMPLE_TYPE__(T) \
-	template<> inline PIVector2D<T> & PIVector2D<T>::_resizeRaw(size_t r, size_t c) {rows_ = r; cols_ = c; mat._resizeRaw(r*c); return *this;}
-
-__PIVECTOR2D_SIMPLE_TYPE__(bool)
-__PIVECTOR2D_SIMPLE_TYPE__(char)
-__PIVECTOR2D_SIMPLE_TYPE__(uchar)
-__PIVECTOR2D_SIMPLE_TYPE__(short)
-__PIVECTOR2D_SIMPLE_TYPE__(ushort)
-__PIVECTOR2D_SIMPLE_TYPE__(int)
-__PIVECTOR2D_SIMPLE_TYPE__(uint)
-__PIVECTOR2D_SIMPLE_TYPE__(long)
-__PIVECTOR2D_SIMPLE_TYPE__(ulong)
-__PIVECTOR2D_SIMPLE_TYPE__(llong)
-__PIVECTOR2D_SIMPLE_TYPE__(ullong)
-__PIVECTOR2D_SIMPLE_TYPE__(float)
-__PIVECTOR2D_SIMPLE_TYPE__(double)
-__PIVECTOR2D_SIMPLE_TYPE__(ldouble)
-
-#endif // PIVECTOR2D_H
+/*! \file pivecto2d.h
+ * \brief 2D wrapper around PIVector
+ *
+ * This file declares PIVector
+*/
+/*
+	PIP - Platform Independent Primitives
+	2D wrapper around PIVector
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIVECTOR2D_H
+#define PIVECTOR2D_H
+
+#include "pivector.h"
+
+/*! \brief 2D array,
+ * \details This class used to store 2D array of any type elements as plain vector.
+ * You can read/write any element via operators [][], first dimension - row, second - column.
+ * The first dimension is Row, and you can operate with Row as PIVector<T>: modify any element, assign to another Row and etc.
+ * You can't add values to array, but you can modify any elements or create another PIVector2D.
+ * PIVector2D has constructors from PIVector<T> and PIVector<PIVector<T> >
+ */
+
+template <typename T>
+class PIVector2D {
+public:
+	inline PIVector2D() {rows_ = cols_ = 0;}
+	inline PIVector2D(size_t rows, size_t cols, const T & f = T()) {
+		rows_ = rows;
+		cols_ = cols;
+		mat.resize(rows*cols, f);
+	}
+	inline PIVector2D(size_t rows, size_t cols, const PIVector<T> & v) {
+		mat = v;
+		rows_ = rows;
+		cols_ = cols;
+		mat.resize(rows*cols);
+	}
+	inline PIVector2D(const PIVector<PIVector<T> > & v) {
+		rows_ = v.size();
+		if (rows_) {
+			cols_ = v[0].size();
+			for (size_t i = 0; i < rows_; i++) {
+				mat.append(v[i]);
+			}
+			mat.resize(rows_*cols_);
+		}
+		if (mat.isEmpty()) rows_ = cols_ = 0;
+	}
+
+	inline size_t rows() const {return rows_;}
+	inline size_t cols() const {return cols_;}
+	inline size_t size() const {return mat.size();}
+	inline ssize_t size_s() const {return mat.size_s();}
+	inline size_t length() const {return mat.length();}
+	inline size_t capacity() const {return mat.capacity();}
+	inline bool isEmpty() const {return mat.isEmpty();}
+
+	class Row {
+		friend class PIVector2D<T>;
+	private:
+		inline Row(PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {st_ = p->cols_ * row; sz_ = p->cols_;}
+		PIVector<T> * p_;
+		size_t st_, sz_;
+	public:
+		inline size_t size() const {return sz_;}
+		inline T & operator [](size_t index) {return (*p_)[st_ + index];}
+		inline const T & operator [](size_t index) const {return (*p_)[st_ + index];}
+		inline T * data(size_t index = 0) {return p_->data(st_ + index);}
+		inline const T * data(size_t index = 0) const {return p_->data(st_ + index);}
+		inline Row & operator =(const Row & other) {
+			if (p_ == other.p_ && st_ == other.st_) return *this;
+			size_t sz = piMin<size_t>(sz_, other.sz_);
+			p_->_copyRaw(p_->data(st_), other.data(), sz);
+			return *this;
+		}
+		inline Row & operator =(const PIVector<T> & other) {
+			size_t sz = piMin<size_t>(sz, other.size());
+			p_->_copyRaw(p_->data(st_), other.data(), sz);
+			return *this;
+		}
+		inline PIVector<T> toVector() const {return PIVector<T>(p_->data(st_), sz_);}
+	};
+
+	class Col {
+		friend class PIVector2D<T>;
+	private:
+		inline Col(PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {step_ = p->cols_; row_ = row; sz_ = p->rows_;}
+		PIVector<T> * p_;
+		size_t step_, row_, sz_;
+	public:
+		inline size_t size() const {return sz_;}
+		inline T & operator [](size_t index) {return (*p_)[index * step_ + row_];}
+		inline const T & operator [](size_t index) const {return (*p_)[index * step_ + row_];}
+		inline T * data(size_t index = 0) {return p_->data(index * step_ + row_);}
+		inline const T * data(size_t index = 0) const {return p_->data(index * step_ + row_);}
+		inline Col & operator =(const Col & other) {
+			if (p_ == other.p_ && row_ == other.row_) return *this;
+			size_t sz = piMin<size_t>(sz_, other.sz_);
+			for (int i=0; i<sz; ++i) (*p_)[i * step_ + row_] = other[i];
+			return *this;
+		}
+		inline Row & operator =(const PIVector<T> & other) {
+			size_t sz = piMin<size_t>(sz_, other.size());
+			for (int i=0; i<sz; ++i) (*p_)[i * step_ + row_] = other[i];
+			return *this;
+		}
+		inline PIVector<T> toVector() const {
+			PIVector<T> ret;
+			ret.reserve(sz_);
+			for (size_t i=0; i<sz_; i++) ret << (*p_)[i * step_ + row_];
+			return ret;
+		}
+	};
+
+	class RowConst {
+		friend class PIVector2D<T>;
+	private:
+		inline RowConst(const PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {st_ = p->cols_ * row; sz_ = p->cols_;}
+		const PIVector<T> * p_;
+		size_t st_, sz_;
+	public:
+		inline size_t size() const {return sz_;}
+		inline const T & operator [](size_t index) const {return (*p_)[st_ + index];}
+		inline const T * data(size_t index = 0) const {return p_->data(st_ + index);}
+		inline PIVector<T> toVector() const {return PIVector<T>(p_->data(st_), sz_);}
+	};
+
+	class ColConst {
+		friend class PIVector2D<T>;
+	private:
+		inline ColConst(const PIVector2D<T> * p, size_t row) : p_(&(p->mat)) {step_ = p->cols_; row_ = row; sz_ = p->rows_;}
+		const PIVector<T> * p_;
+		size_t step_, row_, sz_;
+	public:
+		inline size_t size() const {return p_->rows_;}
+		inline const T & operator [](size_t index) const {return (*p_)[index * step_ + row_];}
+		inline const T * data(size_t index = 0) const {return p_->data(index * step_ + row_);}
+		inline PIVector<T> toVector() const {
+			PIVector<T> ret;
+			ret.reserve(sz_);
+			for (int i=0; i<size(); i++) ret << (*p_)[i * step_ + row_];
+			return ret;
+		}
+	};
+
+	inline T & element(size_t row, size_t col) {return mat[row * cols_ + col];}
+	inline const T & element(size_t row, size_t col) const {return mat[row * cols_ + col];}
+	inline Row operator[](size_t index) {return Row(this, index);}
+	inline RowConst operator[](size_t index) const {return RowConst(this, index);}
+	inline T * data(size_t index = 0) {return mat.data(index);}
+	inline const T * data(size_t index = 0) const {return mat.data(index);}
+
+	inline Row row(size_t index) {return Row(this, index);}
+	inline RowConst row(size_t index) const {return RowConst(this, index);}
+	inline Col col(size_t index) {return Col(this, index);}
+	inline ColConst col(size_t index) const {return ColConst(this, index);}
+	inline PIVector2D<T> & setRow(size_t row, const Row & other) {
+		size_t sz = piMin<size_t>(cols_, other.sz_);
+		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
+		return *this;
+	}
+	inline PIVector2D<T> & setRow(size_t row, const RowConst & other) {
+		size_t sz = piMin<size_t>(cols_, other.sz_);
+		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
+		return *this;
+	}
+	inline PIVector2D<T> & setRow(size_t row, const PIVector<T> & other) {
+		size_t sz = piMin<size_t>(cols_, other.size());
+		mat._copyRaw(mat.data(cols_ * row), other.data(), sz);
+		return *this;
+	}
+	inline PIVector2D<T> & addRow(const Row & other) {
+		if (cols_ == 0) cols_ = other.sz_;
+		size_t sz = piMin<size_t>(cols_, other.sz_);
+		size_t ps = mat.size();
+		mat.resize(mat.size() + cols_);
+		mat._copyRaw(mat.data(ps), other.data(), sz);
+		rows_++;
+		return *this;
+	}
+	inline PIVector2D<T> & addRow(const RowConst & other) {
+		if (cols_ == 0) cols_ = other.sz_;
+		size_t sz = piMin<size_t>(cols_, other.sz_);
+		size_t ps = mat.size();
+		mat.resize(mat.size() + cols_);
+		mat._copyRaw(mat.data(ps), other.data(), sz);
+		rows_++;
+		return *this;
+	}
+	inline PIVector2D<T> & addRow(const PIVector<T> & other) {
+		if (cols_ == 0) cols_ = other.size();
+		size_t sz = piMin<size_t>(cols_, other.size());
+		size_t ps = mat.size();
+		mat.resize(mat.size() + cols_);
+		mat._copyRaw(mat.data(ps), other.data(), sz);
+		rows_++;
+		return *this;
+	}
+
+	inline PIVector2D<T> & resize(size_t rows, size_t cols, const T & f = T()) {
+		mat.resize(rows*cols_, f);
+		rows_ = rows;
+		int cs = (cols - cols_);
+		if (cs < 0) {
+			for (size_t r=0; r<rows; ++r) {
+				mat.remove(r*cols_ + cols_, -cs);
+			}
+		}
+		mat.resize(rows*cols, f);
+		if (!mat.isEmpty()) {
+			if (cs > 0) {
+				for (size_t r=0; r<rows_; ++r) {
+					for (int i=0; i<cs; ++i)
+						mat.insert(r*cols + cols_, mat.take_back());
+				}
+			}
+		}
+		cols_ = cols;
+		return *this;
+	}
+
+	PIVector<PIVector<T> > toVectors() const {
+		PIVector<PIVector<T> > ret;
+		for(size_t i = 0; i < rows_; ++i)
+			ret << PIVector<T>(mat.data(i*cols_), cols_);
+		return ret;
+	}
+	PIVector<T> toPlainVector() const {return mat;}
+	PIVector<T> & plainVector() {return mat;}
+	const PIVector<T> & plainVector() const {return mat;}
+
+	inline void swap(PIVector2D<T> & other) {
+		mat.swap(other.mat);
+		piSwap<size_t>(rows_, other.rows_);
+		piSwap<size_t>(cols_, other.cols_);
+	}
+
+	inline PIVector2D<T> & _resizeRaw(size_t r, size_t c) {
+		piCout << "Error, \"resizeRaw()\" only allowed for simple type declared with __PIVECTOR_SIMPLE_TYPE__ macro!";
+		assert(0);
+		return *this;
+	}
+
+	inline void clear() {
+		rows_ = cols_ = 0;
+		mat.clear();
+	}
+
+protected:
+	size_t rows_, cols_;
+	PIVector<T> mat;
+};
+
+
+template<typename T>
+inline PICout operator <<(PICout s, const PIVector2D<T> & v) {
+	s.setControl(0, true);
+	s << "{";
+	for (size_t i = 0; i < v.rows(); ++i) {
+		s << "{ ";
+		for (size_t j = 0; j < v.cols(); ++j) {
+			s << v[i][j];
+			if (j < v.cols() - 1) s << ", ";
+		}
+		s << " }";
+		if (i < v.rows() - 1) s << PICoutManipulators::NewLine ;
+	}
+	if (v.isEmpty()) s << "{ }";
+	s << "}";
+	s.restoreControl();
+	return s;
+}
+
+#define __PIVECTOR2D_SIMPLE_TYPE__(T) \
+	template<> inline PIVector2D<T> & PIVector2D<T>::_resizeRaw(size_t r, size_t c) {rows_ = r; cols_ = c; mat._resizeRaw(r*c); return *this;}
+
+__PIVECTOR2D_SIMPLE_TYPE__(bool)
+__PIVECTOR2D_SIMPLE_TYPE__(char)
+__PIVECTOR2D_SIMPLE_TYPE__(uchar)
+__PIVECTOR2D_SIMPLE_TYPE__(short)
+__PIVECTOR2D_SIMPLE_TYPE__(ushort)
+__PIVECTOR2D_SIMPLE_TYPE__(int)
+__PIVECTOR2D_SIMPLE_TYPE__(uint)
+__PIVECTOR2D_SIMPLE_TYPE__(long)
+__PIVECTOR2D_SIMPLE_TYPE__(ulong)
+__PIVECTOR2D_SIMPLE_TYPE__(llong)
+__PIVECTOR2D_SIMPLE_TYPE__(ullong)
+__PIVECTOR2D_SIMPLE_TYPE__(float)
+__PIVECTOR2D_SIMPLE_TYPE__(double)
+__PIVECTOR2D_SIMPLE_TYPE__(ldouble)
+
+#endif // PIVECTOR2D_H
diff --git a/src_main/core/pibase.h b/lib/main/core/pibase.h
similarity index 96%
rename from src_main/core/pibase.h
rename to lib/main/core/pibase.h
index 84f23702..e55bb696 100644
--- a/src_main/core/pibase.h
+++ b/lib/main/core/pibase.h
@@ -1,557 +1,557 @@
-/*! \file pibase.h
- * \brief Base types and functions
- *
- * This file implements first layer above the system and
- * declares some basic useful functions
-*/
-/*
-	PIP - Platform Independent Primitives
-	Base types and functions
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIBASE_H
-#define PIBASE_H
-
-#include "piversion.h"
-#include "piplatform.h"
-#include "pip_export.h"
-#include "pip_defs.h"
-#include "string.h"
-
-//! Meta-information section for any entity.
-//! Parsing by \a pip_cmg and can be accessed by \a PICodeInfo.
-//! Contains sequence of key=value pairs, e.g.
-//! PIMETA(id=12345,tag="my string")
-#define PIMETA(...)
-
-#ifdef DOXYGEN
-
-//! Major value of PIP version
-#  define PIP_VERSION_MAJOR
-
-//! Minor value of PIP version
-#  define PIP_VERSION_MINOR
-
-//! Revision value of PIP version
-#  define PIP_VERSION_REVISION
-
-//! Suffix of PIP version
-#  define PIP_VERSION_SUFFIX
-
-//! Version of PIP in hex - 0x##(Major)##(Minor)##(Revision)
-#  define PIP_VERSION
-
-//! Macro is defined when compile-time debug is enabled
-#  define PIP_DEBUG
-
-//! Macro is defined when host is any Windows
-#  define WINDOWS
-
-//! Macro is defined when host is QNX or Blackberry
-#  define QNX
-
-//! Macro is defined when host is Blackberry
-#  define BLACKBERRY
-
-//! Macro is defined when host is FreeBSD
-#  define FREE_BSD
-
-//! Macro is defined when host is Mac OS
-#  define MAC_OS
-
-//! Macro is defined when host is Android
-#  define ANDROID
-
-//! Macro is defined when host is any Linux
-#  define LINUX
-
-//! Macro is defined when compiler is GCC or MinGW
-#  define CC_GCC
-
-//! Macro is defined when PIP is decided that host is support language
-#  define HAS_LOCALE
-
-//! Macro is defined when compiler is Visual Studio
-#  define CC_VC
-
-//! Macro is defined when compiler is unknown
-#  define CC_OTHER
-
-//! Macro is defined when PIP can use "rt" library for "PITimer::ThreadRT" timers implementation
-#  define PIP_TIMER_RT
-
-#endif
-
-#ifdef PIP_CXX11_SUPPORT
-#  include <functional>
-#endif
-
-#include <cstddef>
-#ifdef WINDOWS
-#  ifdef CC_VC
-#    define SHUT_RDWR 2
-#    pragma comment(lib, "Ws2_32.lib")
-#    pragma comment(lib, "Iphlpapi.lib")
-#    pragma comment(lib, "Psapi.lib")
-#    ifdef ARCH_BITS_32
-#      define _X86_
-#    else
-#      define _IA64_
-#    endif
-#  else
-#    define SHUT_RDWR SD_BOTH
-#  endif
-	typedef int socklen_t;
-	extern long long __pi_perf_freq;
-#endif
-
-#ifdef ANDROID
-///#  define tcdrain(fd) ioctl(fd, TCSBRK, 1)
-   //inline int wctomb(char * c, wchar_t w) {*c = ((char * )&w)[0]; return 1;}
-   //inline int mbtowc(wchar_t * w, const char * c, size_t) {*w = ((wchar_t * )&c)[0]; return 1;}
-#endif
-
-#ifdef MAC_OS
-#  define environ (*_NSGetEnviron())
-   typedef long time_t;
-#endif
-
-#ifdef LINUX
-#  define environ __environ
-#endif
-
-#ifdef FREE_BSD
-   extern char ** environ;
-#endif
-
-
-#ifdef CC_GCC
-#  undef DEPRECATED
-#  define DEPRECATED __attribute__((deprecated))
-#  if CC_GCC_VERSION > 0x025F // > 2.95
-#    ifdef LINUX
-#      define HAS_LOCALE
-#    endif
-#    ifdef MAC_OS
-#      pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#      pragma GCC diagnostic ignored "-Wundefined-bool-conversion"
-#      pragma GCC diagnostic ignored "-Wc++11-extensions"
-#    endif
-#  endif
-#  ifdef ANDROID
-#    pragma GCC diagnostic ignored "-Wunused-parameter"
-#    pragma GCC diagnostic ignored "-Wextra"
-#    pragma GCC diagnostic ignored "-Wc++11-extensions"
-#    pragma GCC diagnostic ignored "-Wundefined-bool-conversion"
-//#    pragma GCC diagnostic ignored "-Wliteral-suffix"
-#  endif
-#endif
-
-#ifdef CC_VC
-#  undef DEPRECATED
-#  define DEPRECATED
-#  pragma warning(disable: 4018)
-#  pragma warning(disable: 4061)
-#  pragma warning(disable: 4100)
-#  pragma warning(disable: 4239)
-#  pragma warning(disable: 4242)
-#  pragma warning(disable: 4244)
-#  pragma warning(disable: 4251)
-#  pragma warning(disable: 4365)
-#  pragma warning(disable: 4512)
-#  pragma warning(disable: 4668)
-#  pragma warning(disable: 4710)
-#  pragma warning(disable: 4800)
-#  pragma warning(disable: 4820)
-#  pragma warning(disable: 4986)
-#  pragma warning(disable: 4996)
-#  ifdef ARCH_BITS_32
-	 typedef long ssize_t;
-#  else
-	 typedef long long ssize_t;
-#  endif
-#endif
-
-#ifdef CC_OTHER
-#  undef DEPRECATED
-#  define DEPRECATED
-#endif
-
-
-// Private data macros
-
-#define PRIVATE_DECLARATION \
-	struct __Private__; \
-	friend struct __Private__; \
-	struct __PrivateInitializer__ { \
-		__PrivateInitializer__(); \
-		__PrivateInitializer__(const __PrivateInitializer__ & o); \
-		~__PrivateInitializer__(); \
-		__PrivateInitializer__ & operator =(const __PrivateInitializer__ & o); \
-		__Private__ * p; \
-	}; \
-	__PrivateInitializer__ __privateinitializer__;
-
-#define PRIVATE_DEFINITION_START(c) \
-	struct c::__Private__ {
-
-#define PRIVATE_DEFINITION_END(c) \
-	}; \
-	c::__PrivateInitializer__::__PrivateInitializer__() {p = new c::__Private__();} \
-	c::__PrivateInitializer__::__PrivateInitializer__(const c::__PrivateInitializer__ & ) {/*if (p) delete p;*/ p = new c::__Private__();} \
-	c::__PrivateInitializer__::~__PrivateInitializer__() {delete p; p = 0;} \
-	c::__PrivateInitializer__ & c::__PrivateInitializer__::operator =(const c::__PrivateInitializer__ & ) {if (p) delete p; p = new c::__Private__(); return *this;}
-
-#define PRIVATE (__privateinitializer__.p)
-#define PRIVATEWB __privateinitializer__.p
-
-#define NO_COPY_CLASS(name) \
-	explicit name(const name & ); \
-	void operator =(const name & );
-
-#ifdef FREERTOS
-#  define PIP_MIN_MSLEEP 10.
-#else
-#  define PIP_MIN_MSLEEP 1.
-#endif
-
-
-//! Macro used for infinite loop
-#define FOREVER for (;;)
-
-//! Macro used for infinite wait
-#define FOREVER_WAIT FOREVER msleep(PIP_MIN_MSLEEP);
-
-//! Macro used for infinite wait
-#define WAIT_FOREVER FOREVER msleep(PIP_MIN_MSLEEP);
-
-
-//! global variable enabling output to piCout, default is true
-extern PIP_EXPORT bool piDebug;
-
-//! global variable that set minimum real update interval
-//! for function PIInit::mountInfo(), default is 10000 ms
-extern PIP_EXPORT double piMountInfoRefreshIntervalMs;
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned int uint;
-typedef unsigned long ulong;
-typedef unsigned long long ullong;
-typedef long long llong;
-typedef long double ldouble;
-
-/*! \brief Templated function for swap two values
- * \details Example:\n \snippet piincludes.cpp swap */
-template<typename T> inline void piSwap(T & f, T & s) {T t = f; f = s; s = t;}
-
-/*! \brief Templated function for swap two values without "="
- * \details Example:\n \snippet piincludes.cpp swapBinary */
-template<typename T> inline void piSwapBinary(T & f, T & s) {
-	if ((size_t*)&f == (size_t*)&s) return;
-	size_t j = (sizeof(T) / sizeof(size_t)), bs = j * sizeof(size_t), bf = sizeof(T);
-	size_t i = 0;
-	for (i = 0; i < j; ++i) {
-		((size_t*)(&f))[i] ^= ((size_t*)(&s))[i];
-		((size_t*)(&s))[i] ^= ((size_t*)(&f))[i];
-		((size_t*)(&f))[i] ^= ((size_t*)(&s))[i];
-	}
-	for (i = bs; i < bf; ++i) {
-		((uchar*)(&f))[i] ^= ((uchar*)(&s))[i];
-		((uchar*)(&s))[i] ^= ((uchar*)(&f))[i];
-		((uchar*)(&f))[i] ^= ((uchar*)(&s))[i];
-	}
-}
-
-template<> inline void piSwapBinary(const void *& f, const void *& s) {
-	if ((size_t*)f == (size_t*)s) return;
-	size_t j = (sizeof(void *) / sizeof(size_t)), bs = j * sizeof(size_t), bf = sizeof(void *);
-	size_t i = 0;
-	void * pf = const_cast<void*>(f), * ps = const_cast<void*>(s);
-	for (i = 0; i < j; ++i) {
-		((size_t*)(&pf))[i] ^= ((size_t*)(&ps))[i];
-		((size_t*)(&ps))[i] ^= ((size_t*)(&pf))[i];
-		((size_t*)(&pf))[i] ^= ((size_t*)(&ps))[i];
-	}
-	for (i = bs; i < bf; ++i) {
-		((uchar*)(&pf))[i] ^= ((uchar*)(&ps))[i];
-		((uchar*)(&ps))[i] ^= ((uchar*)(&pf))[i];
-		((uchar*)(&pf))[i] ^= ((uchar*)(&ps))[i];
-	}
-}
-
-/*! \brief Function for compare two values without "=" by raw content
- * \details Example:\n \snippet piincludes.cpp compareBinary */
-inline bool piCompareBinary(const void * f, const void * s, size_t size) {
-	for (size_t i = 0; i < size; ++i)
-		if (((const uchar*)f)[i] != ((const uchar*)s)[i])
-			return false;
-	return true;
-}
-
-/*! \brief Templated function return round of float falue
- * \details Round is the nearest integer value \n
- * There are some macros:
- * - \c piRoundf for "float"
- * - \c piRoundd for "double"
- *
- * Example:
- * \snippet piincludes.cpp round */
-template<typename T> inline int piRound(const T & v) {return int(v >= T(0.) ? v + T(0.5) : v - T(0.5));}
-
-/*! \brief Templated function return floor of float falue
- * \details Floor is the largest integer that is not greater than value \n
- * There are some macros:
- * - \c piFloorf for "float"
- * - \c piFloord for "double"
- *
- * Example:
- * \snippet piincludes.cpp floor */
-template<typename T> inline int piFloor(const T & v) {return v < T(0) ? int(v) - 1 : int(v);}
-
-/*! \brief Templated function return ceil of float falue
- * \details Ceil is the smallest integer that is not less than value \n
- * There are some macros:
- * - \c piCeilf for "float"
- * - \c piCeild for "double"
- *
- * Example:
- * \snippet piincludes.cpp ceil */
-template<typename T> inline int piCeil(const T & v) {return v < T(0) ? int(v) : int(v) + 1;}
-
-/*! \brief Templated function return absolute of numeric falue
- * \details Absolute is the positive or equal 0 value \n
- * There are some macros:
- * - \c piAbss for "short"
- * - \c piAbsi for "int"
- * - \c piAbsl for "long"
- * - \c piAbsll for "llong"
- * - \c piAbsf for "float"
- * - \c piAbsd for "double"
- *
- * Example:
- * \snippet piincludes.cpp abs */
-template<typename T> inline T piAbs(const T & v) {return (v >= T(0) ? v : -v);}
-
-/*! \brief Templated function return minimum of two values
- * \details There are some macros:
- * - \c piMins for "short"
- * - \c piMini for "int"
- * - \c piMinl for "long"
- * - \c piMinll for "llong"
- * - \c piMinf for "float"
- * - \c piMind for "double"
- *
- * Example:
- * \snippet piincludes.cpp min2 */
-template<typename T> inline T piMin(const T & f, const T & s) {return ((f > s) ? s : f);}
-
-/*! \brief Templated function return minimum of tree values
- * \details There are some macros:
- * - \c piMins for "short"
- * - \c piMini for "int"
- * - \c piMinl for "long"
- * - \c piMinll for "llong"
- * - \c piMinf for "float"
- * - \c piMind for "double"
- *
- * Example:
- * \snippet piincludes.cpp min3 */
-template<typename T> inline T piMin(const T & f, const T & s, const T & t) {return ((f < s && f < t) ? f : ((s < t) ? s : t));}
-
-/*! \brief Templated function return maximum of two values
- * \details There are some macros:
- * - \c piMaxs for "short"
- * - \c piMaxi for "int"
- * - \c piMaxl for "long"
- * - \c piMaxll for "llong"
- * - \c piMaxf for "float"
- * - \c piMaxd for "double"
- *
- * Example:
- * \snippet piincludes.cpp max2 */
-template<typename T> inline T piMax(const T & f, const T & s) {return ((f < s) ? s : f);}
-
-/*! \brief Templated function return maximum of tree values
- * \details There are some macros:
- * - \c piMaxs for "short"
- * - \c piMaxi for "int"
- * - \c piMaxl for "long"
- * - \c piMaxll for "llong"
- * - \c piMaxf for "float"
- * - \c piMaxd for "double"
- *
- * Example:
- * \snippet piincludes.cpp max3 */
-template<typename T> inline T piMax(const T & f, const T & s, const T & t) {return ((f > s && f > t) ? f : ((s > t) ? s : t));}
-
-/*! \brief Templated function return clamped value
- * \details Clamped is the not greater than "max" and not lesser than "min" value \n
- * There are some macros:
- * - \c piClamps for "short"
- * - \c piClampi for "int"
- * - \c piClampl for "long"
- * - \c piClampll for "llong"
- * - \c piClampf for "float"
- * - \c piClampd for "double"
- *
- * Example:
- * \snippet piincludes.cpp clamp */
-template<typename T> inline T piClamp(const T & v, const T & min, const T & max) {return (v > max ? max : (v < min ? min : v));}
-
-/// Function inverse byte order in memory block
-inline void piLetobe(void * data, int size) {
-	for (int i = 0; i < size / 2; i++)
-		piSwap<uchar>(((uchar*)data)[size - i - 1], ((uchar*)data)[i]);
-}
-
-/// \brief Templated function that inverse byte order of value "v"
-template<typename T> inline void piLetobe(T * v) {piLetobe(v, sizeof(T));}
-
-/*! \brief Templated function that returns "v" with inversed byte order
- * \details This function used to convert values between little and big endian \n
- * There are some macros:
- * - \c piLetobes for "ushort"
- * - \c piLetobei for "uint"
- * - \c piLetobel for "ulong"
- * - \c piLetobell for "ullong"
- *
- * Example:
- * \snippet piincludes.cpp letobe */
-template<typename T> inline T piLetobe(const T & v) {T tv(v); piLetobe(&tv, sizeof(T)); return tv;}
-
-// specialization
-template<> inline ushort piLetobe(const ushort & v) {return (v << 8) | (v >> 8);}
-template<> inline uint piLetobe(const uint & v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
-template<> inline float piLetobe(const float & v) {
-	union _pletobe_f {
-		_pletobe_f(const float &f_) {f = f_;}
-		float f;
-		uint v;
-	};
-	_pletobe_f a(v);
-	a.v = (a.v >> 24) | ((a.v >> 8) & 0xFF00) | ((a.v << 8) & 0xFF0000) | ((a.v << 24) & 0xFF000000);
-	return a.f;
-}
-
-DEPRECATED inline ushort letobe_s(const ushort & v) {return (v << 8) | (v >> 8);}
-DEPRECATED inline uint letobe_i(const uint & v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
-
-#ifdef DOXYGEN
-
-/// \deprecated \brief Use \a piLetobe() instead of this function
-ushort letobe_s(ushort v) {return (v << 8) | (v >> 8);}
-
-/// \deprecated \brief Use \a piLetobe() instead of this function
-uint letobe_i(uint v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
-
-#endif
-
-/// \brief Generic hash function, impements murmur3/32 algorithm
-inline uint piHashData(const uchar * data, uint len, uint seed = 0) {
-	if (!data || len <= 0) return 0u;
-	uint h = seed;
-	if (len > 3) {
-		uint i = len >> 2;
-		do {
-			uint k;
-			memcpy(&k, data, sizeof(uint));
-			data += sizeof(uint);
-			k *= 0xcc9e2d51;
-			k = (k << 15) | (k >> 17);
-			k *= 0x1b873593;
-			h ^= k;
-			h = (h << 13) | (h >> 19);
-			h = h * 5 + 0xe6546b64;
-		} while (--i);
-	}
-	if (len & 3) {
-		uint i = len & 3;
-		uint k = 0;
-		do {
-			k <<= 8;
-			k |= data[i - 1];
-		} while (--i);
-		k *= 0xcc9e2d51;
-		k = (k << 15) | (k >> 17);
-		k *= 0x1b873593;
-		h ^= k;
-	}
-	h ^= len;
-	h ^= h >> 16;
-	h *= 0x85ebca6b;
-	h ^= h >> 13;
-	h *= 0xc2b2ae35;
-	h ^= h >> 16;
-	return h;
-}
-
-
-template<typename T> inline uint piHash(const T & v) {
-	return 0;
-}
-
-template<> inline uint piHash(const  char   & v) {return (uint)v;}
-template<> inline uint piHash(const uchar   & v) {return (uint)v;}
-template<> inline uint piHash(const  short  & v) {return (uint)v;}
-template<> inline uint piHash(const ushort  & v) {return (uint)v;}
-template<> inline uint piHash(const  int    & v) {return (uint)v;}
-template<> inline uint piHash(const uint    & v) {return (uint)v;}
-template<> inline uint piHash(const  llong  & v) {return piHashData((const uchar *)&v, sizeof(v));}
-template<> inline uint piHash(const ullong  & v) {return piHashData((const uchar *)&v, sizeof(v));}
-template<> inline uint piHash(const float   & v) {return (uint)v;}
-template<> inline uint piHash(const double  & v) {return piHashData((const uchar *)&v, sizeof(v));}
-template<> inline uint piHash(const ldouble & v) {return piHashData((const uchar *)&v, sizeof(v));}
-
-#define piRoundf piRound<float>
-#define piRoundd piRound<double>
-#define piFloorf piFloor<float>
-#define piFloord piFloor<double>
-#define piCeilf piCeil<float>
-#define piCeild piCeil<double>
-#define piAbss piAbs<short>
-#define piAbsi piAbs<int>
-#define piAbsl piAbs<long>
-#define piAbsll piAbs<llong>
-#define piAbsf piAbs<float>
-#define piAbsd piAbs<double>
-#define piMins piMin<short>
-#define piMini piMin<int>
-#define piMinl piMin<long>
-#define piMinll piMin<llong>
-#define piMinf piMin<float>
-#define piMind piMin<double>
-#define piMaxs piMax<short>
-#define piMaxi piMax<int>
-#define piMaxl piMax<long>
-#define piMaxll piMax<llong>
-#define piMaxf piMax<float>
-#define piMaxd piMax<double>
-#define piClamps piClamp<short>
-#define piClampi piClamp<int>
-#define piClampl piClamp<long>
-#define piClampll piClamp<llong>
-#define piClampf piClamp<float>
-#define piClampd piClamp<double>
-#define piLetobes piLetobe<ushort>
-#define piLetobei piLetobe<uint>
-#define piLetobel piLetobe<ulong>
-#define piLetobell piLetobe<ullong>
-#define piLetobef piLetobe<float>
-
-
-#endif // PIBASE_H
+/*! \file pibase.h
+ * \brief Base types and functions
+ *
+ * This file implements first layer above the system and
+ * declares some basic useful functions
+*/
+/*
+	PIP - Platform Independent Primitives
+	Base types and functions
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIBASE_H
+#define PIBASE_H
+
+#include "piversion.h"
+#include "piplatform.h"
+#include "pip_export.h"
+#include "pip_defs.h"
+#include "string.h"
+
+//! Meta-information section for any entity.
+//! Parsing by \a pip_cmg and can be accessed by \a PICodeInfo.
+//! Contains sequence of key=value pairs, e.g.
+//! PIMETA(id=12345,tag="my string")
+#define PIMETA(...)
+
+#ifdef DOXYGEN
+
+//! Major value of PIP version
+#  define PIP_VERSION_MAJOR
+
+//! Minor value of PIP version
+#  define PIP_VERSION_MINOR
+
+//! Revision value of PIP version
+#  define PIP_VERSION_REVISION
+
+//! Suffix of PIP version
+#  define PIP_VERSION_SUFFIX
+
+//! Version of PIP in hex - 0x##(Major)##(Minor)##(Revision)
+#  define PIP_VERSION
+
+//! Macro is defined when compile-time debug is enabled
+#  define PIP_DEBUG
+
+//! Macro is defined when host is any Windows
+#  define WINDOWS
+
+//! Macro is defined when host is QNX or Blackberry
+#  define QNX
+
+//! Macro is defined when host is Blackberry
+#  define BLACKBERRY
+
+//! Macro is defined when host is FreeBSD
+#  define FREE_BSD
+
+//! Macro is defined when host is Mac OS
+#  define MAC_OS
+
+//! Macro is defined when host is Android
+#  define ANDROID
+
+//! Macro is defined when host is any Linux
+#  define LINUX
+
+//! Macro is defined when compiler is GCC or MinGW
+#  define CC_GCC
+
+//! Macro is defined when PIP is decided that host is support language
+#  define HAS_LOCALE
+
+//! Macro is defined when compiler is Visual Studio
+#  define CC_VC
+
+//! Macro is defined when compiler is unknown
+#  define CC_OTHER
+
+//! Macro is defined when PIP can use "rt" library for "PITimer::ThreadRT" timers implementation
+#  define PIP_TIMER_RT
+
+#endif
+
+#ifdef PIP_CXX11_SUPPORT
+#  include <functional>
+#endif
+
+#include <cstddef>
+#ifdef WINDOWS
+#  ifdef CC_VC
+#    define SHUT_RDWR 2
+#    pragma comment(lib, "Ws2_32.lib")
+#    pragma comment(lib, "Iphlpapi.lib")
+#    pragma comment(lib, "Psapi.lib")
+#    ifdef ARCH_BITS_32
+#      define _X86_
+#    else
+#      define _IA64_
+#    endif
+#  else
+#    define SHUT_RDWR SD_BOTH
+#  endif
+	typedef int socklen_t;
+	extern long long __pi_perf_freq;
+#endif
+
+#ifdef ANDROID
+///#  define tcdrain(fd) ioctl(fd, TCSBRK, 1)
+   //inline int wctomb(char * c, wchar_t w) {*c = ((char * )&w)[0]; return 1;}
+   //inline int mbtowc(wchar_t * w, const char * c, size_t) {*w = ((wchar_t * )&c)[0]; return 1;}
+#endif
+
+#ifdef MAC_OS
+#  define environ (*_NSGetEnviron())
+   typedef long time_t;
+#endif
+
+#ifdef LINUX
+#  define environ __environ
+#endif
+
+#ifdef FREE_BSD
+   extern char ** environ;
+#endif
+
+
+#ifdef CC_GCC
+#  undef DEPRECATED
+#  define DEPRECATED __attribute__((deprecated))
+#  if CC_GCC_VERSION > 0x025F // > 2.95
+#    ifdef LINUX
+#      define HAS_LOCALE
+#    endif
+#    ifdef MAC_OS
+#      pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#      pragma GCC diagnostic ignored "-Wundefined-bool-conversion"
+#      pragma GCC diagnostic ignored "-Wc++11-extensions"
+#    endif
+#  endif
+#  ifdef ANDROID
+#    pragma GCC diagnostic ignored "-Wunused-parameter"
+#    pragma GCC diagnostic ignored "-Wextra"
+#    pragma GCC diagnostic ignored "-Wc++11-extensions"
+#    pragma GCC diagnostic ignored "-Wundefined-bool-conversion"
+//#    pragma GCC diagnostic ignored "-Wliteral-suffix"
+#  endif
+#endif
+
+#ifdef CC_VC
+#  undef DEPRECATED
+#  define DEPRECATED
+#  pragma warning(disable: 4018)
+#  pragma warning(disable: 4061)
+#  pragma warning(disable: 4100)
+#  pragma warning(disable: 4239)
+#  pragma warning(disable: 4242)
+#  pragma warning(disable: 4244)
+#  pragma warning(disable: 4251)
+#  pragma warning(disable: 4365)
+#  pragma warning(disable: 4512)
+#  pragma warning(disable: 4668)
+#  pragma warning(disable: 4710)
+#  pragma warning(disable: 4800)
+#  pragma warning(disable: 4820)
+#  pragma warning(disable: 4986)
+#  pragma warning(disable: 4996)
+#  ifdef ARCH_BITS_32
+	 typedef long ssize_t;
+#  else
+	 typedef long long ssize_t;
+#  endif
+#endif
+
+#ifdef CC_OTHER
+#  undef DEPRECATED
+#  define DEPRECATED
+#endif
+
+
+// Private data macros
+
+#define PRIVATE_DECLARATION \
+	struct __Private__; \
+	friend struct __Private__; \
+	struct __PrivateInitializer__ { \
+		__PrivateInitializer__(); \
+		__PrivateInitializer__(const __PrivateInitializer__ & o); \
+		~__PrivateInitializer__(); \
+		__PrivateInitializer__ & operator =(const __PrivateInitializer__ & o); \
+		__Private__ * p; \
+	}; \
+	__PrivateInitializer__ __privateinitializer__;
+
+#define PRIVATE_DEFINITION_START(c) \
+	struct c::__Private__ {
+
+#define PRIVATE_DEFINITION_END(c) \
+	}; \
+	c::__PrivateInitializer__::__PrivateInitializer__() {p = new c::__Private__();} \
+	c::__PrivateInitializer__::__PrivateInitializer__(const c::__PrivateInitializer__ & ) {/*if (p) delete p;*/ p = new c::__Private__();} \
+	c::__PrivateInitializer__::~__PrivateInitializer__() {delete p; p = 0;} \
+	c::__PrivateInitializer__ & c::__PrivateInitializer__::operator =(const c::__PrivateInitializer__ & ) {if (p) delete p; p = new c::__Private__(); return *this;}
+
+#define PRIVATE (__privateinitializer__.p)
+#define PRIVATEWB __privateinitializer__.p
+
+#define NO_COPY_CLASS(name) \
+	explicit name(const name & ); \
+	void operator =(const name & );
+
+#ifdef FREERTOS
+#  define PIP_MIN_MSLEEP 10.
+#else
+#  define PIP_MIN_MSLEEP 1.
+#endif
+
+
+//! Macro used for infinite loop
+#define FOREVER for (;;)
+
+//! Macro used for infinite wait
+#define FOREVER_WAIT FOREVER msleep(PIP_MIN_MSLEEP);
+
+//! Macro used for infinite wait
+#define WAIT_FOREVER FOREVER msleep(PIP_MIN_MSLEEP);
+
+
+//! global variable enabling output to piCout, default is true
+extern PIP_EXPORT bool piDebug;
+
+//! global variable that set minimum real update interval
+//! for function PIInit::mountInfo(), default is 10000 ms
+extern PIP_EXPORT double piMountInfoRefreshIntervalMs;
+
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+typedef unsigned long long ullong;
+typedef long long llong;
+typedef long double ldouble;
+
+/*! \brief Templated function for swap two values
+ * \details Example:\n \snippet piincludes.cpp swap */
+template<typename T> inline void piSwap(T & f, T & s) {T t = f; f = s; s = t;}
+
+/*! \brief Templated function for swap two values without "="
+ * \details Example:\n \snippet piincludes.cpp swapBinary */
+template<typename T> inline void piSwapBinary(T & f, T & s) {
+	if ((size_t*)&f == (size_t*)&s) return;
+	size_t j = (sizeof(T) / sizeof(size_t)), bs = j * sizeof(size_t), bf = sizeof(T);
+	size_t i = 0;
+	for (i = 0; i < j; ++i) {
+		((size_t*)(&f))[i] ^= ((size_t*)(&s))[i];
+		((size_t*)(&s))[i] ^= ((size_t*)(&f))[i];
+		((size_t*)(&f))[i] ^= ((size_t*)(&s))[i];
+	}
+	for (i = bs; i < bf; ++i) {
+		((uchar*)(&f))[i] ^= ((uchar*)(&s))[i];
+		((uchar*)(&s))[i] ^= ((uchar*)(&f))[i];
+		((uchar*)(&f))[i] ^= ((uchar*)(&s))[i];
+	}
+}
+
+template<> inline void piSwapBinary(const void *& f, const void *& s) {
+	if ((size_t*)f == (size_t*)s) return;
+	size_t j = (sizeof(void *) / sizeof(size_t)), bs = j * sizeof(size_t), bf = sizeof(void *);
+	size_t i = 0;
+	void * pf = const_cast<void*>(f), * ps = const_cast<void*>(s);
+	for (i = 0; i < j; ++i) {
+		((size_t*)(&pf))[i] ^= ((size_t*)(&ps))[i];
+		((size_t*)(&ps))[i] ^= ((size_t*)(&pf))[i];
+		((size_t*)(&pf))[i] ^= ((size_t*)(&ps))[i];
+	}
+	for (i = bs; i < bf; ++i) {
+		((uchar*)(&pf))[i] ^= ((uchar*)(&ps))[i];
+		((uchar*)(&ps))[i] ^= ((uchar*)(&pf))[i];
+		((uchar*)(&pf))[i] ^= ((uchar*)(&ps))[i];
+	}
+}
+
+/*! \brief Function for compare two values without "=" by raw content
+ * \details Example:\n \snippet piincludes.cpp compareBinary */
+inline bool piCompareBinary(const void * f, const void * s, size_t size) {
+	for (size_t i = 0; i < size; ++i)
+		if (((const uchar*)f)[i] != ((const uchar*)s)[i])
+			return false;
+	return true;
+}
+
+/*! \brief Templated function return round of float falue
+ * \details Round is the nearest integer value \n
+ * There are some macros:
+ * - \c piRoundf for "float"
+ * - \c piRoundd for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp round */
+template<typename T> inline int piRound(const T & v) {return int(v >= T(0.) ? v + T(0.5) : v - T(0.5));}
+
+/*! \brief Templated function return floor of float falue
+ * \details Floor is the largest integer that is not greater than value \n
+ * There are some macros:
+ * - \c piFloorf for "float"
+ * - \c piFloord for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp floor */
+template<typename T> inline int piFloor(const T & v) {return v < T(0) ? int(v) - 1 : int(v);}
+
+/*! \brief Templated function return ceil of float falue
+ * \details Ceil is the smallest integer that is not less than value \n
+ * There are some macros:
+ * - \c piCeilf for "float"
+ * - \c piCeild for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp ceil */
+template<typename T> inline int piCeil(const T & v) {return v < T(0) ? int(v) : int(v) + 1;}
+
+/*! \brief Templated function return absolute of numeric falue
+ * \details Absolute is the positive or equal 0 value \n
+ * There are some macros:
+ * - \c piAbss for "short"
+ * - \c piAbsi for "int"
+ * - \c piAbsl for "long"
+ * - \c piAbsll for "llong"
+ * - \c piAbsf for "float"
+ * - \c piAbsd for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp abs */
+template<typename T> inline T piAbs(const T & v) {return (v >= T(0) ? v : -v);}
+
+/*! \brief Templated function return minimum of two values
+ * \details There are some macros:
+ * - \c piMins for "short"
+ * - \c piMini for "int"
+ * - \c piMinl for "long"
+ * - \c piMinll for "llong"
+ * - \c piMinf for "float"
+ * - \c piMind for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp min2 */
+template<typename T> inline T piMin(const T & f, const T & s) {return ((f > s) ? s : f);}
+
+/*! \brief Templated function return minimum of tree values
+ * \details There are some macros:
+ * - \c piMins for "short"
+ * - \c piMini for "int"
+ * - \c piMinl for "long"
+ * - \c piMinll for "llong"
+ * - \c piMinf for "float"
+ * - \c piMind for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp min3 */
+template<typename T> inline T piMin(const T & f, const T & s, const T & t) {return ((f < s && f < t) ? f : ((s < t) ? s : t));}
+
+/*! \brief Templated function return maximum of two values
+ * \details There are some macros:
+ * - \c piMaxs for "short"
+ * - \c piMaxi for "int"
+ * - \c piMaxl for "long"
+ * - \c piMaxll for "llong"
+ * - \c piMaxf for "float"
+ * - \c piMaxd for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp max2 */
+template<typename T> inline T piMax(const T & f, const T & s) {return ((f < s) ? s : f);}
+
+/*! \brief Templated function return maximum of tree values
+ * \details There are some macros:
+ * - \c piMaxs for "short"
+ * - \c piMaxi for "int"
+ * - \c piMaxl for "long"
+ * - \c piMaxll for "llong"
+ * - \c piMaxf for "float"
+ * - \c piMaxd for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp max3 */
+template<typename T> inline T piMax(const T & f, const T & s, const T & t) {return ((f > s && f > t) ? f : ((s > t) ? s : t));}
+
+/*! \brief Templated function return clamped value
+ * \details Clamped is the not greater than "max" and not lesser than "min" value \n
+ * There are some macros:
+ * - \c piClamps for "short"
+ * - \c piClampi for "int"
+ * - \c piClampl for "long"
+ * - \c piClampll for "llong"
+ * - \c piClampf for "float"
+ * - \c piClampd for "double"
+ *
+ * Example:
+ * \snippet piincludes.cpp clamp */
+template<typename T> inline T piClamp(const T & v, const T & min, const T & max) {return (v > max ? max : (v < min ? min : v));}
+
+/// Function inverse byte order in memory block
+inline void piLetobe(void * data, int size) {
+	for (int i = 0; i < size / 2; i++)
+		piSwap<uchar>(((uchar*)data)[size - i - 1], ((uchar*)data)[i]);
+}
+
+/// \brief Templated function that inverse byte order of value "v"
+template<typename T> inline void piLetobe(T * v) {piLetobe(v, sizeof(T));}
+
+/*! \brief Templated function that returns "v" with inversed byte order
+ * \details This function used to convert values between little and big endian \n
+ * There are some macros:
+ * - \c piLetobes for "ushort"
+ * - \c piLetobei for "uint"
+ * - \c piLetobel for "ulong"
+ * - \c piLetobell for "ullong"
+ *
+ * Example:
+ * \snippet piincludes.cpp letobe */
+template<typename T> inline T piLetobe(const T & v) {T tv(v); piLetobe(&tv, sizeof(T)); return tv;}
+
+// specialization
+template<> inline ushort piLetobe(const ushort & v) {return (v << 8) | (v >> 8);}
+template<> inline uint piLetobe(const uint & v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
+template<> inline float piLetobe(const float & v) {
+	union _pletobe_f {
+		_pletobe_f(const float &f_) {f = f_;}
+		float f;
+		uint v;
+	};
+	_pletobe_f a(v);
+	a.v = (a.v >> 24) | ((a.v >> 8) & 0xFF00) | ((a.v << 8) & 0xFF0000) | ((a.v << 24) & 0xFF000000);
+	return a.f;
+}
+
+DEPRECATED inline ushort letobe_s(const ushort & v) {return (v << 8) | (v >> 8);}
+DEPRECATED inline uint letobe_i(const uint & v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
+
+#ifdef DOXYGEN
+
+/// \deprecated \brief Use \a piLetobe() instead of this function
+ushort letobe_s(ushort v) {return (v << 8) | (v >> 8);}
+
+/// \deprecated \brief Use \a piLetobe() instead of this function
+uint letobe_i(uint v) {return (v >> 24) | ((v >> 8) & 0xFF00) | ((v << 8) & 0xFF0000) | ((v << 24) & 0xFF000000);}
+
+#endif
+
+/// \brief Generic hash function, impements murmur3/32 algorithm
+inline uint piHashData(const uchar * data, uint len, uint seed = 0) {
+	if (!data || len <= 0) return 0u;
+	uint h = seed;
+	if (len > 3) {
+		uint i = len >> 2;
+		do {
+			uint k;
+			memcpy(&k, data, sizeof(uint));
+			data += sizeof(uint);
+			k *= 0xcc9e2d51;
+			k = (k << 15) | (k >> 17);
+			k *= 0x1b873593;
+			h ^= k;
+			h = (h << 13) | (h >> 19);
+			h = h * 5 + 0xe6546b64;
+		} while (--i);
+	}
+	if (len & 3) {
+		uint i = len & 3;
+		uint k = 0;
+		do {
+			k <<= 8;
+			k |= data[i - 1];
+		} while (--i);
+		k *= 0xcc9e2d51;
+		k = (k << 15) | (k >> 17);
+		k *= 0x1b873593;
+		h ^= k;
+	}
+	h ^= len;
+	h ^= h >> 16;
+	h *= 0x85ebca6b;
+	h ^= h >> 13;
+	h *= 0xc2b2ae35;
+	h ^= h >> 16;
+	return h;
+}
+
+
+template<typename T> inline uint piHash(const T & v) {
+	return 0;
+}
+
+template<> inline uint piHash(const  char   & v) {return (uint)v;}
+template<> inline uint piHash(const uchar   & v) {return (uint)v;}
+template<> inline uint piHash(const  short  & v) {return (uint)v;}
+template<> inline uint piHash(const ushort  & v) {return (uint)v;}
+template<> inline uint piHash(const  int    & v) {return (uint)v;}
+template<> inline uint piHash(const uint    & v) {return (uint)v;}
+template<> inline uint piHash(const  llong  & v) {return piHashData((const uchar *)&v, sizeof(v));}
+template<> inline uint piHash(const ullong  & v) {return piHashData((const uchar *)&v, sizeof(v));}
+template<> inline uint piHash(const float   & v) {return (uint)v;}
+template<> inline uint piHash(const double  & v) {return piHashData((const uchar *)&v, sizeof(v));}
+template<> inline uint piHash(const ldouble & v) {return piHashData((const uchar *)&v, sizeof(v));}
+
+#define piRoundf piRound<float>
+#define piRoundd piRound<double>
+#define piFloorf piFloor<float>
+#define piFloord piFloor<double>
+#define piCeilf piCeil<float>
+#define piCeild piCeil<double>
+#define piAbss piAbs<short>
+#define piAbsi piAbs<int>
+#define piAbsl piAbs<long>
+#define piAbsll piAbs<llong>
+#define piAbsf piAbs<float>
+#define piAbsd piAbs<double>
+#define piMins piMin<short>
+#define piMini piMin<int>
+#define piMinl piMin<long>
+#define piMinll piMin<llong>
+#define piMinf piMin<float>
+#define piMind piMin<double>
+#define piMaxs piMax<short>
+#define piMaxi piMax<int>
+#define piMaxl piMax<long>
+#define piMaxll piMax<llong>
+#define piMaxf piMax<float>
+#define piMaxd piMax<double>
+#define piClamps piClamp<short>
+#define piClampi piClamp<int>
+#define piClampl piClamp<long>
+#define piClampll piClamp<llong>
+#define piClampf piClamp<float>
+#define piClampd piClamp<double>
+#define piLetobes piLetobe<ushort>
+#define piLetobei piLetobe<uint>
+#define piLetobel piLetobe<ulong>
+#define piLetobell piLetobe<ullong>
+#define piLetobef piLetobe<float>
+
+
+#endif // PIBASE_H
diff --git a/src_main/core/pibitarray.cpp b/lib/main/core/pibitarray.cpp
similarity index 96%
rename from src_main/core/pibitarray.cpp
rename to lib/main/core/pibitarray.cpp
index be267f55..c941dc52 100644
--- a/src_main/core/pibitarray.cpp
+++ b/lib/main/core/pibitarray.cpp
@@ -1,44 +1,44 @@
-/*
-	PIP - Platform Independent Primitives
-	Bit array
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pibitarray.h"
-#include "picout.h"
-
-
-PICout operator <<(PICout s, const PIBitArray & ba) {
-	s.space();
-	s.setControl(0, true);
-	for (uint i = 0; i < ba.bitSize(); ++i) {
-		s << int(ba[i]);
-		if (i % 8 == 7) s << ' ';
-	}
-	s.restoreControl();
-	return s;
-}
-
-#ifdef PIP_STD_IOSTREAM
-std::ostream &operator <<(std::ostream & s, const PIBitArray & ba) {
-	for (uint i = 0; i < ba.bitSize(); ++i) {
-		s << ba[i];
-		if (i % 8 == 7) s << ' ';
-	}
-	return s;
-}
-#endif
-
+/*
+	PIP - Platform Independent Primitives
+	Bit array
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pibitarray.h"
+#include "picout.h"
+
+
+PICout operator <<(PICout s, const PIBitArray & ba) {
+	s.space();
+	s.setControl(0, true);
+	for (uint i = 0; i < ba.bitSize(); ++i) {
+		s << int(ba[i]);
+		if (i % 8 == 7) s << ' ';
+	}
+	s.restoreControl();
+	return s;
+}
+
+#ifdef PIP_STD_IOSTREAM
+std::ostream &operator <<(std::ostream & s, const PIBitArray & ba) {
+	for (uint i = 0; i < ba.bitSize(); ++i) {
+		s << ba[i];
+		if (i % 8 == 7) s << ' ';
+	}
+	return s;
+}
+#endif
+
diff --git a/src_main/core/pibitarray.h b/lib/main/core/pibitarray.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pibitarray.h
rename to lib/main/core/pibitarray.h
diff --git a/src_main/core/pibytearray.cpp b/lib/main/core/pibytearray.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pibytearray.cpp
rename to lib/main/core/pibytearray.cpp
diff --git a/src_main/core/pibytearray.h b/lib/main/core/pibytearray.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pibytearray.h
rename to lib/main/core/pibytearray.h
diff --git a/src_main/core/pichar.cpp b/lib/main/core/pichar.cpp
similarity index 100%
rename from src_main/core/pichar.cpp
rename to lib/main/core/pichar.cpp
diff --git a/src_main/core/pichar.h b/lib/main/core/pichar.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pichar.h
rename to lib/main/core/pichar.h
diff --git a/src_main/core/pichunkstream.cpp b/lib/main/core/pichunkstream.cpp
similarity index 100%
rename from src_main/core/pichunkstream.cpp
rename to lib/main/core/pichunkstream.cpp
diff --git a/src_main/core/pichunkstream.h b/lib/main/core/pichunkstream.h
similarity index 100%
rename from src_main/core/pichunkstream.h
rename to lib/main/core/pichunkstream.h
diff --git a/src_main/core/picli.cpp b/lib/main/core/picli.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/picli.cpp
rename to lib/main/core/picli.cpp
diff --git a/src_main/core/picli.h b/lib/main/core/picli.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/picli.h
rename to lib/main/core/picli.h
diff --git a/src_main/core/picollection.cpp b/lib/main/core/picollection.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/picollection.cpp
rename to lib/main/core/picollection.cpp
diff --git a/src_main/core/picollection.h b/lib/main/core/picollection.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/picollection.h
rename to lib/main/core/picollection.h
diff --git a/src_main/core/picoremodule.h b/lib/main/core/picoremodule.h
similarity index 100%
rename from src_main/core/picoremodule.h
rename to lib/main/core/picoremodule.h
diff --git a/src_main/core/picout.cpp b/lib/main/core/picout.cpp
similarity index 100%
rename from src_main/core/picout.cpp
rename to lib/main/core/picout.cpp
diff --git a/src_main/core/picout.h b/lib/main/core/picout.h
similarity index 97%
rename from src_main/core/picout.h
rename to lib/main/core/picout.h
index bafa360d..19eab8ec 100644
--- a/src_main/core/picout.h
+++ b/lib/main/core/picout.h
@@ -1,301 +1,301 @@
-/*! \file picout.h
- * \brief Universal output to console class
-*/
-/*
-	PIP - Platform Independent Primitives
-	Universal output to console class
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICOUT_H
-#define PICOUT_H
-
-#include "piincludes.h"
-
-#ifdef DOXYGEN
-
-//! \brief Macro used for conditional (piDebug) output to PICout
-#  define piCout
-
-//! \relatesalso PIObject \brief Macro used for conditional (piDebug and PIObject::debug()) output to PICout for subclasses of PIObject
-#  define piCoutObj
-
-#else
-#  define piCout PICout(piDebug)
-#  define piCoutObj PICout(piDebug && debug()) << (PIStringAscii("[") + className() + PIStringAscii(" \"") + name() + PIStringAscii("\"]"))
-#endif
-
-
-class PIObject;
-
-
-//! \brief Namespace contains enums controlled PICout
-namespace PICoutManipulators {
-
-	//! \brief Enum contains special characters
-	enum PIP_EXPORT PICoutSpecialChar {
-		Null	/*! Null-character, '\\0' */,
-		NewLine	/*! New line character, '\\n' */,
-		Tab		/*! Tab character, '\\t' */,
-		Esc		/*! Escape character, '\\e' */,
-		Quote	/*! Quote character, '"' */
-	};
-
-	//! \brief Enum contains immediate action
-	enum PIP_EXPORT PICoutAction {
-		Flush			/*! Flush the output */,
-		Backspace		/*! Remove last symbol */,
-		ShowCursor		/*! Show cursor */,
-		HideCursor		/*! Hide cursor */,
-		ClearLine		/*! Clear current line */,
-		ClearScreen		/*! Clear the screen */,
-		SaveContol		/*! Save control flags, equivalent to \a saveControl() */,
-		RestoreControl	/*! Restore control flags, equivalent to \a restoreControl() */
-	};
-
-	//! \brief Enum contains control of PICout
-	enum PIP_EXPORT PICoutControl {
-		AddNone			/*! No controls */ = 0x0,
-		AddSpaces		/*! Spaces will be appear after each output */ = 0x1,
-		AddNewLine		/*! New line will be appear after all output */ = 0x2,
-		AddQuotes		/*! Each string will be quoted */ = 0x4,
-		DefaultControls	/*! Default controls */ = AddSpaces | AddNewLine,
-		AddAll			/*! All controls */ = 0xFF,
-		NoLock			/*! Don`t use mutex for output */ = 0x100,
-	};
-
-	//! \brief Enum contains output format
-	enum PIP_EXPORT PICoutFormat {
-		Bin			/*! Binary representation of integers */ = 0x01,
-		Oct			/*! Octal representation of integers */ = 0x02,
-		Dec			/*! Decimal representation of integers */ = 0x04,
-		Hex			/*! Hexadecimal representation of integers */ = 0x08,
-		Bold		/*! Bold */ = 0x10,
-		Faint		/*!  */ = 0x20,
-		Italic		/*!  */ = 0x40,
-		Underline	/*! Underline */ = 0x80,
-		Blink		/*! Blink */ = 0x100,
-		Black		/*! Black font */ = 0x400,
-		Red			/*! Red font */ = 0x800,
-		Green		/*! Green font */ = 0x1000,
-		Blue		/*! Blue font */ = 0x2000,
-		Yellow		/*! Yellow font */ = 0x4000,
-		Magenta		/*! Magenta font */ = 0x8000,
-		Cyan		/*! Cyan font */ = 0x10000,
-		White		/*! White font */ = 0x20000,
-		BackBlack	/*! Black background */ = 0x40000,
-		BackRed		/*! Red background */ = 0x80000,
-		BackGreen	/*! Green background */ = 0x100000,
-		BackBlue	/*! Blue background */ = 0x200000,
-		BackYellow	/*! Yellow background */ = 0x400000,
-		BackMagenta	/*! Magenta background */ = 0x800000,
-		BackCyan	/*! Cyan background */ = 0x1000000,
-		BackWhite	/*! White background */ = 0x2000000,
-		Default		/*! Default format */ = 0x4000000
-	};
-
-	typedef PIFlags<PICoutControl> PICoutControls;
-}
-
-
-
-class PIP_EXPORT PICout {
-public:
-	//! Default constructor with default features (AddSpaces and AddNewLine)
-	PICout(PIFlags<PICoutManipulators::PICoutControl> controls = PICoutManipulators::DefaultControls);
-	PICout(PICoutManipulators::PICoutControl control = PICoutManipulators::DefaultControls);
-
-	//! Construct with default features (AddSpaces and AddNewLine), but if \"active\" is false does nothing
-	PICout(bool active);
-
-	//! Construct with external buffer and id "id". See \a Notifier for details
-	PICout(PIString * buffer, int id = 0, PIFlags<PICoutManipulators::PICoutControl> controls = PICoutManipulators::AddSpaces | PICoutManipulators::AddNewLine);
-
-	PICout(const PICout & other);
-
-	~PICout();
-
-	class Notifier {
-	public:
-		static Notifier * instance();
-		static PIObject * object();
-	private:
-		Notifier();
-		PIObject * o;
-	};
-
-	//! \brief Enum contains output devices of PICout
-	enum OutputDevice {
-		NoDevices  /** PICout is disabled */ = 0x0,
-		StdOut     /** Standard console output */ = 0x1,
-		Buffer     /** Internal buffer */ = 0x2,
-		AllDevices /** All */ = 0xFFFF,
-	};
-
-	typedef PIFlags<OutputDevice> OutputDevices;
-
-	//! Output operator for strings with <tt>"const char * "</tt> type
-	PICout operator <<(const char * v);
-
-	//! Output operator for strings with <tt>"std::string"</tt> type
-	//PICout operator <<(const std::string & v);
-
-	//! Output operator for boolean values
-	PICout operator <<(const bool v);
-
-	//! Output operator for <tt>"char"</tt> values
-	PICout operator <<(const char v);
-
-	//! Output operator for <tt>"unsigned char"</tt> values
-	PICout operator <<(const uchar v);
-
-	//! Output operator for <tt>"short"</tt> values
-	PICout operator <<(const short v);
-
-	//! Output operator for <tt>"unsigned short"</tt> values
-	PICout operator <<(const ushort v);
-
-	//! Output operator for <tt>"int"</tt> values
-	PICout operator <<(const int v);
-
-	//! Output operator for <tt>"unsigned int"</tt> values
-	PICout operator <<(const uint v);
-
-	//! Output operator for <tt>"long"</tt> values
-	PICout operator <<(const long v);
-
-	//! Output operator for <tt>"unsigned long"</tt> values
-	PICout operator <<(const ulong v);
-
-	//! Output operator for <tt>"long long"</tt> values
-	PICout operator <<(const llong v);
-
-	//! Output operator for <tt>"unsigned long long"</tt> values
-	PICout operator <<(const ullong v);
-
-	//! Output operator for <tt>"float"</tt> values
-	PICout operator <<(const float v);
-
-	//! Output operator for <tt>"double"</tt> values
-	PICout operator <<(const double v);
-
-	//! Output operator for pointers
-	PICout operator <<(const void * v);
-
-	//! Output operator for PIObject and ancestors
-	PICout operator <<(const PIObject * v);
-
-	//! Output operator for \a PICoutSpecialChar values
-	PICout operator <<(const PICoutManipulators::PICoutSpecialChar v);
-
-	//! Output operator for \a PIFlags<PICoutFormat> values
-	PICout operator <<(const PIFlags<PICoutManipulators::PICoutFormat> & v) {
-		if (v[PICoutManipulators::Bin]) cnb_ = 2;
-		if (v[PICoutManipulators::Oct]) cnb_ = 8;
-		if (v[PICoutManipulators::Dec]) cnb_ = 10;
-		if (v[PICoutManipulators::Hex]) cnb_ = 16;
-		if (v[PICoutManipulators::Bold]) applyFormat(PICoutManipulators::Bold);
-		if (v[PICoutManipulators::Faint]) applyFormat(PICoutManipulators::Faint);
-		if (v[PICoutManipulators::Italic]) applyFormat(PICoutManipulators::Italic);
-		if (v[PICoutManipulators::Underline]) applyFormat(PICoutManipulators::Underline);
-		if (v[PICoutManipulators::Blink]) applyFormat(PICoutManipulators::Blink);
-		if (v[PICoutManipulators::Black]) applyFormat(PICoutManipulators::Black);
-		if (v[PICoutManipulators::Red]) applyFormat(PICoutManipulators::Red);
-		if (v[PICoutManipulators::Green]) applyFormat(PICoutManipulators::Green);
-		if (v[PICoutManipulators::Blue]) applyFormat(PICoutManipulators::Blue);
-		if (v[PICoutManipulators::Yellow]) applyFormat(PICoutManipulators::Yellow);
-		if (v[PICoutManipulators::Magenta]) applyFormat(PICoutManipulators::Magenta);
-		if (v[PICoutManipulators::Cyan]) applyFormat(PICoutManipulators::Cyan);
-		if (v[PICoutManipulators::White]) applyFormat(PICoutManipulators::White);
-		if (v[PICoutManipulators::BackBlack]) applyFormat(PICoutManipulators::BackBlack);
-		if (v[PICoutManipulators::BackRed]) applyFormat(PICoutManipulators::BackRed);
-		if (v[PICoutManipulators::BackGreen]) applyFormat(PICoutManipulators::BackGreen);
-		if (v[PICoutManipulators::BackBlue]) applyFormat(PICoutManipulators::BackBlue);
-		if (v[PICoutManipulators::BackYellow]) applyFormat(PICoutManipulators::BackYellow);
-		if (v[PICoutManipulators::BackMagenta]) applyFormat(PICoutManipulators::BackMagenta);
-		if (v[PICoutManipulators::BackCyan]) applyFormat(PICoutManipulators::BackCyan);
-		if (v[PICoutManipulators::BackWhite]) applyFormat(PICoutManipulators::BackWhite);
-		if (v[PICoutManipulators::Default]) applyFormat(PICoutManipulators::Default);
-		return *this;
-	}
-
-	//! Output operator for \a PICoutFormat values
-	PICout operator <<(const PICoutManipulators::PICoutFormat v) {
-		switch (v) {
-		case PICoutManipulators::Bin: cnb_ = 2; break;
-		case PICoutManipulators::Oct: cnb_ = 8; break;
-		case PICoutManipulators::Dec: cnb_ = 10; break;
-		case PICoutManipulators::Hex: cnb_ = 16; break;
-		default: applyFormat(v);
-		};
-		return *this;
-	}
-
-	//! Do some action
-	PICout operator <<(const PICoutManipulators::PICoutAction v);
-
-	//! Set control flag "c" is "on" state
-	PICout & setControl(PICoutManipulators::PICoutControl c, bool on = true) {co_.setFlag(c, on); return *this;}
-
-	//! Set control flags "c" and if "save" exec \a saveControl()
-	PICout & setControl(PICoutManipulators::PICoutControls c, bool save = false) {if (save) saveControl(); co_ = c; return *this;}
-
-	//! Save control flags to internal stack \sa \a restoreControl()
-	PICout & saveControl();
-
-	//! Restore control flags from internal stack \sa \a saveControl()
-	PICout & restoreControl();
-
-	/*! \brief Conditional put space character to output
-	 * \details If it is not a first output and control \a AddSpaces is set
-	 * space character is put \sa \a quote(), \a newLine() */
-	PICout & space();
-
-	/*! \brief Conditional put quote character to output
-	 * \details If control \a AddQuotes is set
-	 * quote character is put \sa \a space(), \a newLine() */
-	PICout & quote();
-
-	/*! \brief Conditional put new line character to output
-	 * \details If control \a AddNewLine is set
-	 * new line character is put \sa \a space(), \a quote() */
-	PICout & newLine();
-
-	static bool setBufferActive(bool on, bool clear = false);
-	static bool isBufferActive();
-	static PIString buffer(bool clear = false);
-	static void clearBuffer();
-
-	static bool setOutputDevice(OutputDevice d, bool on = true);
-	static void setOutputDevices(OutputDevices d);
-	static bool isOutputDeviceActive(OutputDevice d);
-
-	static PIMutex & __mutex__();
-	static PIString & __string__();
-
-private:
-	void init();
-	void applyFormat(PICoutManipulators::PICoutFormat f);
-
-	static OutputDevices devs;
-	PRIVATE_DECLARATION
-	bool fo_, cc_, fc_, act_;
-	int cnb_, attr_, id_;
-	PIString * buffer_;
-	PICoutManipulators::PICoutControls co_;
-};
-
-#endif // PICOUT_H
+/*! \file picout.h
+ * \brief Universal output to console class
+*/
+/*
+	PIP - Platform Independent Primitives
+	Universal output to console class
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICOUT_H
+#define PICOUT_H
+
+#include "piincludes.h"
+
+#ifdef DOXYGEN
+
+//! \brief Macro used for conditional (piDebug) output to PICout
+#  define piCout
+
+//! \relatesalso PIObject \brief Macro used for conditional (piDebug and PIObject::debug()) output to PICout for subclasses of PIObject
+#  define piCoutObj
+
+#else
+#  define piCout PICout(piDebug)
+#  define piCoutObj PICout(piDebug && debug()) << (PIStringAscii("[") + className() + PIStringAscii(" \"") + name() + PIStringAscii("\"]"))
+#endif
+
+
+class PIObject;
+
+
+//! \brief Namespace contains enums controlled PICout
+namespace PICoutManipulators {
+
+	//! \brief Enum contains special characters
+	enum PIP_EXPORT PICoutSpecialChar {
+		Null	/*! Null-character, '\\0' */,
+		NewLine	/*! New line character, '\\n' */,
+		Tab		/*! Tab character, '\\t' */,
+		Esc		/*! Escape character, '\\e' */,
+		Quote	/*! Quote character, '"' */
+	};
+
+	//! \brief Enum contains immediate action
+	enum PIP_EXPORT PICoutAction {
+		Flush			/*! Flush the output */,
+		Backspace		/*! Remove last symbol */,
+		ShowCursor		/*! Show cursor */,
+		HideCursor		/*! Hide cursor */,
+		ClearLine		/*! Clear current line */,
+		ClearScreen		/*! Clear the screen */,
+		SaveContol		/*! Save control flags, equivalent to \a saveControl() */,
+		RestoreControl	/*! Restore control flags, equivalent to \a restoreControl() */
+	};
+
+	//! \brief Enum contains control of PICout
+	enum PIP_EXPORT PICoutControl {
+		AddNone			/*! No controls */ = 0x0,
+		AddSpaces		/*! Spaces will be appear after each output */ = 0x1,
+		AddNewLine		/*! New line will be appear after all output */ = 0x2,
+		AddQuotes		/*! Each string will be quoted */ = 0x4,
+		DefaultControls	/*! Default controls */ = AddSpaces | AddNewLine,
+		AddAll			/*! All controls */ = 0xFF,
+		NoLock			/*! Don`t use mutex for output */ = 0x100,
+	};
+
+	//! \brief Enum contains output format
+	enum PIP_EXPORT PICoutFormat {
+		Bin			/*! Binary representation of integers */ = 0x01,
+		Oct			/*! Octal representation of integers */ = 0x02,
+		Dec			/*! Decimal representation of integers */ = 0x04,
+		Hex			/*! Hexadecimal representation of integers */ = 0x08,
+		Bold		/*! Bold */ = 0x10,
+		Faint		/*!  */ = 0x20,
+		Italic		/*!  */ = 0x40,
+		Underline	/*! Underline */ = 0x80,
+		Blink		/*! Blink */ = 0x100,
+		Black		/*! Black font */ = 0x400,
+		Red			/*! Red font */ = 0x800,
+		Green		/*! Green font */ = 0x1000,
+		Blue		/*! Blue font */ = 0x2000,
+		Yellow		/*! Yellow font */ = 0x4000,
+		Magenta		/*! Magenta font */ = 0x8000,
+		Cyan		/*! Cyan font */ = 0x10000,
+		White		/*! White font */ = 0x20000,
+		BackBlack	/*! Black background */ = 0x40000,
+		BackRed		/*! Red background */ = 0x80000,
+		BackGreen	/*! Green background */ = 0x100000,
+		BackBlue	/*! Blue background */ = 0x200000,
+		BackYellow	/*! Yellow background */ = 0x400000,
+		BackMagenta	/*! Magenta background */ = 0x800000,
+		BackCyan	/*! Cyan background */ = 0x1000000,
+		BackWhite	/*! White background */ = 0x2000000,
+		Default		/*! Default format */ = 0x4000000
+	};
+
+	typedef PIFlags<PICoutControl> PICoutControls;
+}
+
+
+
+class PIP_EXPORT PICout {
+public:
+	//! Default constructor with default features (AddSpaces and AddNewLine)
+	PICout(PIFlags<PICoutManipulators::PICoutControl> controls = PICoutManipulators::DefaultControls);
+	PICout(PICoutManipulators::PICoutControl control = PICoutManipulators::DefaultControls);
+
+	//! Construct with default features (AddSpaces and AddNewLine), but if \"active\" is false does nothing
+	PICout(bool active);
+
+	//! Construct with external buffer and id "id". See \a Notifier for details
+	PICout(PIString * buffer, int id = 0, PIFlags<PICoutManipulators::PICoutControl> controls = PICoutManipulators::AddSpaces | PICoutManipulators::AddNewLine);
+
+	PICout(const PICout & other);
+
+	~PICout();
+
+	class Notifier {
+	public:
+		static Notifier * instance();
+		static PIObject * object();
+	private:
+		Notifier();
+		PIObject * o;
+	};
+
+	//! \brief Enum contains output devices of PICout
+	enum OutputDevice {
+		NoDevices  /** PICout is disabled */ = 0x0,
+		StdOut     /** Standard console output */ = 0x1,
+		Buffer     /** Internal buffer */ = 0x2,
+		AllDevices /** All */ = 0xFFFF,
+	};
+
+	typedef PIFlags<OutputDevice> OutputDevices;
+
+	//! Output operator for strings with <tt>"const char * "</tt> type
+	PICout operator <<(const char * v);
+
+	//! Output operator for strings with <tt>"std::string"</tt> type
+	//PICout operator <<(const std::string & v);
+
+	//! Output operator for boolean values
+	PICout operator <<(const bool v);
+
+	//! Output operator for <tt>"char"</tt> values
+	PICout operator <<(const char v);
+
+	//! Output operator for <tt>"unsigned char"</tt> values
+	PICout operator <<(const uchar v);
+
+	//! Output operator for <tt>"short"</tt> values
+	PICout operator <<(const short v);
+
+	//! Output operator for <tt>"unsigned short"</tt> values
+	PICout operator <<(const ushort v);
+
+	//! Output operator for <tt>"int"</tt> values
+	PICout operator <<(const int v);
+
+	//! Output operator for <tt>"unsigned int"</tt> values
+	PICout operator <<(const uint v);
+
+	//! Output operator for <tt>"long"</tt> values
+	PICout operator <<(const long v);
+
+	//! Output operator for <tt>"unsigned long"</tt> values
+	PICout operator <<(const ulong v);
+
+	//! Output operator for <tt>"long long"</tt> values
+	PICout operator <<(const llong v);
+
+	//! Output operator for <tt>"unsigned long long"</tt> values
+	PICout operator <<(const ullong v);
+
+	//! Output operator for <tt>"float"</tt> values
+	PICout operator <<(const float v);
+
+	//! Output operator for <tt>"double"</tt> values
+	PICout operator <<(const double v);
+
+	//! Output operator for pointers
+	PICout operator <<(const void * v);
+
+	//! Output operator for PIObject and ancestors
+	PICout operator <<(const PIObject * v);
+
+	//! Output operator for \a PICoutSpecialChar values
+	PICout operator <<(const PICoutManipulators::PICoutSpecialChar v);
+
+	//! Output operator for \a PIFlags<PICoutFormat> values
+	PICout operator <<(const PIFlags<PICoutManipulators::PICoutFormat> & v) {
+		if (v[PICoutManipulators::Bin]) cnb_ = 2;
+		if (v[PICoutManipulators::Oct]) cnb_ = 8;
+		if (v[PICoutManipulators::Dec]) cnb_ = 10;
+		if (v[PICoutManipulators::Hex]) cnb_ = 16;
+		if (v[PICoutManipulators::Bold]) applyFormat(PICoutManipulators::Bold);
+		if (v[PICoutManipulators::Faint]) applyFormat(PICoutManipulators::Faint);
+		if (v[PICoutManipulators::Italic]) applyFormat(PICoutManipulators::Italic);
+		if (v[PICoutManipulators::Underline]) applyFormat(PICoutManipulators::Underline);
+		if (v[PICoutManipulators::Blink]) applyFormat(PICoutManipulators::Blink);
+		if (v[PICoutManipulators::Black]) applyFormat(PICoutManipulators::Black);
+		if (v[PICoutManipulators::Red]) applyFormat(PICoutManipulators::Red);
+		if (v[PICoutManipulators::Green]) applyFormat(PICoutManipulators::Green);
+		if (v[PICoutManipulators::Blue]) applyFormat(PICoutManipulators::Blue);
+		if (v[PICoutManipulators::Yellow]) applyFormat(PICoutManipulators::Yellow);
+		if (v[PICoutManipulators::Magenta]) applyFormat(PICoutManipulators::Magenta);
+		if (v[PICoutManipulators::Cyan]) applyFormat(PICoutManipulators::Cyan);
+		if (v[PICoutManipulators::White]) applyFormat(PICoutManipulators::White);
+		if (v[PICoutManipulators::BackBlack]) applyFormat(PICoutManipulators::BackBlack);
+		if (v[PICoutManipulators::BackRed]) applyFormat(PICoutManipulators::BackRed);
+		if (v[PICoutManipulators::BackGreen]) applyFormat(PICoutManipulators::BackGreen);
+		if (v[PICoutManipulators::BackBlue]) applyFormat(PICoutManipulators::BackBlue);
+		if (v[PICoutManipulators::BackYellow]) applyFormat(PICoutManipulators::BackYellow);
+		if (v[PICoutManipulators::BackMagenta]) applyFormat(PICoutManipulators::BackMagenta);
+		if (v[PICoutManipulators::BackCyan]) applyFormat(PICoutManipulators::BackCyan);
+		if (v[PICoutManipulators::BackWhite]) applyFormat(PICoutManipulators::BackWhite);
+		if (v[PICoutManipulators::Default]) applyFormat(PICoutManipulators::Default);
+		return *this;
+	}
+
+	//! Output operator for \a PICoutFormat values
+	PICout operator <<(const PICoutManipulators::PICoutFormat v) {
+		switch (v) {
+		case PICoutManipulators::Bin: cnb_ = 2; break;
+		case PICoutManipulators::Oct: cnb_ = 8; break;
+		case PICoutManipulators::Dec: cnb_ = 10; break;
+		case PICoutManipulators::Hex: cnb_ = 16; break;
+		default: applyFormat(v);
+		};
+		return *this;
+	}
+
+	//! Do some action
+	PICout operator <<(const PICoutManipulators::PICoutAction v);
+
+	//! Set control flag "c" is "on" state
+	PICout & setControl(PICoutManipulators::PICoutControl c, bool on = true) {co_.setFlag(c, on); return *this;}
+
+	//! Set control flags "c" and if "save" exec \a saveControl()
+	PICout & setControl(PICoutManipulators::PICoutControls c, bool save = false) {if (save) saveControl(); co_ = c; return *this;}
+
+	//! Save control flags to internal stack \sa \a restoreControl()
+	PICout & saveControl();
+
+	//! Restore control flags from internal stack \sa \a saveControl()
+	PICout & restoreControl();
+
+	/*! \brief Conditional put space character to output
+	 * \details If it is not a first output and control \a AddSpaces is set
+	 * space character is put \sa \a quote(), \a newLine() */
+	PICout & space();
+
+	/*! \brief Conditional put quote character to output
+	 * \details If control \a AddQuotes is set
+	 * quote character is put \sa \a space(), \a newLine() */
+	PICout & quote();
+
+	/*! \brief Conditional put new line character to output
+	 * \details If control \a AddNewLine is set
+	 * new line character is put \sa \a space(), \a quote() */
+	PICout & newLine();
+
+	static bool setBufferActive(bool on, bool clear = false);
+	static bool isBufferActive();
+	static PIString buffer(bool clear = false);
+	static void clearBuffer();
+
+	static bool setOutputDevice(OutputDevice d, bool on = true);
+	static void setOutputDevices(OutputDevices d);
+	static bool isOutputDeviceActive(OutputDevice d);
+
+	static PIMutex & __mutex__();
+	static PIString & __string__();
+
+private:
+	void init();
+	void applyFormat(PICoutManipulators::PICoutFormat f);
+
+	static OutputDevices devs;
+	PRIVATE_DECLARATION
+	bool fo_, cc_, fc_, act_;
+	int cnb_, attr_, id_;
+	PIString * buffer_;
+	PICoutManipulators::PICoutControls co_;
+};
+
+#endif // PICOUT_H
diff --git a/src_main/core/piflags.h b/lib/main/core/piflags.h
similarity index 97%
rename from src_main/core/piflags.h
rename to lib/main/core/piflags.h
index 3a5b4699..202027f9 100644
--- a/src_main/core/piflags.h
+++ b/lib/main/core/piflags.h
@@ -1,137 +1,137 @@
-/*! \file piflags.h
- * \brief General flags class
-*/
-/*
-	PIP - Platform Independent Primitives
-	General flags class
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIFLAGS_H
-#define PIFLAGS_H
-
-#include "pip_export.h"
-
-/*! \brief This class used as container for bit flags
- * \details PIFlags is wrapper around \c "int". There are many
- * bit-wise operators, native conversion to int and function
- * to test flag. \n Example:
- * \snippet piincludes.cpp flags
- */
-template<typename Enum>
-class PIP_EXPORT PIFlags {
-public:
-	//! Constructor with flags = 0
-	PIFlags(): flags(0) {;}
-	//! Constructor with flags = Enum "e"
-	PIFlags(Enum e): flags(e) {;}
-	//! Constructor with flags = PIFlags "f"
-	PIFlags(const PIFlags & f): flags(f.flags) {;}
-	//! Constructor with flags = int "i"
-	PIFlags(const int i): flags(i) {;}
-	//! Set flags "f" to value "on"
-	PIFlags & setFlag(const PIFlags & f, bool on = true) {if (on) flags |= f.flags; else flags &= ~f.flags; return *this;}
-	//! Set flag "e" to value "on"
-	PIFlags & setFlag(const Enum & e, bool on = true) {if (on) flags |= e; else flags &= ~e; return *this;}
-	//! Set flag "i" to value "on"
-	PIFlags & setFlag(const int & i, bool on = true) {if (on) flags |= i; else flags &= ~i; return *this;}
-	//! copy operator
-	void operator =(const PIFlags & f) {flags = f.flags;}
-	//! copy operator
-	void operator =(const Enum & e) {flags = e;}
-	//! copy operator
-	void operator =(const int & i) {flags = i;}
-	//! compare operator
-	bool operator ==(const PIFlags & f) {return flags == f.flags;}
-	//! compare operator
-	bool operator ==(const Enum & e) {return flags == e;}
-	//! compare operator
-	bool operator ==(const int i) {return flags == i;}
-	//! compare operator
-	bool operator !=(const PIFlags & f) {return flags != f.flags;}
-	//! compare operator
-	bool operator !=(const Enum & e) {return flags != e;}
-	//! compare operator
-	bool operator !=(const int i) {return flags != i;}
-	//! compare operator
-	bool operator >(const PIFlags & f) {return flags > f.flags;}
-	//! compare operator
-	bool operator >(const Enum & e) {return flags > e;}
-	//! compare operator
-	bool operator >(const int i) {return flags > i;}
-	//! compare operator
-	bool operator <(const PIFlags & f) {return flags < f.flags;}
-	//! compare operator
-	bool operator <(const Enum & e) {return flags < e;}
-	//! compare operator
-	bool operator <(const int i) {return flags < i;}
-	//! compare operator
-	bool operator >=(const PIFlags & f) {return flags >= f.flags;}
-	//! compare operator
-	bool operator >=(const Enum & e) {return flags >= e;}
-	//! compare operator
-	bool operator >=(const int i) {return flags >= i;}
-	//! compare operator
-	bool operator <=(const PIFlags & f) {return flags <= f.flags;}
-	//! compare operator
-	bool operator <=(const Enum & e) {return flags <= e;}
-	//! compare operator
-	bool operator <=(const int i) {return flags <= i;}
-	//! Bit-wise AND operator
-	void operator &=(const PIFlags & f) {flags &= f.flags;}
-	//! Bit-wise AND operator
-	void operator &=(const Enum & e) {flags &= e;}
-	//! Bit-wise AND operator
-	void operator &=(const int i) {flags &= i;}
-	//! Bit-wise OR operator
-	void operator |=(const PIFlags & f) {flags |= f.flags;}
-	//! Bit-wise OR operator
-	void operator |=(const Enum & e) {flags |= e;}
-	//! Bit-wise OR operator
-	void operator |=(const int i) {flags |= i;}
-	//! Bit-wise XOR operator
-	void operator ^=(const PIFlags & f) {flags ^= f.flags;}
-	//! Bit-wise XOR operator
-	void operator ^=(const Enum & e) {flags ^= e;}
-	//! Bit-wise XOR operator
-	void operator ^=(const int i) {flags ^= i;}
-	//! Bit-wise AND operator
-	PIFlags operator &(PIFlags f) const {PIFlags tf(flags & f.flags); return tf;}
-	//! Bit-wise AND operator
-	PIFlags operator &(Enum e) const {PIFlags tf(flags & e); return tf;}
-	//! Bit-wise AND operator
-	PIFlags operator &(int i) const {PIFlags tf(flags & i); return tf;}
-	//! Bit-wise OR operator
-	PIFlags operator |(PIFlags f) const {PIFlags tf(flags | f.flags); return tf;}
-	//! Bit-wise OR operator
-	PIFlags operator |(Enum e) const {PIFlags tf(flags | e); return tf;}
-	//! Bit-wise OR operator
-	PIFlags operator |(int i) const {PIFlags tf(flags | i); return tf;}
-	//! Bit-wise XOR operator
-	PIFlags operator ^(PIFlags f) const {PIFlags tf(flags ^ f.flags); return tf;}
-	//! Bit-wise XOR operator
-	PIFlags operator ^(Enum e) const {PIFlags tf(flags ^ e); return tf;}
-	//! Bit-wise XOR operator
-	PIFlags operator ^(int i) const {PIFlags tf(flags ^ i); return tf;}
-	//! Test flag operator
-	bool operator [](Enum e) const {return (flags & e) == e;}
-	//! Implicity conversion to \c int
-	operator int() const {return flags;}
-private:
-	int flags;
-};
-
-#endif // PIFLAGS_H
+/*! \file piflags.h
+ * \brief General flags class
+*/
+/*
+	PIP - Platform Independent Primitives
+	General flags class
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIFLAGS_H
+#define PIFLAGS_H
+
+#include "pip_export.h"
+
+/*! \brief This class used as container for bit flags
+ * \details PIFlags is wrapper around \c "int". There are many
+ * bit-wise operators, native conversion to int and function
+ * to test flag. \n Example:
+ * \snippet piincludes.cpp flags
+ */
+template<typename Enum>
+class PIP_EXPORT PIFlags {
+public:
+	//! Constructor with flags = 0
+	PIFlags(): flags(0) {;}
+	//! Constructor with flags = Enum "e"
+	PIFlags(Enum e): flags(e) {;}
+	//! Constructor with flags = PIFlags "f"
+	PIFlags(const PIFlags & f): flags(f.flags) {;}
+	//! Constructor with flags = int "i"
+	PIFlags(const int i): flags(i) {;}
+	//! Set flags "f" to value "on"
+	PIFlags & setFlag(const PIFlags & f, bool on = true) {if (on) flags |= f.flags; else flags &= ~f.flags; return *this;}
+	//! Set flag "e" to value "on"
+	PIFlags & setFlag(const Enum & e, bool on = true) {if (on) flags |= e; else flags &= ~e; return *this;}
+	//! Set flag "i" to value "on"
+	PIFlags & setFlag(const int & i, bool on = true) {if (on) flags |= i; else flags &= ~i; return *this;}
+	//! copy operator
+	void operator =(const PIFlags & f) {flags = f.flags;}
+	//! copy operator
+	void operator =(const Enum & e) {flags = e;}
+	//! copy operator
+	void operator =(const int & i) {flags = i;}
+	//! compare operator
+	bool operator ==(const PIFlags & f) {return flags == f.flags;}
+	//! compare operator
+	bool operator ==(const Enum & e) {return flags == e;}
+	//! compare operator
+	bool operator ==(const int i) {return flags == i;}
+	//! compare operator
+	bool operator !=(const PIFlags & f) {return flags != f.flags;}
+	//! compare operator
+	bool operator !=(const Enum & e) {return flags != e;}
+	//! compare operator
+	bool operator !=(const int i) {return flags != i;}
+	//! compare operator
+	bool operator >(const PIFlags & f) {return flags > f.flags;}
+	//! compare operator
+	bool operator >(const Enum & e) {return flags > e;}
+	//! compare operator
+	bool operator >(const int i) {return flags > i;}
+	//! compare operator
+	bool operator <(const PIFlags & f) {return flags < f.flags;}
+	//! compare operator
+	bool operator <(const Enum & e) {return flags < e;}
+	//! compare operator
+	bool operator <(const int i) {return flags < i;}
+	//! compare operator
+	bool operator >=(const PIFlags & f) {return flags >= f.flags;}
+	//! compare operator
+	bool operator >=(const Enum & e) {return flags >= e;}
+	//! compare operator
+	bool operator >=(const int i) {return flags >= i;}
+	//! compare operator
+	bool operator <=(const PIFlags & f) {return flags <= f.flags;}
+	//! compare operator
+	bool operator <=(const Enum & e) {return flags <= e;}
+	//! compare operator
+	bool operator <=(const int i) {return flags <= i;}
+	//! Bit-wise AND operator
+	void operator &=(const PIFlags & f) {flags &= f.flags;}
+	//! Bit-wise AND operator
+	void operator &=(const Enum & e) {flags &= e;}
+	//! Bit-wise AND operator
+	void operator &=(const int i) {flags &= i;}
+	//! Bit-wise OR operator
+	void operator |=(const PIFlags & f) {flags |= f.flags;}
+	//! Bit-wise OR operator
+	void operator |=(const Enum & e) {flags |= e;}
+	//! Bit-wise OR operator
+	void operator |=(const int i) {flags |= i;}
+	//! Bit-wise XOR operator
+	void operator ^=(const PIFlags & f) {flags ^= f.flags;}
+	//! Bit-wise XOR operator
+	void operator ^=(const Enum & e) {flags ^= e;}
+	//! Bit-wise XOR operator
+	void operator ^=(const int i) {flags ^= i;}
+	//! Bit-wise AND operator
+	PIFlags operator &(PIFlags f) const {PIFlags tf(flags & f.flags); return tf;}
+	//! Bit-wise AND operator
+	PIFlags operator &(Enum e) const {PIFlags tf(flags & e); return tf;}
+	//! Bit-wise AND operator
+	PIFlags operator &(int i) const {PIFlags tf(flags & i); return tf;}
+	//! Bit-wise OR operator
+	PIFlags operator |(PIFlags f) const {PIFlags tf(flags | f.flags); return tf;}
+	//! Bit-wise OR operator
+	PIFlags operator |(Enum e) const {PIFlags tf(flags | e); return tf;}
+	//! Bit-wise OR operator
+	PIFlags operator |(int i) const {PIFlags tf(flags | i); return tf;}
+	//! Bit-wise XOR operator
+	PIFlags operator ^(PIFlags f) const {PIFlags tf(flags ^ f.flags); return tf;}
+	//! Bit-wise XOR operator
+	PIFlags operator ^(Enum e) const {PIFlags tf(flags ^ e); return tf;}
+	//! Bit-wise XOR operator
+	PIFlags operator ^(int i) const {PIFlags tf(flags ^ i); return tf;}
+	//! Test flag operator
+	bool operator [](Enum e) const {return (flags & e) == e;}
+	//! Implicity conversion to \c int
+	operator int() const {return flags;}
+private:
+	int flags;
+};
+
+#endif // PIFLAGS_H
diff --git a/src_main/core/piincludes.cpp b/lib/main/core/piincludes.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/piincludes.cpp
rename to lib/main/core/piincludes.cpp
diff --git a/src_main/core/piincludes.h b/lib/main/core/piincludes.h
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/core/piincludes.h
rename to lib/main/core/piincludes.h
index 652186c3..14a45a27
--- a/src_main/core/piincludes.h
+++ b/lib/main/core/piincludes.h
@@ -1,56 +1,56 @@
-/*
-	PIP - Platform Independent Primitives
-	Minimal PIP includes
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIINCLUDES_H
-#define PIINCLUDES_H
-
-#include "pibase.h"
-#include "piflags.h"
-#include <sys/types.h>
-#ifdef PIP_STD_IOSTREAM
-#  include <iostream>
-#endif
-
-class PIObject;
-class PIMutex;
-class PIString;
-class PIByteArray;
-class PIInit;
-class PIChar;
-class PICout;
-
-struct lconv;
-
-extern lconv * currentLocale;
-
-/*! \fn errorString()
- * \brief Return readable error description in format "code <number> - <description>" */
-PIP_EXPORT PIString errorString();
-
-PIP_EXPORT void errorClear();
-
-PIP_EXPORT void piqsort(void* base, size_t num, size_t size, int (*compar)(const void*,const void*));
-
-PIP_EXPORT void randomize();
-PIP_EXPORT int randomi();
-
-/// Return readable version of PIP
-PIP_EXPORT PIString PIPVersion();
-
-#endif // PIINCLUDES_H
+/*
+	PIP - Platform Independent Primitives
+	Minimal PIP includes
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIINCLUDES_H
+#define PIINCLUDES_H
+
+#include "pibase.h"
+#include "piflags.h"
+#include <sys/types.h>
+#ifdef PIP_STD_IOSTREAM
+#  include <iostream>
+#endif
+
+class PIObject;
+class PIMutex;
+class PIString;
+class PIByteArray;
+class PIInit;
+class PIChar;
+class PICout;
+
+struct lconv;
+
+extern lconv * currentLocale;
+
+/*! \fn errorString()
+ * \brief Return readable error description in format "code <number> - <description>" */
+PIP_EXPORT PIString errorString();
+
+PIP_EXPORT void errorClear();
+
+PIP_EXPORT void piqsort(void* base, size_t num, size_t size, int (*compar)(const void*,const void*));
+
+PIP_EXPORT void randomize();
+PIP_EXPORT int randomi();
+
+/// Return readable version of PIP
+PIP_EXPORT PIString PIPVersion();
+
+#endif // PIINCLUDES_H
diff --git a/src_main/core/piincludes_p.h b/lib/main/core/piincludes_p.h
similarity index 96%
rename from src_main/core/piincludes_p.h
rename to lib/main/core/piincludes_p.h
index d35cc504..b2f8a348 100644
--- a/src_main/core/piincludes_p.h
+++ b/lib/main/core/piincludes_p.h
@@ -1,45 +1,45 @@
-/*
-	PIP - Platform Independent Primitives
-	Private PIP includes
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef PIINCLUDES_P_H
-#define PIINCLUDES_P_H
-
-
-#include "picout.h"
-#ifdef WINDOWS
-#  include <stdarg.h>
-#  include <windef.h>
-#  include <winbase.h>
-typedef LONG(NTAPI*PINtQueryTimerResolution)(PULONG, PULONG, PULONG);
-typedef LONG(NTAPI*PINtSetTimerResolution)(ULONG, BOOLEAN, PULONG);
-#endif
-#ifdef CC_GCC
-#  include <unistd.h>
-#endif
-#include <string.h>
-#include <cstring>
-#include <string>
-#include <stdlib.h>
-#include <cstdlib>
-#include <stdio.h>
-#include <cstdio>
-#include <iostream>
-
-
-
-#endif // PIINCLUDES_P_H
+/*
+	PIP - Platform Independent Primitives
+	Private PIP includes
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef PIINCLUDES_P_H
+#define PIINCLUDES_P_H
+
+
+#include "picout.h"
+#ifdef WINDOWS
+#  include <stdarg.h>
+#  include <windef.h>
+#  include <winbase.h>
+typedef LONG(NTAPI*PINtQueryTimerResolution)(PULONG, PULONG, PULONG);
+typedef LONG(NTAPI*PINtSetTimerResolution)(ULONG, BOOLEAN, PULONG);
+#endif
+#ifdef CC_GCC
+#  include <unistd.h>
+#endif
+#include <string.h>
+#include <cstring>
+#include <string>
+#include <stdlib.h>
+#include <cstdlib>
+#include <stdio.h>
+#include <cstdio>
+#include <iostream>
+
+
+
+#endif // PIINCLUDES_P_H
diff --git a/src_main/core/piinit.cpp b/lib/main/core/piinit.cpp
similarity index 100%
rename from src_main/core/piinit.cpp
rename to lib/main/core/piinit.cpp
diff --git a/src_main/core/piinit.h b/lib/main/core/piinit.h
similarity index 100%
rename from src_main/core/piinit.h
rename to lib/main/core/piinit.h
diff --git a/src_main/core/piobject.cpp b/lib/main/core/piobject.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/piobject.cpp
rename to lib/main/core/piobject.cpp
diff --git a/src_main/core/piobject.h b/lib/main/core/piobject.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/piobject.h
rename to lib/main/core/piobject.h
diff --git a/src_main/core/pipropertystorage.cpp b/lib/main/core/pipropertystorage.cpp
similarity index 96%
rename from src_main/core/pipropertystorage.cpp
rename to lib/main/core/pipropertystorage.cpp
index b4947ed4..e68d7238 100644
--- a/src_main/core/pipropertystorage.cpp
+++ b/lib/main/core/pipropertystorage.cpp
@@ -1,133 +1,133 @@
-/*
-	PIP - Platform Independent Primitives
-	Storage of properties for GUI usage
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pipropertystorage.h"
-
-
-bool PIPropertyStorage::isPropertyExists(const PIString & _name) const {
-	for (uint i = 0; i < props.size(); ++i)
-		if (props[i].name == _name)
-			return true;
-	return false;
-}
-
-
-void PIPropertyStorage::addProperty(const PIPropertyStorage::Property & p) {
-	for (uint i = 0; i < props.size(); ++i)
-		if (props[i].name == p.name) {
-			props[i] = p;
-			return;
-		}
-	props << p;
-}
-
-
-void PIPropertyStorage::removeProperty(const PIString & _name) {
-	for (uint i = 0; i < props.size(); ++i)
-		if (props[i].name == _name) {
-			props.remove(i);
-			return;
-		}
-}
-
-
-void PIPropertyStorage::removePropertiesByFlag(int flag) {
-	for (int i = 0; i < props.size_s(); ++i)
-		if ((props[i].flags & flag) == flag) {
-			props.remove(i);
-			--i;
-		}
-}
-
-
-void PIPropertyStorage::updateProperties(const PIVector<PIPropertyStorage::Property> & properties_, int flag_ignore) {
-	PIMap<PIString, PIVariant> values;
-	piForeachC(Property & p, props)
-		if (((p.flags & flag_ignore) != flag_ignore) || (flag_ignore == 0))
-			values[p.name] = p.value;
-	props = properties_;
-	for (uint i = 0; i < props.size(); ++i) {
-		Property & p(props[i]);
-		if (values.contains(p.name)) {
-			PIVariant pv = values[p.name];
-			if (pv.type() == p.value.type())
-				p.value = pv;
-		}
-	}
-}
-
-
-PIPropertyStorage::Property PIPropertyStorage::propertyByName(const PIString & name) const {
-	piForeachC(Property & p, props)
-		if (p.name == name)
-			return p;
-	return Property();
-}
-
-
-PIVariant PIPropertyStorage::propertyValueByName(const PIString & name) const {
-	piForeachC(Property & p, props)
-		if (p.name == name)
-			return p.value;
-	return PIVariant();
-}
-
-
-void PIPropertyStorage::setPropertyValue(const PIString & name, const PIVariant & value) {
-	for (uint i = 0; i < props.size(); ++i)
-		if (props[i].name == name) {
-			props[i].value = value;
-			return;
-		}
-}
-
-
-void PIPropertyStorage::setPropertyComment(const PIString & name, const PIString & comment) {
-	for (uint i = 0; i < props.size(); ++i)
-		if (props[i].name == name) {
-			props[i].comment = comment;
-			return;
-		}
-}
-
-
-void PIPropertyStorage::setPropertyFlags(const PIString & name, int flags) {
-	for (uint i = 0; i < props.size(); ++i)
-		if (props[i].name == name) {
-			props[i].flags = flags;
-			return;
-		}
-}
-
-
-PIPropertyStorage::Property & PIPropertyStorage::operator[](const PIString & name) {
-	piForeach (Property & p, props)
-		if (p.name == name)
-			return p;
-	addProperty(name, "");
-	return props.back();
-}
-
-
-const PIPropertyStorage::Property PIPropertyStorage::operator[](const PIString & name) const {
-	piForeachC (Property & p, props)
-		if (p.name == name)
-			return p;
-	return Property();
-}
+/*
+	PIP - Platform Independent Primitives
+	Storage of properties for GUI usage
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pipropertystorage.h"
+
+
+bool PIPropertyStorage::isPropertyExists(const PIString & _name) const {
+	for (uint i = 0; i < props.size(); ++i)
+		if (props[i].name == _name)
+			return true;
+	return false;
+}
+
+
+void PIPropertyStorage::addProperty(const PIPropertyStorage::Property & p) {
+	for (uint i = 0; i < props.size(); ++i)
+		if (props[i].name == p.name) {
+			props[i] = p;
+			return;
+		}
+	props << p;
+}
+
+
+void PIPropertyStorage::removeProperty(const PIString & _name) {
+	for (uint i = 0; i < props.size(); ++i)
+		if (props[i].name == _name) {
+			props.remove(i);
+			return;
+		}
+}
+
+
+void PIPropertyStorage::removePropertiesByFlag(int flag) {
+	for (int i = 0; i < props.size_s(); ++i)
+		if ((props[i].flags & flag) == flag) {
+			props.remove(i);
+			--i;
+		}
+}
+
+
+void PIPropertyStorage::updateProperties(const PIVector<PIPropertyStorage::Property> & properties_, int flag_ignore) {
+	PIMap<PIString, PIVariant> values;
+	piForeachC(Property & p, props)
+		if (((p.flags & flag_ignore) != flag_ignore) || (flag_ignore == 0))
+			values[p.name] = p.value;
+	props = properties_;
+	for (uint i = 0; i < props.size(); ++i) {
+		Property & p(props[i]);
+		if (values.contains(p.name)) {
+			PIVariant pv = values[p.name];
+			if (pv.type() == p.value.type())
+				p.value = pv;
+		}
+	}
+}
+
+
+PIPropertyStorage::Property PIPropertyStorage::propertyByName(const PIString & name) const {
+	piForeachC(Property & p, props)
+		if (p.name == name)
+			return p;
+	return Property();
+}
+
+
+PIVariant PIPropertyStorage::propertyValueByName(const PIString & name) const {
+	piForeachC(Property & p, props)
+		if (p.name == name)
+			return p.value;
+	return PIVariant();
+}
+
+
+void PIPropertyStorage::setPropertyValue(const PIString & name, const PIVariant & value) {
+	for (uint i = 0; i < props.size(); ++i)
+		if (props[i].name == name) {
+			props[i].value = value;
+			return;
+		}
+}
+
+
+void PIPropertyStorage::setPropertyComment(const PIString & name, const PIString & comment) {
+	for (uint i = 0; i < props.size(); ++i)
+		if (props[i].name == name) {
+			props[i].comment = comment;
+			return;
+		}
+}
+
+
+void PIPropertyStorage::setPropertyFlags(const PIString & name, int flags) {
+	for (uint i = 0; i < props.size(); ++i)
+		if (props[i].name == name) {
+			props[i].flags = flags;
+			return;
+		}
+}
+
+
+PIPropertyStorage::Property & PIPropertyStorage::operator[](const PIString & name) {
+	piForeach (Property & p, props)
+		if (p.name == name)
+			return p;
+	addProperty(name, "");
+	return props.back();
+}
+
+
+const PIPropertyStorage::Property PIPropertyStorage::operator[](const PIString & name) const {
+	piForeachC (Property & p, props)
+		if (p.name == name)
+			return p;
+	return Property();
+}
diff --git a/src_main/core/pipropertystorage.h b/lib/main/core/pipropertystorage.h
similarity index 97%
rename from src_main/core/pipropertystorage.h
rename to lib/main/core/pipropertystorage.h
index 0dd7ed00..56c09a51 100644
--- a/src_main/core/pipropertystorage.h
+++ b/lib/main/core/pipropertystorage.h
@@ -1,172 +1,172 @@
-/*! \file pipropertystorage.h
- * \brief Storage of properties for GUI usage
- *
- * This file declare PIPropertyStorage
-*/
-/*
-	PIP - Platform Independent Primitives
-	Storage of properties for GUI usage
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIPROPERTYSTORAGE_H
-#define PIPROPERTYSTORAGE_H
-
-#include "pivariant.h"
-
-/**
- * @brief Key-value storage, based on PIVector with PIPropertyStorage::Property elements. Each element in vector
- * contains unique name and you can identify property by name with propertyValueByName(), propertyByName().
- * You can add property using addProperty(const Property&), addProperty(const PIString&, const PIVariant&, const PIString&, int).
- */
-class PIPropertyStorage {
-public:
-	PIPropertyStorage() {}
-
-	/**
-	 * @brief PIPropertyStorage element.
-	 */
-	struct Property {
-		Property(const PIString & n = PIString(), const PIString & c = PIString(), const PIVariant & v = PIVariant(), int f = 0):
-			name(n), comment(c), value(v), flags(f) {}
-			
-		bool toBool() const {return value.toBool();}
-		int toInt() const {return value.toInt();}
-		float toFloat() const {return value.toFloat();}
-		double toDouble() const {return value.toDouble();}
-		PIString toString() const {return value.toString();}
-		
-		/*! Uniqueue id of property */
-		PIString name;
-
-		/*! Optional description of property */
-		PIString comment;
-
-		/*! Custom value of property */
-		PIVariant value;
-
-		/*! Abstract flags which may be used for user needs */
-		int flags;
-	};
-
-	PIPropertyStorage(const PIVector<Property> & pl) {props = pl;}
-
-	typedef PIVector<Property>::const_iterator const_iterator;
-	typedef PIVector<Property>::iterator iterator;
-	typedef Property value_type;
-
-	iterator begin() {return props.begin();}
-	const_iterator begin() const {return props.begin();}
-	iterator end() {return props.end();}
-	const_iterator end() const {return props.end();}
-
-	int length() const {return props.length();}
-	int size() const {return props.size();}
-	bool isEmpty() const {return props.isEmpty();}
-	Property & front() {return props.front();}
-	const Property & front() const {return props.front();}
-	Property & back() {return props.back();}
-	const Property & back() const {return props.back();}
-	void removeAt(int i) {props.remove(i);}
-	void clear() {props.clear();}
-
-	PIPropertyStorage copy() const {return PIPropertyStorage(*this);}
-	int propertiesCount() const {return props.size();}
-	PIVector<Property> & properties() {return props;}
-	const PIVector<Property> & properties() const {return props;}
-	const PIPropertyStorage & propertyStorage() const {return *this;}
-	bool isPropertyExists(const PIString & _name) const;
-	void clearProperties() {props.clear();}
-
-	/**
-	 * @brief Add property if name isn't present in storage, otherwrise update existing property with same name.
-	 *
-	 * @param p to copy in storage
-	 */
-	void addProperty(const Property & p);
-
-	/**
-	 * @brief First of all construct Property with method params. After then add property if name isn't present
-	 * in storage, otherwrise update existing property with same name.
-	 */
-	void addProperty(const PIString & _name, const PIVariant & _def_value, const PIString & _comment = PIString(), int _flags = 0) {addProperty(Property(_name, _comment, _def_value, _flags));}
-	void removeProperty(const PIString & _name);
-	void removePropertiesByFlag(int flag);
-	void updateProperties(const PIVector<Property> & properties_, int flag_ignore = 0);
-
-	/**
-	 * @brief Search property by name and return it.
-	 *
-	 * @param name of property
-	 * @return property value or default constructed Property
-	 */
-	Property propertyByName(const PIString & name) const;
-
-	/**
-	 * @brief Search property by name and return property value.
-	 *
-	 * @param name of property
-	 * @return property value or invalid PIVariant if name unknown
-	 */
-	PIVariant propertyValueByName(const PIString & name) const;
-
-	/**
-	 * @brief Set value of property with specific name if name is present in storage.
-	 *
-	 * @param name of property to set value
-	 * @param value to set
-	 */
-	void setPropertyValue(const PIString & name, const PIVariant & value);
-
-	/**
-	 * @brief Set comment of property with specific name if name is present in storage.
-	 *
-	 * @param name of property to set comment
-	 * @param comment to set
-	 */
-	void setPropertyComment(const PIString & name, const PIString & comment);
-
-    /**
-     * @brief Set flags of property with specific name if name is present in storage.
-     *
-     * @param name of property to set flags
-     * @param flags to set
-     */
-	void setPropertyFlags(const PIString & name, int flags);
-
-	PIPropertyStorage & operator <<(const PIPropertyStorage::Property & p) {props << p; return *this;}
-	PIPropertyStorage & operator <<(const PIVector<Property> & p) {props << p; return *this;}
-	PIPropertyStorage & operator <<(const PIPropertyStorage & p) {props << p.props; return *this;}
-	Property & operator[](int i) {return props[i];}
-	const Property & operator[](int i) const {return props[i];}
-	Property & operator[](const PIString & name);
-	const Property operator[](const PIString & name) const;
-
-	static Property parsePropertyLine(PIString l);
-
-protected:
-	PIVector<Property> props;
-
-};
-
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIPropertyStorage::Property & v) {s << v.name << v.value << v.comment << v.flags; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIPropertyStorage::Property & v) {s >> v.name >> v.value >> v.comment >> v.flags; return s;}
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIPropertyStorage & v) {s << v.properties(); return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIPropertyStorage & v) {s >> v.properties(); return s;}
-
-#endif // PIPROPERTYSTORAGE_H
+/*! \file pipropertystorage.h
+ * \brief Storage of properties for GUI usage
+ *
+ * This file declare PIPropertyStorage
+*/
+/*
+	PIP - Platform Independent Primitives
+	Storage of properties for GUI usage
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIPROPERTYSTORAGE_H
+#define PIPROPERTYSTORAGE_H
+
+#include "pivariant.h"
+
+/**
+ * @brief Key-value storage, based on PIVector with PIPropertyStorage::Property elements. Each element in vector
+ * contains unique name and you can identify property by name with propertyValueByName(), propertyByName().
+ * You can add property using addProperty(const Property&), addProperty(const PIString&, const PIVariant&, const PIString&, int).
+ */
+class PIPropertyStorage {
+public:
+	PIPropertyStorage() {}
+
+	/**
+	 * @brief PIPropertyStorage element.
+	 */
+	struct Property {
+		Property(const PIString & n = PIString(), const PIString & c = PIString(), const PIVariant & v = PIVariant(), int f = 0):
+			name(n), comment(c), value(v), flags(f) {}
+			
+		bool toBool() const {return value.toBool();}
+		int toInt() const {return value.toInt();}
+		float toFloat() const {return value.toFloat();}
+		double toDouble() const {return value.toDouble();}
+		PIString toString() const {return value.toString();}
+		
+		/*! Uniqueue id of property */
+		PIString name;
+
+		/*! Optional description of property */
+		PIString comment;
+
+		/*! Custom value of property */
+		PIVariant value;
+
+		/*! Abstract flags which may be used for user needs */
+		int flags;
+	};
+
+	PIPropertyStorage(const PIVector<Property> & pl) {props = pl;}
+
+	typedef PIVector<Property>::const_iterator const_iterator;
+	typedef PIVector<Property>::iterator iterator;
+	typedef Property value_type;
+
+	iterator begin() {return props.begin();}
+	const_iterator begin() const {return props.begin();}
+	iterator end() {return props.end();}
+	const_iterator end() const {return props.end();}
+
+	int length() const {return props.length();}
+	int size() const {return props.size();}
+	bool isEmpty() const {return props.isEmpty();}
+	Property & front() {return props.front();}
+	const Property & front() const {return props.front();}
+	Property & back() {return props.back();}
+	const Property & back() const {return props.back();}
+	void removeAt(int i) {props.remove(i);}
+	void clear() {props.clear();}
+
+	PIPropertyStorage copy() const {return PIPropertyStorage(*this);}
+	int propertiesCount() const {return props.size();}
+	PIVector<Property> & properties() {return props;}
+	const PIVector<Property> & properties() const {return props;}
+	const PIPropertyStorage & propertyStorage() const {return *this;}
+	bool isPropertyExists(const PIString & _name) const;
+	void clearProperties() {props.clear();}
+
+	/**
+	 * @brief Add property if name isn't present in storage, otherwrise update existing property with same name.
+	 *
+	 * @param p to copy in storage
+	 */
+	void addProperty(const Property & p);
+
+	/**
+	 * @brief First of all construct Property with method params. After then add property if name isn't present
+	 * in storage, otherwrise update existing property with same name.
+	 */
+	void addProperty(const PIString & _name, const PIVariant & _def_value, const PIString & _comment = PIString(), int _flags = 0) {addProperty(Property(_name, _comment, _def_value, _flags));}
+	void removeProperty(const PIString & _name);
+	void removePropertiesByFlag(int flag);
+	void updateProperties(const PIVector<Property> & properties_, int flag_ignore = 0);
+
+	/**
+	 * @brief Search property by name and return it.
+	 *
+	 * @param name of property
+	 * @return property value or default constructed Property
+	 */
+	Property propertyByName(const PIString & name) const;
+
+	/**
+	 * @brief Search property by name and return property value.
+	 *
+	 * @param name of property
+	 * @return property value or invalid PIVariant if name unknown
+	 */
+	PIVariant propertyValueByName(const PIString & name) const;
+
+	/**
+	 * @brief Set value of property with specific name if name is present in storage.
+	 *
+	 * @param name of property to set value
+	 * @param value to set
+	 */
+	void setPropertyValue(const PIString & name, const PIVariant & value);
+
+	/**
+	 * @brief Set comment of property with specific name if name is present in storage.
+	 *
+	 * @param name of property to set comment
+	 * @param comment to set
+	 */
+	void setPropertyComment(const PIString & name, const PIString & comment);
+
+    /**
+     * @brief Set flags of property with specific name if name is present in storage.
+     *
+     * @param name of property to set flags
+     * @param flags to set
+     */
+	void setPropertyFlags(const PIString & name, int flags);
+
+	PIPropertyStorage & operator <<(const PIPropertyStorage::Property & p) {props << p; return *this;}
+	PIPropertyStorage & operator <<(const PIVector<Property> & p) {props << p; return *this;}
+	PIPropertyStorage & operator <<(const PIPropertyStorage & p) {props << p.props; return *this;}
+	Property & operator[](int i) {return props[i];}
+	const Property & operator[](int i) const {return props[i];}
+	Property & operator[](const PIString & name);
+	const Property operator[](const PIString & name) const;
+
+	static Property parsePropertyLine(PIString l);
+
+protected:
+	PIVector<Property> props;
+
+};
+
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIPropertyStorage::Property & v) {s << v.name << v.value << v.comment << v.flags; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIPropertyStorage::Property & v) {s >> v.name >> v.value >> v.comment >> v.flags; return s;}
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIPropertyStorage & v) {s << v.properties(); return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIPropertyStorage & v) {s >> v.properties(); return s;}
+
+#endif // PIPROPERTYSTORAGE_H
diff --git a/src_main/core/pistring.cpp b/lib/main/core/pistring.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pistring.cpp
rename to lib/main/core/pistring.cpp
diff --git a/src_main/core/pistring.h b/lib/main/core/pistring.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pistring.h
rename to lib/main/core/pistring.h
diff --git a/src_main/core/pistring_std.h b/lib/main/core/pistring_std.h
similarity index 96%
rename from src_main/core/pistring_std.h
rename to lib/main/core/pistring_std.h
index 913b376f..8d1d05e1 100644
--- a/src_main/core/pistring_std.h
+++ b/lib/main/core/pistring_std.h
@@ -1,100 +1,100 @@
-/*! \file pistring.h
- * \brief String
- *
- * This file declare std operators and string conversions
-*/
-/*
-	PIP - Platform Independent Primitives
-	STD for PIString
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef PISTRING_STD_H
-#define PISTRING_STD_H
-#include <string>
-#ifdef QNX
-  typedef std::basic_string<wchar_t> wstring;
-#endif
-
-#include "pistringlist.h"
-
-
-inline std::string PIString2StdString(const PIString & v) {
-	std::string s;
-	uint wc;
-	uchar tc;
-	if (v.size() > 0) {
-		for (int i = 0; i < v.length(); ++i) {
-			wc = uint(v.at(i).unicode16Code());
-			while (tc = wc & 0xFF, tc) {
-				s.push_back(char(tc));
-				wc >>= 8;
-			}
-		}
-	}
-	return s;
-}
-
-inline PIString StdString2PIString(const std::string & v) {
-	return PIString(v.c_str(), v.length());
-}
-
-#ifdef HAS_LOCALE
-inline std::wstring PIString2StdWString(const PIString & v) {
-	std::wstring s;
-	for (int i = 0; i < v.length(); ++i)
-		s.push_back(v.at(i).toWChar());
-	return s;
-}
-
-inline PIString StdWString2PIString(const std::wstring & v) {
-	PIString s;
-	uint l = v.size();
-	for (uint i = 0; i < l; ++i) s.push_back(v[i]);
-	return s;
-}
-#endif
-
-
-
-//! \relatesalso PIChar \brief Output operator to \c std::ostream
-inline std::ostream & operator <<(std::ostream & s, const PIChar & v) {s << v.toCharPtr(); return s;}
-
-//! \relatesalso PIString \brief Return concatenated string
-inline PIString operator +(const PIString & f, const std::string & str) {PIString s(f); s += StdString2PIString(str); return s;}
-
-//! \relatesalso PIString \brief Return concatenated string
-inline PIString operator +(const std::string & str, const PIString & f) {return StdString2PIString(str) + f;}
-
-
-//! \relatesalso PIString \brief Output operator to std::ostream (cout)
-inline std::ostream & operator <<(std::ostream & s, const PIString & v) {for (int i = 0; i < v.length(); ++i) s << v[i]; return s;}
-
-//! \relatesalso PIString \brief Input operator from std::istream (cin)
-inline std::istream & operator >>(std::istream & s, PIString & v) {std::string ss; s >> ss; v = StdString2PIString(ss); return s;}
-
-
-//! \relatesalso PIStringList \brief Output operator to std::ostream (cout)
-inline std::ostream & operator <<(std::ostream & s, const PIStringList & v) {
-	s << PIChar("{");
-	for (uint i = 0; i < v.size(); ++i) {
-		s << PIChar("\"") << v[i] << PIChar("\"");
-		if (i < v.size() - 1) s << PIStringAscii(", ");
-	}
-	s << PIChar("}");
-	return s;
-}
-
-#endif // PISTRING_STD_H
+/*! \file pistring.h
+ * \brief String
+ *
+ * This file declare std operators and string conversions
+*/
+/*
+	PIP - Platform Independent Primitives
+	STD for PIString
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef PISTRING_STD_H
+#define PISTRING_STD_H
+#include <string>
+#ifdef QNX
+  typedef std::basic_string<wchar_t> wstring;
+#endif
+
+#include "pistringlist.h"
+
+
+inline std::string PIString2StdString(const PIString & v) {
+	std::string s;
+	uint wc;
+	uchar tc;
+	if (v.size() > 0) {
+		for (int i = 0; i < v.length(); ++i) {
+			wc = uint(v.at(i).unicode16Code());
+			while (tc = wc & 0xFF, tc) {
+				s.push_back(char(tc));
+				wc >>= 8;
+			}
+		}
+	}
+	return s;
+}
+
+inline PIString StdString2PIString(const std::string & v) {
+	return PIString(v.c_str(), v.length());
+}
+
+#ifdef HAS_LOCALE
+inline std::wstring PIString2StdWString(const PIString & v) {
+	std::wstring s;
+	for (int i = 0; i < v.length(); ++i)
+		s.push_back(v.at(i).toWChar());
+	return s;
+}
+
+inline PIString StdWString2PIString(const std::wstring & v) {
+	PIString s;
+	uint l = v.size();
+	for (uint i = 0; i < l; ++i) s.push_back(v[i]);
+	return s;
+}
+#endif
+
+
+
+//! \relatesalso PIChar \brief Output operator to \c std::ostream
+inline std::ostream & operator <<(std::ostream & s, const PIChar & v) {s << v.toCharPtr(); return s;}
+
+//! \relatesalso PIString \brief Return concatenated string
+inline PIString operator +(const PIString & f, const std::string & str) {PIString s(f); s += StdString2PIString(str); return s;}
+
+//! \relatesalso PIString \brief Return concatenated string
+inline PIString operator +(const std::string & str, const PIString & f) {return StdString2PIString(str) + f;}
+
+
+//! \relatesalso PIString \brief Output operator to std::ostream (cout)
+inline std::ostream & operator <<(std::ostream & s, const PIString & v) {for (int i = 0; i < v.length(); ++i) s << v[i]; return s;}
+
+//! \relatesalso PIString \brief Input operator from std::istream (cin)
+inline std::istream & operator >>(std::istream & s, PIString & v) {std::string ss; s >> ss; v = StdString2PIString(ss); return s;}
+
+
+//! \relatesalso PIStringList \brief Output operator to std::ostream (cout)
+inline std::ostream & operator <<(std::ostream & s, const PIStringList & v) {
+	s << PIChar("{");
+	for (uint i = 0; i < v.size(); ++i) {
+		s << PIChar("\"") << v[i] << PIChar("\"");
+		if (i < v.size() - 1) s << PIStringAscii(", ");
+	}
+	s << PIChar("}");
+	return s;
+}
+
+#endif // PISTRING_STD_H
diff --git a/src_main/core/pistringlist.cpp b/lib/main/core/pistringlist.cpp
similarity index 100%
rename from src_main/core/pistringlist.cpp
rename to lib/main/core/pistringlist.cpp
diff --git a/src_main/core/pistringlist.h b/lib/main/core/pistringlist.h
similarity index 100%
rename from src_main/core/pistringlist.h
rename to lib/main/core/pistringlist.h
diff --git a/src_main/core/pitime.cpp b/lib/main/core/pitime.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pitime.cpp
rename to lib/main/core/pitime.cpp
diff --git a/src_main/core/pitime.h b/lib/main/core/pitime.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pitime.h
rename to lib/main/core/pitime.h
diff --git a/src_main/core/pitime_win.h b/lib/main/core/pitime_win.h
similarity index 96%
rename from src_main/core/pitime_win.h
rename to lib/main/core/pitime_win.h
index d12dcb1e..053e727b 100644
--- a/src_main/core/pitime_win.h
+++ b/lib/main/core/pitime_win.h
@@ -1,87 +1,87 @@
-/*! \file pitime_win.h
- * \brief PITime conversions for Windows
- *
- * This file declare time conversions for Windows
-*/
-/*
-	PIP - Platform Independent Primitives
-	PITime conversions for Windows
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef PITIME_WIN_H
-#define PITIME_WIN_H
-
-#include "pibase.h"
-#ifdef WINDOWS
-
-#include "pitime.h"
-#include <windows.h>
-
-
-inline PISystemTime FILETIME2PISystemTime(const FILETIME &t) {
-	PISystemTime st;
-	ullong lt = ullong(t.dwHighDateTime) * 0x100000000U + ullong(t.dwLowDateTime);
-	st.seconds = lt / 10000000U;
-	st.nanoseconds = (lt % 10000000U) * 100U;
-	return st;
-}
-
-
-
-inline PIDateTime SYSTEMTIME2PIDateTime(const SYSTEMTIME &t) {
-	PIDateTime dt;
-	dt.year         = t.wYear;
-	dt.month        = t.wMonth;
-	dt.day          = t.wDay;
-	dt.hours        = t.wHour;
-	dt.minutes      = t.wMinute;
-	dt.seconds      = t.wSecond;
-	dt.milliseconds = t.wMilliseconds;
-	return dt;
-}
-
-inline PIDateTime FILETIME2PIDateTime(const FILETIME &t) {
-	FILETIME lt;
-	SYSTEMTIME st;
-	FileTimeToLocalFileTime(&t, &lt);
-	FileTimeToSystemTime(&lt, &st);
-	return SYSTEMTIME2PIDateTime(st);
-}
-
-inline SYSTEMTIME PIDateTime2SYSTEMTIME(const PIDateTime &dt) {
-	SYSTEMTIME st;
-	st.wYear         = dt.year;
-	st.wMonth        = dt.month;
-	st.wDay          = dt.day;
-	st.wHour         = dt.hours;
-	st.wMinute       = dt.minutes;
-	st.wSecond       = dt.seconds;
-	st.wMilliseconds = dt.milliseconds;
-	return st;
-}
-
-inline FILETIME PIDateTime2FILETIME(const PIDateTime &dt) {
-	FILETIME lt, ret;
-	SYSTEMTIME st = PIDateTime2SYSTEMTIME(dt);
-	SystemTimeToFileTime(&st, &lt);
-	LocalFileTimeToFileTime(&lt, &ret);
-	return ret;
-}
-
-
-
-#endif // WINDOWS
-#endif // PITIME_WIN_H
+/*! \file pitime_win.h
+ * \brief PITime conversions for Windows
+ *
+ * This file declare time conversions for Windows
+*/
+/*
+	PIP - Platform Independent Primitives
+	PITime conversions for Windows
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef PITIME_WIN_H
+#define PITIME_WIN_H
+
+#include "pibase.h"
+#ifdef WINDOWS
+
+#include "pitime.h"
+#include <windows.h>
+
+
+inline PISystemTime FILETIME2PISystemTime(const FILETIME &t) {
+	PISystemTime st;
+	ullong lt = ullong(t.dwHighDateTime) * 0x100000000U + ullong(t.dwLowDateTime);
+	st.seconds = lt / 10000000U;
+	st.nanoseconds = (lt % 10000000U) * 100U;
+	return st;
+}
+
+
+
+inline PIDateTime SYSTEMTIME2PIDateTime(const SYSTEMTIME &t) {
+	PIDateTime dt;
+	dt.year         = t.wYear;
+	dt.month        = t.wMonth;
+	dt.day          = t.wDay;
+	dt.hours        = t.wHour;
+	dt.minutes      = t.wMinute;
+	dt.seconds      = t.wSecond;
+	dt.milliseconds = t.wMilliseconds;
+	return dt;
+}
+
+inline PIDateTime FILETIME2PIDateTime(const FILETIME &t) {
+	FILETIME lt;
+	SYSTEMTIME st;
+	FileTimeToLocalFileTime(&t, &lt);
+	FileTimeToSystemTime(&lt, &st);
+	return SYSTEMTIME2PIDateTime(st);
+}
+
+inline SYSTEMTIME PIDateTime2SYSTEMTIME(const PIDateTime &dt) {
+	SYSTEMTIME st;
+	st.wYear         = dt.year;
+	st.wMonth        = dt.month;
+	st.wDay          = dt.day;
+	st.wHour         = dt.hours;
+	st.wMinute       = dt.minutes;
+	st.wSecond       = dt.seconds;
+	st.wMilliseconds = dt.milliseconds;
+	return st;
+}
+
+inline FILETIME PIDateTime2FILETIME(const PIDateTime &dt) {
+	FILETIME lt, ret;
+	SYSTEMTIME st = PIDateTime2SYSTEMTIME(dt);
+	SystemTimeToFileTime(&st, &lt);
+	LocalFileTimeToFileTime(&lt, &ret);
+	return ret;
+}
+
+
+
+#endif // WINDOWS
+#endif // PITIME_WIN_H
diff --git a/src_main/core/pivariant.cpp b/lib/main/core/pivariant.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pivariant.cpp
rename to lib/main/core/pivariant.cpp
diff --git a/src_main/core/pivariant.h b/lib/main/core/pivariant.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/core/pivariant.h
rename to lib/main/core/pivariant.h
diff --git a/src_main/core/pivarianttypes.cpp b/lib/main/core/pivarianttypes.cpp
similarity index 100%
rename from src_main/core/pivarianttypes.cpp
rename to lib/main/core/pivarianttypes.cpp
diff --git a/src_main/core/pivarianttypes.h b/lib/main/core/pivarianttypes.h
similarity index 100%
rename from src_main/core/pivarianttypes.h
rename to lib/main/core/pivarianttypes.h
diff --git a/src_main/crypt/piauth.h b/lib/main/crypt/piauth.h
similarity index 96%
rename from src_main/crypt/piauth.h
rename to lib/main/crypt/piauth.h
index aca4939c..55559484 100644
--- a/src_main/crypt/piauth.h
+++ b/lib/main/crypt/piauth.h
@@ -1,109 +1,109 @@
-/*! \file piauth.h
- * \brief PIP Authentication API
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIP Authentication API
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIAUTH_H
-#define PIAUTH_H
-
-#include "piobject.h"
-#include "picrypt.h"
-
-
-class PIP_EXPORT PIAuth : public PIObject
-{
-	PIOBJECT(PIAuth)
-public:
-	enum Role {Client, Server};
-	enum State {NotConnected, AuthProbe, PassRequest, AuthReply, KeyExchange, Connected};
-
-	//! Create PIAuth with your digital sign
-	PIAuth(const PIByteArray & sign);
-
-	//! Set server info data for client authorize event
-	void setInfoData(const PIByteArray & info) {custom_info = info;}
-
-	//! Set server password for check
-	void setServerPassword(const PIString & ps);
-
-	//! Set list of trusted clients/servers public digital sign keys
-	void setAuthorizedPublicKeys(const PIVector<PIByteArray> & pkeys) {auth_pkeys = pkeys;}
-
-	//! Get list of trusted clients/servers public digital sign keys
-	PIVector<PIByteArray> getAuthorizedPublicKeys() {return auth_pkeys;}
-
-	//! Get your digital sign public key
-	PIByteArray getSignPublicKey() {return sign_pk;}
-
-
-	//! Stop authorization
-	void stop();
-
-	//! Start authorization as client
-	void startClient();
-
-	//! Start authorization as server, return first server message for client
-	PIByteArray startServer();
-
-	//! Process reseived message both for client and server, return current state and new message writed in "ba"
-	State receive(PIByteArray & ba);
-
-	//! Get session secret key, return key only when Connected state
-	PIByteArray getSecretKey();
-
-	//! Generate digital sign from seed
-	static PIByteArray generateSign(const PIByteArray & seed);
-
-
-	//! Disconneted event
-	EVENT1(disconnected, PIString, reason)
-
-	//! Conneted event
-	EVENT1(connected, PIString, info)
-
-	//! Client event for authorize new server
-	EVENT2(authorize, PIByteArray, info, bool *, ok)
-
-	//! Client event for input server password
-	EVENT1(passwordRequest, PIString *, pass)
-
-	//! Server event on check client password
-	EVENT1(passwordCheck, bool, result)
-
-private:
-	State disconnect(PIByteArray & ba, const PIString & error = PIString());
-	bool isAuthorizedKey(const PIByteArray & pkey);
-
-	PIByteArray createSKMessage();
-
-	Role role;
-	State state;
-	PIByteArray custom_info;
-	PICrypt crypt;
-	PIByteArray sign_sk, sign_pk;
-	PIByteArray auth_sign;
-	PIByteArray box_sk, box_pk;
-	PIByteArray my_pk;
-	PIByteArray secret_key;
-	PIByteArray pass_hash;
-	PIVector<PIByteArray> auth_pkeys;
-};
-
-#endif // PIAUTH_H
+/*! \file piauth.h
+ * \brief PIP Authentication API
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIP Authentication API
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIAUTH_H
+#define PIAUTH_H
+
+#include "piobject.h"
+#include "picrypt.h"
+
+
+class PIP_EXPORT PIAuth : public PIObject
+{
+	PIOBJECT(PIAuth)
+public:
+	enum Role {Client, Server};
+	enum State {NotConnected, AuthProbe, PassRequest, AuthReply, KeyExchange, Connected};
+
+	//! Create PIAuth with your digital sign
+	PIAuth(const PIByteArray & sign);
+
+	//! Set server info data for client authorize event
+	void setInfoData(const PIByteArray & info) {custom_info = info;}
+
+	//! Set server password for check
+	void setServerPassword(const PIString & ps);
+
+	//! Set list of trusted clients/servers public digital sign keys
+	void setAuthorizedPublicKeys(const PIVector<PIByteArray> & pkeys) {auth_pkeys = pkeys;}
+
+	//! Get list of trusted clients/servers public digital sign keys
+	PIVector<PIByteArray> getAuthorizedPublicKeys() {return auth_pkeys;}
+
+	//! Get your digital sign public key
+	PIByteArray getSignPublicKey() {return sign_pk;}
+
+
+	//! Stop authorization
+	void stop();
+
+	//! Start authorization as client
+	void startClient();
+
+	//! Start authorization as server, return first server message for client
+	PIByteArray startServer();
+
+	//! Process reseived message both for client and server, return current state and new message writed in "ba"
+	State receive(PIByteArray & ba);
+
+	//! Get session secret key, return key only when Connected state
+	PIByteArray getSecretKey();
+
+	//! Generate digital sign from seed
+	static PIByteArray generateSign(const PIByteArray & seed);
+
+
+	//! Disconneted event
+	EVENT1(disconnected, PIString, reason)
+
+	//! Conneted event
+	EVENT1(connected, PIString, info)
+
+	//! Client event for authorize new server
+	EVENT2(authorize, PIByteArray, info, bool *, ok)
+
+	//! Client event for input server password
+	EVENT1(passwordRequest, PIString *, pass)
+
+	//! Server event on check client password
+	EVENT1(passwordCheck, bool, result)
+
+private:
+	State disconnect(PIByteArray & ba, const PIString & error = PIString());
+	bool isAuthorizedKey(const PIByteArray & pkey);
+
+	PIByteArray createSKMessage();
+
+	Role role;
+	State state;
+	PIByteArray custom_info;
+	PICrypt crypt;
+	PIByteArray sign_sk, sign_pk;
+	PIByteArray auth_sign;
+	PIByteArray box_sk, box_pk;
+	PIByteArray my_pk;
+	PIByteArray secret_key;
+	PIByteArray pass_hash;
+	PIVector<PIByteArray> auth_pkeys;
+};
+
+#endif // PIAUTH_H
diff --git a/src_main/crypt/picrypt.h b/lib/main/crypt/picrypt.h
similarity index 97%
rename from src_main/crypt/picrypt.h
rename to lib/main/crypt/picrypt.h
index e11be27e..e9eea9cd 100644
--- a/src_main/crypt/picrypt.h
+++ b/lib/main/crypt/picrypt.h
@@ -1,116 +1,116 @@
-/*! \file picrypt.h
- * \brief Cryptographic class using lib Sodium
-*/
-/*
-	PIP - Platform Independent Primitives
-	Cryptographic class using lib Sodium
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICRYPT_H
-#define PICRYPT_H
-
-#include "pistring.h"
-
-class PIP_EXPORT PICrypt {
-public:
-	//! Construct and generate random key
-	PICrypt();
-
-	//! Set key to "key", key size must be a \a sizeKey()
-	bool setKey(const PIByteArray & key);
-
-	//! Generate and set key from keyphrase "secret"
-	PIByteArray setKey(const PIString & secret);
-
-	//! Returns current key
-	PIByteArray key() {return key_;}
-
-	//! Encrypt given data "data", result size will be increased by \a sizeCrypt()
-	PIByteArray crypt(const PIByteArray & data);
-
-	//! Decrypt given data "crypt_data"
-	PIByteArray decrypt(const PIByteArray & crypt_data, bool * ok = 0);
-
-	//! Encrypt given data "data" with key "key", result size will be increased by \a sizeCrypt()
-	static PIByteArray crypt(const PIByteArray & data, PIByteArray key);
-
-	//! Decrypt given data "crypt_data" with key "key"
-	static PIByteArray decrypt(const PIByteArray & crypt_data, PIByteArray key, bool * ok = 0);
-
-	//! Generate hash from keyphrase "secret", may be used as a key for encryption
-	static PIByteArray hash(const PIString & secret);
-
-	//! Generate hash from bytearray
-	static PIByteArray hash(const PIByteArray & data);
-
-	//! Generate short hash from string "s", may be used for hash table
-	static ullong shorthash(const PIString & s, PIByteArray key = PIByteArray());
-
-	//! Generate random key
-	static PIByteArray generateKey();
-
-	//! Generate random buffer
-	static PIByteArray generateRandomBuff(int size);
-
-	//! Returns key size
-	static size_t sizeKey();
-
-	//! Returns size which be added to data size in encryption process
-	static size_t sizeCrypt();
-
-	//! Function randomly generates a secret key and a corresponding public key for digital signature
-	static void generateSignKeys(PIByteArray & public_key, PIByteArray & secret_key);
-
-	//! Function generates a secret key from input data and a corresponding public key for digital signature
-	static void generateSignKeys(PIByteArray & public_key, PIByteArray & secret_key, const PIByteArray & seed);
-
-	//! Function extract sign public key from sing secret key
-	static PIByteArray extractSignPublicKey(const PIByteArray & secret_key);
-
-	//! Calculate digital signature for data
-	PIByteArray signMessage(const PIByteArray & data,  PIByteArray secret_key);
-
-	//! Verify digital signature of signed message
-	bool verifySign(const PIByteArray & data, const PIByteArray & signature, PIByteArray public_key);
-
-	//! Function randomly generates a secret key and a corresponding public key for authenticated encryption
-	static void generateKeypair(PIByteArray & public_key, PIByteArray & secret_key);
-
-	//! Function generates a secret key from input data and a corresponding public key for authenticated encryption
-	static void generateKeypair(PIByteArray & public_key, PIByteArray & secret_key, const PIByteArray & seed);
-
-	//! Encrypt given data "data"
-	PIByteArray crypt(const PIByteArray &data, const PIByteArray & public_key, const PIByteArray & secret_key);
-
-	//! Decrypt given data "crypt_data"
-	PIByteArray decrypt(const PIByteArray & crypt_data, const PIByteArray & public_key, const PIByteArray & secret_key, bool * ok = 0);
-
-	//! Generate password hash from "password"
-	static PIByteArray passwordHash(const PIString & password, const PIByteArray & seed);
-
-	//! Returns libsodium version
-	static PIString version();
-
-
-private:
-	static bool init();
-
-	PIByteArray nonce_, key_;
-
-};
-
-#endif // PICRYPT_H
+/*! \file picrypt.h
+ * \brief Cryptographic class using lib Sodium
+*/
+/*
+	PIP - Platform Independent Primitives
+	Cryptographic class using lib Sodium
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICRYPT_H
+#define PICRYPT_H
+
+#include "pistring.h"
+
+class PIP_EXPORT PICrypt {
+public:
+	//! Construct and generate random key
+	PICrypt();
+
+	//! Set key to "key", key size must be a \a sizeKey()
+	bool setKey(const PIByteArray & key);
+
+	//! Generate and set key from keyphrase "secret"
+	PIByteArray setKey(const PIString & secret);
+
+	//! Returns current key
+	PIByteArray key() {return key_;}
+
+	//! Encrypt given data "data", result size will be increased by \a sizeCrypt()
+	PIByteArray crypt(const PIByteArray & data);
+
+	//! Decrypt given data "crypt_data"
+	PIByteArray decrypt(const PIByteArray & crypt_data, bool * ok = 0);
+
+	//! Encrypt given data "data" with key "key", result size will be increased by \a sizeCrypt()
+	static PIByteArray crypt(const PIByteArray & data, PIByteArray key);
+
+	//! Decrypt given data "crypt_data" with key "key"
+	static PIByteArray decrypt(const PIByteArray & crypt_data, PIByteArray key, bool * ok = 0);
+
+	//! Generate hash from keyphrase "secret", may be used as a key for encryption
+	static PIByteArray hash(const PIString & secret);
+
+	//! Generate hash from bytearray
+	static PIByteArray hash(const PIByteArray & data);
+
+	//! Generate short hash from string "s", may be used for hash table
+	static ullong shorthash(const PIString & s, PIByteArray key = PIByteArray());
+
+	//! Generate random key
+	static PIByteArray generateKey();
+
+	//! Generate random buffer
+	static PIByteArray generateRandomBuff(int size);
+
+	//! Returns key size
+	static size_t sizeKey();
+
+	//! Returns size which be added to data size in encryption process
+	static size_t sizeCrypt();
+
+	//! Function randomly generates a secret key and a corresponding public key for digital signature
+	static void generateSignKeys(PIByteArray & public_key, PIByteArray & secret_key);
+
+	//! Function generates a secret key from input data and a corresponding public key for digital signature
+	static void generateSignKeys(PIByteArray & public_key, PIByteArray & secret_key, const PIByteArray & seed);
+
+	//! Function extract sign public key from sing secret key
+	static PIByteArray extractSignPublicKey(const PIByteArray & secret_key);
+
+	//! Calculate digital signature for data
+	PIByteArray signMessage(const PIByteArray & data,  PIByteArray secret_key);
+
+	//! Verify digital signature of signed message
+	bool verifySign(const PIByteArray & data, const PIByteArray & signature, PIByteArray public_key);
+
+	//! Function randomly generates a secret key and a corresponding public key for authenticated encryption
+	static void generateKeypair(PIByteArray & public_key, PIByteArray & secret_key);
+
+	//! Function generates a secret key from input data and a corresponding public key for authenticated encryption
+	static void generateKeypair(PIByteArray & public_key, PIByteArray & secret_key, const PIByteArray & seed);
+
+	//! Encrypt given data "data"
+	PIByteArray crypt(const PIByteArray &data, const PIByteArray & public_key, const PIByteArray & secret_key);
+
+	//! Decrypt given data "crypt_data"
+	PIByteArray decrypt(const PIByteArray & crypt_data, const PIByteArray & public_key, const PIByteArray & secret_key, bool * ok = 0);
+
+	//! Generate password hash from "password"
+	static PIByteArray passwordHash(const PIString & password, const PIByteArray & seed);
+
+	//! Returns libsodium version
+	static PIString version();
+
+
+private:
+	static bool init();
+
+	PIByteArray nonce_, key_;
+
+};
+
+#endif // PICRYPT_H
diff --git a/src_main/crypt/picryptmodule.h b/lib/main/crypt/picryptmodule.h
similarity index 100%
rename from src_main/crypt/picryptmodule.h
rename to lib/main/crypt/picryptmodule.h
diff --git a/src_main/geo/piellipsoidmodel.cpp b/lib/main/geo/piellipsoidmodel.cpp
similarity index 96%
rename from src_main/geo/piellipsoidmodel.cpp
rename to lib/main/geo/piellipsoidmodel.cpp
index b01f1737..4b886393 100644
--- a/src_main/geo/piellipsoidmodel.cpp
+++ b/lib/main/geo/piellipsoidmodel.cpp
@@ -1,66 +1,66 @@
-/*
-	PIP - Platform Independent Primitives
-	Contains geo ellipsoid models
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piellipsoidmodel.h"
-
-
-PIEllipsoidModel::PIEllipsoidModel() {
-	a = 0.0;
-	flattening = 0.0;
-	eccentricity = 0.0;
-	angVelocity = 0.0;
-}
-
-
-PIEllipsoidModel PIEllipsoidModel::WGS84Ellipsoid() {
-	PIEllipsoidModel v;
-	v.a = 6378137.0;
-	v.flattening = 0.335281066475e-2;
-	v.eccentricity = 8.1819190842622e-2;
-	v.angVelocity = 7.292115e-5;
-	return v;
-}
-
-
-PIEllipsoidModel PIEllipsoidModel::PZ90Ellipsoid() {
-	PIEllipsoidModel v;
-	v.a = 6378136.0;
-	v.flattening = 3.35280373518e-3;
-	v.eccentricity = 8.1819106432923e-2;
-	v.angVelocity = 7.292115e-5;
-	return v;
-}
-
-
-PIEllipsoidModel PIEllipsoidModel::GPSEllipsoid() {
-	PIEllipsoidModel v = WGS84Ellipsoid();
-	v.angVelocity = 7.2921151467e-5;
-	return v;
-}
-
-
-PIEllipsoidModel PIEllipsoidModel::KrasovskiyEllipsoid() {
-	PIEllipsoidModel v;
-	v.a = 6378245.0;
-	v.flattening = 1.0/298.3;
-	v.eccentricity = sqrt(v.a*v.a - 6356863.0*6356863.0)/v.a;
-	v.angVelocity = 7.292115e-5;
-	return v;
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Contains geo ellipsoid models
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piellipsoidmodel.h"
+
+
+PIEllipsoidModel::PIEllipsoidModel() {
+	a = 0.0;
+	flattening = 0.0;
+	eccentricity = 0.0;
+	angVelocity = 0.0;
+}
+
+
+PIEllipsoidModel PIEllipsoidModel::WGS84Ellipsoid() {
+	PIEllipsoidModel v;
+	v.a = 6378137.0;
+	v.flattening = 0.335281066475e-2;
+	v.eccentricity = 8.1819190842622e-2;
+	v.angVelocity = 7.292115e-5;
+	return v;
+}
+
+
+PIEllipsoidModel PIEllipsoidModel::PZ90Ellipsoid() {
+	PIEllipsoidModel v;
+	v.a = 6378136.0;
+	v.flattening = 3.35280373518e-3;
+	v.eccentricity = 8.1819106432923e-2;
+	v.angVelocity = 7.292115e-5;
+	return v;
+}
+
+
+PIEllipsoidModel PIEllipsoidModel::GPSEllipsoid() {
+	PIEllipsoidModel v = WGS84Ellipsoid();
+	v.angVelocity = 7.2921151467e-5;
+	return v;
+}
+
+
+PIEllipsoidModel PIEllipsoidModel::KrasovskiyEllipsoid() {
+	PIEllipsoidModel v;
+	v.a = 6378245.0;
+	v.flattening = 1.0/298.3;
+	v.eccentricity = sqrt(v.a*v.a - 6356863.0*6356863.0)/v.a;
+	v.angVelocity = 7.292115e-5;
+	return v;
+}
+
diff --git a/src_main/geo/piellipsoidmodel.h b/lib/main/geo/piellipsoidmodel.h
similarity index 97%
rename from src_main/geo/piellipsoidmodel.h
rename to lib/main/geo/piellipsoidmodel.h
index a7f1c64a..c9c2f621 100644
--- a/src_main/geo/piellipsoidmodel.h
+++ b/lib/main/geo/piellipsoidmodel.h
@@ -1,48 +1,48 @@
-/*! \file piellipsoidmodel.h
- * \brief Contains geo ellipsoid models
-*/
-/*
-	PIP - Platform Independent Primitives
-	Contains geo ellipsoid models
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIELLIPSOIDMODEL_H
-#define PIELLIPSOIDMODEL_H
-
-
-#include "pimathbase.h"
-
-class PIP_EXPORT PIEllipsoidModel {
-public:
-	PIEllipsoidModel();
-	double eccSquared() const {return eccentricity * eccentricity;} // eccentricity squared
-	double b() const {return a * sqrt(1 - eccSquared());}
-
-	static PIEllipsoidModel WGS84Ellipsoid();
-	static PIEllipsoidModel PZ90Ellipsoid();
-	static PIEllipsoidModel GPSEllipsoid();
-	static PIEllipsoidModel KrasovskiyEllipsoid();
-
-	double a; /// Major axis of Earth in meters
-	double flattening; /// Flattening (ellipsoid parameter)
-	double eccentricity; /// Eccentricity (ellipsoid parameter)
-	double angVelocity; /// Angular velocity of Earth in radians/sec
-};
-
-
-
-#endif // PIELLIPSOIDMODEL_H
+/*! \file piellipsoidmodel.h
+ * \brief Contains geo ellipsoid models
+*/
+/*
+	PIP - Platform Independent Primitives
+	Contains geo ellipsoid models
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIELLIPSOIDMODEL_H
+#define PIELLIPSOIDMODEL_H
+
+
+#include "pimathbase.h"
+
+class PIP_EXPORT PIEllipsoidModel {
+public:
+	PIEllipsoidModel();
+	double eccSquared() const {return eccentricity * eccentricity;} // eccentricity squared
+	double b() const {return a * sqrt(1 - eccSquared());}
+
+	static PIEllipsoidModel WGS84Ellipsoid();
+	static PIEllipsoidModel PZ90Ellipsoid();
+	static PIEllipsoidModel GPSEllipsoid();
+	static PIEllipsoidModel KrasovskiyEllipsoid();
+
+	double a; /// Major axis of Earth in meters
+	double flattening; /// Flattening (ellipsoid parameter)
+	double eccentricity; /// Eccentricity (ellipsoid parameter)
+	double angVelocity; /// Angular velocity of Earth in radians/sec
+};
+
+
+
+#endif // PIELLIPSOIDMODEL_H
diff --git a/src_main/geo/pigeomodule.h b/lib/main/geo/pigeomodule.h
similarity index 100%
rename from src_main/geo/pigeomodule.h
rename to lib/main/geo/pigeomodule.h
diff --git a/src_main/geo/pigeoposition.cpp b/lib/main/geo/pigeoposition.cpp
similarity index 96%
rename from src_main/geo/pigeoposition.cpp
rename to lib/main/geo/pigeoposition.cpp
index 1c06878f..eac7e3a6 100644
--- a/src_main/geo/pigeoposition.cpp
+++ b/lib/main/geo/pigeoposition.cpp
@@ -1,588 +1,588 @@
-/*
-	PIP - Platform Independent Primitives
-	Class for geo position storage and conversions
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pigeoposition.h"
-
-const double PIGeoPosition::one_cm_tolerance = 0.01; // One centimeter tolerance.
-const double PIGeoPosition::one_mm_tolerance = 0.001; // One milimeter tolerance.
-const double PIGeoPosition::one_um_tolerance = 0.000001; // One micron tolerance.
-double PIGeoPosition::position_tolerance = PIGeoPosition::one_mm_tolerance; // Default tolerance in meters.
-
-
-PIGeoPosition::PIGeoPosition() {
-	initialize(PIMathVectorT3d());
-}
-
-
-PIGeoPosition::PIGeoPosition(double a, double b, double c, PIGeoPosition::CoordinateSystem s, PIEllipsoidModel ell) {
-	PIMathVectorT3d v;
-	v[0] = a;
-	v[1] = b;
-	v[2] = c;
-	initialize(v, s, ell);
-}
-
-
-PIGeoPosition::PIGeoPosition(PIMathVectorT3d v, PIGeoPosition::CoordinateSystem s, PIEllipsoidModel ell) {
-	initialize(v, s, ell);
-}
-
-
-PIGeoPosition &PIGeoPosition::transformTo(PIGeoPosition::CoordinateSystem sys) {
-	if(sys == Unknown || sys == s) return *this;
-	PIGeoPosition tmp(*this);
-	switch(s) {
-		case Unknown:
-		return *this;
-		case Geodetic:
-			switch(sys) {
-				case Unknown: case Geodetic: return *this;
-				case Geocentric:
-					convertGeodeticToGeocentric(*this, tmp, el);
-					tmp.s = Geocentric;
-				break;
-				case Cartesian:
-					convertGeodeticToCartesian(*this, tmp, el);
-					tmp.s = Cartesian;
-				break;
-				case Spherical:
-					convertGeodeticToGeocentric(*this, tmp, el);
-					tmp[0] = 90 - tmp[0];   // geocen -> sph
-					tmp.s = Spherical;
-				break;
-			}
-		break;
-		case Geocentric:
-			switch(sys) {
-				case Unknown: case Geocentric: return *this;
-				case Geodetic:
-					convertGeocentricToGeodetic(*this, tmp, el);
-					tmp.s = Geodetic;
-				break;
-				case Cartesian:
-					convertGeocentricToCartesian(*this, tmp);
-					tmp.s = Cartesian;
-				break;
-				case Spherical:
-					tmp[0] = 90 - tmp[0];   // geocen -> sph
-					tmp.s = Spherical;
-				break;
-			}
-		break;
-		case Cartesian:
-			switch(sys) {
-				case Unknown: case Cartesian: return *this;
-				case Geodetic:
-					convertCartesianToGeodetic(*this, tmp, el);
-					tmp.s = Geodetic;
-				break;
-				case Geocentric:
-					convertCartesianToGeocentric(*this, tmp);
-					tmp.s = Geocentric;
-				break;
-				case Spherical:
-					convertCartesianToSpherical(*this, tmp);
-					tmp.s = Spherical;
-				break;
-			}
-		break;
-		case Spherical:
-			switch(sys) {
-				case Unknown: case Spherical: return *this;
-				case Geodetic:
-					(*this)[0] = 90 - (*this)[0];   // sph -> geocen
-					convertGeocentricToGeodetic(*this, tmp, el);
-					tmp.s = Geodetic;
-				break;
-				case Geocentric:
-					tmp[0] = 90 - tmp[0];   // sph -> geocen
-					tmp.s = Geocentric;
-				break;
-				case Cartesian:
-					convertSphericalToCartesian(*this, tmp);
-					tmp.s = Cartesian;
-				break;
-			}
-		break;
-	}
-	*this = tmp;
-	return *this;
-}
-
-double PIGeoPosition::x() const {
-	if(s == Cartesian) return (*this)[0];
-	PIGeoPosition t(*this);
-	t.transformTo(Cartesian);
-	return t[0];
-}
-
-
-double PIGeoPosition::y() const {
-	if(s == Cartesian) return (*this)[1];
-	PIGeoPosition t(*this);
-	t.transformTo(Cartesian);
-	return t[1];
-}
-
-
-double PIGeoPosition::z() const {
-	if(s == Cartesian) return (*this)[2];
-	PIGeoPosition t(*this);
-	t.transformTo(Cartesian);
-	return t[2];
-}
-
-
-double PIGeoPosition::latitudeGeodetic() const {
-	if(s == Geodetic) return (*this)[0];
-	PIGeoPosition t(*this);
-	t.transformTo(Geodetic);
-	return t[0];
-}
-
-
-double PIGeoPosition::latitudeGeocentric() const {
-	if(s == Geocentric) return (*this)[0];
-	PIGeoPosition t(*this);
-	t.transformTo(Geocentric);
-	return t[0];
-}
-
-
-double PIGeoPosition::longitude() const {
-	if(s != Cartesian) return (*this)[1];
-	PIGeoPosition t(*this);
-	t.transformTo(Spherical);
-	return t[1];
-}
-
-
-double PIGeoPosition::theta() const {
-	if(s == Spherical) return (*this)[0];
-	PIGeoPosition t(*this);
-	t.transformTo(Spherical);
-	return t[0];
-}
-
-
-double PIGeoPosition::phi() const {
-	return longitude();
-}
-
-
-double PIGeoPosition::radius() const {
-	if(s == Spherical || s == Geocentric) return (*this)[2];
-	PIGeoPosition t(*this);
-	t.transformTo(Spherical);
-	return t[2];
-}
-
-
-double PIGeoPosition::height() const {
-	if(s == Geodetic) return (*this)[2];
-	PIGeoPosition t(*this);
-	t.transformTo(Geodetic);
-	return t[2];
-}
-
-
-PIGeoPosition &PIGeoPosition::setGeodetic(double lat, double lon, double ht, PIEllipsoidModel ell) {
-	if(lat > 90 || lat < -90) {
-		piCout << "[PIGeoPosition]" << "Achtung! Invalid latitude in setGeodetic:" << lat;
-		assert(lat <= 90 && lat >= -90);
-	}
-	(*this)[0] = lat;
-	(*this)[1] = lon;
-	if((*this)[1] < 0) (*this)[1] += 360 * (1 + (unsigned long)((*this)[1]/360));
-	else if((*this)[1] >= 360) (*this)[1] -= 360 * (unsigned long)((*this)[1]/360);
-	(*this)[2] = ht;
-	el = ell;
-	s = Geodetic;
-	return *this;
-}
-
-
-PIGeoPosition &PIGeoPosition::setGeocentric(double lat, double lon, double rad) {
-	if(lat > 90 || lat < -90) {
-		piCout << "[PIGeoPosition]" << "Achtung! Invalid latitude in setGeocentric:" << lat;
-		assert(lat <= 90 && lat >= -90);
-	}
-	if(rad < 0) {
-		piCout << "[PIGeoPosition]" << "Achtung! Invalid radius in setGeocentric:" << rad;
-		assert(rad >= 0);
-	}
-	(*this)[0] = lat;
-	(*this)[1] = lon;
-	(*this)[2] = rad;
-	if((*this)[1] < 0) (*this)[1] += 360*(1+(unsigned long)((*this)[1]/360));
-	else if((*this)[1] >= 360) (*this)[1] -= 360*(unsigned long)((*this)[1]/360);
-	s = Geocentric;
-	return *this;
-}
-
-
-PIGeoPosition &PIGeoPosition::setSpherical(double theta, double phi, double rad) {
-	if(theta < 0 || theta > 180) {
-		piCout << "[PIGeoPosition]" << "Achtung! Invalid theta in setSpherical:" << theta;
-		assert(theta <= 180 && theta >= 0);
-	}
-	if(rad < 0) {
-		piCout << "[PIGeoPosition]" << "Achtung! Invalid radius in setSpherical:" << rad;
-		assert(rad >= 0);
-	}
-	(*this)[0] = theta;
-	(*this)[1] = phi;
-	(*this)[2] = rad;
-	if((*this)[1] < 0) (*this)[1] += 360*(1+(unsigned long)((*this)[1]/360));
-	else if((*this)[1] >= 360) (*this)[1] -= 360*(unsigned long)((*this)[1]/360);
-	s = Spherical;
-	return *this;
-}
-
-
-PIGeoPosition &PIGeoPosition::setECEF(double x, double y, double z) {
-	(*this)[0] = x;
-	(*this)[1] = y;
-	(*this)[2] = z;
-	s = Cartesian;
-	return *this;
-}
-
-
-void PIGeoPosition::convertSphericalToCartesian(const PIMathVectorT3d &tpr, PIMathVectorT3d &xyz) {
-	double st = sin(tpr[0] * deg2rad);
-	xyz[0] = tpr[2] * st * cos(tpr[1] * deg2rad);
-	xyz[1] = tpr[2] * st * sin(tpr[1] * deg2rad);
-	xyz[2] = tpr[2] * cos(tpr[0] * deg2rad);
-}
-
-
-void PIGeoPosition::convertCartesianToSpherical(const PIMathVectorT3d &xyz, PIMathVectorT3d &tpr) {
-	tpr[2] = xyz.length();
-	if(tpr[2] <= PIGeoPosition::position_tolerance / 5) { // zero-length Cartesian vector
-		tpr[0] = 90.0;
-		tpr[1] = 0.0;
-		return;
-	}
-	tpr[0] = acos(xyz[2] / tpr[2]) * rad2deg;
-	if(sqrt(xyz[0] * xyz[0] + xyz[1] * xyz[1]) < PIGeoPosition::position_tolerance / 5) { // pole
-		tpr[1] = 0.0;
-		return;
-	}
-	tpr[1] = atan2(xyz[1],xyz[0]) * rad2deg;
-	if(tpr[1] < 0.0) tpr[1] += 360.0;
-}
-
-
-void PIGeoPosition::convertCartesianToGeodetic(const PIMathVectorT3d &xyz, PIMathVectorT3d &llh, PIEllipsoidModel ell) {
-	double p,slat,nn,htold,latold;
-	p = sqrt(xyz[0] * xyz[0] + xyz[1] * xyz[1]);
-	if(p < PIGeoPosition::position_tolerance / 5) { // pole or origin
-		llh[0] = (xyz[2] > 0.0 ? 90.0: -90.0);
-		llh[1] = 0.0; // lon undefined, really
-		llh[2] = piAbsd(xyz[2]) - ell.a * sqrt(1.0-ell.eccSquared());
-		return;
-	}
-	llh[0] = atan2(xyz[2], p*(1.0-ell.eccSquared()));
-	llh[2] = 0;
-	for(int i=0; i<5; i++) {
-		slat = sin(llh[0]);
-		nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
-		htold = llh[2];
-		llh[2] = p / cos(llh[0]) - nn;
-		latold = llh[0];
-		llh[0] = atan2(xyz[2], p*(1.0 - ell.eccSquared() * (nn / (nn + llh[2]))));
-		if(piAbsd(llh[0] - latold) < 1.0e-9 && piAbsd(llh[2] - htold) < 1.0e-9 * ell.a) break;
-	}
-	llh[1] = atan2(xyz[1], xyz[0]);
-	if(llh[1] < 0.0) llh[1] += M_2PI;
-	llh[0] *= rad2deg;
-	llh[1] *= rad2deg;
-}
-
-
-void PIGeoPosition::convertGeodeticToCartesian(const PIMathVectorT3d &llh, PIMathVectorT3d &xyz, PIEllipsoidModel ell) {
-	double slat = sin(llh[0] * deg2rad);
-	double clat = cos(llh[0] * deg2rad);
-	double nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
-	xyz[0] = (nn + llh[2]) * clat * cos(llh[1] * deg2rad);
-	xyz[1] = (nn + llh[2]) * clat * sin(llh[1] * deg2rad);
-	xyz[2] = (nn * (1.0 - ell.eccSquared()) + llh[2]) * slat;
-}
-
-
-void PIGeoPosition::convertCartesianToGeocentric(const PIMathVectorT3d &xyz, PIMathVectorT3d &llr) {
-	convertCartesianToSpherical(xyz, llr);
-	llr[0] = 90.0 - llr[0]; // convert theta to latitude
-}
-
-
-void PIGeoPosition::convertGeocentricToCartesian(const PIMathVectorT3d &llr, PIMathVectorT3d &xyz) {
-	PIMathVectorT3d llh(llr);
-	llh[0] = 90.0 - llh[0]; // convert latitude to theta
-	convertSphericalToCartesian(llh, xyz);
-}
-
-
-void PIGeoPosition::convertGeocentricToGeodetic(const PIMathVectorT3d &llr, PIMathVectorT3d &llh, PIEllipsoidModel ell) {
-	double cl, p, sl, slat, nn, htold, latold;
-	llh[1] = llr[1]; // longitude is unchanged
-	cl = sin((90.0 - llr[0]) * deg2rad);
-	sl = cos((90.0 - llr[0]) * deg2rad);
-	if(llr[2] <= PIGeoPosition::position_tolerance / 5) { // radius is below tolerance, hence assign zero-length, arbitrarily set latitude = longitude = 0
-		llh[0] = llh[1] = 0.0;
-		llh[2] = -ell.a;
-		return;
-	} else if(cl < 1.e-10) { // near pole ... note that 1mm/radius(Earth) = 1.5e-10
-		if(llr[0] < 0.0) llh[0] = -90.0;
-		else llh[0] =  90.0;
-		llh[1] = 0.0;
-		llh[2] = llr[2] - ell.a * sqrt(1.0 - ell.eccSquared());
-		return;
-	}
-	llh[0] = atan2(sl, cl * (1.0 - ell.eccSquared()));
-	p = cl * llr[2];
-	llh[2] = 0.0;
-	for(int i=0; i<5; i++) {
-		slat = sin(llh[0]);
-		nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
-		htold = llh[2];
-		llh[2] = p / cos(llh[0]) - nn;
-		latold = llh[0];
-		llh[0] = atan2(sl, cl * (1.0 - ell.eccSquared() * (nn / (nn + llh[2]))));
-		if(piAbsd(llh[0] - latold) < 1.0e-9 && piAbsd(llh[2] - htold) < 1.0e-9 * ell.a) break;
-	}
-	llh[0] *= rad2deg;
-}
-
-
-void PIGeoPosition::convertGeodeticToGeocentric(const PIMathVectorT3d &llh, PIMathVectorT3d &llr, PIEllipsoidModel ell) {
-	double slat = sin(llh[0] * deg2rad);
-	double nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
-	llr[1] = llh[1]; // longitude is unchanged
-	llr[2] = sqrt((nn+llh[2])*(nn+llh[2]) + nn*ell.eccSquared()*(nn*ell.eccSquared()-2*(nn+llh[2]))*slat*slat); // radius
-	if(llr[2] <= PIGeoPosition::position_tolerance/5) { // radius is below tolerance, hence assign zero-length
-		llr[0] = llr[1] = llr[2] = 0; // arbitrarily set latitude = longitude = 0
-		return;
-	}
-	if(1 - piAbsd(slat) < 1.e-10) { // at the pole
-		if(slat < 0) llr[0] = -90.0;
-		else llr[0] =  90.0;
-		llr[1] = 0.0;
-		return;
-	}
-	llr[0] = acos((nn * (1.0 - ell.eccSquared()) + llh[2]) * slat / llr[2]); // theta
-	llr[0] *= rad2deg;
-	llr[0] = 90.0 - llr[0];
-}
-
-
-double PIGeoPosition::radiusEarth(double geolat, PIEllipsoidModel ell) {
-	double slat = sin(geolat * deg2rad);
-	double e = (1.0 - ell.eccSquared());
-	double f = (1.0 + (e * e - 1.0) * slat * slat) / (1.0 - ell.eccSquared() * slat * slat);
-	return (ell.a * sqrt(f));
-}
-
-
-PIGeoPosition &PIGeoPosition::operator=(const PIMathVectorT3d &v) {
-	*((PIMathVectorT3d*)(this)) = v;
-	return *this;
-}
-
-
-PIGeoPosition &PIGeoPosition::operator-=(const PIGeoPosition &right) {
-	PIGeoPosition r(right);
-	CoordinateSystem saves = s;
-	transformTo(Cartesian);
-	r.transformTo(Cartesian);
-	(*(PIMathVectorT3d*)(this)) -= r;
-	transformTo(saves);
-	return *this;
-}
-
-
-PIGeoPosition &PIGeoPosition::operator+=(const PIGeoPosition &right) {
-	PIGeoPosition r(right);
-	CoordinateSystem saves = s;
-	transformTo(Cartesian);
-	r.transformTo(Cartesian);
-	(*(PIMathVectorT3d*)(this)) += r;
-	transformTo(saves);
-	return *this;
-}
-
-
-bool PIGeoPosition::operator==(const PIGeoPosition &right) const {
-	if(el.a != right.el.a || el.eccSquared() != right.el.eccSquared()) return false;
-	if(range(*this, right) < position_tolerance) return true;
-	else return false;
-}
-
-
-void PIGeoPosition::initialize(PIMathVectorT3d v, PIGeoPosition::CoordinateSystem sys, PIEllipsoidModel ell) {
-	double a(v[0]), b(v[1]), c(v[2]);
-	if(sys == Geodetic || sys==Geocentric) {
-		if(a > 90 || a < -90) {
-			piCout << "[PIGeoPosition]" << "Achtung! Invalid latitude in constructor:" << a;
-			assert(a <= 90 && a >= -90);
-		}
-		if(b < 0) b += 360*(1+(unsigned long)(b/360));
-		else if(b >= 360) b -= 360*(unsigned long)(b/360);
-	}
-	if(sys==Geocentric || sys==Spherical) {
-		if(c < 0) {
-			piCout << "[PIGeoPosition]" << "Achtung! Invalid radius in constructor:" << c;
-			assert(c >= 0);
-		}
-	}
-	if(sys==Spherical) {
-		if(a < 0 || a > 180) {
-			piCout << "[PIGeoPosition]" << "Achtung! Invalid theta in constructor:" << a;
-			assert(a >= 0 && a <= 180);
-		}
-		if(b < 0) b += 360*(1+(unsigned long)(b/360));
-		else if(b >= 360) b -= 360*(unsigned long)(b/360);
-	}
-	(*this)[0] = a;
-	(*this)[1] = b;
-	(*this)[2] = c;
-	el = ell;
-	s = sys;
-}
-
-
-double PIGeoPosition::range(const PIGeoPosition &a, const PIGeoPosition &b) {
-	PIGeoPosition l(a),r(b);
-	l.transformTo(PIGeoPosition::Cartesian);
-	r.transformTo(PIGeoPosition::Cartesian);
-	return (l - r).length();
-}
-
-
-double PIGeoPosition::elevation(const PIGeoPosition &p) const {
-	PIGeoPosition r(*this), s(p);
-	r.transformTo(Cartesian);
-	s.transformTo(Cartesian);
-	return r.angleElevation(s);
-}
-
-
-double PIGeoPosition::elevationGeodetic(const PIGeoPosition &p) const {
-	PIGeoPosition r(*this), s(p);
-	double lat = r.latitudeGeodetic() * deg2rad;
-	double lng = r.longitude() * deg2rad;
-	double local_up;
-	double cos_up;
-	r.transformTo(Cartesian);
-	s.transformTo(Cartesian);
-	PIMathVectorT3d z = s - r;
-	if (z.length() <= 1e-4) { // if the positions are within .1 millimeter
-		piCout << "[PIGeoPosition]" << "Positions are within .1 millimeter" << z;
-		assert(z.length() > 1e-4);
-	}
-	PIMathVectorT3d kv; // Compute k vector in local North-East-Up (NEU) system
-	kv[0] = cos(lat) * cos(lng);
-	kv[1] = cos(lat) * sin(lng);
-	kv[2] = sin(lat);
-	local_up = z.dot(kv); // Take advantage of dot method to get Up coordinate in local NEU system
-	cos_up = local_up / z.length(); // Let's get cos(z), being z the angle with respect to local vertical (Up);
-	return 90.0 - ((acos(cos_up)) * rad2deg);
-}
-
-
-double PIGeoPosition::azimuth(const PIGeoPosition &p) const {
-	PIGeoPosition r(*this), s(p);
-	r.transformTo(Cartesian);
-	s.transformTo(Cartesian);
-	double xy, xyz, cosl, sinl, sint, xn1, xn2, xn3, xe1, xe2;
-	double z1, z2, z3, p1, p2, test, alpha;
-	xy = r[0] * r[0] + r[1] * r[1];
-	xyz = xy + r[2] * r[2];
-	xy = sqrt(xy);
-	xyz = sqrt(xyz);
-	if (xy <= 1e-14 || xyz <=1e-14) {
-		piCout << "[PIGeoPosition]" << "Divide by Zero Error";
-		assert(xy > 1e-14 && xyz > 1e-14);
-	}
-	cosl = r[0] / xy;
-	sinl = r[1] / xy;
-	sint = r[2] / xyz;
-	xn1 = -sint * cosl;
-	xn2 = -sint * sinl;
-	xn3 = xy / xyz;
-	xe1 = -sinl;
-	xe2 = cosl;
-	z1 = s[0] - r[0];
-	z2 = s[1] - r[1];
-	z3 = s[2] - r[2];
-	p1 = (xn1 * z1) + (xn2 * z2) + (xn3 * z3) ;
-	p2 = (xe1 * z1) + (xe2 * z2) ;
-	test = piAbsd(p1) + piAbsd(p2);
-	if (test < 1.0e-16) {
-		piCout << "[PIGeoPosition]" << "azAngle(), failed p1+p2 test" << test;
-		assert(test >= 1.0e-16);
-	}
-	alpha = 90 - atan2(p1, p2) * rad2deg;
-	if (alpha < 0) return alpha + 360;
-	else  return alpha;
-}
-
-
-double PIGeoPosition::azimuthGeodetic(const PIGeoPosition &p) const {
-	PIGeoPosition r(*this), s(p);
-	double lat = r.latitudeGeodetic() * deg2rad;
-	double lng = r.longitude() * deg2rad;
-	r.transformTo(Cartesian);
-	s.transformTo(Cartesian);
-	PIMathVectorT3d z;
-	z = s - r;
-	if (z.length() <= 1e-4) { // if the positions are within .1 millimeter
-		piCout << "[PIGeoPosition]" << "Positions are within 0.1 millimeter" << z.length();
-		assert(z.length() > 1e-4);
-	}
-	PIMathVectorT3d iv; // Compute i vector in local North-East-Up (NEU) system
-	iv[0] = -sin(lat) * cos(lng);
-	iv[1] = -sin(lat) * sin(lng);
-	iv[2] = cos(lat);
-	PIMathVectorT3d jv; // Compute j vector in local North-East-Up (NEU) system
-	jv[0] = -sin(lng);
-	jv[1] = cos(lng);
-	jv[2] = 0.0;
-	double local_n = z.dot(iv) / z.length(); // Now, let's use dot product to get localN unitary vectors
-	double local_e = z.dot(jv) / z.length(); // Now, let's use dot product to get localE unitary vector
-	double test = piAbsd(local_n) + piAbsd(local_e); // Let's test if computing azimuth has any sense
-	if (test < 1.0e-16) return 0.0; // Warning: If elevation is very close to 90 degrees, we will return azimuth = 0.0
-	double alpha = atan2(local_e, local_n) * rad2deg;
-	if (alpha < 0.0) return alpha + 360.0;
-	else return alpha;
-}
-
-double PIGeoPosition::getCurvMeridian() const {
-	double slat = sin(latitudeGeodetic() * deg2rad);
-	double w = 1.0 / sqrt(1.0 - el.eccSquared() * slat * slat);
-	return el.a * (1.0 - el.eccSquared()) * w * w * w;
-}
-
-
-double PIGeoPosition::getCurvPrimeVertical() const {
-	double slat = sin(latitudeGeodetic() * deg2rad);
-	return el.a / sqrt(1.0 - el.eccSquared() * slat * slat);
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Class for geo position storage and conversions
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pigeoposition.h"
+
+const double PIGeoPosition::one_cm_tolerance = 0.01; // One centimeter tolerance.
+const double PIGeoPosition::one_mm_tolerance = 0.001; // One milimeter tolerance.
+const double PIGeoPosition::one_um_tolerance = 0.000001; // One micron tolerance.
+double PIGeoPosition::position_tolerance = PIGeoPosition::one_mm_tolerance; // Default tolerance in meters.
+
+
+PIGeoPosition::PIGeoPosition() {
+	initialize(PIMathVectorT3d());
+}
+
+
+PIGeoPosition::PIGeoPosition(double a, double b, double c, PIGeoPosition::CoordinateSystem s, PIEllipsoidModel ell) {
+	PIMathVectorT3d v;
+	v[0] = a;
+	v[1] = b;
+	v[2] = c;
+	initialize(v, s, ell);
+}
+
+
+PIGeoPosition::PIGeoPosition(PIMathVectorT3d v, PIGeoPosition::CoordinateSystem s, PIEllipsoidModel ell) {
+	initialize(v, s, ell);
+}
+
+
+PIGeoPosition &PIGeoPosition::transformTo(PIGeoPosition::CoordinateSystem sys) {
+	if(sys == Unknown || sys == s) return *this;
+	PIGeoPosition tmp(*this);
+	switch(s) {
+		case Unknown:
+		return *this;
+		case Geodetic:
+			switch(sys) {
+				case Unknown: case Geodetic: return *this;
+				case Geocentric:
+					convertGeodeticToGeocentric(*this, tmp, el);
+					tmp.s = Geocentric;
+				break;
+				case Cartesian:
+					convertGeodeticToCartesian(*this, tmp, el);
+					tmp.s = Cartesian;
+				break;
+				case Spherical:
+					convertGeodeticToGeocentric(*this, tmp, el);
+					tmp[0] = 90 - tmp[0];   // geocen -> sph
+					tmp.s = Spherical;
+				break;
+			}
+		break;
+		case Geocentric:
+			switch(sys) {
+				case Unknown: case Geocentric: return *this;
+				case Geodetic:
+					convertGeocentricToGeodetic(*this, tmp, el);
+					tmp.s = Geodetic;
+				break;
+				case Cartesian:
+					convertGeocentricToCartesian(*this, tmp);
+					tmp.s = Cartesian;
+				break;
+				case Spherical:
+					tmp[0] = 90 - tmp[0];   // geocen -> sph
+					tmp.s = Spherical;
+				break;
+			}
+		break;
+		case Cartesian:
+			switch(sys) {
+				case Unknown: case Cartesian: return *this;
+				case Geodetic:
+					convertCartesianToGeodetic(*this, tmp, el);
+					tmp.s = Geodetic;
+				break;
+				case Geocentric:
+					convertCartesianToGeocentric(*this, tmp);
+					tmp.s = Geocentric;
+				break;
+				case Spherical:
+					convertCartesianToSpherical(*this, tmp);
+					tmp.s = Spherical;
+				break;
+			}
+		break;
+		case Spherical:
+			switch(sys) {
+				case Unknown: case Spherical: return *this;
+				case Geodetic:
+					(*this)[0] = 90 - (*this)[0];   // sph -> geocen
+					convertGeocentricToGeodetic(*this, tmp, el);
+					tmp.s = Geodetic;
+				break;
+				case Geocentric:
+					tmp[0] = 90 - tmp[0];   // sph -> geocen
+					tmp.s = Geocentric;
+				break;
+				case Cartesian:
+					convertSphericalToCartesian(*this, tmp);
+					tmp.s = Cartesian;
+				break;
+			}
+		break;
+	}
+	*this = tmp;
+	return *this;
+}
+
+double PIGeoPosition::x() const {
+	if(s == Cartesian) return (*this)[0];
+	PIGeoPosition t(*this);
+	t.transformTo(Cartesian);
+	return t[0];
+}
+
+
+double PIGeoPosition::y() const {
+	if(s == Cartesian) return (*this)[1];
+	PIGeoPosition t(*this);
+	t.transformTo(Cartesian);
+	return t[1];
+}
+
+
+double PIGeoPosition::z() const {
+	if(s == Cartesian) return (*this)[2];
+	PIGeoPosition t(*this);
+	t.transformTo(Cartesian);
+	return t[2];
+}
+
+
+double PIGeoPosition::latitudeGeodetic() const {
+	if(s == Geodetic) return (*this)[0];
+	PIGeoPosition t(*this);
+	t.transformTo(Geodetic);
+	return t[0];
+}
+
+
+double PIGeoPosition::latitudeGeocentric() const {
+	if(s == Geocentric) return (*this)[0];
+	PIGeoPosition t(*this);
+	t.transformTo(Geocentric);
+	return t[0];
+}
+
+
+double PIGeoPosition::longitude() const {
+	if(s != Cartesian) return (*this)[1];
+	PIGeoPosition t(*this);
+	t.transformTo(Spherical);
+	return t[1];
+}
+
+
+double PIGeoPosition::theta() const {
+	if(s == Spherical) return (*this)[0];
+	PIGeoPosition t(*this);
+	t.transformTo(Spherical);
+	return t[0];
+}
+
+
+double PIGeoPosition::phi() const {
+	return longitude();
+}
+
+
+double PIGeoPosition::radius() const {
+	if(s == Spherical || s == Geocentric) return (*this)[2];
+	PIGeoPosition t(*this);
+	t.transformTo(Spherical);
+	return t[2];
+}
+
+
+double PIGeoPosition::height() const {
+	if(s == Geodetic) return (*this)[2];
+	PIGeoPosition t(*this);
+	t.transformTo(Geodetic);
+	return t[2];
+}
+
+
+PIGeoPosition &PIGeoPosition::setGeodetic(double lat, double lon, double ht, PIEllipsoidModel ell) {
+	if(lat > 90 || lat < -90) {
+		piCout << "[PIGeoPosition]" << "Achtung! Invalid latitude in setGeodetic:" << lat;
+		assert(lat <= 90 && lat >= -90);
+	}
+	(*this)[0] = lat;
+	(*this)[1] = lon;
+	if((*this)[1] < 0) (*this)[1] += 360 * (1 + (unsigned long)((*this)[1]/360));
+	else if((*this)[1] >= 360) (*this)[1] -= 360 * (unsigned long)((*this)[1]/360);
+	(*this)[2] = ht;
+	el = ell;
+	s = Geodetic;
+	return *this;
+}
+
+
+PIGeoPosition &PIGeoPosition::setGeocentric(double lat, double lon, double rad) {
+	if(lat > 90 || lat < -90) {
+		piCout << "[PIGeoPosition]" << "Achtung! Invalid latitude in setGeocentric:" << lat;
+		assert(lat <= 90 && lat >= -90);
+	}
+	if(rad < 0) {
+		piCout << "[PIGeoPosition]" << "Achtung! Invalid radius in setGeocentric:" << rad;
+		assert(rad >= 0);
+	}
+	(*this)[0] = lat;
+	(*this)[1] = lon;
+	(*this)[2] = rad;
+	if((*this)[1] < 0) (*this)[1] += 360*(1+(unsigned long)((*this)[1]/360));
+	else if((*this)[1] >= 360) (*this)[1] -= 360*(unsigned long)((*this)[1]/360);
+	s = Geocentric;
+	return *this;
+}
+
+
+PIGeoPosition &PIGeoPosition::setSpherical(double theta, double phi, double rad) {
+	if(theta < 0 || theta > 180) {
+		piCout << "[PIGeoPosition]" << "Achtung! Invalid theta in setSpherical:" << theta;
+		assert(theta <= 180 && theta >= 0);
+	}
+	if(rad < 0) {
+		piCout << "[PIGeoPosition]" << "Achtung! Invalid radius in setSpherical:" << rad;
+		assert(rad >= 0);
+	}
+	(*this)[0] = theta;
+	(*this)[1] = phi;
+	(*this)[2] = rad;
+	if((*this)[1] < 0) (*this)[1] += 360*(1+(unsigned long)((*this)[1]/360));
+	else if((*this)[1] >= 360) (*this)[1] -= 360*(unsigned long)((*this)[1]/360);
+	s = Spherical;
+	return *this;
+}
+
+
+PIGeoPosition &PIGeoPosition::setECEF(double x, double y, double z) {
+	(*this)[0] = x;
+	(*this)[1] = y;
+	(*this)[2] = z;
+	s = Cartesian;
+	return *this;
+}
+
+
+void PIGeoPosition::convertSphericalToCartesian(const PIMathVectorT3d &tpr, PIMathVectorT3d &xyz) {
+	double st = sin(tpr[0] * deg2rad);
+	xyz[0] = tpr[2] * st * cos(tpr[1] * deg2rad);
+	xyz[1] = tpr[2] * st * sin(tpr[1] * deg2rad);
+	xyz[2] = tpr[2] * cos(tpr[0] * deg2rad);
+}
+
+
+void PIGeoPosition::convertCartesianToSpherical(const PIMathVectorT3d &xyz, PIMathVectorT3d &tpr) {
+	tpr[2] = xyz.length();
+	if(tpr[2] <= PIGeoPosition::position_tolerance / 5) { // zero-length Cartesian vector
+		tpr[0] = 90.0;
+		tpr[1] = 0.0;
+		return;
+	}
+	tpr[0] = acos(xyz[2] / tpr[2]) * rad2deg;
+	if(sqrt(xyz[0] * xyz[0] + xyz[1] * xyz[1]) < PIGeoPosition::position_tolerance / 5) { // pole
+		tpr[1] = 0.0;
+		return;
+	}
+	tpr[1] = atan2(xyz[1],xyz[0]) * rad2deg;
+	if(tpr[1] < 0.0) tpr[1] += 360.0;
+}
+
+
+void PIGeoPosition::convertCartesianToGeodetic(const PIMathVectorT3d &xyz, PIMathVectorT3d &llh, PIEllipsoidModel ell) {
+	double p,slat,nn,htold,latold;
+	p = sqrt(xyz[0] * xyz[0] + xyz[1] * xyz[1]);
+	if(p < PIGeoPosition::position_tolerance / 5) { // pole or origin
+		llh[0] = (xyz[2] > 0.0 ? 90.0: -90.0);
+		llh[1] = 0.0; // lon undefined, really
+		llh[2] = piAbsd(xyz[2]) - ell.a * sqrt(1.0-ell.eccSquared());
+		return;
+	}
+	llh[0] = atan2(xyz[2], p*(1.0-ell.eccSquared()));
+	llh[2] = 0;
+	for(int i=0; i<5; i++) {
+		slat = sin(llh[0]);
+		nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
+		htold = llh[2];
+		llh[2] = p / cos(llh[0]) - nn;
+		latold = llh[0];
+		llh[0] = atan2(xyz[2], p*(1.0 - ell.eccSquared() * (nn / (nn + llh[2]))));
+		if(piAbsd(llh[0] - latold) < 1.0e-9 && piAbsd(llh[2] - htold) < 1.0e-9 * ell.a) break;
+	}
+	llh[1] = atan2(xyz[1], xyz[0]);
+	if(llh[1] < 0.0) llh[1] += M_2PI;
+	llh[0] *= rad2deg;
+	llh[1] *= rad2deg;
+}
+
+
+void PIGeoPosition::convertGeodeticToCartesian(const PIMathVectorT3d &llh, PIMathVectorT3d &xyz, PIEllipsoidModel ell) {
+	double slat = sin(llh[0] * deg2rad);
+	double clat = cos(llh[0] * deg2rad);
+	double nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
+	xyz[0] = (nn + llh[2]) * clat * cos(llh[1] * deg2rad);
+	xyz[1] = (nn + llh[2]) * clat * sin(llh[1] * deg2rad);
+	xyz[2] = (nn * (1.0 - ell.eccSquared()) + llh[2]) * slat;
+}
+
+
+void PIGeoPosition::convertCartesianToGeocentric(const PIMathVectorT3d &xyz, PIMathVectorT3d &llr) {
+	convertCartesianToSpherical(xyz, llr);
+	llr[0] = 90.0 - llr[0]; // convert theta to latitude
+}
+
+
+void PIGeoPosition::convertGeocentricToCartesian(const PIMathVectorT3d &llr, PIMathVectorT3d &xyz) {
+	PIMathVectorT3d llh(llr);
+	llh[0] = 90.0 - llh[0]; // convert latitude to theta
+	convertSphericalToCartesian(llh, xyz);
+}
+
+
+void PIGeoPosition::convertGeocentricToGeodetic(const PIMathVectorT3d &llr, PIMathVectorT3d &llh, PIEllipsoidModel ell) {
+	double cl, p, sl, slat, nn, htold, latold;
+	llh[1] = llr[1]; // longitude is unchanged
+	cl = sin((90.0 - llr[0]) * deg2rad);
+	sl = cos((90.0 - llr[0]) * deg2rad);
+	if(llr[2] <= PIGeoPosition::position_tolerance / 5) { // radius is below tolerance, hence assign zero-length, arbitrarily set latitude = longitude = 0
+		llh[0] = llh[1] = 0.0;
+		llh[2] = -ell.a;
+		return;
+	} else if(cl < 1.e-10) { // near pole ... note that 1mm/radius(Earth) = 1.5e-10
+		if(llr[0] < 0.0) llh[0] = -90.0;
+		else llh[0] =  90.0;
+		llh[1] = 0.0;
+		llh[2] = llr[2] - ell.a * sqrt(1.0 - ell.eccSquared());
+		return;
+	}
+	llh[0] = atan2(sl, cl * (1.0 - ell.eccSquared()));
+	p = cl * llr[2];
+	llh[2] = 0.0;
+	for(int i=0; i<5; i++) {
+		slat = sin(llh[0]);
+		nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
+		htold = llh[2];
+		llh[2] = p / cos(llh[0]) - nn;
+		latold = llh[0];
+		llh[0] = atan2(sl, cl * (1.0 - ell.eccSquared() * (nn / (nn + llh[2]))));
+		if(piAbsd(llh[0] - latold) < 1.0e-9 && piAbsd(llh[2] - htold) < 1.0e-9 * ell.a) break;
+	}
+	llh[0] *= rad2deg;
+}
+
+
+void PIGeoPosition::convertGeodeticToGeocentric(const PIMathVectorT3d &llh, PIMathVectorT3d &llr, PIEllipsoidModel ell) {
+	double slat = sin(llh[0] * deg2rad);
+	double nn = ell.a / sqrt(1.0 - ell.eccSquared() * slat * slat);
+	llr[1] = llh[1]; // longitude is unchanged
+	llr[2] = sqrt((nn+llh[2])*(nn+llh[2]) + nn*ell.eccSquared()*(nn*ell.eccSquared()-2*(nn+llh[2]))*slat*slat); // radius
+	if(llr[2] <= PIGeoPosition::position_tolerance/5) { // radius is below tolerance, hence assign zero-length
+		llr[0] = llr[1] = llr[2] = 0; // arbitrarily set latitude = longitude = 0
+		return;
+	}
+	if(1 - piAbsd(slat) < 1.e-10) { // at the pole
+		if(slat < 0) llr[0] = -90.0;
+		else llr[0] =  90.0;
+		llr[1] = 0.0;
+		return;
+	}
+	llr[0] = acos((nn * (1.0 - ell.eccSquared()) + llh[2]) * slat / llr[2]); // theta
+	llr[0] *= rad2deg;
+	llr[0] = 90.0 - llr[0];
+}
+
+
+double PIGeoPosition::radiusEarth(double geolat, PIEllipsoidModel ell) {
+	double slat = sin(geolat * deg2rad);
+	double e = (1.0 - ell.eccSquared());
+	double f = (1.0 + (e * e - 1.0) * slat * slat) / (1.0 - ell.eccSquared() * slat * slat);
+	return (ell.a * sqrt(f));
+}
+
+
+PIGeoPosition &PIGeoPosition::operator=(const PIMathVectorT3d &v) {
+	*((PIMathVectorT3d*)(this)) = v;
+	return *this;
+}
+
+
+PIGeoPosition &PIGeoPosition::operator-=(const PIGeoPosition &right) {
+	PIGeoPosition r(right);
+	CoordinateSystem saves = s;
+	transformTo(Cartesian);
+	r.transformTo(Cartesian);
+	(*(PIMathVectorT3d*)(this)) -= r;
+	transformTo(saves);
+	return *this;
+}
+
+
+PIGeoPosition &PIGeoPosition::operator+=(const PIGeoPosition &right) {
+	PIGeoPosition r(right);
+	CoordinateSystem saves = s;
+	transformTo(Cartesian);
+	r.transformTo(Cartesian);
+	(*(PIMathVectorT3d*)(this)) += r;
+	transformTo(saves);
+	return *this;
+}
+
+
+bool PIGeoPosition::operator==(const PIGeoPosition &right) const {
+	if(el.a != right.el.a || el.eccSquared() != right.el.eccSquared()) return false;
+	if(range(*this, right) < position_tolerance) return true;
+	else return false;
+}
+
+
+void PIGeoPosition::initialize(PIMathVectorT3d v, PIGeoPosition::CoordinateSystem sys, PIEllipsoidModel ell) {
+	double a(v[0]), b(v[1]), c(v[2]);
+	if(sys == Geodetic || sys==Geocentric) {
+		if(a > 90 || a < -90) {
+			piCout << "[PIGeoPosition]" << "Achtung! Invalid latitude in constructor:" << a;
+			assert(a <= 90 && a >= -90);
+		}
+		if(b < 0) b += 360*(1+(unsigned long)(b/360));
+		else if(b >= 360) b -= 360*(unsigned long)(b/360);
+	}
+	if(sys==Geocentric || sys==Spherical) {
+		if(c < 0) {
+			piCout << "[PIGeoPosition]" << "Achtung! Invalid radius in constructor:" << c;
+			assert(c >= 0);
+		}
+	}
+	if(sys==Spherical) {
+		if(a < 0 || a > 180) {
+			piCout << "[PIGeoPosition]" << "Achtung! Invalid theta in constructor:" << a;
+			assert(a >= 0 && a <= 180);
+		}
+		if(b < 0) b += 360*(1+(unsigned long)(b/360));
+		else if(b >= 360) b -= 360*(unsigned long)(b/360);
+	}
+	(*this)[0] = a;
+	(*this)[1] = b;
+	(*this)[2] = c;
+	el = ell;
+	s = sys;
+}
+
+
+double PIGeoPosition::range(const PIGeoPosition &a, const PIGeoPosition &b) {
+	PIGeoPosition l(a),r(b);
+	l.transformTo(PIGeoPosition::Cartesian);
+	r.transformTo(PIGeoPosition::Cartesian);
+	return (l - r).length();
+}
+
+
+double PIGeoPosition::elevation(const PIGeoPosition &p) const {
+	PIGeoPosition r(*this), s(p);
+	r.transformTo(Cartesian);
+	s.transformTo(Cartesian);
+	return r.angleElevation(s);
+}
+
+
+double PIGeoPosition::elevationGeodetic(const PIGeoPosition &p) const {
+	PIGeoPosition r(*this), s(p);
+	double lat = r.latitudeGeodetic() * deg2rad;
+	double lng = r.longitude() * deg2rad;
+	double local_up;
+	double cos_up;
+	r.transformTo(Cartesian);
+	s.transformTo(Cartesian);
+	PIMathVectorT3d z = s - r;
+	if (z.length() <= 1e-4) { // if the positions are within .1 millimeter
+		piCout << "[PIGeoPosition]" << "Positions are within .1 millimeter" << z;
+		assert(z.length() > 1e-4);
+	}
+	PIMathVectorT3d kv; // Compute k vector in local North-East-Up (NEU) system
+	kv[0] = cos(lat) * cos(lng);
+	kv[1] = cos(lat) * sin(lng);
+	kv[2] = sin(lat);
+	local_up = z.dot(kv); // Take advantage of dot method to get Up coordinate in local NEU system
+	cos_up = local_up / z.length(); // Let's get cos(z), being z the angle with respect to local vertical (Up);
+	return 90.0 - ((acos(cos_up)) * rad2deg);
+}
+
+
+double PIGeoPosition::azimuth(const PIGeoPosition &p) const {
+	PIGeoPosition r(*this), s(p);
+	r.transformTo(Cartesian);
+	s.transformTo(Cartesian);
+	double xy, xyz, cosl, sinl, sint, xn1, xn2, xn3, xe1, xe2;
+	double z1, z2, z3, p1, p2, test, alpha;
+	xy = r[0] * r[0] + r[1] * r[1];
+	xyz = xy + r[2] * r[2];
+	xy = sqrt(xy);
+	xyz = sqrt(xyz);
+	if (xy <= 1e-14 || xyz <=1e-14) {
+		piCout << "[PIGeoPosition]" << "Divide by Zero Error";
+		assert(xy > 1e-14 && xyz > 1e-14);
+	}
+	cosl = r[0] / xy;
+	sinl = r[1] / xy;
+	sint = r[2] / xyz;
+	xn1 = -sint * cosl;
+	xn2 = -sint * sinl;
+	xn3 = xy / xyz;
+	xe1 = -sinl;
+	xe2 = cosl;
+	z1 = s[0] - r[0];
+	z2 = s[1] - r[1];
+	z3 = s[2] - r[2];
+	p1 = (xn1 * z1) + (xn2 * z2) + (xn3 * z3) ;
+	p2 = (xe1 * z1) + (xe2 * z2) ;
+	test = piAbsd(p1) + piAbsd(p2);
+	if (test < 1.0e-16) {
+		piCout << "[PIGeoPosition]" << "azAngle(), failed p1+p2 test" << test;
+		assert(test >= 1.0e-16);
+	}
+	alpha = 90 - atan2(p1, p2) * rad2deg;
+	if (alpha < 0) return alpha + 360;
+	else  return alpha;
+}
+
+
+double PIGeoPosition::azimuthGeodetic(const PIGeoPosition &p) const {
+	PIGeoPosition r(*this), s(p);
+	double lat = r.latitudeGeodetic() * deg2rad;
+	double lng = r.longitude() * deg2rad;
+	r.transformTo(Cartesian);
+	s.transformTo(Cartesian);
+	PIMathVectorT3d z;
+	z = s - r;
+	if (z.length() <= 1e-4) { // if the positions are within .1 millimeter
+		piCout << "[PIGeoPosition]" << "Positions are within 0.1 millimeter" << z.length();
+		assert(z.length() > 1e-4);
+	}
+	PIMathVectorT3d iv; // Compute i vector in local North-East-Up (NEU) system
+	iv[0] = -sin(lat) * cos(lng);
+	iv[1] = -sin(lat) * sin(lng);
+	iv[2] = cos(lat);
+	PIMathVectorT3d jv; // Compute j vector in local North-East-Up (NEU) system
+	jv[0] = -sin(lng);
+	jv[1] = cos(lng);
+	jv[2] = 0.0;
+	double local_n = z.dot(iv) / z.length(); // Now, let's use dot product to get localN unitary vectors
+	double local_e = z.dot(jv) / z.length(); // Now, let's use dot product to get localE unitary vector
+	double test = piAbsd(local_n) + piAbsd(local_e); // Let's test if computing azimuth has any sense
+	if (test < 1.0e-16) return 0.0; // Warning: If elevation is very close to 90 degrees, we will return azimuth = 0.0
+	double alpha = atan2(local_e, local_n) * rad2deg;
+	if (alpha < 0.0) return alpha + 360.0;
+	else return alpha;
+}
+
+double PIGeoPosition::getCurvMeridian() const {
+	double slat = sin(latitudeGeodetic() * deg2rad);
+	double w = 1.0 / sqrt(1.0 - el.eccSquared() * slat * slat);
+	return el.a * (1.0 - el.eccSquared()) * w * w * w;
+}
+
+
+double PIGeoPosition::getCurvPrimeVertical() const {
+	double slat = sin(latitudeGeodetic() * deg2rad);
+	return el.a / sqrt(1.0 - el.eccSquared() * slat * slat);
+}
+
diff --git a/src_main/geo/pigeoposition.h b/lib/main/geo/pigeoposition.h
similarity index 98%
rename from src_main/geo/pigeoposition.h
rename to lib/main/geo/pigeoposition.h
index c99647e0..ef6ead1e 100644
--- a/src_main/geo/pigeoposition.h
+++ b/lib/main/geo/pigeoposition.h
@@ -1,173 +1,173 @@
-/*! \file pigeoposition.h
- * \brief Class for geo position storage and conversions
-*/
-/*
-	PIP - Platform Independent Primitives
-	Class for geo position storage and conversions
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIGEOPOSITION_H
-#define PIGEOPOSITION_H
-
-#include "piellipsoidmodel.h"
-#include "pimathvector.h"
-
-class PIP_EXPORT PIGeoPosition : public PIMathVectorT3d
-{
-public:
-
-	enum CoordinateSystem
-	{
-		Unknown=0,  /// Unknown coordinate system
-		Geodetic,   /// Geodetic latitude, longitude, and height above ellipsoid
-		Geocentric, /// Geocentric (regular spherical coordinates)
-		Cartesian,  /// Cartesian (Earth-centered, Earth-fixed)
-		Spherical   /// Spherical coordinates (theta,phi,radius)
-	};
-
-	static const double one_cm_tolerance;/// One centimeter tolerance.
-	static const double one_mm_tolerance;/// One millimeter tolerance.
-	static const double one_um_tolerance;/// One micron tolerance.
-	static double position_tolerance;/// Default tolerance (default 1mm)
-	static double setPositionTolerance(const double tol) {position_tolerance = tol; return position_tolerance;}
-	static double getPositionTolerance() {return position_tolerance;}
-
-	PIGeoPosition();
-	PIGeoPosition(double a, double b, double c, CoordinateSystem s = Cartesian, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-	PIGeoPosition(PIMathVectorT3d v, CoordinateSystem s = Cartesian, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-
-
-	PIGeoPosition &transformTo(CoordinateSystem sys);
-	PIGeoPosition &asGeodetic() {transformTo(Geodetic); return *this; } /// Convert to geodetic coordinate
-	PIGeoPosition &asGeodetic(const PIEllipsoidModel &ell) {setEllipsoidModel(ell); transformTo(Geodetic); return *this;} /// Convert to another ell, then to geodetic coordinates
-	PIGeoPosition &asECEF() {transformTo(Cartesian); return *this; } /// Convert to cartesian coordinates
-
-	double x() const;
-	double y() const;
-	double z() const;
-	double latitudeGeodetic() const;
-	double latitudeGeocentric() const;
-	double longitude() const;
-	double theta() const;
-	double phi() const;
-	double radius() const;
-	double height() const;
-
-	/// Set the ellipsoid values for this PIGeoPosition given a ellipsoid.
-	void setEllipsoidModel(const PIEllipsoidModel &ell) {el = ell;}
-
-	/// Set the \a PIGeoPosition given geodetic coordinates in degrees. \a CoordinateSystem is set to \a Geodetic.
-	PIGeoPosition &setGeodetic(double lat, double lon, double ht, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-
-	/// Set the \a PIGeoPosition given geocentric coordinates in degrees. \a CoordinateSystem is set to \a Geocentric
-	PIGeoPosition &setGeocentric(double lat, double lon, double rad);
-
-	/// Set the \a PIGeoPosition given spherical coordinates in degrees. \a CoordinateSystem is set to \a Spherical
-	PIGeoPosition &setSpherical(double theta, double phi, double rad);
-
-	/// Set the \a PIGeoPosition given ECEF coordinates in meeters. \a CoordinateSystem is set to \a Cartesian.
-	PIGeoPosition &setECEF(double x, double y, double z);
-
-	/// Fundamental conversion from spherical to cartesian coordinates.
-	static void convertSphericalToCartesian(const PIMathVectorT3d &tpr, PIMathVectorT3d &xyz);
-
-	/// Fundamental routine to convert cartesian to spherical coordinates.
-	static void convertCartesianToSpherical(const PIMathVectorT3d &xyz, PIMathVectorT3d &tpr);
-
-	/// Fundamental routine to convert ECEF (cartesian) to geodetic coordinates,
-	static void convertCartesianToGeodetic(const PIMathVectorT3d &xyz, PIMathVectorT3d &llh, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-
-	/// Fundamental routine to convert geodetic to ECEF (cartesian) coordinates,
-	static void convertGeodeticToCartesian(const PIMathVectorT3d &llh, PIMathVectorT3d &xyz, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-
-	/// Fundamental routine to convert cartesian (ECEF) to geocentric
-	static void convertCartesianToGeocentric(const PIMathVectorT3d &xyz, PIMathVectorT3d &llr);
-
-	/// Fundamental routine to convert geocentric to cartesian (ECEF)
-	static void convertGeocentricToCartesian(const PIMathVectorT3d &llr, PIMathVectorT3d &xyz);
-
-	/// Fundamental routine to convert geocentric to geodetic
-	static void convertGeocentricToGeodetic(const PIMathVectorT3d &llr, PIMathVectorT3d &llh, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-
-	/// Fundamental routine to convert geodetic to geocentric
-	static void convertGeodeticToGeocentric(const PIMathVectorT3d &llh, PIMathVectorT3d &llr, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-
-	/// Compute the radius of the ellipsoidal Earth, given the geodetic latitude.
-	static double radiusEarth(double geolat, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-	double radiusEarth() const {
-		PIGeoPosition p(*this);
-		p.transformTo(PIGeoPosition::Geodetic);
-		return PIGeoPosition::radiusEarth((*this)[0], p.el);
-	}
-
-	/// Compute the range in meters between two PIGeoPositions.
-	static double range(const PIGeoPosition &a, const PIGeoPosition &b);
-	double range(const PIGeoPosition &p) const {
-		return range((*this), p);
-	}
-
-	/// Computes the elevation of the input (p) position as seen from this PIGeoPosition.
-	double elevation(const PIGeoPosition &p) const;
-
-	/// Computes the elevation of the input (p) position as seen from this PIGeoPosition, using a Geodetic (ellipsoidal) system.
-	double elevationGeodetic(const PIGeoPosition &p) const;
-
-	/// Computes the azimuth of the input (p) position as seen from this PIGeoPosition.
-	double azimuth(const PIGeoPosition &p) const;
-
-	/// Computes the azimuth of the input (p) position as seen from this PIGeoPosition, using a Geodetic (ellipsoidal) system.
-	double azimuthGeodetic(const PIGeoPosition &p) const;
-
-	/// Computes the radius of curvature of the meridian (Rm) corresponding to this PIGeoPosition.
-	double getCurvMeridian() const;
-
-	/// Computes the radius of curvature in the prime vertical (Rn) corresponding to this PIGeoPosition.
-	double getCurvPrimeVertical() const;
-
-	/// Returns as PIMathVectorT3d
-	const PIMathVectorT3d & vector() const {return *this;}
-
-	PIGeoPosition &operator=(const PIMathVectorT3d & v);
-	PIGeoPosition &operator-=(const PIGeoPosition &right);
-	PIGeoPosition &operator+=(const PIGeoPosition &right);
-	friend PIGeoPosition operator-(const PIGeoPosition &left, const PIGeoPosition &right);
-	friend PIGeoPosition operator+(const PIGeoPosition &left, const PIGeoPosition &right);
-	friend PIGeoPosition operator*(const double &scale, const PIGeoPosition &right);
-	friend PIGeoPosition operator*(const PIGeoPosition &left, const double &scale);
-	friend PIGeoPosition operator*(const int &scale, const PIGeoPosition &right);
-	friend PIGeoPosition operator*(const PIGeoPosition &left, const int &scale);
-	bool operator==(const PIGeoPosition &right) const;
-	bool operator!=(const PIGeoPosition &right) const {return !(operator==(right));}
-
-
-private:
-	void initialize(PIMathVectorT3d v, CoordinateSystem sys = Cartesian, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
-
-	PIEllipsoidModel el;
-	CoordinateSystem s;
-
-};
-
-
-inline PIGeoPosition operator-(const PIGeoPosition &left, const PIGeoPosition &right) {PIGeoPosition l(left),r(right); l.transformTo(PIGeoPosition::Cartesian); r.transformTo(PIGeoPosition::Cartesian); l -= r; return l;}
-inline PIGeoPosition operator+(const PIGeoPosition &left, const PIGeoPosition &right) {PIGeoPosition l(left),r(right); l.transformTo(PIGeoPosition::Cartesian); r.transformTo(PIGeoPosition::Cartesian); l += r; return l;}
-inline PIGeoPosition operator*(const double &scale, const PIGeoPosition &right) {PIMathVectorT3d tmp(right); tmp *= scale; return PIGeoPosition(tmp);}
-inline PIGeoPosition operator*(const PIGeoPosition &left, const double &scale) {return operator* (scale, left);}
-inline PIGeoPosition operator*(const int &scale, const PIGeoPosition &right) {return operator* (double(scale), right);}
-inline PIGeoPosition operator*(const PIGeoPosition &left, const int &scale) {return operator* (double(scale), left);}
-
-#endif // PIGEOPOSITION_H
+/*! \file pigeoposition.h
+ * \brief Class for geo position storage and conversions
+*/
+/*
+	PIP - Platform Independent Primitives
+	Class for geo position storage and conversions
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIGEOPOSITION_H
+#define PIGEOPOSITION_H
+
+#include "piellipsoidmodel.h"
+#include "pimathvector.h"
+
+class PIP_EXPORT PIGeoPosition : public PIMathVectorT3d
+{
+public:
+
+	enum CoordinateSystem
+	{
+		Unknown=0,  /// Unknown coordinate system
+		Geodetic,   /// Geodetic latitude, longitude, and height above ellipsoid
+		Geocentric, /// Geocentric (regular spherical coordinates)
+		Cartesian,  /// Cartesian (Earth-centered, Earth-fixed)
+		Spherical   /// Spherical coordinates (theta,phi,radius)
+	};
+
+	static const double one_cm_tolerance;/// One centimeter tolerance.
+	static const double one_mm_tolerance;/// One millimeter tolerance.
+	static const double one_um_tolerance;/// One micron tolerance.
+	static double position_tolerance;/// Default tolerance (default 1mm)
+	static double setPositionTolerance(const double tol) {position_tolerance = tol; return position_tolerance;}
+	static double getPositionTolerance() {return position_tolerance;}
+
+	PIGeoPosition();
+	PIGeoPosition(double a, double b, double c, CoordinateSystem s = Cartesian, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+	PIGeoPosition(PIMathVectorT3d v, CoordinateSystem s = Cartesian, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+
+
+	PIGeoPosition &transformTo(CoordinateSystem sys);
+	PIGeoPosition &asGeodetic() {transformTo(Geodetic); return *this; } /// Convert to geodetic coordinate
+	PIGeoPosition &asGeodetic(const PIEllipsoidModel &ell) {setEllipsoidModel(ell); transformTo(Geodetic); return *this;} /// Convert to another ell, then to geodetic coordinates
+	PIGeoPosition &asECEF() {transformTo(Cartesian); return *this; } /// Convert to cartesian coordinates
+
+	double x() const;
+	double y() const;
+	double z() const;
+	double latitudeGeodetic() const;
+	double latitudeGeocentric() const;
+	double longitude() const;
+	double theta() const;
+	double phi() const;
+	double radius() const;
+	double height() const;
+
+	/// Set the ellipsoid values for this PIGeoPosition given a ellipsoid.
+	void setEllipsoidModel(const PIEllipsoidModel &ell) {el = ell;}
+
+	/// Set the \a PIGeoPosition given geodetic coordinates in degrees. \a CoordinateSystem is set to \a Geodetic.
+	PIGeoPosition &setGeodetic(double lat, double lon, double ht, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+
+	/// Set the \a PIGeoPosition given geocentric coordinates in degrees. \a CoordinateSystem is set to \a Geocentric
+	PIGeoPosition &setGeocentric(double lat, double lon, double rad);
+
+	/// Set the \a PIGeoPosition given spherical coordinates in degrees. \a CoordinateSystem is set to \a Spherical
+	PIGeoPosition &setSpherical(double theta, double phi, double rad);
+
+	/// Set the \a PIGeoPosition given ECEF coordinates in meeters. \a CoordinateSystem is set to \a Cartesian.
+	PIGeoPosition &setECEF(double x, double y, double z);
+
+	/// Fundamental conversion from spherical to cartesian coordinates.
+	static void convertSphericalToCartesian(const PIMathVectorT3d &tpr, PIMathVectorT3d &xyz);
+
+	/// Fundamental routine to convert cartesian to spherical coordinates.
+	static void convertCartesianToSpherical(const PIMathVectorT3d &xyz, PIMathVectorT3d &tpr);
+
+	/// Fundamental routine to convert ECEF (cartesian) to geodetic coordinates,
+	static void convertCartesianToGeodetic(const PIMathVectorT3d &xyz, PIMathVectorT3d &llh, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+
+	/// Fundamental routine to convert geodetic to ECEF (cartesian) coordinates,
+	static void convertGeodeticToCartesian(const PIMathVectorT3d &llh, PIMathVectorT3d &xyz, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+
+	/// Fundamental routine to convert cartesian (ECEF) to geocentric
+	static void convertCartesianToGeocentric(const PIMathVectorT3d &xyz, PIMathVectorT3d &llr);
+
+	/// Fundamental routine to convert geocentric to cartesian (ECEF)
+	static void convertGeocentricToCartesian(const PIMathVectorT3d &llr, PIMathVectorT3d &xyz);
+
+	/// Fundamental routine to convert geocentric to geodetic
+	static void convertGeocentricToGeodetic(const PIMathVectorT3d &llr, PIMathVectorT3d &llh, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+
+	/// Fundamental routine to convert geodetic to geocentric
+	static void convertGeodeticToGeocentric(const PIMathVectorT3d &llh, PIMathVectorT3d &llr, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+
+	/// Compute the radius of the ellipsoidal Earth, given the geodetic latitude.
+	static double radiusEarth(double geolat, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+	double radiusEarth() const {
+		PIGeoPosition p(*this);
+		p.transformTo(PIGeoPosition::Geodetic);
+		return PIGeoPosition::radiusEarth((*this)[0], p.el);
+	}
+
+	/// Compute the range in meters between two PIGeoPositions.
+	static double range(const PIGeoPosition &a, const PIGeoPosition &b);
+	double range(const PIGeoPosition &p) const {
+		return range((*this), p);
+	}
+
+	/// Computes the elevation of the input (p) position as seen from this PIGeoPosition.
+	double elevation(const PIGeoPosition &p) const;
+
+	/// Computes the elevation of the input (p) position as seen from this PIGeoPosition, using a Geodetic (ellipsoidal) system.
+	double elevationGeodetic(const PIGeoPosition &p) const;
+
+	/// Computes the azimuth of the input (p) position as seen from this PIGeoPosition.
+	double azimuth(const PIGeoPosition &p) const;
+
+	/// Computes the azimuth of the input (p) position as seen from this PIGeoPosition, using a Geodetic (ellipsoidal) system.
+	double azimuthGeodetic(const PIGeoPosition &p) const;
+
+	/// Computes the radius of curvature of the meridian (Rm) corresponding to this PIGeoPosition.
+	double getCurvMeridian() const;
+
+	/// Computes the radius of curvature in the prime vertical (Rn) corresponding to this PIGeoPosition.
+	double getCurvPrimeVertical() const;
+
+	/// Returns as PIMathVectorT3d
+	const PIMathVectorT3d & vector() const {return *this;}
+
+	PIGeoPosition &operator=(const PIMathVectorT3d & v);
+	PIGeoPosition &operator-=(const PIGeoPosition &right);
+	PIGeoPosition &operator+=(const PIGeoPosition &right);
+	friend PIGeoPosition operator-(const PIGeoPosition &left, const PIGeoPosition &right);
+	friend PIGeoPosition operator+(const PIGeoPosition &left, const PIGeoPosition &right);
+	friend PIGeoPosition operator*(const double &scale, const PIGeoPosition &right);
+	friend PIGeoPosition operator*(const PIGeoPosition &left, const double &scale);
+	friend PIGeoPosition operator*(const int &scale, const PIGeoPosition &right);
+	friend PIGeoPosition operator*(const PIGeoPosition &left, const int &scale);
+	bool operator==(const PIGeoPosition &right) const;
+	bool operator!=(const PIGeoPosition &right) const {return !(operator==(right));}
+
+
+private:
+	void initialize(PIMathVectorT3d v, CoordinateSystem sys = Cartesian, PIEllipsoidModel ell = PIEllipsoidModel::WGS84Ellipsoid());
+
+	PIEllipsoidModel el;
+	CoordinateSystem s;
+
+};
+
+
+inline PIGeoPosition operator-(const PIGeoPosition &left, const PIGeoPosition &right) {PIGeoPosition l(left),r(right); l.transformTo(PIGeoPosition::Cartesian); r.transformTo(PIGeoPosition::Cartesian); l -= r; return l;}
+inline PIGeoPosition operator+(const PIGeoPosition &left, const PIGeoPosition &right) {PIGeoPosition l(left),r(right); l.transformTo(PIGeoPosition::Cartesian); r.transformTo(PIGeoPosition::Cartesian); l += r; return l;}
+inline PIGeoPosition operator*(const double &scale, const PIGeoPosition &right) {PIMathVectorT3d tmp(right); tmp *= scale; return PIGeoPosition(tmp);}
+inline PIGeoPosition operator*(const PIGeoPosition &left, const double &scale) {return operator* (scale, left);}
+inline PIGeoPosition operator*(const int &scale, const PIGeoPosition &right) {return operator* (double(scale), right);}
+inline PIGeoPosition operator*(const PIGeoPosition &left, const int &scale) {return operator* (double(scale), left);}
+
+#endif // PIGEOPOSITION_H
diff --git a/src_main/introspection/piintrospection_base.h b/lib/main/introspection/piintrospection_base.h
similarity index 100%
rename from src_main/introspection/piintrospection_base.h
rename to lib/main/introspection/piintrospection_base.h
diff --git a/src_main/introspection/piintrospection_containers.cpp b/lib/main/introspection/piintrospection_containers.cpp
similarity index 100%
rename from src_main/introspection/piintrospection_containers.cpp
rename to lib/main/introspection/piintrospection_containers.cpp
diff --git a/src_main/introspection/piintrospection_containers.h b/lib/main/introspection/piintrospection_containers.h
similarity index 100%
rename from src_main/introspection/piintrospection_containers.h
rename to lib/main/introspection/piintrospection_containers.h
diff --git a/src_main/introspection/piintrospection_containers_p.cpp b/lib/main/introspection/piintrospection_containers_p.cpp
similarity index 100%
rename from src_main/introspection/piintrospection_containers_p.cpp
rename to lib/main/introspection/piintrospection_containers_p.cpp
diff --git a/src_main/introspection/piintrospection_containers_p.h b/lib/main/introspection/piintrospection_containers_p.h
similarity index 100%
rename from src_main/introspection/piintrospection_containers_p.h
rename to lib/main/introspection/piintrospection_containers_p.h
diff --git a/src_main/introspection/piintrospection_server.cpp b/lib/main/introspection/piintrospection_server.cpp
similarity index 100%
rename from src_main/introspection/piintrospection_server.cpp
rename to lib/main/introspection/piintrospection_server.cpp
diff --git a/src_main/introspection/piintrospection_server.h b/lib/main/introspection/piintrospection_server.h
similarity index 100%
rename from src_main/introspection/piintrospection_server.h
rename to lib/main/introspection/piintrospection_server.h
diff --git a/src_main/introspection/piintrospection_server_p.cpp b/lib/main/introspection/piintrospection_server_p.cpp
similarity index 100%
rename from src_main/introspection/piintrospection_server_p.cpp
rename to lib/main/introspection/piintrospection_server_p.cpp
diff --git a/src_main/introspection/piintrospection_server_p.h b/lib/main/introspection/piintrospection_server_p.h
similarity index 100%
rename from src_main/introspection/piintrospection_server_p.h
rename to lib/main/introspection/piintrospection_server_p.h
diff --git a/src_main/introspection/piintrospection_threads.cpp b/lib/main/introspection/piintrospection_threads.cpp
similarity index 100%
rename from src_main/introspection/piintrospection_threads.cpp
rename to lib/main/introspection/piintrospection_threads.cpp
diff --git a/src_main/introspection/piintrospection_threads.h b/lib/main/introspection/piintrospection_threads.h
similarity index 100%
rename from src_main/introspection/piintrospection_threads.h
rename to lib/main/introspection/piintrospection_threads.h
diff --git a/src_main/introspection/piintrospection_threads_p.cpp b/lib/main/introspection/piintrospection_threads_p.cpp
similarity index 100%
rename from src_main/introspection/piintrospection_threads_p.cpp
rename to lib/main/introspection/piintrospection_threads_p.cpp
diff --git a/src_main/introspection/piintrospection_threads_p.h b/lib/main/introspection/piintrospection_threads_p.h
similarity index 100%
rename from src_main/introspection/piintrospection_threads_p.h
rename to lib/main/introspection/piintrospection_threads_p.h
diff --git a/src_main/io_devices/pibinarylog.cpp b/lib/main/io_devices/pibinarylog.cpp
similarity index 96%
rename from src_main/io_devices/pibinarylog.cpp
rename to lib/main/io_devices/pibinarylog.cpp
index 1cdea146..51b33dc6 100644
--- a/src_main/io_devices/pibinarylog.cpp
+++ b/lib/main/io_devices/pibinarylog.cpp
@@ -1,732 +1,732 @@
-/*
-	PIP - Platform Independent Primitives
-	Class for write binary data to logfile, and read or playback this data
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pibinarylog.h"
-#include "pidir.h"
-#include "pipropertystorage.h"
-
-/*! \class PIBinaryLog
- * \brief Class for read and write binary data to logfile, and playback this data in realtime, or custom speed
- *
- * \section PIBinaryLog_sec0 Synopsis
- * Binary Log is a file with simple header, where you can read and write some binary data.
- * Any written data include special header with ID, size and timestamp.
- * This header provides separation different messages from the one file by choosing different IDs.
- * With \a filterID or special functions, like \a readBinLog() you can choose IDs what you want to read.
- * With function \a writeBinLog() or \a setDefaultID() you can choose ID that mark you data.
- * By default ID = 1, and \a filterID is empty, that mean you read any ID without filtering.
- * ThreadedRead provide you playback data, with delay that you write data.
- * You can choose different playbak modes by set \a PlayMode.
- *
- * \section PIBinaryLog_sec1 Basic usage
- * This class provide all functions of \a PIIODevice, such \a open(), \a close(),
- * \a read() ,\a write(), and threaded read/write.
- * function \a setLogDir() need to set directory for BinLog files
- * function \a createNewFile() need to create new binlog file
- * function \a restart() need start from the begining of binlog file
- *
- */
-
-REGISTER_DEVICE(PIBinaryLog)
-
-PIBinaryLog::PIBinaryLog() {
-#ifdef FREERTOS
-	setThreadedReadBufferSize(512);
-#else
-	setThreadedReadBufferSize(65536);
-#endif
-	is_started = is_indexed = is_pause = false;
-	current_index = -1;
-	log_size = 0;
-	setPlaySpeed(1.);
-	setDefaultID(1);
-	setPlaySpeed(1.0);
-	setPlayDelay(PISystemTime::fromSeconds(1.0));
-	setPlayRealTime();
-	setSplitTime(PISystemTime(600, 0));
-	setSplitRecordCount(1000);
-	setSplitFileSize(0xFFFFFF);
-	setSplitMode(SplitNone);
-	setLogDir(PIString());
-	setFilePrefix(PIString());
-	setRapidStart(false);
-	file.setName("__S__PIBinaryLog::file");
-//	piCoutObj << "created";
-}
-
-
-bool PIBinaryLog::openDevice() {
-	lastrecord.timestamp = PISystemTime();
-	lastrecord.id = 0;
-	write_count = 0;
-	is_started = false;
-	is_thread_ok = true;
-	is_indexed = false;
-	is_pause = false;
-	index.clear();
-	index_pos.clear();
-	log_size = 0;
-	if (mode_ == ReadWrite) {
-		piCoutObj << "Error: ReadWrite mode not supported, use WriteOnly or ReadOnly";
-		return false;
-	}
-	if (path().isEmpty() && mode_ == WriteOnly) {
-		setPath(getLogfilePath());
-	}
-	if (path().isEmpty() && mode_ == ReadOnly) {
-		PIDir ld(logDir());
-		if (ld.isExists()) {
-			PIVector<PIFile::FileInfo> es = ld.allEntries();
-			piForeachC(PIFile::FileInfo &i, es) {
-				if (i.extension() == "binlog" && i.isFile() && i.baseName().startsWith(filePrefix())) {
-					setPath(i.path);
-					piBreak;
-				}
-			}
-		}
-	}
-	if (!file.open(path(), mode_)) {
-		piCoutObj << "Error: Can't open file" << path();
-		return false;
-	}
-	setName(path());
-	if (mode_ == WriteOnly) {
-		file.clear();
-		if (!writeFileHeader()) {
-			piCoutObj << "Error: Can't write binlog file header" << path();
-			return false;
-		}
-		is_started = true;
-	}
-	if (mode_ == ReadOnly) {
-		if (file.isEmpty()) {
-			piCoutObj << "Error: File is null" << path();
-			fileError();
-			return false;
-		}
-		if (!checkFileHeader()) {
-			fileError();
-			return false;
-		}
-		if (isEmpty()) {
-			piCoutObj << "Warning: Empty BinLog file" << path();
-			fileEnd();
-		}
-		play_time = 0;
-		if (!rapid_start) is_started = true;
-	}
-	startlogtime = PISystemTime::current();
-	pause_time = PISystemTime();
-	return true;
-}
-
-
-bool PIBinaryLog::closeDevice() {
-	moveIndex(-1);
-	is_indexed = false;
-	index.clear();
-	index_pos.clear();
-	bool e = isEmpty();
-	log_size = 0;
-	if (canWrite() && e) {
-		file.remove();
-		return true;
-	}
-	return file.close();
-}
-
-
-bool PIBinaryLog::threadedRead(uchar *readed, int size) {
-//	piCout << "binlog threaded read";
-	if (!canRead() || isEnd()) return PIIODevice::threadedRead(readed, size);
-	is_thread_ok = false;
-	PISystemTime pt;
-	double delay;
-	switch (play_mode) {
-	case PlayRealTime:
-		pausemutex.lock();
-		if (is_pause) {
-			piMSleep(100);
-			pausemutex.unlock();
-			return false;
-		} else if (pause_time > PISystemTime()) {
-			startlogtime += pause_time;
-			pause_time = PISystemTime();
-		}
-		pausemutex.unlock();
-		pt = PISystemTime::current() - startlogtime;
-		if (is_started) {
-			if (lastrecord.timestamp > pt)
-				(lastrecord.timestamp - pt).sleep();
-		} else {
-			startlogtime = PISystemTime::current() - lastrecord.timestamp;
-			is_started = true;
-		}
-		break;
-	case PlayVariableSpeed:
-		delay = lastrecord.timestamp.toMilliseconds() - play_time;
-		//piCoutObj << "delay" << delay;
-		double cdelay;
-		int dtc;
-		if (is_started) {
-			if (is_pause) {
-				piMSleep(100);
-				return false;
-			}
-			if (delay > 0) {
-				cdelay = delay * play_speed;
-				dtc = int(cdelay) /100;
-				if (play_speed <= 0.) dtc = 2;
-				//piCout << play_speed << dtc;
-				for (int j=0; j<dtc; j++) {
-					cdelay = delay * play_speed;
-					dtc = int(cdelay) /100;
-					piMSleep(100);
-					if (play_speed <= 0.) {dtc = 2; j = 0;}
-					//piCout << "    " << play_speed << dtc << j;
-				}
-				cdelay = cdelay - dtc*100;
-				PISystemTime::fromMilliseconds(cdelay).sleep();
-			}
-		} else is_started = true;
-		play_time = lastrecord.timestamp.toMilliseconds();
-		break;
-	case PlayStaticDelay:
-		if (is_started) {
-			if (is_pause) {
-				piMSleep(100);
-				return false;
-			}
-			play_delay.sleep();
-		} else is_started = true;
-		break;
-	default:
-		return false;
-	}
-	bool res = PIIODevice::threadedRead(readed, size);
-	is_thread_ok = true;
-	return res;
-}
-
-
-PIString PIBinaryLog::getLogfilePath() const {
-	PIDir dir(logDir());
-	dir.setDir(dir.absolutePath());
-	if (!dir.isExists()) {
-		piCoutObj << "Creating directory" << dir.path();
-		dir.make(true);
-	}
-	PIString npath = logDir() + "/" + filePrefix() + PIDateTime::current().toString("yyyy_MM_dd__hh_mm_ss");
-	PIString cnpath = npath + ".binlog";
-	int i = 1;
-	while (PIFile::isExists(cnpath)) {
-		cnpath = npath + "_" + PIString::fromNumber(i) + ".binlog";
-		i++;
-	}
-	return cnpath;
-}
-
-PIString PIBinaryLog::createNewFile() {
-	if (!file.close()) return PIString();
-	PIString cnpath = getLogfilePath();
-	if (open(cnpath, PIIODevice::WriteOnly)) {
-		newFile(file.path());
-		return file.path();
-	}
-	piCoutObj << "Can't create new file, maybe LogDir is invalid.";
-	return PIString();
-}
-
-
-void PIBinaryLog::createNewFile(const PIString &path) {
-	if (open(path, PIIODevice::WriteOnly)) {
-		newFile(file.path());
-	}
-	else piCoutObj << "Can't create new file, maybe path is invalid.";
-}
-
-
-void PIBinaryLog::setPause(bool pause) {
-	pausemutex.lock();
-	is_pause = pause;
-	if (pause) pause_time = PISystemTime::current();
-	else pause_time = PISystemTime::current() - pause_time;
-	pausemutex.unlock();
-}
-
-
-int PIBinaryLog::writeBinLog(int id, const void *data, int size) {
-	if (size <= 0 || !canWrite()) return -1;
-	if (id == 0) {
-		piCoutObj << "Error: can`t write with id = 0!";
-		return -1;
-	}
-	logmutex.lock();
-	switch (split_mode) {
-	case SplitSize:
-		if (file.size() > split_size) createNewFile();
-		break;
-	case SplitTime:
-		if ((PISystemTime::current() - startlogtime) > split_time) createNewFile();
-		break;
-	case SplitCount:
-		if (write_count > split_count) createNewFile();
-		break;
-	default: break;
-	}
-	if (is_pause) {
-		logmutex.unlock();
-		return 0;
-	}
-	PIByteArray logdata;
-	logdata << id << size << (PISystemTime::current() - startlogtime) << PIByteArray::RawData(data, size);
-	int res = file.write(logdata.data(), logdata.size());
-	file.flush();
-	write_count++;
-	log_size = file.size();
-	logmutex.unlock();
-	if (res > 0) return size;
-	else return res;
-}
-
-
-int PIBinaryLog::writeBinLog_raw(int id, const PISystemTime &time, const void *data, int size) {
-	if (size <= 0 || !canWrite()) return -1;
-	PIByteArray logdata;
-	logdata << id << size << time << PIByteArray::RawData(data, size);
-	logmutex.lock();
-	int res = file.write(logdata.data(), logdata.size());
-	file.flush();
-	write_count++;
-	log_size = file.size();
-	logmutex.unlock();
-	if (res > 0) return size;
-	else return res;
-}
-
-
-PIByteArray PIBinaryLog::readBinLog(int id, PISystemTime * time) {
-	if (!canRead()) return PIByteArray();
-	BinLogRecord br = readRecord();
-	if (br.id == -1) {
-		piCoutObj << "End of BinLog file";
-		fileEnd();
-		return PIByteArray();
-	}
-	if (id == 0 && br.id > 0) return br.data;
-	while (br.id != id && !isEnd()) br = readRecord();
-	if (br.id == -1) {
-		piCoutObj << "End of BinLog file";
-		fileEnd();
-		return PIByteArray();
-	}
-	if (br.id == id) {
-		if (time)
-			*time = br.timestamp;
-		return br.data;
-	}
-	piCoutObj << "Can't find record with id =" << id;
-	return PIByteArray();
-}
-
-
-int PIBinaryLog::readBinLog(int id, void *read_to, int max_size, PISystemTime * time) {
-	if (max_size <= 0 || read_to == 0) return -1;
-	PIByteArray ba = readBinLog(id, time);
-	if (ba.isEmpty()) return -1;
-	int sz = piMini(max_size, ba.size());
-	memcpy(read_to, ba.data(), sz);
-	return sz;
-}
-
-
-int PIBinaryLog::readDevice(void *read_to, int max_size) {
-	if (lastrecord.id == -1 || isEnd()) return 0;
-	if(!is_thread_ok && lastrecord.id > 0) return lastrecord.data.size();
-	if (!canRead()) return -1;
-	if (max_size <= 0 || read_to == 0) return -1;
-	BinLogRecord br;
-	br.id = 0;
-	if (filterID.isEmpty()) br = readRecord();
-	else {
-		while (!filterID.contains(br.id) && !isEnd()) br = readRecord();
-	}
-	if (br.id == -1) {
-		fileEnd();
-		piCoutObj << "End of BinLog file";
-		return 0;
-	}
-	if (br.id <= 0) {
-		piCoutObj << "Read record error";
-		return -1;
-	}
-	int sz = piMini(max_size, br.data.size());
-	if (sz < br.data.size_s()) piCoutObj << "too small read buffer:" << max_size << ", data size:" << br.data.size();
-	memcpy(read_to, br.data.data(), sz);
-	return sz;
-}
-
-
-void PIBinaryLog::restart() {
-	bool th = isRunning();
-	if (th) stopThreadedRead();
-	if (!canRead()) return;
-	logmutex.unlock();
-	lastrecord.timestamp = PISystemTime();
-	lastrecord.id = 0;
-	is_thread_ok = true;
-	is_started = !rapidStart();
-	play_time = 0;
-	file.seekToBegin();
-	checkFileHeader();
-	moveIndex(0);
-	startlogtime = PISystemTime::current();
-	if (th) startThreadedRead();
-}
-
-
-bool PIBinaryLog::writeFileHeader() {
-	if (file.write(&__S__PIBinaryLog::binlog_sig, PIBINARYLOG_SIGNATURE_SIZE) <= 0) return false;
-	uchar version = PIBINARYLOG_VERSION;
-	if (file.write(&version, 1) <= 0) return false;
-	file.flush();
-	return true;
-}
-
-
-bool PIBinaryLog::checkFileHeader() {
-	uchar read_sig[PIBINARYLOG_SIGNATURE_SIZE];
-	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++) read_sig[i] = 0;
-	if (file.read(read_sig, PIBINARYLOG_SIGNATURE_SIZE) < 0) return false;
-	bool correct = true;
-	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++)
-		if (read_sig[i] != __S__PIBinaryLog::binlog_sig[i]) correct = false;
-	if (!correct) {
-		piCoutObj << "BinLogFile signature is corrupted or invalid file";
-		return false;
-	}
-	uchar read_version = 0;
-	if (file.read(&read_version, 1) < 0) return false;
-	if (read_version == PIBINARYLOG_VERSION) {
-		log_size = file.size();
-		return true;
-	}
-	if (read_version == 0)
-		piCoutObj << "BinLogFile has invalid version";
-	if (read_version < PIBINARYLOG_VERSION)
-		piCoutObj << "BinLogFile has too old verion";
-	if (read_version > PIBINARYLOG_VERSION)
-		piCoutObj << "BinLogFile has too newest version";
-	return false;
-}
-
-
-PIBinaryLog::BinLogRecord PIBinaryLog::readRecord() {
-//	piCoutObj << "readRecord";
-	logmutex.lock();
-	PIByteArray ba;
-	BinLogRecord br;
-	lastrecord.id = 0;
-	lastrecord.data.clear();
-	lastrecord.timestamp = PISystemTime();
-	ba.resize(sizeof(BinLogRecord) - sizeof(PIByteArray));
-	if(file.read(ba.data(), ba.size_s()) > 0) {
-		ba >> br.id >> br.size >> br.timestamp;
-	} else {
-		br.id = -1;
-		logmutex.unlock();
-//		piCoutObj << "readRecord done";
-		return br;
-	}
-	if (br.id > 0 && br.size > 0) {
-		ba.resize(br.size);
-		if(file.read(ba.data(), ba.size_s()) > 0) br.data = ba;
-		else br.id = 0;
-	} else br.id = 0;
-	lastrecord = br;
-	if (br.id == 0) fileError();
-	moveIndex(index_pos.value(file.pos(), -1));
-	logmutex.unlock();
-//	piCoutObj << "readRecord done";
-	return br;
-}
-
-
-
-void PIBinaryLog::parseLog(PIFile * f, PIBinaryLog::BinLogInfo * info, PIVector<PIBinaryLog::BinLogIndex> * index) {
-	BinLogInfo * bi = info;
-	bool ginfo = info != 0;
-	bool gindex = index != 0;
-	if (!ginfo && !gindex) return;
-	if (ginfo) {
-		bi->log_size = -1;
-		bi->records_count = 0;
-		bi->records.clear();
-	}
-	if (gindex) index->clear();
-	if (f == 0) return;
-	if (!f->canRead()) return;
-	if (ginfo) {
-		bi->path = f->path();
-		bi->log_size = f->size();
-	}
-	uchar read_sig[PIBINARYLOG_SIGNATURE_SIZE];
-	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++) read_sig[i] = 0;
-	bool ok = true;
-	if (f->read(read_sig, PIBINARYLOG_SIGNATURE_SIZE) < 0) {if (ginfo) bi->records_count = -1; ok = false;}
-	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++)
-		if (read_sig[i] != __S__PIBinaryLog::binlog_sig[i]) {if (ginfo) bi->records_count = -2; ok = false;}
-	uchar read_version = 0;
-	if (f->read(&read_version, 1) < 0) {if (ginfo) bi->records_count = -3; ok = false;}
-	if (read_version == 0)  {if (ginfo) bi->records_count = -4; ok = false;}
-	if (read_version < PIBINARYLOG_VERSION) {if (ginfo) bi->records_count = -5; ok = false;}
-	if (read_version > PIBINARYLOG_VERSION) {if (ginfo) bi->records_count = -6; ok = false;}
-	if (!ok) return;
-	PIByteArray ba;
-	BinLogRecord br;
-	bool first = true;
-	size_t hdr_size = sizeof(BinLogRecord) - sizeof(PIByteArray);
-	ba.resize(hdr_size);
-	while (1) {
-		ba.resize(hdr_size);
-		{
-			if (f->read(ba.data(), ba.size()) > 0) {
-				ba >> br.id >> br.size >> br.timestamp;
-			} else
-				break;
-			if (bi->log_size - f->pos() >= br.size)
-				f->seek(f->pos() + br.size);
-			else
-				break;
-		}
-		if (br.id > 0) {
-			if (gindex) {
-				BinLogIndex bl_ind;
-				bl_ind.id = br.id;
-				bl_ind.pos = f->pos() - br.size - hdr_size;
-				bl_ind.timestamp = br.timestamp;
-				index->append(bl_ind);
-			}
-			if (ginfo) {
-				bi->records_count++;
-				if (first) {
-					bi->start_time = br.timestamp;
-					first = false;
-				}
-				BinLogRecordInfo &bri(bi->records[br.id]);
-				bri.count++;
-				if (bri.id == 0) {
-					bri.id = br.id;
-					bri.minimum_size = bri.maximum_size = br.size;
-					bri.start_time = br.timestamp;
-				} else {
-					bri.end_time = br.timestamp;
-					if (bri.minimum_size > br.size) bri.minimum_size = br.size;
-					if (bri.maximum_size < br.size) bri.maximum_size = br.size;
-				}
-			}
-		}
-	}
-	if (ginfo) bi->end_time = br.timestamp;
-}
-
-
-void PIBinaryLog::moveIndex(int i) {
-	if (is_indexed) {
-		current_index = i;
-		posChanged(current_index);
-	}
-}
-
-
-PIBinaryLog::BinLogInfo PIBinaryLog::getLogInfo(const PIString & path) {
-	BinLogInfo bi;
-	bi.path = path;
-	bi.records_count = 0;
-	PIFile tfile;
-	if (!tfile.open(path, PIIODevice::ReadOnly)) return bi;
-	parseLog(&tfile, &bi, 0);
-	return bi;
-}
-
-
-bool PIBinaryLog::cutBinLog(const PIBinaryLog::BinLogInfo & src, const PIString & dst, int from, int to) {
-	PIBinaryLog slog;
-	if (!slog.open(src.path, PIIODevice::ReadOnly)) return false;
-	PIVector<int> ids = src.records.keys();
-	slog.seekTo(from);
-	PIBinaryLog dlog;
-	dlog.createNewFile(dst);
-	bool first = true;
-	BinLogRecord br;
-	PISystemTime st;
-	while (!slog.isEnd() && ((slog.pos() <= to) || to < 0)) {
-		br = slog.readRecord();
-		if (first) {
-			st = br.timestamp;
-			first = false;
-		}
-		if (ids.contains(br.id)) {
-			dlog.writeBinLog_raw(br.id, br.timestamp - st, br.data);
-		}
-	}
-	return true;
-}
-
-
-bool PIBinaryLog::createIndex() {
-	logmutex.lock();
-	llong cp = file.pos();
-	file.seekToBegin();
-	index.clear();
-	index_pos.clear();
-	parseLog(&file, &binfo, &index);
-	file.seek(cp);
-	is_indexed = !index.isEmpty();
-	for (uint i=0; i<index.size(); i++) index_pos[index[i].pos] = i;
-	logmutex.unlock();
-	return is_indexed;
-}
-
-
-void PIBinaryLog::seekTo(int rindex) {
-//	piCoutObj << "seekTo";
-	logmutex.lock();
-	if (rindex < index.size_s() && rindex >= 0) {
-		file.seek(index[rindex].pos);
-		moveIndex(index_pos.value(file.pos(), -1));
-		play_time = index[rindex].timestamp.toMilliseconds();
-		lastrecord.timestamp = index[rindex].timestamp;
-	}
-//	piCoutObj << "seekTo done";
-	logmutex.unlock();
-}
-
-
-bool PIBinaryLog::seek(const PISystemTime & time) {
-	int ci = -1;
-	for (uint i=0; i<index.size(); i++) {
-		if (time <= index[i].timestamp && (filterID.contains(index[i].id) || filterID.isEmpty())) {
-			ci = i;
-			break;
-		}
-	}
-	if (ci >= 0) {
-		seekTo(ci);
-		return true;
-	}
-	return false;
-}
-
-
-bool PIBinaryLog::seek(llong filepos) {
-	int ci = -1;
-	for (uint i=0; i<index.size(); i++) {
-		if (filepos <= index[i].pos && (filterID.contains(index[i].id) || filterID.isEmpty())) {
-			ci = i;
-			break;
-		}
-	}
-	if (ci >= 0) {
-		seekTo(ci);
-		return true;
-	}
-	return false;
-}
-
-
-PIString PIBinaryLog::constructFullPathDevice() const {
-	PIString ret;
-	ret << logDir() << ":" << filePrefix() << ":" << defaultID() << ":";
-	switch (play_mode) {
-	case PlayRealTime:
-		ret << "RT";
-		break;
-	case PlayVariableSpeed:
-		ret << PIString::fromNumber(playSpeed()) << "X";
-		break;
-	case PlayStaticDelay:
-		ret << PIString::fromNumber(playDelay().toMilliseconds()) << "M";
-		break;
-	default:
-		ret << "RT";
-		break;
-	}
-	return ret;
-}
-
-
-void PIBinaryLog::configureFromFullPathDevice(const PIString & full_path) {
-	PIStringList pl = full_path.split(":");
-	for (int i = 0; i < pl.size_s(); ++i) {
-		PIString p(pl[i]);
-		switch (i) {
-		case 0: setLogDir(p); break;
-		case 1: setFilePrefix(p); break;
-		case 2: setDefaultID(p.toInt()); break;
-		case 3:
-			if (p.toUpperCase() == "RT") setPlayRealTime();
-			if (p.toUpperCase().right(1) == "X") setPlaySpeed((p.left(p.size() - 1)).toDouble());
-			if (p.toUpperCase().right(1) == "M") setPlayDelay(PISystemTime::fromMilliseconds((p.left(p.size() - 1)).toDouble()));
-		break;
-		}
-	}
-	//	piCoutObj << "configured";
-}
-
-
-PIPropertyStorage PIBinaryLog::constructVariantDevice() const {
-	PIPropertyStorage ret;
-	PIVariantTypes::Enum e;
-	ret.addProperty("log dir", PIVariantTypes::Dir(logDir()));
-	ret.addProperty("file prefix", filePrefix());
-	ret.addProperty("default ID", defaultID());
-	e << "real-time" << "variable speed" << "static delay";
-	e.selectValue((int)playMode());
-	ret.addProperty("play mode", e);
-	ret.addProperty("play speed", playSpeed());
-	ret.addProperty("play delay", playDelay().toMilliseconds());
-	return ret;
-}
-
-
-void PIBinaryLog::configureFromVariantDevice(const PIPropertyStorage & d) {
-	setLogDir(d.propertyValueByName("log dir").toString());
-	setFilePrefix(d.propertyValueByName("file prefix").toString());
-	setDefaultID(d.propertyValueByName("default ID").toInt());
-	setPlaySpeed(d.propertyValueByName("play speed").toDouble());
-	setPlayDelay(PISystemTime::fromMilliseconds(d.propertyValueByName("play delay").toDouble()));
-	setPlayMode((PlayMode)d.propertyValueByName("play mode").toEnum().selectedValue());
-}
-
-
-void PIBinaryLog::propertyChanged(const PIString &s) {
-	default_id = property("defaultID").toInt();
-	rapid_start = property("rapidStart").toBool();
-	play_mode = (PlayMode)property("playMode").toInt();
-	double ps = property("playSpeed").toDouble();
-	play_speed = ps > 0. ? 1. / ps : 0.;
-	play_delay = property("playDelay").toSystemTime();
-	split_mode = (SplitMode)property("splitMode").toInt();
-	split_time = property("splitTime").toSystemTime();
-	split_size = property("splitFileSize").toLLong();
-	split_count = property("splitRecordCount").toInt();
-//	piCoutObj << "propertyChanged" << s << play_mode;
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Class for write binary data to logfile, and read or playback this data
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pibinarylog.h"
+#include "pidir.h"
+#include "pipropertystorage.h"
+
+/*! \class PIBinaryLog
+ * \brief Class for read and write binary data to logfile, and playback this data in realtime, or custom speed
+ *
+ * \section PIBinaryLog_sec0 Synopsis
+ * Binary Log is a file with simple header, where you can read and write some binary data.
+ * Any written data include special header with ID, size and timestamp.
+ * This header provides separation different messages from the one file by choosing different IDs.
+ * With \a filterID or special functions, like \a readBinLog() you can choose IDs what you want to read.
+ * With function \a writeBinLog() or \a setDefaultID() you can choose ID that mark you data.
+ * By default ID = 1, and \a filterID is empty, that mean you read any ID without filtering.
+ * ThreadedRead provide you playback data, with delay that you write data.
+ * You can choose different playbak modes by set \a PlayMode.
+ *
+ * \section PIBinaryLog_sec1 Basic usage
+ * This class provide all functions of \a PIIODevice, such \a open(), \a close(),
+ * \a read() ,\a write(), and threaded read/write.
+ * function \a setLogDir() need to set directory for BinLog files
+ * function \a createNewFile() need to create new binlog file
+ * function \a restart() need start from the begining of binlog file
+ *
+ */
+
+REGISTER_DEVICE(PIBinaryLog)
+
+PIBinaryLog::PIBinaryLog() {
+#ifdef FREERTOS
+	setThreadedReadBufferSize(512);
+#else
+	setThreadedReadBufferSize(65536);
+#endif
+	is_started = is_indexed = is_pause = false;
+	current_index = -1;
+	log_size = 0;
+	setPlaySpeed(1.);
+	setDefaultID(1);
+	setPlaySpeed(1.0);
+	setPlayDelay(PISystemTime::fromSeconds(1.0));
+	setPlayRealTime();
+	setSplitTime(PISystemTime(600, 0));
+	setSplitRecordCount(1000);
+	setSplitFileSize(0xFFFFFF);
+	setSplitMode(SplitNone);
+	setLogDir(PIString());
+	setFilePrefix(PIString());
+	setRapidStart(false);
+	file.setName("__S__PIBinaryLog::file");
+//	piCoutObj << "created";
+}
+
+
+bool PIBinaryLog::openDevice() {
+	lastrecord.timestamp = PISystemTime();
+	lastrecord.id = 0;
+	write_count = 0;
+	is_started = false;
+	is_thread_ok = true;
+	is_indexed = false;
+	is_pause = false;
+	index.clear();
+	index_pos.clear();
+	log_size = 0;
+	if (mode_ == ReadWrite) {
+		piCoutObj << "Error: ReadWrite mode not supported, use WriteOnly or ReadOnly";
+		return false;
+	}
+	if (path().isEmpty() && mode_ == WriteOnly) {
+		setPath(getLogfilePath());
+	}
+	if (path().isEmpty() && mode_ == ReadOnly) {
+		PIDir ld(logDir());
+		if (ld.isExists()) {
+			PIVector<PIFile::FileInfo> es = ld.allEntries();
+			piForeachC(PIFile::FileInfo &i, es) {
+				if (i.extension() == "binlog" && i.isFile() && i.baseName().startsWith(filePrefix())) {
+					setPath(i.path);
+					piBreak;
+				}
+			}
+		}
+	}
+	if (!file.open(path(), mode_)) {
+		piCoutObj << "Error: Can't open file" << path();
+		return false;
+	}
+	setName(path());
+	if (mode_ == WriteOnly) {
+		file.clear();
+		if (!writeFileHeader()) {
+			piCoutObj << "Error: Can't write binlog file header" << path();
+			return false;
+		}
+		is_started = true;
+	}
+	if (mode_ == ReadOnly) {
+		if (file.isEmpty()) {
+			piCoutObj << "Error: File is null" << path();
+			fileError();
+			return false;
+		}
+		if (!checkFileHeader()) {
+			fileError();
+			return false;
+		}
+		if (isEmpty()) {
+			piCoutObj << "Warning: Empty BinLog file" << path();
+			fileEnd();
+		}
+		play_time = 0;
+		if (!rapid_start) is_started = true;
+	}
+	startlogtime = PISystemTime::current();
+	pause_time = PISystemTime();
+	return true;
+}
+
+
+bool PIBinaryLog::closeDevice() {
+	moveIndex(-1);
+	is_indexed = false;
+	index.clear();
+	index_pos.clear();
+	bool e = isEmpty();
+	log_size = 0;
+	if (canWrite() && e) {
+		file.remove();
+		return true;
+	}
+	return file.close();
+}
+
+
+bool PIBinaryLog::threadedRead(uchar *readed, int size) {
+//	piCout << "binlog threaded read";
+	if (!canRead() || isEnd()) return PIIODevice::threadedRead(readed, size);
+	is_thread_ok = false;
+	PISystemTime pt;
+	double delay;
+	switch (play_mode) {
+	case PlayRealTime:
+		pausemutex.lock();
+		if (is_pause) {
+			piMSleep(100);
+			pausemutex.unlock();
+			return false;
+		} else if (pause_time > PISystemTime()) {
+			startlogtime += pause_time;
+			pause_time = PISystemTime();
+		}
+		pausemutex.unlock();
+		pt = PISystemTime::current() - startlogtime;
+		if (is_started) {
+			if (lastrecord.timestamp > pt)
+				(lastrecord.timestamp - pt).sleep();
+		} else {
+			startlogtime = PISystemTime::current() - lastrecord.timestamp;
+			is_started = true;
+		}
+		break;
+	case PlayVariableSpeed:
+		delay = lastrecord.timestamp.toMilliseconds() - play_time;
+		//piCoutObj << "delay" << delay;
+		double cdelay;
+		int dtc;
+		if (is_started) {
+			if (is_pause) {
+				piMSleep(100);
+				return false;
+			}
+			if (delay > 0) {
+				cdelay = delay * play_speed;
+				dtc = int(cdelay) /100;
+				if (play_speed <= 0.) dtc = 2;
+				//piCout << play_speed << dtc;
+				for (int j=0; j<dtc; j++) {
+					cdelay = delay * play_speed;
+					dtc = int(cdelay) /100;
+					piMSleep(100);
+					if (play_speed <= 0.) {dtc = 2; j = 0;}
+					//piCout << "    " << play_speed << dtc << j;
+				}
+				cdelay = cdelay - dtc*100;
+				PISystemTime::fromMilliseconds(cdelay).sleep();
+			}
+		} else is_started = true;
+		play_time = lastrecord.timestamp.toMilliseconds();
+		break;
+	case PlayStaticDelay:
+		if (is_started) {
+			if (is_pause) {
+				piMSleep(100);
+				return false;
+			}
+			play_delay.sleep();
+		} else is_started = true;
+		break;
+	default:
+		return false;
+	}
+	bool res = PIIODevice::threadedRead(readed, size);
+	is_thread_ok = true;
+	return res;
+}
+
+
+PIString PIBinaryLog::getLogfilePath() const {
+	PIDir dir(logDir());
+	dir.setDir(dir.absolutePath());
+	if (!dir.isExists()) {
+		piCoutObj << "Creating directory" << dir.path();
+		dir.make(true);
+	}
+	PIString npath = logDir() + "/" + filePrefix() + PIDateTime::current().toString("yyyy_MM_dd__hh_mm_ss");
+	PIString cnpath = npath + ".binlog";
+	int i = 1;
+	while (PIFile::isExists(cnpath)) {
+		cnpath = npath + "_" + PIString::fromNumber(i) + ".binlog";
+		i++;
+	}
+	return cnpath;
+}
+
+PIString PIBinaryLog::createNewFile() {
+	if (!file.close()) return PIString();
+	PIString cnpath = getLogfilePath();
+	if (open(cnpath, PIIODevice::WriteOnly)) {
+		newFile(file.path());
+		return file.path();
+	}
+	piCoutObj << "Can't create new file, maybe LogDir is invalid.";
+	return PIString();
+}
+
+
+void PIBinaryLog::createNewFile(const PIString &path) {
+	if (open(path, PIIODevice::WriteOnly)) {
+		newFile(file.path());
+	}
+	else piCoutObj << "Can't create new file, maybe path is invalid.";
+}
+
+
+void PIBinaryLog::setPause(bool pause) {
+	pausemutex.lock();
+	is_pause = pause;
+	if (pause) pause_time = PISystemTime::current();
+	else pause_time = PISystemTime::current() - pause_time;
+	pausemutex.unlock();
+}
+
+
+int PIBinaryLog::writeBinLog(int id, const void *data, int size) {
+	if (size <= 0 || !canWrite()) return -1;
+	if (id == 0) {
+		piCoutObj << "Error: can`t write with id = 0!";
+		return -1;
+	}
+	logmutex.lock();
+	switch (split_mode) {
+	case SplitSize:
+		if (file.size() > split_size) createNewFile();
+		break;
+	case SplitTime:
+		if ((PISystemTime::current() - startlogtime) > split_time) createNewFile();
+		break;
+	case SplitCount:
+		if (write_count > split_count) createNewFile();
+		break;
+	default: break;
+	}
+	if (is_pause) {
+		logmutex.unlock();
+		return 0;
+	}
+	PIByteArray logdata;
+	logdata << id << size << (PISystemTime::current() - startlogtime) << PIByteArray::RawData(data, size);
+	int res = file.write(logdata.data(), logdata.size());
+	file.flush();
+	write_count++;
+	log_size = file.size();
+	logmutex.unlock();
+	if (res > 0) return size;
+	else return res;
+}
+
+
+int PIBinaryLog::writeBinLog_raw(int id, const PISystemTime &time, const void *data, int size) {
+	if (size <= 0 || !canWrite()) return -1;
+	PIByteArray logdata;
+	logdata << id << size << time << PIByteArray::RawData(data, size);
+	logmutex.lock();
+	int res = file.write(logdata.data(), logdata.size());
+	file.flush();
+	write_count++;
+	log_size = file.size();
+	logmutex.unlock();
+	if (res > 0) return size;
+	else return res;
+}
+
+
+PIByteArray PIBinaryLog::readBinLog(int id, PISystemTime * time) {
+	if (!canRead()) return PIByteArray();
+	BinLogRecord br = readRecord();
+	if (br.id == -1) {
+		piCoutObj << "End of BinLog file";
+		fileEnd();
+		return PIByteArray();
+	}
+	if (id == 0 && br.id > 0) return br.data;
+	while (br.id != id && !isEnd()) br = readRecord();
+	if (br.id == -1) {
+		piCoutObj << "End of BinLog file";
+		fileEnd();
+		return PIByteArray();
+	}
+	if (br.id == id) {
+		if (time)
+			*time = br.timestamp;
+		return br.data;
+	}
+	piCoutObj << "Can't find record with id =" << id;
+	return PIByteArray();
+}
+
+
+int PIBinaryLog::readBinLog(int id, void *read_to, int max_size, PISystemTime * time) {
+	if (max_size <= 0 || read_to == 0) return -1;
+	PIByteArray ba = readBinLog(id, time);
+	if (ba.isEmpty()) return -1;
+	int sz = piMini(max_size, ba.size());
+	memcpy(read_to, ba.data(), sz);
+	return sz;
+}
+
+
+int PIBinaryLog::readDevice(void *read_to, int max_size) {
+	if (lastrecord.id == -1 || isEnd()) return 0;
+	if(!is_thread_ok && lastrecord.id > 0) return lastrecord.data.size();
+	if (!canRead()) return -1;
+	if (max_size <= 0 || read_to == 0) return -1;
+	BinLogRecord br;
+	br.id = 0;
+	if (filterID.isEmpty()) br = readRecord();
+	else {
+		while (!filterID.contains(br.id) && !isEnd()) br = readRecord();
+	}
+	if (br.id == -1) {
+		fileEnd();
+		piCoutObj << "End of BinLog file";
+		return 0;
+	}
+	if (br.id <= 0) {
+		piCoutObj << "Read record error";
+		return -1;
+	}
+	int sz = piMini(max_size, br.data.size());
+	if (sz < br.data.size_s()) piCoutObj << "too small read buffer:" << max_size << ", data size:" << br.data.size();
+	memcpy(read_to, br.data.data(), sz);
+	return sz;
+}
+
+
+void PIBinaryLog::restart() {
+	bool th = isRunning();
+	if (th) stopThreadedRead();
+	if (!canRead()) return;
+	logmutex.unlock();
+	lastrecord.timestamp = PISystemTime();
+	lastrecord.id = 0;
+	is_thread_ok = true;
+	is_started = !rapidStart();
+	play_time = 0;
+	file.seekToBegin();
+	checkFileHeader();
+	moveIndex(0);
+	startlogtime = PISystemTime::current();
+	if (th) startThreadedRead();
+}
+
+
+bool PIBinaryLog::writeFileHeader() {
+	if (file.write(&__S__PIBinaryLog::binlog_sig, PIBINARYLOG_SIGNATURE_SIZE) <= 0) return false;
+	uchar version = PIBINARYLOG_VERSION;
+	if (file.write(&version, 1) <= 0) return false;
+	file.flush();
+	return true;
+}
+
+
+bool PIBinaryLog::checkFileHeader() {
+	uchar read_sig[PIBINARYLOG_SIGNATURE_SIZE];
+	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++) read_sig[i] = 0;
+	if (file.read(read_sig, PIBINARYLOG_SIGNATURE_SIZE) < 0) return false;
+	bool correct = true;
+	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++)
+		if (read_sig[i] != __S__PIBinaryLog::binlog_sig[i]) correct = false;
+	if (!correct) {
+		piCoutObj << "BinLogFile signature is corrupted or invalid file";
+		return false;
+	}
+	uchar read_version = 0;
+	if (file.read(&read_version, 1) < 0) return false;
+	if (read_version == PIBINARYLOG_VERSION) {
+		log_size = file.size();
+		return true;
+	}
+	if (read_version == 0)
+		piCoutObj << "BinLogFile has invalid version";
+	if (read_version < PIBINARYLOG_VERSION)
+		piCoutObj << "BinLogFile has too old verion";
+	if (read_version > PIBINARYLOG_VERSION)
+		piCoutObj << "BinLogFile has too newest version";
+	return false;
+}
+
+
+PIBinaryLog::BinLogRecord PIBinaryLog::readRecord() {
+//	piCoutObj << "readRecord";
+	logmutex.lock();
+	PIByteArray ba;
+	BinLogRecord br;
+	lastrecord.id = 0;
+	lastrecord.data.clear();
+	lastrecord.timestamp = PISystemTime();
+	ba.resize(sizeof(BinLogRecord) - sizeof(PIByteArray));
+	if(file.read(ba.data(), ba.size_s()) > 0) {
+		ba >> br.id >> br.size >> br.timestamp;
+	} else {
+		br.id = -1;
+		logmutex.unlock();
+//		piCoutObj << "readRecord done";
+		return br;
+	}
+	if (br.id > 0 && br.size > 0) {
+		ba.resize(br.size);
+		if(file.read(ba.data(), ba.size_s()) > 0) br.data = ba;
+		else br.id = 0;
+	} else br.id = 0;
+	lastrecord = br;
+	if (br.id == 0) fileError();
+	moveIndex(index_pos.value(file.pos(), -1));
+	logmutex.unlock();
+//	piCoutObj << "readRecord done";
+	return br;
+}
+
+
+
+void PIBinaryLog::parseLog(PIFile * f, PIBinaryLog::BinLogInfo * info, PIVector<PIBinaryLog::BinLogIndex> * index) {
+	BinLogInfo * bi = info;
+	bool ginfo = info != 0;
+	bool gindex = index != 0;
+	if (!ginfo && !gindex) return;
+	if (ginfo) {
+		bi->log_size = -1;
+		bi->records_count = 0;
+		bi->records.clear();
+	}
+	if (gindex) index->clear();
+	if (f == 0) return;
+	if (!f->canRead()) return;
+	if (ginfo) {
+		bi->path = f->path();
+		bi->log_size = f->size();
+	}
+	uchar read_sig[PIBINARYLOG_SIGNATURE_SIZE];
+	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++) read_sig[i] = 0;
+	bool ok = true;
+	if (f->read(read_sig, PIBINARYLOG_SIGNATURE_SIZE) < 0) {if (ginfo) bi->records_count = -1; ok = false;}
+	for (uint i=0; i<PIBINARYLOG_SIGNATURE_SIZE; i++)
+		if (read_sig[i] != __S__PIBinaryLog::binlog_sig[i]) {if (ginfo) bi->records_count = -2; ok = false;}
+	uchar read_version = 0;
+	if (f->read(&read_version, 1) < 0) {if (ginfo) bi->records_count = -3; ok = false;}
+	if (read_version == 0)  {if (ginfo) bi->records_count = -4; ok = false;}
+	if (read_version < PIBINARYLOG_VERSION) {if (ginfo) bi->records_count = -5; ok = false;}
+	if (read_version > PIBINARYLOG_VERSION) {if (ginfo) bi->records_count = -6; ok = false;}
+	if (!ok) return;
+	PIByteArray ba;
+	BinLogRecord br;
+	bool first = true;
+	size_t hdr_size = sizeof(BinLogRecord) - sizeof(PIByteArray);
+	ba.resize(hdr_size);
+	while (1) {
+		ba.resize(hdr_size);
+		{
+			if (f->read(ba.data(), ba.size()) > 0) {
+				ba >> br.id >> br.size >> br.timestamp;
+			} else
+				break;
+			if (bi->log_size - f->pos() >= br.size)
+				f->seek(f->pos() + br.size);
+			else
+				break;
+		}
+		if (br.id > 0) {
+			if (gindex) {
+				BinLogIndex bl_ind;
+				bl_ind.id = br.id;
+				bl_ind.pos = f->pos() - br.size - hdr_size;
+				bl_ind.timestamp = br.timestamp;
+				index->append(bl_ind);
+			}
+			if (ginfo) {
+				bi->records_count++;
+				if (first) {
+					bi->start_time = br.timestamp;
+					first = false;
+				}
+				BinLogRecordInfo &bri(bi->records[br.id]);
+				bri.count++;
+				if (bri.id == 0) {
+					bri.id = br.id;
+					bri.minimum_size = bri.maximum_size = br.size;
+					bri.start_time = br.timestamp;
+				} else {
+					bri.end_time = br.timestamp;
+					if (bri.minimum_size > br.size) bri.minimum_size = br.size;
+					if (bri.maximum_size < br.size) bri.maximum_size = br.size;
+				}
+			}
+		}
+	}
+	if (ginfo) bi->end_time = br.timestamp;
+}
+
+
+void PIBinaryLog::moveIndex(int i) {
+	if (is_indexed) {
+		current_index = i;
+		posChanged(current_index);
+	}
+}
+
+
+PIBinaryLog::BinLogInfo PIBinaryLog::getLogInfo(const PIString & path) {
+	BinLogInfo bi;
+	bi.path = path;
+	bi.records_count = 0;
+	PIFile tfile;
+	if (!tfile.open(path, PIIODevice::ReadOnly)) return bi;
+	parseLog(&tfile, &bi, 0);
+	return bi;
+}
+
+
+bool PIBinaryLog::cutBinLog(const PIBinaryLog::BinLogInfo & src, const PIString & dst, int from, int to) {
+	PIBinaryLog slog;
+	if (!slog.open(src.path, PIIODevice::ReadOnly)) return false;
+	PIVector<int> ids = src.records.keys();
+	slog.seekTo(from);
+	PIBinaryLog dlog;
+	dlog.createNewFile(dst);
+	bool first = true;
+	BinLogRecord br;
+	PISystemTime st;
+	while (!slog.isEnd() && ((slog.pos() <= to) || to < 0)) {
+		br = slog.readRecord();
+		if (first) {
+			st = br.timestamp;
+			first = false;
+		}
+		if (ids.contains(br.id)) {
+			dlog.writeBinLog_raw(br.id, br.timestamp - st, br.data);
+		}
+	}
+	return true;
+}
+
+
+bool PIBinaryLog::createIndex() {
+	logmutex.lock();
+	llong cp = file.pos();
+	file.seekToBegin();
+	index.clear();
+	index_pos.clear();
+	parseLog(&file, &binfo, &index);
+	file.seek(cp);
+	is_indexed = !index.isEmpty();
+	for (uint i=0; i<index.size(); i++) index_pos[index[i].pos] = i;
+	logmutex.unlock();
+	return is_indexed;
+}
+
+
+void PIBinaryLog::seekTo(int rindex) {
+//	piCoutObj << "seekTo";
+	logmutex.lock();
+	if (rindex < index.size_s() && rindex >= 0) {
+		file.seek(index[rindex].pos);
+		moveIndex(index_pos.value(file.pos(), -1));
+		play_time = index[rindex].timestamp.toMilliseconds();
+		lastrecord.timestamp = index[rindex].timestamp;
+	}
+//	piCoutObj << "seekTo done";
+	logmutex.unlock();
+}
+
+
+bool PIBinaryLog::seek(const PISystemTime & time) {
+	int ci = -1;
+	for (uint i=0; i<index.size(); i++) {
+		if (time <= index[i].timestamp && (filterID.contains(index[i].id) || filterID.isEmpty())) {
+			ci = i;
+			break;
+		}
+	}
+	if (ci >= 0) {
+		seekTo(ci);
+		return true;
+	}
+	return false;
+}
+
+
+bool PIBinaryLog::seek(llong filepos) {
+	int ci = -1;
+	for (uint i=0; i<index.size(); i++) {
+		if (filepos <= index[i].pos && (filterID.contains(index[i].id) || filterID.isEmpty())) {
+			ci = i;
+			break;
+		}
+	}
+	if (ci >= 0) {
+		seekTo(ci);
+		return true;
+	}
+	return false;
+}
+
+
+PIString PIBinaryLog::constructFullPathDevice() const {
+	PIString ret;
+	ret << logDir() << ":" << filePrefix() << ":" << defaultID() << ":";
+	switch (play_mode) {
+	case PlayRealTime:
+		ret << "RT";
+		break;
+	case PlayVariableSpeed:
+		ret << PIString::fromNumber(playSpeed()) << "X";
+		break;
+	case PlayStaticDelay:
+		ret << PIString::fromNumber(playDelay().toMilliseconds()) << "M";
+		break;
+	default:
+		ret << "RT";
+		break;
+	}
+	return ret;
+}
+
+
+void PIBinaryLog::configureFromFullPathDevice(const PIString & full_path) {
+	PIStringList pl = full_path.split(":");
+	for (int i = 0; i < pl.size_s(); ++i) {
+		PIString p(pl[i]);
+		switch (i) {
+		case 0: setLogDir(p); break;
+		case 1: setFilePrefix(p); break;
+		case 2: setDefaultID(p.toInt()); break;
+		case 3:
+			if (p.toUpperCase() == "RT") setPlayRealTime();
+			if (p.toUpperCase().right(1) == "X") setPlaySpeed((p.left(p.size() - 1)).toDouble());
+			if (p.toUpperCase().right(1) == "M") setPlayDelay(PISystemTime::fromMilliseconds((p.left(p.size() - 1)).toDouble()));
+		break;
+		}
+	}
+	//	piCoutObj << "configured";
+}
+
+
+PIPropertyStorage PIBinaryLog::constructVariantDevice() const {
+	PIPropertyStorage ret;
+	PIVariantTypes::Enum e;
+	ret.addProperty("log dir", PIVariantTypes::Dir(logDir()));
+	ret.addProperty("file prefix", filePrefix());
+	ret.addProperty("default ID", defaultID());
+	e << "real-time" << "variable speed" << "static delay";
+	e.selectValue((int)playMode());
+	ret.addProperty("play mode", e);
+	ret.addProperty("play speed", playSpeed());
+	ret.addProperty("play delay", playDelay().toMilliseconds());
+	return ret;
+}
+
+
+void PIBinaryLog::configureFromVariantDevice(const PIPropertyStorage & d) {
+	setLogDir(d.propertyValueByName("log dir").toString());
+	setFilePrefix(d.propertyValueByName("file prefix").toString());
+	setDefaultID(d.propertyValueByName("default ID").toInt());
+	setPlaySpeed(d.propertyValueByName("play speed").toDouble());
+	setPlayDelay(PISystemTime::fromMilliseconds(d.propertyValueByName("play delay").toDouble()));
+	setPlayMode((PlayMode)d.propertyValueByName("play mode").toEnum().selectedValue());
+}
+
+
+void PIBinaryLog::propertyChanged(const PIString &s) {
+	default_id = property("defaultID").toInt();
+	rapid_start = property("rapidStart").toBool();
+	play_mode = (PlayMode)property("playMode").toInt();
+	double ps = property("playSpeed").toDouble();
+	play_speed = ps > 0. ? 1. / ps : 0.;
+	play_delay = property("playDelay").toSystemTime();
+	split_mode = (SplitMode)property("splitMode").toInt();
+	split_time = property("splitTime").toSystemTime();
+	split_size = property("splitFileSize").toLLong();
+	split_count = property("splitRecordCount").toInt();
+//	piCoutObj << "propertyChanged" << s << play_mode;
+}
+
diff --git a/src_main/io_devices/pibinarylog.h b/lib/main/io_devices/pibinarylog.h
similarity index 97%
rename from src_main/io_devices/pibinarylog.h
rename to lib/main/io_devices/pibinarylog.h
index 09485eed..c41401f0 100644
--- a/src_main/io_devices/pibinarylog.h
+++ b/lib/main/io_devices/pibinarylog.h
@@ -1,363 +1,363 @@
-/*! \file pibinarylog.h
- * \brief Binary log
-*/
-/*
-	PIP - Platform Independent Primitives
-	Class for write binary data to logfile, and read or playback this data
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIBINARYLOG_H
-#define PIBINARYLOG_H
-
-#include "pifile.h"
-
-#define PIBINARYLOG_VERSION 0x31
-namespace __S__PIBinaryLog {
-static const uchar binlog_sig[] = {'B','I','N','L','O','G'};
-}
-#define PIBINARYLOG_SIGNATURE_SIZE sizeof(__S__PIBinaryLog::binlog_sig)
-
-/// TODO: Create static functions to join binlog files
-/// TODO: Create functions to insert and delete records
-class PIP_EXPORT PIBinaryLog: public PIIODevice
-{
-	PIIODEVICE(PIBinaryLog)
-public:
-	explicit PIBinaryLog();
-	~PIBinaryLog() {closeDevice();}
-
-	//! \brief Play modes for \a PIBinaryLog
-	enum PlayMode {
-		PlayRealTime       /*! Play in system realtime, default mode */ ,
-		PlayVariableSpeed  /*! Play in software realtime with speed, set by \a setSpeed */ ,
-		PlayStaticDelay    /*! Play with custom static delay, ignoring timestamp */
-	};
-	
-	//! \brief Different split modes for writing \a PIBinaryLog, which can separate files by size, by time or by records count
-	enum SplitMode {
-		SplitNone   /*! Without separate, default mode */ ,
-		SplitTime   /*! Separate files by record time */ ,
-		SplitSize   /*! Separate files by size */ ,
-		SplitCount  /*! Separate files by records count */
-	};
-
-	//! \brief Struct contains information about all records with same ID
-	struct BinLogRecordInfo {
-		BinLogRecordInfo() {
-			id = count = 0;
-			minimum_size = maximum_size = 0;
-		}
-		int id;
-		int count;
-		int minimum_size;
-		int maximum_size;
-		PISystemTime start_time;
-		PISystemTime end_time;
-	};
-
-	//! \brief Struct contains full information about Binary Log file and about all Records using map of \a BinLogRecordInfo
-	struct BinLogInfo {
-		PIString path;
-		int records_count;
-		llong log_size;
-		PISystemTime start_time;
-		PISystemTime end_time;
-		PIMap<int, BinLogRecordInfo> records;
-	};
-
-	//! \brief Struct contains position, ID and timestamp of record in file
-	struct BinLogIndex {
-		int id;
-		llong pos;
-		PISystemTime timestamp;
-	};
-
-
-	//! Current \a PlayMode
-	PlayMode playMode() const {return play_mode;}
-
-	//! Current \a SplitMode
-	SplitMode splitMode() const {return split_mode;}
-
-	//! Current directory where billogs wiil be saved
-	PIString logDir() const {return property("logDir").toString();}
-	
-	//! Returns current file prefix
-	PIString filePrefix() const {return property("filePrefix").toString();}
-	
-	//! Default ID, used in \a write function
-	int defaultID() const {return default_id;}
-	
-	//! Returns current play speed
-	double playSpeed() const {return play_speed > 0 ? 1. / play_speed : 0.;}
-
-	//! Returns current play delay
-	PISystemTime playDelay() const {return play_delay;}
-
-	//! Returns current binlog file split time
-	PISystemTime splitTime() const {return split_time;}
-
-	//! Returns current binlog file split size
-	llong splitFileSize() const {return split_size;}
-
-	//! Returns current binlog file split records count
-	int splitRecordCount() const {return split_count;}
-
-	//! Returns if rapid start enabled
-	bool rapidStart() const {return rapid_start;}
-	
-	//! Create binlog file with Filename = path
-	void createNewFile(const PIString &path);
-	
-	//! Set \a PlayMode
-	void setPlayMode(PlayMode mode) {setProperty("playMode", (int)mode);}
-
-	//! Set \a SplitMode
-	void setSplitMode(SplitMode mode) {setProperty("splitMode", (int)mode);}
-
-	//! Set path to directory where binlogs will be saved
-	void setLogDir(const PIString & path) {setProperty("logDir", path);}
-	
-	//! Set file prefix, used to
-	void setFilePrefix(const PIString & prefix) {setProperty("filePrefix", prefix);}
-	
-	//! Set defaultID, used in \a write function
-	void setDefaultID(int id) {setProperty("defaultID", id);}
-	
-	//! If enabled BinLog \a ThreadedRead starts without delay for first record, i.e. first record will be readed immediately
-	void setRapidStart(bool enabled) {setProperty("rapidStart", enabled);}
-
-	//! Set play speed to "speed", default value is 1.0x
-	//! Also this function set \a playMode to \a PlayVariableSpeed
-	void setPlaySpeed(double speed) {setPlayMode(PlayVariableSpeed); setProperty("playSpeed", speed);}
-
-	//! Setting static delay between records, default value is 1 sec
-	//! Also this function set \a playMode to \a PlayStaticDelay
-	void setPlayDelay(const PISystemTime & delay) {setPlayMode(PlayStaticDelay); setProperty("playDelay", delay);}
-
-	//! Set \a playMode to \a PlayRealTime
-	void setPlayRealTime() {setPlayMode(PlayRealTime);}
-
-	//! Set binlog file split time
-	//! Also this function set \a splitMode to \a SplitTime
-	void setSplitTime(const PISystemTime & time) {setSplitMode(SplitTime); setProperty("splitTime", time);}
-
-	//! Set binlog file split size
-	//! Also this function set \a splitMode to \a SplitSize
-	void setSplitFileSize(llong size) {setSplitMode(SplitSize); setProperty("splitFileSize", size);}
-
-	//! Set binlog file split records count
-	//! Also this function set \a splitMode to \a SplitCount
-	void setSplitRecordCount(int count) {setSplitMode(SplitCount); setProperty("splitRecordCount", count);}
-
-	//! Set pause while playing via \a threadedRead or writing via write
-	void setPause(bool pause);
-
-	//! Write one record to BinLog file, with ID = id, id must be greather than 0
-	int writeBinLog(int id, PIByteArray data) {return writeBinLog(id, data.data(), data.size_s());}
-	
-	//! Write one record to BinLog file, with ID = id, id must be greather than 0
-	int writeBinLog(int id, const void * data, int size);
-
-	//! Write one RAW record to BinLog file, with ID = id, Timestamp = time
-	int writeBinLog_raw(int id, const PISystemTime &time, const PIByteArray &data) {return writeBinLog_raw(id, time, data.data(), data.size_s());}
-	int writeBinLog_raw(int id, const PISystemTime &time, const void * data, int size);
-
-	//! Returns count of writed records
-	int writeCount() const {return write_count;}
-	
-	//! Read one record from BinLog file, with ID = id, if id = 0 than any id will be readed
-	PIByteArray readBinLog(int id = 0, PISystemTime * time = 0);
-	
-	//! Read one record from BinLog file, with ID = id, if id = 0 than any id will be readed
-	int readBinLog(int id, void * read_to, int max_size, PISystemTime * time = 0);
-	
-	//! Returns binary log file size
-	llong logSize() const {return log_size;}
-
-	//! Return position in current binlog file
-	llong logPos() const {return file.pos();}
-
-	//! Return true, if position at the end of BinLog file
-	bool isEnd() const {if (isClosed()) return true; return file.isEnd();}
-	
-	//! Returns if BinLog file is empty
-	bool isEmpty() const {return (log_size <= llong(PIBINARYLOG_SIGNATURE_SIZE + 1));}
-
-	//! Returns BinLog pause status
-	bool isPause() const {return is_pause;}
-	
-	//! Returns id of last readed record
-	int lastReadedID() const {return lastrecord.id;}
-
-	//! Returns timestamp of last readed record
-	PISystemTime lastReadedTimestamp() const {return lastrecord.timestamp;}
-
-	
-#ifdef DOXYGEN
-	//! Read one message from binlog file, with ID contains in "filterID" or any ID, if "filterID" is empty
-	int read(void *read_to, int max_size);
-	
-	//! Write one record to BinLog file, with ID = "defaultID"
-	int write(const void * data, int size);
-#endif
-
-	//! Array of ID, that BinLog can read from binlog file, when use \a read function, or in \a ThreadedRead
-	PIVector<int> filterID;
-	
-	//! Go to begin of BinLog file
-	void restart();
-
-	//! Get binlog info \a BinLogInfo
-	BinLogInfo logInfo() const {if (is_indexed) return binfo; return getLogInfo(path());}
-
-	//! Get binlog index \a BinLogIndex, need \a createIndex before getting index
-	const PIVector<BinLogIndex> & logIndex() const {return index;}
-	
-	//! Create index of current binlog file
-	bool createIndex();
-
-	//! Return if current binlog file is indexed
-	bool isIndexed() {return is_indexed;}
-
-	//! Go to record #index
-	void seekTo(int rindex);
-
-	//! Go to nearest record
-	bool seek(const PISystemTime & time);
-
-	//! Set position in file to reading/playing
-	bool seek(llong filepos);
-
-	//! Get current record index (position record in file)
-	int pos() const {if (is_indexed) return current_index; return -1;}
-
-	//! \handlers
-	//! \{
-	
-	//! \fn PIString createNewFile()
-	//! \brief Create new binlog file in \a logDir, if successful returns filename, else returns empty string.
-	//! Filename is like  \a filePrefix + "yyyy_MM_dd__hh_mm_ss.binlog"
-	
-	//! \}
-	//! \events
-	//! \{
-	
-	//! \fn void fileEnd()
-	//! \brief Raise on file end while reading
-	
-	//! \fn void fileError()
-	//! \brief Raise on file creation error
-
-	//! \fn void newFile(const PIString & filename)
-	//! \brief Raise on new file created
-
-	//! \}
-	
-	EVENT_HANDLER(PIString, createNewFile);
-	EVENT(fileEnd)
-	EVENT(fileError)
-	EVENT1(newFile, const PIString &, filename)
-	EVENT1(posChanged, int, pos)
-
-	//! Get binlog info and statistic
-	static BinLogInfo getLogInfo(const PIString & path);
-	static bool cutBinLog(const BinLogInfo & src, const PIString & dst, int from, int to);
-
-protected:
-	PIString fullPathPrefix() const {return PIStringAscii("binlog");}
-	PIString constructFullPathDevice() const;
-	void configureFromFullPathDevice(const PIString & full_path);
-	PIPropertyStorage constructVariantDevice() const;
-	void configureFromVariantDevice(const PIPropertyStorage & d);
-	int readDevice(void *read_to, int max_size);
-	int writeDevice(const void * data, int size) {return writeBinLog(default_id, data, size);}
-	bool openDevice();
-	bool closeDevice();
-	void propertyChanged(const PIString &);
-	bool threadedRead(uchar *readed, int size);
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
-
-private:
-	struct BinLogRecord {
-		int id;
-		int size;
-		PISystemTime timestamp;
-		PIByteArray data;
-	};
-
-	bool writeFileHeader();
-	bool checkFileHeader();
-	BinLogRecord readRecord();
-	static void parseLog(PIFile *f, BinLogInfo *info, PIVector<BinLogIndex> * index);
-	void moveIndex(int i);
-	PIString getLogfilePath() const;
-
-	PIVector<BinLogIndex> index;
-	PIMap<llong, int> index_pos;
-	BinLogInfo binfo;
-
-	PlayMode play_mode;
-	SplitMode split_mode;
-	PIFile file;
-	BinLogRecord lastrecord;
-	PISystemTime startlogtime, play_delay, split_time, pause_time;
-	mutable PIMutex logmutex, pausemutex;
-	double play_time, play_speed;
-	llong split_size, log_size;
-	int write_count, split_count, default_id, current_index;
-	bool is_started, is_thread_ok, is_indexed, rapid_start, is_pause;
-};
-
-//! \relatesalso PICout \relatesalso PIBinaryLog::BinLogInfo \brief Output operator to PICout
-inline PICout operator <<(PICout s, const PIBinaryLog::BinLogInfo & bi) {
-	s.space();
-	s.setControl(0, true);
-	s << "[PIBinaryLog] " << bi.path << "\n";
-	if (bi.log_size < 0) {
-		s << "invalid file path";
-		s.restoreControl();
-		return s;
-	}
-	if (bi.log_size == 0) {
-		s << "Invalid empty file";
-		s.restoreControl();
-		return s;
-	}	if (bi.records_count < 0 && bi.records_count > -4) {
-		s << "Invalid file or corrupted signature";
-		s.restoreControl();
-		return s;
-	}
-	if (bi.records_count < -3) {
-		s << "Invalid binlog version";
-		s.restoreControl();
-		return s;
-	}
-	s << "read records " << bi.records_count << " in " << bi.records.size() << " types, log size " << bi.log_size;
-	s << "\nlog start " << bi.start_time << " , log end " << bi.end_time;
-	PIVector<int> keys = bi.records.keys();
-	piForeachC(int i, keys) {
-		const PIBinaryLog::BinLogRecordInfo &bri(bi.records[i]);
-		s << "\n  record id " << bri.id << " , count " << bri.count;
-		s << "\n    record start " << bri.start_time << " , end " << bri.end_time;
-		s << "\n    record size " << bri.minimum_size << " - " << bri.maximum_size;
-	}
-	s.restoreControl();
-	return s;
-}
-
-#endif // PIBINARYLOG_H
+/*! \file pibinarylog.h
+ * \brief Binary log
+*/
+/*
+	PIP - Platform Independent Primitives
+	Class for write binary data to logfile, and read or playback this data
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIBINARYLOG_H
+#define PIBINARYLOG_H
+
+#include "pifile.h"
+
+#define PIBINARYLOG_VERSION 0x31
+namespace __S__PIBinaryLog {
+static const uchar binlog_sig[] = {'B','I','N','L','O','G'};
+}
+#define PIBINARYLOG_SIGNATURE_SIZE sizeof(__S__PIBinaryLog::binlog_sig)
+
+/// TODO: Create static functions to join binlog files
+/// TODO: Create functions to insert and delete records
+class PIP_EXPORT PIBinaryLog: public PIIODevice
+{
+	PIIODEVICE(PIBinaryLog)
+public:
+	explicit PIBinaryLog();
+	~PIBinaryLog() {closeDevice();}
+
+	//! \brief Play modes for \a PIBinaryLog
+	enum PlayMode {
+		PlayRealTime       /*! Play in system realtime, default mode */ ,
+		PlayVariableSpeed  /*! Play in software realtime with speed, set by \a setSpeed */ ,
+		PlayStaticDelay    /*! Play with custom static delay, ignoring timestamp */
+	};
+	
+	//! \brief Different split modes for writing \a PIBinaryLog, which can separate files by size, by time or by records count
+	enum SplitMode {
+		SplitNone   /*! Without separate, default mode */ ,
+		SplitTime   /*! Separate files by record time */ ,
+		SplitSize   /*! Separate files by size */ ,
+		SplitCount  /*! Separate files by records count */
+	};
+
+	//! \brief Struct contains information about all records with same ID
+	struct BinLogRecordInfo {
+		BinLogRecordInfo() {
+			id = count = 0;
+			minimum_size = maximum_size = 0;
+		}
+		int id;
+		int count;
+		int minimum_size;
+		int maximum_size;
+		PISystemTime start_time;
+		PISystemTime end_time;
+	};
+
+	//! \brief Struct contains full information about Binary Log file and about all Records using map of \a BinLogRecordInfo
+	struct BinLogInfo {
+		PIString path;
+		int records_count;
+		llong log_size;
+		PISystemTime start_time;
+		PISystemTime end_time;
+		PIMap<int, BinLogRecordInfo> records;
+	};
+
+	//! \brief Struct contains position, ID and timestamp of record in file
+	struct BinLogIndex {
+		int id;
+		llong pos;
+		PISystemTime timestamp;
+	};
+
+
+	//! Current \a PlayMode
+	PlayMode playMode() const {return play_mode;}
+
+	//! Current \a SplitMode
+	SplitMode splitMode() const {return split_mode;}
+
+	//! Current directory where billogs wiil be saved
+	PIString logDir() const {return property("logDir").toString();}
+	
+	//! Returns current file prefix
+	PIString filePrefix() const {return property("filePrefix").toString();}
+	
+	//! Default ID, used in \a write function
+	int defaultID() const {return default_id;}
+	
+	//! Returns current play speed
+	double playSpeed() const {return play_speed > 0 ? 1. / play_speed : 0.;}
+
+	//! Returns current play delay
+	PISystemTime playDelay() const {return play_delay;}
+
+	//! Returns current binlog file split time
+	PISystemTime splitTime() const {return split_time;}
+
+	//! Returns current binlog file split size
+	llong splitFileSize() const {return split_size;}
+
+	//! Returns current binlog file split records count
+	int splitRecordCount() const {return split_count;}
+
+	//! Returns if rapid start enabled
+	bool rapidStart() const {return rapid_start;}
+	
+	//! Create binlog file with Filename = path
+	void createNewFile(const PIString &path);
+	
+	//! Set \a PlayMode
+	void setPlayMode(PlayMode mode) {setProperty("playMode", (int)mode);}
+
+	//! Set \a SplitMode
+	void setSplitMode(SplitMode mode) {setProperty("splitMode", (int)mode);}
+
+	//! Set path to directory where binlogs will be saved
+	void setLogDir(const PIString & path) {setProperty("logDir", path);}
+	
+	//! Set file prefix, used to
+	void setFilePrefix(const PIString & prefix) {setProperty("filePrefix", prefix);}
+	
+	//! Set defaultID, used in \a write function
+	void setDefaultID(int id) {setProperty("defaultID", id);}
+	
+	//! If enabled BinLog \a ThreadedRead starts without delay for first record, i.e. first record will be readed immediately
+	void setRapidStart(bool enabled) {setProperty("rapidStart", enabled);}
+
+	//! Set play speed to "speed", default value is 1.0x
+	//! Also this function set \a playMode to \a PlayVariableSpeed
+	void setPlaySpeed(double speed) {setPlayMode(PlayVariableSpeed); setProperty("playSpeed", speed);}
+
+	//! Setting static delay between records, default value is 1 sec
+	//! Also this function set \a playMode to \a PlayStaticDelay
+	void setPlayDelay(const PISystemTime & delay) {setPlayMode(PlayStaticDelay); setProperty("playDelay", delay);}
+
+	//! Set \a playMode to \a PlayRealTime
+	void setPlayRealTime() {setPlayMode(PlayRealTime);}
+
+	//! Set binlog file split time
+	//! Also this function set \a splitMode to \a SplitTime
+	void setSplitTime(const PISystemTime & time) {setSplitMode(SplitTime); setProperty("splitTime", time);}
+
+	//! Set binlog file split size
+	//! Also this function set \a splitMode to \a SplitSize
+	void setSplitFileSize(llong size) {setSplitMode(SplitSize); setProperty("splitFileSize", size);}
+
+	//! Set binlog file split records count
+	//! Also this function set \a splitMode to \a SplitCount
+	void setSplitRecordCount(int count) {setSplitMode(SplitCount); setProperty("splitRecordCount", count);}
+
+	//! Set pause while playing via \a threadedRead or writing via write
+	void setPause(bool pause);
+
+	//! Write one record to BinLog file, with ID = id, id must be greather than 0
+	int writeBinLog(int id, PIByteArray data) {return writeBinLog(id, data.data(), data.size_s());}
+	
+	//! Write one record to BinLog file, with ID = id, id must be greather than 0
+	int writeBinLog(int id, const void * data, int size);
+
+	//! Write one RAW record to BinLog file, with ID = id, Timestamp = time
+	int writeBinLog_raw(int id, const PISystemTime &time, const PIByteArray &data) {return writeBinLog_raw(id, time, data.data(), data.size_s());}
+	int writeBinLog_raw(int id, const PISystemTime &time, const void * data, int size);
+
+	//! Returns count of writed records
+	int writeCount() const {return write_count;}
+	
+	//! Read one record from BinLog file, with ID = id, if id = 0 than any id will be readed
+	PIByteArray readBinLog(int id = 0, PISystemTime * time = 0);
+	
+	//! Read one record from BinLog file, with ID = id, if id = 0 than any id will be readed
+	int readBinLog(int id, void * read_to, int max_size, PISystemTime * time = 0);
+	
+	//! Returns binary log file size
+	llong logSize() const {return log_size;}
+
+	//! Return position in current binlog file
+	llong logPos() const {return file.pos();}
+
+	//! Return true, if position at the end of BinLog file
+	bool isEnd() const {if (isClosed()) return true; return file.isEnd();}
+	
+	//! Returns if BinLog file is empty
+	bool isEmpty() const {return (log_size <= llong(PIBINARYLOG_SIGNATURE_SIZE + 1));}
+
+	//! Returns BinLog pause status
+	bool isPause() const {return is_pause;}
+	
+	//! Returns id of last readed record
+	int lastReadedID() const {return lastrecord.id;}
+
+	//! Returns timestamp of last readed record
+	PISystemTime lastReadedTimestamp() const {return lastrecord.timestamp;}
+
+	
+#ifdef DOXYGEN
+	//! Read one message from binlog file, with ID contains in "filterID" or any ID, if "filterID" is empty
+	int read(void *read_to, int max_size);
+	
+	//! Write one record to BinLog file, with ID = "defaultID"
+	int write(const void * data, int size);
+#endif
+
+	//! Array of ID, that BinLog can read from binlog file, when use \a read function, or in \a ThreadedRead
+	PIVector<int> filterID;
+	
+	//! Go to begin of BinLog file
+	void restart();
+
+	//! Get binlog info \a BinLogInfo
+	BinLogInfo logInfo() const {if (is_indexed) return binfo; return getLogInfo(path());}
+
+	//! Get binlog index \a BinLogIndex, need \a createIndex before getting index
+	const PIVector<BinLogIndex> & logIndex() const {return index;}
+	
+	//! Create index of current binlog file
+	bool createIndex();
+
+	//! Return if current binlog file is indexed
+	bool isIndexed() {return is_indexed;}
+
+	//! Go to record #index
+	void seekTo(int rindex);
+
+	//! Go to nearest record
+	bool seek(const PISystemTime & time);
+
+	//! Set position in file to reading/playing
+	bool seek(llong filepos);
+
+	//! Get current record index (position record in file)
+	int pos() const {if (is_indexed) return current_index; return -1;}
+
+	//! \handlers
+	//! \{
+	
+	//! \fn PIString createNewFile()
+	//! \brief Create new binlog file in \a logDir, if successful returns filename, else returns empty string.
+	//! Filename is like  \a filePrefix + "yyyy_MM_dd__hh_mm_ss.binlog"
+	
+	//! \}
+	//! \events
+	//! \{
+	
+	//! \fn void fileEnd()
+	//! \brief Raise on file end while reading
+	
+	//! \fn void fileError()
+	//! \brief Raise on file creation error
+
+	//! \fn void newFile(const PIString & filename)
+	//! \brief Raise on new file created
+
+	//! \}
+	
+	EVENT_HANDLER(PIString, createNewFile);
+	EVENT(fileEnd)
+	EVENT(fileError)
+	EVENT1(newFile, const PIString &, filename)
+	EVENT1(posChanged, int, pos)
+
+	//! Get binlog info and statistic
+	static BinLogInfo getLogInfo(const PIString & path);
+	static bool cutBinLog(const BinLogInfo & src, const PIString & dst, int from, int to);
+
+protected:
+	PIString fullPathPrefix() const {return PIStringAscii("binlog");}
+	PIString constructFullPathDevice() const;
+	void configureFromFullPathDevice(const PIString & full_path);
+	PIPropertyStorage constructVariantDevice() const;
+	void configureFromVariantDevice(const PIPropertyStorage & d);
+	int readDevice(void *read_to, int max_size);
+	int writeDevice(const void * data, int size) {return writeBinLog(default_id, data, size);}
+	bool openDevice();
+	bool closeDevice();
+	void propertyChanged(const PIString &);
+	bool threadedRead(uchar *readed, int size);
+	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
+
+private:
+	struct BinLogRecord {
+		int id;
+		int size;
+		PISystemTime timestamp;
+		PIByteArray data;
+	};
+
+	bool writeFileHeader();
+	bool checkFileHeader();
+	BinLogRecord readRecord();
+	static void parseLog(PIFile *f, BinLogInfo *info, PIVector<BinLogIndex> * index);
+	void moveIndex(int i);
+	PIString getLogfilePath() const;
+
+	PIVector<BinLogIndex> index;
+	PIMap<llong, int> index_pos;
+	BinLogInfo binfo;
+
+	PlayMode play_mode;
+	SplitMode split_mode;
+	PIFile file;
+	BinLogRecord lastrecord;
+	PISystemTime startlogtime, play_delay, split_time, pause_time;
+	mutable PIMutex logmutex, pausemutex;
+	double play_time, play_speed;
+	llong split_size, log_size;
+	int write_count, split_count, default_id, current_index;
+	bool is_started, is_thread_ok, is_indexed, rapid_start, is_pause;
+};
+
+//! \relatesalso PICout \relatesalso PIBinaryLog::BinLogInfo \brief Output operator to PICout
+inline PICout operator <<(PICout s, const PIBinaryLog::BinLogInfo & bi) {
+	s.space();
+	s.setControl(0, true);
+	s << "[PIBinaryLog] " << bi.path << "\n";
+	if (bi.log_size < 0) {
+		s << "invalid file path";
+		s.restoreControl();
+		return s;
+	}
+	if (bi.log_size == 0) {
+		s << "Invalid empty file";
+		s.restoreControl();
+		return s;
+	}	if (bi.records_count < 0 && bi.records_count > -4) {
+		s << "Invalid file or corrupted signature";
+		s.restoreControl();
+		return s;
+	}
+	if (bi.records_count < -3) {
+		s << "Invalid binlog version";
+		s.restoreControl();
+		return s;
+	}
+	s << "read records " << bi.records_count << " in " << bi.records.size() << " types, log size " << bi.log_size;
+	s << "\nlog start " << bi.start_time << " , log end " << bi.end_time;
+	PIVector<int> keys = bi.records.keys();
+	piForeachC(int i, keys) {
+		const PIBinaryLog::BinLogRecordInfo &bri(bi.records[i]);
+		s << "\n  record id " << bri.id << " , count " << bri.count;
+		s << "\n    record start " << bri.start_time << " , end " << bri.end_time;
+		s << "\n    record size " << bri.minimum_size << " - " << bri.maximum_size;
+	}
+	s.restoreControl();
+	return s;
+}
+
+#endif // PIBINARYLOG_H
diff --git a/src_main/io_devices/pican.cpp b/lib/main/io_devices/pican.cpp
similarity index 96%
rename from src_main/io_devices/pican.cpp
rename to lib/main/io_devices/pican.cpp
index de52c62c..f3201f09 100644
--- a/src_main/io_devices/pican.cpp
+++ b/lib/main/io_devices/pican.cpp
@@ -1,173 +1,173 @@
-/*
-	PIP - Platform Independent Primitives
-	CAN
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "pican.h"
-#include "pipropertystorage.h"
-#include "piincludes_p.h"
-#if !defined(WINDOWS) && !defined(MAC_OS) && !defined(FREERTOS)
-#  define PIP_CAN
-#endif
-#ifdef PIP_CAN
-#  include <sys/ioctl.h>
-#  include <net/if.h>
-#  include <linux/can.h>
-#  include <linux/can/raw.h>
-#  ifndef AF_CAN
-#  define AF_CAN 29
-#  endif
-#  ifndef PF_CAN
-#  define PF_CAN AF_CAN
-#  endif
-#endif
-
-
-REGISTER_DEVICE(PICAN)
-
-
-PICAN::PICAN(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode) {
-	setThreadedReadBufferSize(256);
-	setPath(path);
-	can_id = 0;
-}
-
-
-bool PICAN::openDevice() {
-#ifdef PIP_CAN
-	piCout << "PICAN open device" << path();
-	sock = socket(PF_CAN, SOCK_RAW, CAN_RAW);
-	if(sock < 0){
-		piCoutObj << "Error! while opening socket";
-		return false;
-	}
-	ifreq ifr;
-	strcpy(ifr.ifr_name, path().dataAscii());
-	piCout << "PICAN try to get interface index...";
-	if(ioctl(sock, SIOCGIFINDEX, &ifr) < 0){
-		piCoutObj << "Error! while determin the interface ioctl";
-		return false;
-	}
-	struct timeval tv;
-	tv.tv_sec = 1;
-	tv.tv_usec = 0;
-	setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
-	// bind socket to all CAN interface
-	sockaddr_can addr;
-	addr.can_family = AF_CAN;
-	addr.can_ifindex = ifr.ifr_ifindex;
-	piCout << "PICAN try to bind socket to interface" << ifr.ifr_ifindex;
-	if(bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0){
-		piCoutObj << "Error! while binding socket";
-		return false;
-	}
-	piCout << "PICAN Open OK!";
-	return true;
-#else
-	piCoutObj << "PICAN not implemented on windows";
-	return false;
-#endif
-}
-
-
-bool PICAN::closeDevice() {
-#ifdef PIP_CAN
-	if (sock > 0) ::close(sock);
-#endif
-	return true;
-}
-
-
-int PICAN::readDevice(void * read_to, int max_size) {
-#ifdef PIP_CAN
-	//piCout << "PICAN read";
-	can_frame frame;
-	int ret = 0;
-	ret = ::read(sock, &frame, sizeof(can_frame));
-	if(ret < 0) {/*piCoutObj << "Error while read CAN frame " << ret;*/ return -1;}
-	//piCoutObj << "receive CAN frame Id =" << frame.can_id;
-	memcpy(read_to, frame.data, piMini(frame.can_dlc, max_size));
-	readed_id = frame.can_id;
-	return piMini(frame.can_dlc, max_size);
-#endif
-	return 0;
-}
-
-
-int PICAN::writeDevice(const void * data, int max_size) {
-#ifdef PIP_CAN
-	//piCout << "PICAN write" << can_id << max_size;
-	if (max_size > 8) {piCoutObj << "Can't send CAN frame bigger than 8 bytes (requested " << max_size << ")!"; return -1;}
-	can_frame frame;
-	frame.can_id = can_id;
-	frame.can_dlc = max_size;
-	memcpy(frame.data, data, max_size);
-	int ret = 0;
-	ret = ::write(sock, &frame, sizeof(can_frame));
-	if(ret < 0) {piCoutObj << "Error while send CAN frame " << ret; return -1;}
-	return max_size;
-#endif
-	return 0;
-}
-
-
-void PICAN::setCANID(int id) {
-	can_id = id;
-}
-
-
-int PICAN::CANID() const {
-	return can_id;
-}
-
-
-int PICAN::readedCANID() const {
-	return readed_id;
-}
-
-
-PIString PICAN::constructFullPathDevice() const {
-	PIString ret;
-	ret << path() << ":" << PIString::fromNumber(CANID(),16);
-	return ret;
-}
-
-
-void PICAN::configureFromFullPathDevice(const PIString & full_path) {
-	PIStringList pl = full_path.split(":");
-	for (int i = 0; i < pl.size_s(); ++i) {
-		PIString p(pl[i]);
-		switch (i) {
-		case 0: setPath(p); break;
-		case 1: setCANID(p.toInt(16)); break;
-		default: break;
-		}
-	}
-}
-
-
-PIPropertyStorage PICAN::constructVariantDevice() const {
-	PIPropertyStorage ret;
-	ret.addProperty("path", path());
-	ret.addProperty("CAN ID", PIString::fromNumber(CANID(),16));
-	return ret;
-}
-
-
-void PICAN::configureFromVariantDevice(const PIPropertyStorage & d) {
-	setPath(d.propertyValueByName("path").toString());
-	setCANID(d.propertyValueByName("CAN ID").toString().toInt(16));
-}
+/*
+	PIP - Platform Independent Primitives
+	CAN
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "pican.h"
+#include "pipropertystorage.h"
+#include "piincludes_p.h"
+#if !defined(WINDOWS) && !defined(MAC_OS) && !defined(FREERTOS)
+#  define PIP_CAN
+#endif
+#ifdef PIP_CAN
+#  include <sys/ioctl.h>
+#  include <net/if.h>
+#  include <linux/can.h>
+#  include <linux/can/raw.h>
+#  ifndef AF_CAN
+#  define AF_CAN 29
+#  endif
+#  ifndef PF_CAN
+#  define PF_CAN AF_CAN
+#  endif
+#endif
+
+
+REGISTER_DEVICE(PICAN)
+
+
+PICAN::PICAN(const PIString & path, PIIODevice::DeviceMode mode) : PIIODevice(path, mode) {
+	setThreadedReadBufferSize(256);
+	setPath(path);
+	can_id = 0;
+}
+
+
+bool PICAN::openDevice() {
+#ifdef PIP_CAN
+	piCout << "PICAN open device" << path();
+	sock = socket(PF_CAN, SOCK_RAW, CAN_RAW);
+	if(sock < 0){
+		piCoutObj << "Error! while opening socket";
+		return false;
+	}
+	ifreq ifr;
+	strcpy(ifr.ifr_name, path().dataAscii());
+	piCout << "PICAN try to get interface index...";
+	if(ioctl(sock, SIOCGIFINDEX, &ifr) < 0){
+		piCoutObj << "Error! while determin the interface ioctl";
+		return false;
+	}
+	struct timeval tv;
+	tv.tv_sec = 1;
+	tv.tv_usec = 0;
+	setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof tv);
+	// bind socket to all CAN interface
+	sockaddr_can addr;
+	addr.can_family = AF_CAN;
+	addr.can_ifindex = ifr.ifr_ifindex;
+	piCout << "PICAN try to bind socket to interface" << ifr.ifr_ifindex;
+	if(bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0){
+		piCoutObj << "Error! while binding socket";
+		return false;
+	}
+	piCout << "PICAN Open OK!";
+	return true;
+#else
+	piCoutObj << "PICAN not implemented on windows";
+	return false;
+#endif
+}
+
+
+bool PICAN::closeDevice() {
+#ifdef PIP_CAN
+	if (sock > 0) ::close(sock);
+#endif
+	return true;
+}
+
+
+int PICAN::readDevice(void * read_to, int max_size) {
+#ifdef PIP_CAN
+	//piCout << "PICAN read";
+	can_frame frame;
+	int ret = 0;
+	ret = ::read(sock, &frame, sizeof(can_frame));
+	if(ret < 0) {/*piCoutObj << "Error while read CAN frame " << ret;*/ return -1;}
+	//piCoutObj << "receive CAN frame Id =" << frame.can_id;
+	memcpy(read_to, frame.data, piMini(frame.can_dlc, max_size));
+	readed_id = frame.can_id;
+	return piMini(frame.can_dlc, max_size);
+#endif
+	return 0;
+}
+
+
+int PICAN::writeDevice(const void * data, int max_size) {
+#ifdef PIP_CAN
+	//piCout << "PICAN write" << can_id << max_size;
+	if (max_size > 8) {piCoutObj << "Can't send CAN frame bigger than 8 bytes (requested " << max_size << ")!"; return -1;}
+	can_frame frame;
+	frame.can_id = can_id;
+	frame.can_dlc = max_size;
+	memcpy(frame.data, data, max_size);
+	int ret = 0;
+	ret = ::write(sock, &frame, sizeof(can_frame));
+	if(ret < 0) {piCoutObj << "Error while send CAN frame " << ret; return -1;}
+	return max_size;
+#endif
+	return 0;
+}
+
+
+void PICAN::setCANID(int id) {
+	can_id = id;
+}
+
+
+int PICAN::CANID() const {
+	return can_id;
+}
+
+
+int PICAN::readedCANID() const {
+	return readed_id;
+}
+
+
+PIString PICAN::constructFullPathDevice() const {
+	PIString ret;
+	ret << path() << ":" << PIString::fromNumber(CANID(),16);
+	return ret;
+}
+
+
+void PICAN::configureFromFullPathDevice(const PIString & full_path) {
+	PIStringList pl = full_path.split(":");
+	for (int i = 0; i < pl.size_s(); ++i) {
+		PIString p(pl[i]);
+		switch (i) {
+		case 0: setPath(p); break;
+		case 1: setCANID(p.toInt(16)); break;
+		default: break;
+		}
+	}
+}
+
+
+PIPropertyStorage PICAN::constructVariantDevice() const {
+	PIPropertyStorage ret;
+	ret.addProperty("path", path());
+	ret.addProperty("CAN ID", PIString::fromNumber(CANID(),16));
+	return ret;
+}
+
+
+void PICAN::configureFromVariantDevice(const PIPropertyStorage & d) {
+	setPath(d.propertyValueByName("path").toString());
+	setCANID(d.propertyValueByName("CAN ID").toString().toInt(16));
+}
diff --git a/src_main/io_devices/pican.h b/lib/main/io_devices/pican.h
similarity index 96%
rename from src_main/io_devices/pican.h
rename to lib/main/io_devices/pican.h
index a1e12c78..51a6689a 100644
--- a/src_main/io_devices/pican.h
+++ b/lib/main/io_devices/pican.h
@@ -1,57 +1,57 @@
-/*! \file pican.h
- * \brief CAN device
-*/
-/*
-	PIP - Platform Independent Primitives
-	CAN
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICAN_H
-#define PICAN_H
-
-#include "piiodevice.h"
-
-
-class PIP_EXPORT PICAN: public PIIODevice
-{
-	PIIODEVICE(PICAN)
-public:
-	explicit PICAN(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
-	~PICAN() {}
-
-	void setCANID(int id);
-	int CANID() const;
-	int readedCANID() const;
-
-protected:
-	bool openDevice();
-	bool closeDevice();
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int max_size);
-	PIString fullPathPrefix() const {return PIStringAscii("can");}
-	PIString constructFullPathDevice() const;
-	void configureFromFullPathDevice(const PIString & full_path);
-	PIPropertyStorage constructVariantDevice() const;
-	void configureFromVariantDevice(const PIPropertyStorage & d);
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
-
-private:
-	int sock;
-	int can_id, readed_id;
-};
-
-#endif // PICAN_H
+/*! \file pican.h
+ * \brief CAN device
+*/
+/*
+	PIP - Platform Independent Primitives
+	CAN
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICAN_H
+#define PICAN_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PICAN: public PIIODevice
+{
+	PIIODEVICE(PICAN)
+public:
+	explicit PICAN(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
+	~PICAN() {}
+
+	void setCANID(int id);
+	int CANID() const;
+	int readedCANID() const;
+
+protected:
+	bool openDevice();
+	bool closeDevice();
+	int readDevice(void * read_to, int max_size);
+	int writeDevice(const void * data, int max_size);
+	PIString fullPathPrefix() const {return PIStringAscii("can");}
+	PIString constructFullPathDevice() const;
+	void configureFromFullPathDevice(const PIString & full_path);
+	PIPropertyStorage constructVariantDevice() const;
+	void configureFromVariantDevice(const PIPropertyStorage & d);
+	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
+
+private:
+	int sock;
+	int can_id, readed_id;
+};
+
+#endif // PICAN_H
diff --git a/src_main/io_devices/piconfig.cpp b/lib/main/io_devices/piconfig.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/piconfig.cpp
rename to lib/main/io_devices/piconfig.cpp
diff --git a/src_main/io_devices/piconfig.h b/lib/main/io_devices/piconfig.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/piconfig.h
rename to lib/main/io_devices/piconfig.h
diff --git a/src_main/io_devices/pidir.cpp b/lib/main/io_devices/pidir.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/pidir.cpp
rename to lib/main/io_devices/pidir.cpp
diff --git a/src_main/io_devices/pidir.h b/lib/main/io_devices/pidir.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/pidir.h
rename to lib/main/io_devices/pidir.h
diff --git a/src_main/io_devices/piethernet.cpp b/lib/main/io_devices/piethernet.cpp
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/io_devices/piethernet.cpp
rename to lib/main/io_devices/piethernet.cpp
index 4a6e33a5..6f44cfff
--- a/src_main/io_devices/piethernet.cpp
+++ b/lib/main/io_devices/piethernet.cpp
@@ -1,1243 +1,1243 @@
-/*
-	PIP - Platform Independent Primitives
-	Ethernet, UDP/TCP Broadcast/Multicast
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "piincludes_p.h"
-#include "piethernet.h"
-#include "piconfig.h"
-#include "pisysteminfo.h"
-#include "pipropertystorage.h"
-#ifdef QNX
-#  include <net/if.h>
-#  include <net/if_dl.h>
-#  include <hw/nicinfo.h>
-#  include <netdb.h>
-#  include <sys/socket.h>
-#  include <sys/time.h>
-#  include <sys/types.h>
-#  include <sys/ioctl.h>
-#  include <netinet/in.h>
-#  include <arpa/inet.h>
-#  include <ifaddrs.h>
-#  include <fcntl.h>
-#  ifdef BLACKBERRY
-#    include <netinet/in.h>
-#  else
-#    include <sys/dcmd_io-net.h>
-#  endif
-#  define ip_mreqn ip_mreq
-#  define imr_address imr_interface
-#else
-#  ifdef WINDOWS
-#    include <io.h>
-#    include <winsock2.h>
-#    include <iphlpapi.h>
-#    include <psapi.h>
-#    include <ws2tcpip.h>
-#    define ip_mreqn ip_mreq
-#    define imr_address imr_interface
-#  else
-#    include <fcntl.h>
-#    include <sys/ioctl.h>
-#    include <netinet/in.h>
-#    include <arpa/inet.h>
-#    include <sys/socket.h>
-#    include <netdb.h>
-#    include <net/if.h>
-#    if !defined(ANDROID) && !defined(FREERTOS)
-#      include <ifaddrs.h>
-#    endif
-#    ifdef FREERTOS
-#      include <lwip/sockets.h>
-#    endif
-#  endif
-#endif
-#include <errno.h>
-
-
-/** \class PIEthernet
- * \brief Ethernet device
- * \details 
- * \section PIEthernet_sec0 Synopsis
- * %PIEthernet designed to work with IPv4 network via two protocols:
- * UDP and TCP. This class allow you send and receive packets to/from
- * another computer through network. Also it supports broadcast and
- * multicast extensions.
- * 
- * \section PIEthernet_sec1 IPv4
- * 
- * 
- * \section PIEthernet_sec2 UDP
- * User Datagram Protocol
- * 
- * \section PIEthernet_sec3 TCP
- * Transmission Control Protocol
- * 
- * */
-
-#ifndef WINDOWS
-PIString getSockAddr(sockaddr * s) {
-	return s == 0 ? PIString() : PIStringAscii(inet_ntoa(((sockaddr_in*)s)->sin_addr));
-}
-#endif
-
-
-PIEthernet::Address::Address(uint _ip, ushort _port) {
-	set(_ip, _port);
-}
-
-
-PIEthernet::Address::Address(const PIString & ip_port) {
-	set(ip_port);
-}
-
-
-PIEthernet::Address::Address(const PIString & _ip, ushort _port) {
-	set(_ip, _port);
-}
-
-
-PIString PIEthernet::Address::ipString() const {
-	PIString ret = PIString::fromNumber(ip_b[0]);
-	ret << "." << PIString::fromNumber(ip_b[1]);
-	ret << "." << PIString::fromNumber(ip_b[2]);
-	ret << "." << PIString::fromNumber(ip_b[3]);
-	return ret;
-}
-
-
-PIString PIEthernet::Address::toString() const {
-	return ipString() + ":" + PIString::fromNumber(port_);
-}
-
-
-void PIEthernet::Address::setIP(uint _ip) {
-	ip_ = _ip;
-}
-
-
-void PIEthernet::Address::setIP(const PIString & _ip) {
-	initIP(_ip);
-}
-
-
-void PIEthernet::Address::setPort(ushort _port) {
-	port_ = _port;
-}
-
-
-void PIEthernet::Address::set(const PIString & ip_port) {
-	PIString _ip; int p(0);
-	splitIPPort(ip_port, &_ip, &p);
-	port_ = p;
-	initIP(_ip);
-}
-
-
-void PIEthernet::Address::set(const PIString & _ip, ushort _port) {
-	initIP(_ip);
-	port_ = _port;
-}
-
-
-void PIEthernet::Address::set(uint _ip, ushort _port) {
-	ip_ = _ip;
-	port_ = _port;
-}
-
-
-void PIEthernet::Address::clear() {
-	ip_ = 0;
-	port_ = 0;
-}
-
-
-bool PIEthernet::Address::isNull() const {
-	return (ip_ == 0) && (port_ == 0);
-}
-
-
-PIEthernet::Address PIEthernet::Address::resolve(const PIString & host_port) {
-	PIString host; int port(0);
-	splitIPPort(host_port, &host, &port);
-	return resolve(host, port);
-}
-
-
-PIEthernet::Address PIEthernet::Address::resolve(const PIString & host, ushort port) {
-	Address ret(0, port);
-	hostent * he = gethostbyname(host.dataAscii());
-	if (!he)
-		return ret;
-	if (he->h_addr_list[0])
-		ret.setIP(*((uint*)(he->h_addr_list[0])));
-	return ret;
-}
-
-
-void PIEthernet::Address::splitIPPort(const PIString & ipp, PIString * _ip, int * _port) {
-	//piCout << "parse" << ipp;
-	int sp = ipp.findLast(":");
-	if (_ip != 0) *_ip = (sp >= 0 ? ipp.left(sp) : ipp);
-	if (_port != 0 && sp >= 0) *_port = ipp.right(ipp.length() - ipp.find(":") - 1).toInt();
-}
-
-
-void PIEthernet::Address::initIP(const PIString & _ip) {
-	ip_ = inet_addr(_ip.dataAscii());
-}
-
-
-REGISTER_DEVICE(PIEthernet)
-
-
-PRIVATE_DEFINITION_START(PIEthernet)
-	sockaddr_in addr_;
-	sockaddr_in saddr_;
-	sockaddr_in raddr_;
-PRIVATE_DEFINITION_END(PIEthernet)
-
-
-PIEthernet::PIEthernet(): PIIODevice("", ReadWrite) {
-	construct();
-	setType(UDP);
-	setParameters(PIEthernet::ReuseAddress | PIEthernet::MulticastLoop | PIEthernet::KeepConnection);
-}
-
-
-PIEthernet::PIEthernet(PIEthernet::Type type_, const PIString & ip_port, const PIFlags<PIEthernet::Parameters> params_): PIIODevice(ip_port, ReadWrite) {
-	construct();
-	addr_r.set(ip_port);
-	setType(type_);
-	setParameters(params_);
-	if (type_ != UDP) init();
-}
-
-
-PIEthernet::PIEthernet(int sock_, PIString ip_port): PIIODevice("", ReadWrite) {
-	construct();
-	addr_s.set(ip_port);
-	sock = sock_;
-	opened_ = connected_ = true;
-	init();
-	setParameters(PIEthernet::ReuseAddress | PIEthernet::MulticastLoop);
-	setType(TCP_Client, false);
-	setPath(ip_port);
-	//piCoutObj << "new tcp client" << sock_;
-}
-
-
-PIEthernet::~PIEthernet() {
-	//piCout << "~PIEthernet" << uint(this);
-	stop();
-	closeDevice();
-	//piCoutObj << "~PIEthernet done";
-}
-
-
-void PIEthernet::construct() {
-	//piCout << " PIEthernet" << uint(this);
-	setOption(BlockingWrite);
-	connected_ = connecting_ = listen_threaded = server_bounded = false;
-	sock = sock_s = -1;
-	setReadTimeout(10000.);
-	setWriteTimeout(10000.);
-	setTTL(64);
-	setMulticastTTL(1);
-	server_thread_.setData(this);
-	server_thread_.setName("__S__server_thread");
-#ifdef FREERTOS
-	setThreadedReadBufferSize(512);
-#else
-	setThreadedReadBufferSize(65536);
-#endif
-	setPriority(piHigh);
-}
-
-
-bool PIEthernet::init() {
-	if (isOpened()) return true;
-	//cout << "init " << type_ << endl;
-	if (sock_s == sock)
-		sock_s = -1;
-	closeSocket(sock);
-	closeSocket(sock_s);
-	int st = 0, pr = 0;
-	if (type() == UDP) {
-		st = SOCK_DGRAM;
-		pr = IPPROTO_UDP;
-	} else {
-		st = SOCK_STREAM;
-		pr = IPPROTO_TCP;
-	}
-	PIFlags<Parameters> params = parameters();
-	sock = ::socket(AF_INET, st, pr);
-	if (params[SeparateSockets])
-		sock_s = ::socket(AF_INET, st, pr);
-	else
-		sock_s = sock;
-	if (sock == -1 || sock_s == -1) {
-		piCoutObj << "Can`t create socket," << ethErrorString();
-		return false;
-	}
-	if (params[PIEthernet::ReuseAddress]) ethSetsockoptBool(sock, SOL_SOCKET, SO_REUSEADDR);
-	if (params[PIEthernet::Broadcast]) ethSetsockoptBool(sock, SOL_SOCKET, SO_BROADCAST);
-	applyTimeouts();
-	applyOptInt(IPPROTO_IP, IP_TTL, TTL());
-//	piCoutObj << "inited" << path();
-	return true;
-}
-
-
-PIString PIEthernet::macFromBytes(const PIByteArray & mac) {
-	PIString r;
-	for (int i = 0; i < mac.size_s(); ++i) {
-		r += PIString::fromNumber(mac[i], 16).expandLeftTo(2, '0');
-		if (i < mac.size_s() - 1) r += ":";
-	}
-	return r;
-}
-
-
- PIByteArray PIEthernet::macToBytes(const PIString & mac) {
-	PIByteArray r;
-	PIStringList sl = mac.split(PIStringAscii(":"));
-	piForeachC (PIString & i, sl)
-		r << uchar(i.toInt(16));
-	return r;
-}
-
-
-PIString PIEthernet::applyMask(const PIString & ip, const PIString & mask) {
-	struct in_addr ia;
-	ia.s_addr = inet_addr(ip.dataAscii()) & inet_addr(mask.dataAscii());
-	return PIStringAscii(inet_ntoa(ia));
-}
-
-
-PIEthernet::Address PIEthernet::applyMask(const PIEthernet::Address & ip, const PIEthernet::Address & mask) {
-	Address ret(ip);
-	ret.ip_ &= mask.ip_;
-	return ret;
-}
-
-
-PIString PIEthernet::getBroadcast(const PIString & ip, const PIString & mask) {
-	struct in_addr ia;
-	ia.s_addr = inet_addr(ip.dataAscii()) | ~inet_addr(mask.dataAscii());
-	return PIStringAscii(inet_ntoa(ia));
-}
-
-
-PIEthernet::Address PIEthernet::getBroadcast(const PIEthernet::Address & ip, const PIEthernet::Address & mask) {
-	Address ret(ip);
-	ret.ip_ |= ~mask.ip_;
-	return ret;
-}
-
-
-bool PIEthernet::openDevice() {
-	if (connected_) return true;
-	init();
-	if (sock == -1 || path().isEmpty()) return false;
-	addr_r.set(path());
-	if (type() == TCP_Client)
-		connecting_ = true;
-	if (type() != UDP || mode() == PIIODevice::WriteOnly)
-		return true;
-	memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
-	PRIVATE->addr_.sin_family = AF_INET;
-	PRIVATE->addr_.sin_port = htons(addr_r.port());
-	PIFlags<Parameters> params = parameters();
-	if (params[PIEthernet::Broadcast]) PRIVATE->addr_.sin_addr.s_addr = INADDR_ANY;
-	else PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
-#ifdef QNX
-	PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
-#endif
-	//piCout << "bind to" << (params[PIEthernet::Broadcast] ? "255.255.255.255" : ip_) << ":" << port_ << " ...";
-	int tries = 0;
-	while ((bind(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == -1) && (tries < 2)) {
-		init();
-		tries++;
-	}
-	if (tries == 2) {
-		piCoutObj << "Can`t bind to" << addr_r << "," << ethErrorString();
-		return false;
-	}
-	opened_ = true;
-	while (!mcast_queue.isEmpty())
-		joinMulticastGroup(mcast_queue.dequeue());
-	applyTimeouts();
-	applyOptInt(IPPROTO_IP, IP_TTL, TTL());
-	addr_lr.clear();
-	return true;
-}
-
-
-bool PIEthernet::closeDevice() {
-	//cout << "close\n";
-	if (server_thread_.isRunning()) {
-		server_thread_.stop();
-		if (!server_thread_.waitForFinish(100))
-			server_thread_.terminate();
-	}
-	if (sock_s == sock)
-		sock_s = -1;
-	closeSocket(sock);
-	closeSocket(sock_s);
-	while (!clients_.isEmpty())
-		delete clients_.back();
-	bool ned = connected_;
-	connected_ = connecting_ = false;
-	if (ned) disconnected(false);
-	return true;
-}
-
-
-void PIEthernet::closeSocket(int & sd) {
-	if (sd != -1)
-		ethClosesocket(sd, type() != PIEthernet::UDP);
-	sd = -1;
-}
-
-
-void PIEthernet::applyTimeouts() {
-	if (sock < 0) return;
-	double rtm = readTimeout(), wtm = writeTimeout();
-	applyTimeout(sock, SO_RCVTIMEO, rtm);
-	applyTimeout(sock, SO_SNDTIMEO, wtm);
-	if (sock_s != sock && sock_s != -1) {
-		applyTimeout(sock_s, SO_RCVTIMEO, rtm);
-		applyTimeout(sock_s, SO_SNDTIMEO, wtm);
-	}
-}
-
-
-void PIEthernet::applyTimeout(int fd, int opt, double ms) {
-	if (fd == 0) return;
-	//piCoutObj << "setReadIsBlocking" << yes;
-#ifdef WINDOWS
-	DWORD _tm = ms;
-#else
-	double s = ms / 1000.;
-	timeval _tm;
-	_tm.tv_sec = piFloord(s); s -= _tm.tv_sec;
-	_tm.tv_usec = s * 1000000.;
-#endif
-	ethSetsockopt(fd, SOL_SOCKET, opt, &_tm, sizeof(_tm));
-}
-
-
-void PIEthernet::applyOptInt(int level, int opt, int val) {
-	if (sock < 0) return;
-	ethSetsockoptInt(sock, level, opt, val);
-	if (sock_s != sock && sock_s != -1)
-		ethSetsockoptInt(sock_s, level, opt, val);
-}
-
-
-void PIEthernet::setParameter(PIEthernet::Parameters parameter, bool on) {
-	PIFlags<Parameters> cp = (PIFlags<Parameters>)(property("parameters").toInt());
-	cp.setFlag(parameter, on);
-	setParameters(cp);
-}
-
-
-bool PIEthernet::joinMulticastGroup(const PIString & group) {
-	if (sock == -1) init();
-	if (sock == -1) return false;
-	if (type() != UDP) {
-		piCoutObj << "Only UDP sockets can join multicast groups";
-		return false;
-	}
-	if (isClosed()) {
-		if (mcast_queue.contains(group))
-			return false;
-		mcast_queue.enqueue(group);
-		if (!mcast_groups.contains(group)) mcast_groups << group;
-		return true;
-	}
-	PIFlags<Parameters> params = parameters();
-	addr_r.set(path());
-#ifndef FREERTOS
-	struct ip_mreqn mreq;
-#else
-	struct ip_mreq mreq;
-#endif
-	memset(&mreq, 0, sizeof(mreq));
-#ifdef LINUX
-	//mreq.imr_address.s_addr = INADDR_ANY;
-	/*PIEthernet::InterfaceList il = interfaces();
-	const PIEthernet::Interface * ci = il.getByAddress(addr_r.ipString());
-	if (ci != 0) mreq.imr_ifindex = ci->index;*/
-#endif
-	if (params[PIEthernet::Broadcast])
-#ifndef FREERTOS
-		mreq.imr_address.s_addr = INADDR_ANY;
-#else
-		mreq.imr_interface.s_addr = INADDR_ANY;
-#endif
-	else 
-#ifndef FREERTOS
-		mreq.imr_address.s_addr = addr_r.ip();
-#else
-		mreq.imr_interface.s_addr = addr_r.ip();
-#endif
-
-	//piCout << "join group" << group << "ip" << ip_ << "with index" << mreq.imr_ifindex << "socket" << sock;
-	mreq.imr_multiaddr.s_addr = inet_addr(group.dataAscii());
-	if (ethSetsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) != 0) {
-		piCoutObj << "Can`t join multicast group" << group << "," << ethErrorString();
-		return false;
-	}
-	if (params[PIEthernet::MulticastLoop]) ethSetsockoptInt(sock, IPPROTO_IP, IP_MULTICAST_LOOP);
-	applyOptInt(IPPROTO_IP, IP_MULTICAST_TTL, multicastTTL());
-	if (!mcast_groups.contains(group)) mcast_groups << group;
-	return true;
-}
-
-
-bool PIEthernet::leaveMulticastGroup(const PIString & group) {
-	if (sock == -1) init();
-	if (sock == -1) return false;
-	if (type() != UDP) {
-		piCoutObj << "Only UDP sockets can leave multicast groups";
-		return false;
-	}
-	PIFlags<Parameters> params = parameters();
-	addr_r.set(path());
-#ifndef FREERTOS
-	struct ip_mreqn mreq;
-#else
-	struct ip_mreq mreq;
-#endif
-	memset(&mreq, 0, sizeof(mreq));
-	if (params[PIEthernet::Broadcast])
-#ifndef FREERTOS
-		mreq.imr_address.s_addr = INADDR_ANY;
-#else
-		mreq.imr_interface.s_addr = INADDR_ANY;
-#endif
-	else 
-#ifndef FREERTOS
-		mreq.imr_address.s_addr = addr_r.ip();
-#else
-		mreq.imr_interface.s_addr = addr_r.ip();
-#endif
-	mreq.imr_multiaddr.s_addr = inet_addr(group.dataAscii());
-	if (ethSetsockopt(sock, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) == -1) {
-		piCoutObj << "Can`t leave multicast group" << group << "," << ethErrorString();
-		return false;
-	}
-	mcast_groups.removeAll(group);
-	return true;
-}
-
-
-bool PIEthernet::connect(bool threaded) {
-	if (threaded) {
-		connecting_ = true;
-		return true;
-	}
-	if (sock == -1) init();
-	if (sock == -1) return false;
-	memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
-	addr_r.set(path());
-	PRIVATE->addr_.sin_port = htons(addr_r.port());
-	PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
-	PRIVATE->addr_.sin_family = AF_INET;
-#ifdef QNX
-	PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
-#endif
-	connected_ = (::connect(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == 0);
-	if (!connected_)
-		piCoutObj << "Can`t connect to" << addr_r << "," << ethErrorString();
-	opened_ = connected_;
-	if (connected_) {
-		connecting_ = false;
-		connected();
-	}
-	return connected_;
-}
-
-
-bool PIEthernet::listen(bool threaded) {
-	if (sock == -1) init();
-	if (sock == -1) return false;
-	if (threaded) {
-		if (server_thread_.isRunning()) {
-			if (!server_bounded) return true;
-			server_thread_.stop();
-			if (!server_thread_.waitForFinish(100))
-				server_thread_.terminate();
-		}
-		listen_threaded = true;
-		server_bounded = false;
-		server_thread_.start(server_func);
-		return true;
-	}
-	listen_threaded = server_bounded = false;
-	addr_r.set(path());
-	memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
-	PRIVATE->addr_.sin_port = htons(addr_r.port());
-	PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
-	PRIVATE->addr_.sin_family = AF_INET;
-#ifdef QNX
-	PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
-#endif
-	opened_ = false;
-	int tries = 0;
-	while ((bind(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == -1) && (tries < 2)) {
-		init();
-		tries++;
-	}
-	if (tries == 2) {
-		piCoutObj << "Can`t bind to" << addr_r << "," << ethErrorString();
-		return false;
-	}
-	if (::listen(sock, 64) == -1) {
-		piCoutObj << "Can`t listen on"<< addr_r << "," << ethErrorString();
-		return false;
-	}
-	opened_ = server_bounded = true;
-	//piCoutObj << "listen on " << ip_ << ":" << port_;
-	server_thread_.start(server_func);
-	return true;
-}
-
-
-int PIEthernet::readDevice(void * read_to, int max_size) {
-	//piCout << "read" << sock;
-	if (sock == -1) init();
-	if (sock == -1 || read_to == 0) return -1;
-	int rs = 0, s = 0, lerr = 0;
-	sockaddr_in client_addr;
-	socklen_t slen = sizeof(client_addr);
-//	piCoutObj << "read from " << ip_ << ":" << port_;
-	switch (type()) {
-	case TCP_SingleTCP:
-		::listen(sock, 64);
-		s = accept(sock, (sockaddr * )&client_addr, &slen);
-		if (s == -1) {
-			//piCoutObj << "Can`t accept new connection, " << ethErrorString();
-			msleep(PIP_MIN_MSLEEP);
-			return -1;
-		}
-		rs = ethRecv(s, read_to, max_size);
-		closeSocket(s);
-		return rs;
-	case TCP_Client:
-		if (connecting_) {
-#ifdef ANDROID
-			/*if (sock_s == sock)
-				sock_s = -1;
-			closeSocket(sock);
-			closeSocket(sock_s);
-			init();
-			qDebug() << "init() in read thread";*/
-#endif
-			addr_r.set(path());
-			memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
-			PRIVATE->addr_.sin_port = htons(addr_r.port());
-			PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
-			PRIVATE->addr_.sin_family = AF_INET;
-#ifdef QNX
-			PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
-#endif
-			//piCoutObj << "connect to " << ip_ << ":" << port_ << "...";
-			connected_ = (::connect(sock, (sockaddr * )&(PRIVATE->addr_), sizeof(PRIVATE->addr_)) == 0);
-			//piCoutObj << "connect to " << ip_ << ":" << port_ << connected_;
-			if (!connected_)
-				piCoutObj << "Can`t connect to" << addr_r << "," << ethErrorString();
-			opened_ = connected_;
-			if (connected_) {
-				connecting_ = false;
-				connected();
-			} else
-				piMSleep(10);
-			//piCout << "connected to" << path();
-		}
-		if (!connected_) return -1;
-		errorClear();
-		rs = ethRecv(sock, read_to, max_size);
-		//piCoutObj << "readed" << rs;
-		if (rs <= 0) {
-			lerr = ethErrorCore();
-			//piCoutObj << "readed error" << lerr << errorString().data() << parameters()[DisonnectOnTimeout];
-#ifdef WINDOWS
-			if ((lerr == WSAEWOULDBLOCK || lerr == WSAETIMEDOUT) && !parameters()[DisonnectOnTimeout]) {
-#elif defined(ANDROID)
-			if ((lerr == EWOULDBLOCK || lerr == EAGAIN || lerr == EINTR) && !parameters()[DisonnectOnTimeout]) {
-#else
-			if ((lerr == EWOULDBLOCK || lerr == EAGAIN) && !parameters()[DisonnectOnTimeout]) {
-#endif
-			//piCoutObj << errorString();
-				return -1;
-			}
-			if (connected_) {
-				piCoutObj << "Disconnect on read," << ethErrorString();
-				init();
-				connected_ = false;
-				disconnected(rs < 0);
-			}
-			if (parameters()[KeepConnection])
-				connect();
-			//piCoutObj << "eth" << ip_ << "disconnected";
-		}
-		if (rs > 0) received(read_to, rs);
-		return rs;
-	case UDP:
-		memset(&PRIVATE->raddr_, 0, sizeof(PRIVATE->raddr_));
-		rs = ethRecvfrom(sock, read_to, max_size, 0, (sockaddr*)&PRIVATE->raddr_);
-		if (rs > 0) {
-			addr_lr.set(uint(PRIVATE->raddr_.sin_addr.s_addr), ntohs(PRIVATE->raddr_.sin_port));
-			//piCoutObj << "read from" << ip_r << ":" << port_r << rs << "bytes";
-			received(read_to, rs);
-		}
-		//else piCoutObj << "read returt" << rs << ", error" << ethErrorString();
-		return rs;
-	default: break;
-	}
-	return -1;
-}
-
-
-int PIEthernet::writeDevice(const void * data, int max_size) {
-	if (sock == -1) init();
-	if (sock == -1 || !isWriteable()) {
-		//piCoutObj << "Can`t send to uninitialized socket";
-		return -1;
-	}
-	//piCoutObj << "sending to " << ip_s << ":" << port_s << "  " << max_size << " bytes";
-	int ret = 0;
-	switch (type()) {
-	case TCP_SingleTCP:
-		memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
-		PRIVATE->addr_.sin_port = htons(addr_s.port());
-		PRIVATE->addr_.sin_addr.s_addr = addr_s.ip();
-		PRIVATE->addr_.sin_family = AF_INET;
-#ifdef QNX
-		PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
-#endif
-		//piCoutObj << "connect SingleTCP" << ip_s << ":" << port_s << "...";
-		if (::connect(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) != 0) {
-			//piCoutObj << "Can`t connect to " << ip_s << ":" << port_s << ", " << ethErrorString();
-			msleep(PIP_MIN_MSLEEP);
-			return -1;
-		}
-		//piCoutObj << "ok, write SingleTCP" << int(data) << max_size << "bytes ...";
-		ret = ::send(sock, (const char *)data, max_size, 0);
-		//piCoutObj << "ok, ret" << ret;
-		closeSocket(sock);
-		init();
-		return ret;
-	case UDP:
-		PRIVATE->saddr_.sin_port = htons(addr_s.port());
-		PRIVATE->saddr_.sin_addr.s_addr = addr_s.ip();
-		PRIVATE->saddr_.sin_family = AF_INET;
-		//piCoutObj << "write to" << ip_s << ":" << port_s << "socket" << sock_s << max_size << "bytes ...";
-		return ethSendto(sock_s, data, max_size,
-#ifndef WINDOWS
-												isOptionSet(BlockingWrite) ? 0 : MSG_DONTWAIT
-#else
-												0
-#endif
-																								, (sockaddr * )&PRIVATE->saddr_, sizeof(PRIVATE->saddr_));
-		//piCout << "[PIEth] write to" << ip_s << ":" << port_s << "ok";
-	case TCP_Client:
-		if (connecting_) {
-			memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
-			addr_r.set(path());
-			PRIVATE->addr_.sin_port = htons(addr_r.port());
-			PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
-			PRIVATE->addr_.sin_family = AF_INET;
-#ifdef QNX
-			PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
-#endif
-			//piCoutObj << "connect to " << ip << ":" << port_;
-			connected_ = (::connect(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == 0);
-			if (!connected_)
-				piCoutObj << "Can`t connect to" << addr_r << "," << ethErrorString();
-			opened_ = connected_;
-			if (connected_) {
-				connecting_ = false;
-				connected();
-			}
-		}
-		if (!connected_) return -1;
-		ret = ::send(sock, (const char *)data, max_size, 0);
-		if (ret < 0) {
-			connected_ = false;
-			piCoutObj << "Disconnect on write," << ethErrorString();
-			init();
-			disconnected(true);
-		}
-		return ret;
-	default: break;
-	}
-	return -1;
-}
-
-
-PIIODevice::DeviceInfoFlags PIEthernet::deviceInfoFlags() const {
-	switch (type()) {
-	case UDP: return 0;
-	case TCP_Client:
-	case TCP_Server:
-	case TCP_SingleTCP: return Sequential | Reliable;
-	default: break;
-	}
-	return 0;
-}
-
-
-void PIEthernet::clientDeleted() {
-	clients_mutex.lock();
-	clients_.removeOne((PIEthernet*)emitter());
-	clients_mutex.unlock();
-}
-
-
-void PIEthernet::server_func(void * eth) {
-	PIEthernet * ce = (PIEthernet * )eth;
-	if (ce->listen_threaded) {
-		if (!ce->server_bounded) {
-			if (!ce->listen(false)) {
-				ce->listen_threaded = true;
-				piMSleep(100);
-				return;
-			}
-		}
-	}
-	sockaddr_in client_addr;
-	socklen_t slen = sizeof(client_addr);
-	int s = accept(ce->sock, (sockaddr * )&client_addr, &slen);
-	if (s == -1) {
-		int lerr = ethErrorCore();
-#ifdef WINDOWS
-		if (lerr == WSAETIMEDOUT) {
-#elif defined(ANDROID)
-		if ((lerr == EAGAIN || lerr == EINTR)) {
-#else
-		if (lerr == EAGAIN) {
-#endif
-			piMSleep(10);
-			return;
-		}
-		if (ce->debug()) piCout << "[PIEthernet] Can`t accept new connection," << ethErrorString();
-		piMSleep(10);
-		return;
-	}
-	PIString ip = PIStringAscii(inet_ntoa(client_addr.sin_addr));
-	ip += ":" + PIString::fromNumber(htons(client_addr.sin_port));
-	PIEthernet * e = new PIEthernet(s, ip);
-	ce->clients_mutex.lock();
-	CONNECTU(e, deleted, ce, clientDeleted)
-	ce->clients_ << e;
-	ce->clients_mutex.unlock();
-	ce->newConnection(e);
-	//cout << "connected " << ip << endl;
-}
-
-
-bool PIEthernet::configureDevice(const void * e_main, const void * e_parent) {
-	PIConfig::Entry * em = (PIConfig::Entry * )e_main;
-	PIConfig::Entry * ep = (PIConfig::Entry * )e_parent;
-	setReadIP(readDeviceSetting<PIString>("ip", readIP(), em, ep));
-	setReadPort(readDeviceSetting<int>("port", readPort(), em, ep));
-	setParameter(PIEthernet::Broadcast, readDeviceSetting<bool>("broadcast", isParameterSet(PIEthernet::Broadcast), em, ep));
-	setParameter(PIEthernet::ReuseAddress, readDeviceSetting<bool>("reuseAddress", isParameterSet(PIEthernet::ReuseAddress), em, ep));
-	return true;
-}
-
-
-void PIEthernet::propertyChanged(const PIString & name) {
-	if (name.endsWith("Timeout")) applyTimeouts();
-	if (name == "TTL") applyOptInt(IPPROTO_IP, IP_TTL, TTL());
-	if (name == "MulticastTTL") applyOptInt(IPPROTO_IP, IP_MULTICAST_TTL, multicastTTL());
-}
-
-
-PIString PIEthernet::constructFullPathDevice() const {
-	PIString ret;
-	ret << (type() == PIEthernet::UDP ? "UDP" : "TCP") << ":" << readIP() << ":" << readPort();
-	if (type() == PIEthernet::UDP) {
-		ret << ":" << sendIP() << ":" << sendPort();
-		piForeachC (PIString & m, multicastGroups())
-			ret << ":mcast:" << m;
-	}
-	return ret;
-}
-
-
-void PIEthernet::configureFromFullPathDevice(const PIString & full_path) {
-	PIStringList pl = full_path.split(":");
-	bool mcast = false;
-	for (int i = 0; i < pl.size_s(); ++i) {
-		PIString p(pl[i]);
-		switch (i) {
-		case 0:
-			p = p.toLowerCase();
-			if (p == "udp") setType(UDP);
-			if (p == "tcp") setType(TCP_Client);
-			break;
-		case 1: setReadIP(p); setSendIP(p); break;
-		case 2: setReadPort(p.toInt()); setSendPort(p.toInt()); break;
-		case 3: setSendIP(p); break;
-		case 4: setSendPort(p.toInt()); break;
-		}
-		if (i <= 4) continue;
-		if (i % 2 == 1) {if (p.toLowerCase() == "mcast") mcast = true;}
-		else {if (mcast) {joinMulticastGroup(p); mcast = false;}}
-	}
-}
-
-
-PIPropertyStorage PIEthernet::constructVariantDevice() const {
-	PIPropertyStorage ret;
-	PIVariantTypes::Enum e;
-
-	e << "UDP" << "TCP";
-	if (type() == PIEthernet::UDP)
-		e.selectValue(0);
-	else
-		e.selectValue(1);
-	ret.addProperty("protocol", e);
-
-	ret.addProperty("read IP", readIP());
-	ret.addProperty("read port", readPort());
-	ret.addProperty("send IP", sendIP());
-	ret.addProperty("send port", sendPort());
-	ret.addProperty("multicast", multicastGroups());
-	return ret;
-}
-
-
-void PIEthernet::configureFromVariantDevice(const PIPropertyStorage & d) {
-	setType(d.propertyValueByName("protocol").toEnum().selectedValue() == 0 ? UDP : TCP_Client);
-	setReadIP(d.propertyValueByName("read IP").toString());
-	setReadPort(d.propertyValueByName("read port").toInt());
-	setSendIP(d.propertyValueByName("send IP").toString());
-	setSendPort(d.propertyValueByName("send port").toInt());
-	PIStringList mcgl = d.propertyValueByName("multicast").toStringList();
-	piForeachC (PIString & g, mcgl) {
-		joinMulticastGroup(g);
-	}
-}
-
-
-PIEthernet::InterfaceList PIEthernet::interfaces() {
-	PIEthernet::InterfaceList il;
-	Interface ci;
-	ci.index = -1;
-	ci.mtu = 1500;
-#ifdef WINDOWS
-	PIP_ADAPTER_INFO pAdapterInfo, pAdapter = 0;
-	int ret = 0;
-	ulong ulOutBufLen = sizeof(IP_ADAPTER_INFO);
-	pAdapterInfo = (IP_ADAPTER_INFO * ) HeapAlloc(GetProcessHeap(), 0, (sizeof (IP_ADAPTER_INFO)));
-	if (pAdapterInfo == 0) {
-		piCout << "[PIEthernet] Error allocating memory needed to call GetAdaptersinfo";
-		return il;
-	}
-	if (GetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) {
-		HeapFree(GetProcessHeap(), 0, (pAdapterInfo));
-		pAdapterInfo = (IP_ADAPTER_INFO *) HeapAlloc(GetProcessHeap(), 0, (ulOutBufLen));
-		if (pAdapterInfo == 0) {
-			piCout << "[PIEthernet] Error allocating memory needed to call GetAdaptersinfo";
-			return il;
-		}
-	}
-	if ((ret = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == NO_ERROR) {
-		pAdapter = pAdapterInfo;
-		while (pAdapter) {
-			ci.name = PIString(pAdapter->AdapterName);
-			ci.index = pAdapter->Index;
-			ci.mac = macFromBytes(PIByteArray(pAdapter->Address, pAdapter->AddressLength));
-			ci.flags = PIEthernet::ifActive | PIEthernet::ifRunning;
-			if (pAdapter->Type == MIB_IF_TYPE_PPP) ci.flags |= PIEthernet::ifPTP;
-			if (pAdapter->Type == MIB_IF_TYPE_LOOPBACK) ci.flags |= PIEthernet::ifLoopback;
-			ci.broadcast.clear();
-			ci.ptp.clear();
-			IP_ADDR_STRING * as = &(pAdapter->IpAddressList);
-			while (as) {
-//				piCout << "[pAdapter]" << ci.name << PIString(as->IpAddress.String);
-				ci.address = PIString(as->IpAddress.String);
-				ci.netmask = PIString(as->IpMask.String);
-				if (ci.address == "0.0.0.0") {
-					as = as->Next;
-					continue;
-				}
-				il << ci;
-				as = as->Next;
-			}
-			pAdapter = pAdapter->Next;
-		}
-	} else
-		piCout << "[PIEthernet] GetAdaptersInfo failed with error:" << ret;
-	if (pAdapterInfo)
-		HeapFree(GetProcessHeap(), 0, (pAdapterInfo));
-#else
-#ifdef FREERTOS
-#else
-#  ifdef ANDROID
-	struct ifconf ifc;
-	int s = ::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
-	ifc.ifc_len = 256;
-	ifc.ifc_buf = new char[ifc.ifc_len];
-	if (ioctl(s, SIOCGIFCONF, &ifc) < 0) {
-		piCout << "[PIEthernet] Can`t get interfaces:" << errorString();
-		delete[] ifc.ifc_buf;
-		return il;
-	}
-	int icnt = ifc.ifc_len / sizeof(ifreq);
-	PIStringList inl;
-	struct ifreq ir;
-	for (int i = 0; i < icnt; ++i) {
-		ci.flags = 0;
-		PIString in = PIStringAscii(ifc.ifc_req[i].ifr_name);
-		if (in.isEmpty()) continue;
-		ci.name = in;
-		strcpy(ir.ifr_name, in.dataAscii());
-		if (ioctl(s, SIOCGIFHWADDR, &ir) == 0)
-			ci.mac = macFromBytes(PIByteArray(ir.ifr_hwaddr.sa_data, 6));
-		if (ioctl(s, SIOCGIFADDR, &ir) >= 0)
-			ci.address = getSockAddr(&ir.ifr_addr);
-		if (ioctl(s, SIOCGIFNETMASK, &ir) >= 0)
-			ci.netmask = getSockAddr(&ir.ifr_addr);
-		ioctl(s, SIOCGIFMTU, &ci.mtu);
-		if (ci.address == "127.0.0.1") ci.flags |= PIEthernet::ifLoopback;
-		il << ci;
-	}
-	delete ifc.ifc_buf;
-#  else
-	struct ifaddrs * ret, * cif = 0;
-	int s = ::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
-	if (getifaddrs(&ret) == 0) {
-		cif = ret;
-		while (cif != 0) {
-			if (cif->ifa_addr == 0) {
-				cif = cif->ifa_next;
-				continue;
-			}
-			if (cif->ifa_addr->sa_family != AF_INET) {
-				cif = cif->ifa_next;
-				continue;
-			}
-			ci.name = PIString(cif->ifa_name);
-			ci.address = getSockAddr(cif->ifa_addr);
-			ci.netmask = getSockAddr(cif->ifa_netmask);
-			ci.mac.clear();
-#    ifdef QNX
-#      ifndef BLACKBERRY
-			int fd = ::open((PIString("/dev/io-net/") + ci.name).dataAscii(), O_RDONLY);
-			if (fd != 0) {
-				nic_config_t nic;
-				devctl(fd, DCMD_IO_NET_GET_CONFIG, &nic, sizeof(nic), 0);
-				::close(fd);
-				ci.mac = macFromBytes(PIByteArray(nic.permanent_address, 6));
-			}
-#      endif
-#    else
-#      ifdef MAC_OS
-			PIString req = PISystemInfo::instance()->ifconfigPath + " " + ci.name + " | grep ether";
-			FILE * fp = popen(req.dataAscii(), "r");
-			if (fp != 0) {
-				char in[256];
-				if (fgets(in, 256, fp) != 0) {
-					req = PIString(in).trim();
-					ci.mac = req.cutLeft(req.find(" ") + 1).trim().toUpperCase();
-				}
-				pclose(fp);
-			}
-#      else
-			if (s != -1) {
-				struct ifreq ir;
-				strcpy(ir.ifr_name, cif->ifa_name);
-				if (ioctl(s, SIOCGIFHWADDR, &ir) == 0) {
-					ci.mac = macFromBytes(PIByteArray(ir.ifr_hwaddr.sa_data, 6));
-					ci.mtu = ir.ifr_mtu;
-				}
-			}
-#      endif
-#    endif
-			ci.flags = 0;
-			if (cif->ifa_flags & IFF_UP) ci.flags |= PIEthernet::ifActive;
-			if (cif->ifa_flags & IFF_RUNNING) ci.flags |= PIEthernet::ifRunning;
-			if (cif->ifa_flags & IFF_BROADCAST) ci.flags |= PIEthernet::ifBroadcast;
-			if (cif->ifa_flags & IFF_MULTICAST) ci.flags |= PIEthernet::ifMulticast;
-			if (cif->ifa_flags & IFF_LOOPBACK) ci.flags |= PIEthernet::ifLoopback;
-			if (cif->ifa_flags & IFF_POINTOPOINT) ci.flags |= PIEthernet::ifPTP;
-			ci.broadcast.clear();
-			ci.ptp.clear();
-			if (ci.flags[PIEthernet::ifBroadcast])
-				ci.broadcast = getSockAddr(cif->ifa_broadaddr);
-			if (ci.flags[PIEthernet::ifPTP])
-				ci.ptp = getSockAddr(cif->ifa_dstaddr);
-			ci.index = if_nametoindex(cif->ifa_name);
-			il << ci;
-			cif = cif->ifa_next;
-		}
-		freeifaddrs(ret);
-	} else
-		piCout << "[PIEthernet] Can`t get interfaces:" << errorString();
-	if (s != -1) ::close(s);
-#  endif
-#  endif
-#endif
-	return il;
-}
-
-
-PIEthernet::Address PIEthernet::interfaceAddress(const PIString & interface_) {
-#if defined(WINDOWS) || defined(FREERTOS)
-	piCout << "[PIEthernet] Not implemented, use \"PIEthernet::allAddresses\" or \"PIEthernet::interfaces\" instead";
-	return Address();
-#else
-	struct ifreq ifr;
-	memset(&ifr, 0, sizeof(ifr));
-	strcpy(ifr.ifr_name, interface_.dataAscii());
-	int s = ::socket(AF_INET, SOCK_DGRAM, 0);
-	ioctl(s, SIOCGIFADDR, &ifr);
-	::close(s);
-	struct sockaddr_in * sa = (struct sockaddr_in * )&ifr.ifr_addr;
-	return Address(uint(sa->sin_addr.s_addr));
-#endif
-
-}
-
-
-PIVector<PIEthernet::Address> PIEthernet::allAddresses() {
-	PIEthernet::InterfaceList il = interfaces();
-	PIVector<Address> ret;
-	bool has_127 = false;
-	piForeachC (PIEthernet::Interface & i, il) {
-		if (i.address == "127.0.0.1") has_127 = true;
-		Address a(i.address);
-		if (a.ip() == 0) continue;
-		ret << a;
-	}
-//	piCout << "[PIEthernet::allAddresses]" << al;
-	if (!has_127) ret << Address("127.0.0.1");
-	return ret;
-}
-
-
-// System wrap
-
-int PIEthernet::ethErrorCore() {
-#ifdef WINDOWS
-	return WSAGetLastError();
-#else
-	return errno;
-#endif
-}
-
-
-PIString PIEthernet::ethErrorString() {
-#ifdef WINDOWS
-	char * msg;
-	int err = WSAGetLastError();
-	FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&msg, 0, NULL);
-	return "code " + PIString::fromNumber(err) + " - " + PIString(msg);
-#else
-	return errorString();
-#endif
-}
-
-
-int PIEthernet::ethRecv(int sock, void * buf, int size, int flags) {
-	if (sock < 0) return -1;
-	return recv(sock,
-#ifdef WINDOWS
-					 (char*)
-#endif
-							buf, size, flags);
-}
-
-
-int PIEthernet::ethRecvfrom(int sock, void * buf, int size, int flags, sockaddr * addr) {
-	if (sock < 0) return -1;
-#ifdef QNX
-	return recv(sock, buf, size, flags);
-#else
-	socklen_t len = sizeof(sockaddr);
-	return recvfrom(sock,
-#  ifdef WINDOWS
-					 (char*)
-#  endif
-							buf, size, flags, addr, &len);
-#endif
-}
-
-
-int PIEthernet::ethSendto(int sock, const void * buf, int size, int flags, sockaddr * addr, int addr_len) {
-	if (sock < 0) return -1;
-	return sendto(sock,
-#ifdef WINDOWS
-					   (const char*)
-#endif
-									buf, size, flags, addr, addr_len);
-}
-
-
-void PIEthernet::ethClosesocket(int sock, bool shutdown) {
-	//piCout << "close socket" << sock << shutdown;
-	if (sock < 0) return;
-		if (shutdown) ::shutdown(sock,
-#ifdef WINDOWS
-					SD_BOTH);
-		closesocket(sock);
-#else
-					SHUT_RDWR);
-		::close(sock);
-#endif
-}
-
-
-int PIEthernet::ethSetsockopt(int sock, int level, int optname, const void * optval, int optlen) {
-	if (sock < 0) return -1;
-	return setsockopt(sock, level, optname,
-#ifdef WINDOWS
-											(char*)
-#endif
-													optval, optlen);
-}
-
-
-int PIEthernet::ethSetsockoptInt(int sock, int level, int optname, int value) {
-	if (sock < 0) return -1;
-#ifdef WINDOWS
-	DWORD
-#else
-	int
-#endif
-			so = value;
-	return ethSetsockopt(sock, level, optname, &so, sizeof(so));
-}
-
-
-int PIEthernet::ethSetsockoptBool(int sock, int level, int optname, bool value) {
-	if (sock < 0) return -1;
-#ifdef WINDOWS
-	BOOL
-#else
-	int
-#endif
-			so = (value ? 1 : 0);
-	return ethSetsockopt(sock, level, optname, &so, sizeof(so));
-}
+/*
+	PIP - Platform Independent Primitives
+	Ethernet, UDP/TCP Broadcast/Multicast
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "piincludes_p.h"
+#include "piethernet.h"
+#include "piconfig.h"
+#include "pisysteminfo.h"
+#include "pipropertystorage.h"
+#ifdef QNX
+#  include <net/if.h>
+#  include <net/if_dl.h>
+#  include <hw/nicinfo.h>
+#  include <netdb.h>
+#  include <sys/socket.h>
+#  include <sys/time.h>
+#  include <sys/types.h>
+#  include <sys/ioctl.h>
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <ifaddrs.h>
+#  include <fcntl.h>
+#  ifdef BLACKBERRY
+#    include <netinet/in.h>
+#  else
+#    include <sys/dcmd_io-net.h>
+#  endif
+#  define ip_mreqn ip_mreq
+#  define imr_address imr_interface
+#else
+#  ifdef WINDOWS
+#    include <io.h>
+#    include <winsock2.h>
+#    include <iphlpapi.h>
+#    include <psapi.h>
+#    include <ws2tcpip.h>
+#    define ip_mreqn ip_mreq
+#    define imr_address imr_interface
+#  else
+#    include <fcntl.h>
+#    include <sys/ioctl.h>
+#    include <netinet/in.h>
+#    include <arpa/inet.h>
+#    include <sys/socket.h>
+#    include <netdb.h>
+#    include <net/if.h>
+#    if !defined(ANDROID) && !defined(FREERTOS)
+#      include <ifaddrs.h>
+#    endif
+#    ifdef FREERTOS
+#      include <lwip/sockets.h>
+#    endif
+#  endif
+#endif
+#include <errno.h>
+
+
+/** \class PIEthernet
+ * \brief Ethernet device
+ * \details 
+ * \section PIEthernet_sec0 Synopsis
+ * %PIEthernet designed to work with IPv4 network via two protocols:
+ * UDP and TCP. This class allow you send and receive packets to/from
+ * another computer through network. Also it supports broadcast and
+ * multicast extensions.
+ * 
+ * \section PIEthernet_sec1 IPv4
+ * 
+ * 
+ * \section PIEthernet_sec2 UDP
+ * User Datagram Protocol
+ * 
+ * \section PIEthernet_sec3 TCP
+ * Transmission Control Protocol
+ * 
+ * */
+
+#ifndef WINDOWS
+PIString getSockAddr(sockaddr * s) {
+	return s == 0 ? PIString() : PIStringAscii(inet_ntoa(((sockaddr_in*)s)->sin_addr));
+}
+#endif
+
+
+PIEthernet::Address::Address(uint _ip, ushort _port) {
+	set(_ip, _port);
+}
+
+
+PIEthernet::Address::Address(const PIString & ip_port) {
+	set(ip_port);
+}
+
+
+PIEthernet::Address::Address(const PIString & _ip, ushort _port) {
+	set(_ip, _port);
+}
+
+
+PIString PIEthernet::Address::ipString() const {
+	PIString ret = PIString::fromNumber(ip_b[0]);
+	ret << "." << PIString::fromNumber(ip_b[1]);
+	ret << "." << PIString::fromNumber(ip_b[2]);
+	ret << "." << PIString::fromNumber(ip_b[3]);
+	return ret;
+}
+
+
+PIString PIEthernet::Address::toString() const {
+	return ipString() + ":" + PIString::fromNumber(port_);
+}
+
+
+void PIEthernet::Address::setIP(uint _ip) {
+	ip_ = _ip;
+}
+
+
+void PIEthernet::Address::setIP(const PIString & _ip) {
+	initIP(_ip);
+}
+
+
+void PIEthernet::Address::setPort(ushort _port) {
+	port_ = _port;
+}
+
+
+void PIEthernet::Address::set(const PIString & ip_port) {
+	PIString _ip; int p(0);
+	splitIPPort(ip_port, &_ip, &p);
+	port_ = p;
+	initIP(_ip);
+}
+
+
+void PIEthernet::Address::set(const PIString & _ip, ushort _port) {
+	initIP(_ip);
+	port_ = _port;
+}
+
+
+void PIEthernet::Address::set(uint _ip, ushort _port) {
+	ip_ = _ip;
+	port_ = _port;
+}
+
+
+void PIEthernet::Address::clear() {
+	ip_ = 0;
+	port_ = 0;
+}
+
+
+bool PIEthernet::Address::isNull() const {
+	return (ip_ == 0) && (port_ == 0);
+}
+
+
+PIEthernet::Address PIEthernet::Address::resolve(const PIString & host_port) {
+	PIString host; int port(0);
+	splitIPPort(host_port, &host, &port);
+	return resolve(host, port);
+}
+
+
+PIEthernet::Address PIEthernet::Address::resolve(const PIString & host, ushort port) {
+	Address ret(0, port);
+	hostent * he = gethostbyname(host.dataAscii());
+	if (!he)
+		return ret;
+	if (he->h_addr_list[0])
+		ret.setIP(*((uint*)(he->h_addr_list[0])));
+	return ret;
+}
+
+
+void PIEthernet::Address::splitIPPort(const PIString & ipp, PIString * _ip, int * _port) {
+	//piCout << "parse" << ipp;
+	int sp = ipp.findLast(":");
+	if (_ip != 0) *_ip = (sp >= 0 ? ipp.left(sp) : ipp);
+	if (_port != 0 && sp >= 0) *_port = ipp.right(ipp.length() - ipp.find(":") - 1).toInt();
+}
+
+
+void PIEthernet::Address::initIP(const PIString & _ip) {
+	ip_ = inet_addr(_ip.dataAscii());
+}
+
+
+REGISTER_DEVICE(PIEthernet)
+
+
+PRIVATE_DEFINITION_START(PIEthernet)
+	sockaddr_in addr_;
+	sockaddr_in saddr_;
+	sockaddr_in raddr_;
+PRIVATE_DEFINITION_END(PIEthernet)
+
+
+PIEthernet::PIEthernet(): PIIODevice("", ReadWrite) {
+	construct();
+	setType(UDP);
+	setParameters(PIEthernet::ReuseAddress | PIEthernet::MulticastLoop | PIEthernet::KeepConnection);
+}
+
+
+PIEthernet::PIEthernet(PIEthernet::Type type_, const PIString & ip_port, const PIFlags<PIEthernet::Parameters> params_): PIIODevice(ip_port, ReadWrite) {
+	construct();
+	addr_r.set(ip_port);
+	setType(type_);
+	setParameters(params_);
+	if (type_ != UDP) init();
+}
+
+
+PIEthernet::PIEthernet(int sock_, PIString ip_port): PIIODevice("", ReadWrite) {
+	construct();
+	addr_s.set(ip_port);
+	sock = sock_;
+	opened_ = connected_ = true;
+	init();
+	setParameters(PIEthernet::ReuseAddress | PIEthernet::MulticastLoop);
+	setType(TCP_Client, false);
+	setPath(ip_port);
+	//piCoutObj << "new tcp client" << sock_;
+}
+
+
+PIEthernet::~PIEthernet() {
+	//piCout << "~PIEthernet" << uint(this);
+	stop();
+	closeDevice();
+	//piCoutObj << "~PIEthernet done";
+}
+
+
+void PIEthernet::construct() {
+	//piCout << " PIEthernet" << uint(this);
+	setOption(BlockingWrite);
+	connected_ = connecting_ = listen_threaded = server_bounded = false;
+	sock = sock_s = -1;
+	setReadTimeout(10000.);
+	setWriteTimeout(10000.);
+	setTTL(64);
+	setMulticastTTL(1);
+	server_thread_.setData(this);
+	server_thread_.setName("__S__server_thread");
+#ifdef FREERTOS
+	setThreadedReadBufferSize(512);
+#else
+	setThreadedReadBufferSize(65536);
+#endif
+	setPriority(piHigh);
+}
+
+
+bool PIEthernet::init() {
+	if (isOpened()) return true;
+	//cout << "init " << type_ << endl;
+	if (sock_s == sock)
+		sock_s = -1;
+	closeSocket(sock);
+	closeSocket(sock_s);
+	int st = 0, pr = 0;
+	if (type() == UDP) {
+		st = SOCK_DGRAM;
+		pr = IPPROTO_UDP;
+	} else {
+		st = SOCK_STREAM;
+		pr = IPPROTO_TCP;
+	}
+	PIFlags<Parameters> params = parameters();
+	sock = ::socket(AF_INET, st, pr);
+	if (params[SeparateSockets])
+		sock_s = ::socket(AF_INET, st, pr);
+	else
+		sock_s = sock;
+	if (sock == -1 || sock_s == -1) {
+		piCoutObj << "Can`t create socket," << ethErrorString();
+		return false;
+	}
+	if (params[PIEthernet::ReuseAddress]) ethSetsockoptBool(sock, SOL_SOCKET, SO_REUSEADDR);
+	if (params[PIEthernet::Broadcast]) ethSetsockoptBool(sock, SOL_SOCKET, SO_BROADCAST);
+	applyTimeouts();
+	applyOptInt(IPPROTO_IP, IP_TTL, TTL());
+//	piCoutObj << "inited" << path();
+	return true;
+}
+
+
+PIString PIEthernet::macFromBytes(const PIByteArray & mac) {
+	PIString r;
+	for (int i = 0; i < mac.size_s(); ++i) {
+		r += PIString::fromNumber(mac[i], 16).expandLeftTo(2, '0');
+		if (i < mac.size_s() - 1) r += ":";
+	}
+	return r;
+}
+
+
+ PIByteArray PIEthernet::macToBytes(const PIString & mac) {
+	PIByteArray r;
+	PIStringList sl = mac.split(PIStringAscii(":"));
+	piForeachC (PIString & i, sl)
+		r << uchar(i.toInt(16));
+	return r;
+}
+
+
+PIString PIEthernet::applyMask(const PIString & ip, const PIString & mask) {
+	struct in_addr ia;
+	ia.s_addr = inet_addr(ip.dataAscii()) & inet_addr(mask.dataAscii());
+	return PIStringAscii(inet_ntoa(ia));
+}
+
+
+PIEthernet::Address PIEthernet::applyMask(const PIEthernet::Address & ip, const PIEthernet::Address & mask) {
+	Address ret(ip);
+	ret.ip_ &= mask.ip_;
+	return ret;
+}
+
+
+PIString PIEthernet::getBroadcast(const PIString & ip, const PIString & mask) {
+	struct in_addr ia;
+	ia.s_addr = inet_addr(ip.dataAscii()) | ~inet_addr(mask.dataAscii());
+	return PIStringAscii(inet_ntoa(ia));
+}
+
+
+PIEthernet::Address PIEthernet::getBroadcast(const PIEthernet::Address & ip, const PIEthernet::Address & mask) {
+	Address ret(ip);
+	ret.ip_ |= ~mask.ip_;
+	return ret;
+}
+
+
+bool PIEthernet::openDevice() {
+	if (connected_) return true;
+	init();
+	if (sock == -1 || path().isEmpty()) return false;
+	addr_r.set(path());
+	if (type() == TCP_Client)
+		connecting_ = true;
+	if (type() != UDP || mode() == PIIODevice::WriteOnly)
+		return true;
+	memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
+	PRIVATE->addr_.sin_family = AF_INET;
+	PRIVATE->addr_.sin_port = htons(addr_r.port());
+	PIFlags<Parameters> params = parameters();
+	if (params[PIEthernet::Broadcast]) PRIVATE->addr_.sin_addr.s_addr = INADDR_ANY;
+	else PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
+#ifdef QNX
+	PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
+#endif
+	//piCout << "bind to" << (params[PIEthernet::Broadcast] ? "255.255.255.255" : ip_) << ":" << port_ << " ...";
+	int tries = 0;
+	while ((bind(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == -1) && (tries < 2)) {
+		init();
+		tries++;
+	}
+	if (tries == 2) {
+		piCoutObj << "Can`t bind to" << addr_r << "," << ethErrorString();
+		return false;
+	}
+	opened_ = true;
+	while (!mcast_queue.isEmpty())
+		joinMulticastGroup(mcast_queue.dequeue());
+	applyTimeouts();
+	applyOptInt(IPPROTO_IP, IP_TTL, TTL());
+	addr_lr.clear();
+	return true;
+}
+
+
+bool PIEthernet::closeDevice() {
+	//cout << "close\n";
+	if (server_thread_.isRunning()) {
+		server_thread_.stop();
+		if (!server_thread_.waitForFinish(100))
+			server_thread_.terminate();
+	}
+	if (sock_s == sock)
+		sock_s = -1;
+	closeSocket(sock);
+	closeSocket(sock_s);
+	while (!clients_.isEmpty())
+		delete clients_.back();
+	bool ned = connected_;
+	connected_ = connecting_ = false;
+	if (ned) disconnected(false);
+	return true;
+}
+
+
+void PIEthernet::closeSocket(int & sd) {
+	if (sd != -1)
+		ethClosesocket(sd, type() != PIEthernet::UDP);
+	sd = -1;
+}
+
+
+void PIEthernet::applyTimeouts() {
+	if (sock < 0) return;
+	double rtm = readTimeout(), wtm = writeTimeout();
+	applyTimeout(sock, SO_RCVTIMEO, rtm);
+	applyTimeout(sock, SO_SNDTIMEO, wtm);
+	if (sock_s != sock && sock_s != -1) {
+		applyTimeout(sock_s, SO_RCVTIMEO, rtm);
+		applyTimeout(sock_s, SO_SNDTIMEO, wtm);
+	}
+}
+
+
+void PIEthernet::applyTimeout(int fd, int opt, double ms) {
+	if (fd == 0) return;
+	//piCoutObj << "setReadIsBlocking" << yes;
+#ifdef WINDOWS
+	DWORD _tm = ms;
+#else
+	double s = ms / 1000.;
+	timeval _tm;
+	_tm.tv_sec = piFloord(s); s -= _tm.tv_sec;
+	_tm.tv_usec = s * 1000000.;
+#endif
+	ethSetsockopt(fd, SOL_SOCKET, opt, &_tm, sizeof(_tm));
+}
+
+
+void PIEthernet::applyOptInt(int level, int opt, int val) {
+	if (sock < 0) return;
+	ethSetsockoptInt(sock, level, opt, val);
+	if (sock_s != sock && sock_s != -1)
+		ethSetsockoptInt(sock_s, level, opt, val);
+}
+
+
+void PIEthernet::setParameter(PIEthernet::Parameters parameter, bool on) {
+	PIFlags<Parameters> cp = (PIFlags<Parameters>)(property("parameters").toInt());
+	cp.setFlag(parameter, on);
+	setParameters(cp);
+}
+
+
+bool PIEthernet::joinMulticastGroup(const PIString & group) {
+	if (sock == -1) init();
+	if (sock == -1) return false;
+	if (type() != UDP) {
+		piCoutObj << "Only UDP sockets can join multicast groups";
+		return false;
+	}
+	if (isClosed()) {
+		if (mcast_queue.contains(group))
+			return false;
+		mcast_queue.enqueue(group);
+		if (!mcast_groups.contains(group)) mcast_groups << group;
+		return true;
+	}
+	PIFlags<Parameters> params = parameters();
+	addr_r.set(path());
+#ifndef FREERTOS
+	struct ip_mreqn mreq;
+#else
+	struct ip_mreq mreq;
+#endif
+	memset(&mreq, 0, sizeof(mreq));
+#ifdef LINUX
+	//mreq.imr_address.s_addr = INADDR_ANY;
+	/*PIEthernet::InterfaceList il = interfaces();
+	const PIEthernet::Interface * ci = il.getByAddress(addr_r.ipString());
+	if (ci != 0) mreq.imr_ifindex = ci->index;*/
+#endif
+	if (params[PIEthernet::Broadcast])
+#ifndef FREERTOS
+		mreq.imr_address.s_addr = INADDR_ANY;
+#else
+		mreq.imr_interface.s_addr = INADDR_ANY;
+#endif
+	else 
+#ifndef FREERTOS
+		mreq.imr_address.s_addr = addr_r.ip();
+#else
+		mreq.imr_interface.s_addr = addr_r.ip();
+#endif
+
+	//piCout << "join group" << group << "ip" << ip_ << "with index" << mreq.imr_ifindex << "socket" << sock;
+	mreq.imr_multiaddr.s_addr = inet_addr(group.dataAscii());
+	if (ethSetsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) != 0) {
+		piCoutObj << "Can`t join multicast group" << group << "," << ethErrorString();
+		return false;
+	}
+	if (params[PIEthernet::MulticastLoop]) ethSetsockoptInt(sock, IPPROTO_IP, IP_MULTICAST_LOOP);
+	applyOptInt(IPPROTO_IP, IP_MULTICAST_TTL, multicastTTL());
+	if (!mcast_groups.contains(group)) mcast_groups << group;
+	return true;
+}
+
+
+bool PIEthernet::leaveMulticastGroup(const PIString & group) {
+	if (sock == -1) init();
+	if (sock == -1) return false;
+	if (type() != UDP) {
+		piCoutObj << "Only UDP sockets can leave multicast groups";
+		return false;
+	}
+	PIFlags<Parameters> params = parameters();
+	addr_r.set(path());
+#ifndef FREERTOS
+	struct ip_mreqn mreq;
+#else
+	struct ip_mreq mreq;
+#endif
+	memset(&mreq, 0, sizeof(mreq));
+	if (params[PIEthernet::Broadcast])
+#ifndef FREERTOS
+		mreq.imr_address.s_addr = INADDR_ANY;
+#else
+		mreq.imr_interface.s_addr = INADDR_ANY;
+#endif
+	else 
+#ifndef FREERTOS
+		mreq.imr_address.s_addr = addr_r.ip();
+#else
+		mreq.imr_interface.s_addr = addr_r.ip();
+#endif
+	mreq.imr_multiaddr.s_addr = inet_addr(group.dataAscii());
+	if (ethSetsockopt(sock, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) == -1) {
+		piCoutObj << "Can`t leave multicast group" << group << "," << ethErrorString();
+		return false;
+	}
+	mcast_groups.removeAll(group);
+	return true;
+}
+
+
+bool PIEthernet::connect(bool threaded) {
+	if (threaded) {
+		connecting_ = true;
+		return true;
+	}
+	if (sock == -1) init();
+	if (sock == -1) return false;
+	memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
+	addr_r.set(path());
+	PRIVATE->addr_.sin_port = htons(addr_r.port());
+	PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
+	PRIVATE->addr_.sin_family = AF_INET;
+#ifdef QNX
+	PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
+#endif
+	connected_ = (::connect(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == 0);
+	if (!connected_)
+		piCoutObj << "Can`t connect to" << addr_r << "," << ethErrorString();
+	opened_ = connected_;
+	if (connected_) {
+		connecting_ = false;
+		connected();
+	}
+	return connected_;
+}
+
+
+bool PIEthernet::listen(bool threaded) {
+	if (sock == -1) init();
+	if (sock == -1) return false;
+	if (threaded) {
+		if (server_thread_.isRunning()) {
+			if (!server_bounded) return true;
+			server_thread_.stop();
+			if (!server_thread_.waitForFinish(100))
+				server_thread_.terminate();
+		}
+		listen_threaded = true;
+		server_bounded = false;
+		server_thread_.start(server_func);
+		return true;
+	}
+	listen_threaded = server_bounded = false;
+	addr_r.set(path());
+	memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
+	PRIVATE->addr_.sin_port = htons(addr_r.port());
+	PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
+	PRIVATE->addr_.sin_family = AF_INET;
+#ifdef QNX
+	PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
+#endif
+	opened_ = false;
+	int tries = 0;
+	while ((bind(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == -1) && (tries < 2)) {
+		init();
+		tries++;
+	}
+	if (tries == 2) {
+		piCoutObj << "Can`t bind to" << addr_r << "," << ethErrorString();
+		return false;
+	}
+	if (::listen(sock, 64) == -1) {
+		piCoutObj << "Can`t listen on"<< addr_r << "," << ethErrorString();
+		return false;
+	}
+	opened_ = server_bounded = true;
+	//piCoutObj << "listen on " << ip_ << ":" << port_;
+	server_thread_.start(server_func);
+	return true;
+}
+
+
+int PIEthernet::readDevice(void * read_to, int max_size) {
+	//piCout << "read" << sock;
+	if (sock == -1) init();
+	if (sock == -1 || read_to == 0) return -1;
+	int rs = 0, s = 0, lerr = 0;
+	sockaddr_in client_addr;
+	socklen_t slen = sizeof(client_addr);
+//	piCoutObj << "read from " << ip_ << ":" << port_;
+	switch (type()) {
+	case TCP_SingleTCP:
+		::listen(sock, 64);
+		s = accept(sock, (sockaddr * )&client_addr, &slen);
+		if (s == -1) {
+			//piCoutObj << "Can`t accept new connection, " << ethErrorString();
+			msleep(PIP_MIN_MSLEEP);
+			return -1;
+		}
+		rs = ethRecv(s, read_to, max_size);
+		closeSocket(s);
+		return rs;
+	case TCP_Client:
+		if (connecting_) {
+#ifdef ANDROID
+			/*if (sock_s == sock)
+				sock_s = -1;
+			closeSocket(sock);
+			closeSocket(sock_s);
+			init();
+			qDebug() << "init() in read thread";*/
+#endif
+			addr_r.set(path());
+			memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
+			PRIVATE->addr_.sin_port = htons(addr_r.port());
+			PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
+			PRIVATE->addr_.sin_family = AF_INET;
+#ifdef QNX
+			PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
+#endif
+			//piCoutObj << "connect to " << ip_ << ":" << port_ << "...";
+			connected_ = (::connect(sock, (sockaddr * )&(PRIVATE->addr_), sizeof(PRIVATE->addr_)) == 0);
+			//piCoutObj << "connect to " << ip_ << ":" << port_ << connected_;
+			if (!connected_)
+				piCoutObj << "Can`t connect to" << addr_r << "," << ethErrorString();
+			opened_ = connected_;
+			if (connected_) {
+				connecting_ = false;
+				connected();
+			} else
+				piMSleep(10);
+			//piCout << "connected to" << path();
+		}
+		if (!connected_) return -1;
+		errorClear();
+		rs = ethRecv(sock, read_to, max_size);
+		//piCoutObj << "readed" << rs;
+		if (rs <= 0) {
+			lerr = ethErrorCore();
+			//piCoutObj << "readed error" << lerr << errorString().data() << parameters()[DisonnectOnTimeout];
+#ifdef WINDOWS
+			if ((lerr == WSAEWOULDBLOCK || lerr == WSAETIMEDOUT) && !parameters()[DisonnectOnTimeout]) {
+#elif defined(ANDROID)
+			if ((lerr == EWOULDBLOCK || lerr == EAGAIN || lerr == EINTR) && !parameters()[DisonnectOnTimeout]) {
+#else
+			if ((lerr == EWOULDBLOCK || lerr == EAGAIN) && !parameters()[DisonnectOnTimeout]) {
+#endif
+			//piCoutObj << errorString();
+				return -1;
+			}
+			if (connected_) {
+				piCoutObj << "Disconnect on read," << ethErrorString();
+				init();
+				connected_ = false;
+				disconnected(rs < 0);
+			}
+			if (parameters()[KeepConnection])
+				connect();
+			//piCoutObj << "eth" << ip_ << "disconnected";
+		}
+		if (rs > 0) received(read_to, rs);
+		return rs;
+	case UDP:
+		memset(&PRIVATE->raddr_, 0, sizeof(PRIVATE->raddr_));
+		rs = ethRecvfrom(sock, read_to, max_size, 0, (sockaddr*)&PRIVATE->raddr_);
+		if (rs > 0) {
+			addr_lr.set(uint(PRIVATE->raddr_.sin_addr.s_addr), ntohs(PRIVATE->raddr_.sin_port));
+			//piCoutObj << "read from" << ip_r << ":" << port_r << rs << "bytes";
+			received(read_to, rs);
+		}
+		//else piCoutObj << "read returt" << rs << ", error" << ethErrorString();
+		return rs;
+	default: break;
+	}
+	return -1;
+}
+
+
+int PIEthernet::writeDevice(const void * data, int max_size) {
+	if (sock == -1) init();
+	if (sock == -1 || !isWriteable()) {
+		//piCoutObj << "Can`t send to uninitialized socket";
+		return -1;
+	}
+	//piCoutObj << "sending to " << ip_s << ":" << port_s << "  " << max_size << " bytes";
+	int ret = 0;
+	switch (type()) {
+	case TCP_SingleTCP:
+		memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
+		PRIVATE->addr_.sin_port = htons(addr_s.port());
+		PRIVATE->addr_.sin_addr.s_addr = addr_s.ip();
+		PRIVATE->addr_.sin_family = AF_INET;
+#ifdef QNX
+		PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
+#endif
+		//piCoutObj << "connect SingleTCP" << ip_s << ":" << port_s << "...";
+		if (::connect(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) != 0) {
+			//piCoutObj << "Can`t connect to " << ip_s << ":" << port_s << ", " << ethErrorString();
+			msleep(PIP_MIN_MSLEEP);
+			return -1;
+		}
+		//piCoutObj << "ok, write SingleTCP" << int(data) << max_size << "bytes ...";
+		ret = ::send(sock, (const char *)data, max_size, 0);
+		//piCoutObj << "ok, ret" << ret;
+		closeSocket(sock);
+		init();
+		return ret;
+	case UDP:
+		PRIVATE->saddr_.sin_port = htons(addr_s.port());
+		PRIVATE->saddr_.sin_addr.s_addr = addr_s.ip();
+		PRIVATE->saddr_.sin_family = AF_INET;
+		//piCoutObj << "write to" << ip_s << ":" << port_s << "socket" << sock_s << max_size << "bytes ...";
+		return ethSendto(sock_s, data, max_size,
+#ifndef WINDOWS
+												isOptionSet(BlockingWrite) ? 0 : MSG_DONTWAIT
+#else
+												0
+#endif
+																								, (sockaddr * )&PRIVATE->saddr_, sizeof(PRIVATE->saddr_));
+		//piCout << "[PIEth] write to" << ip_s << ":" << port_s << "ok";
+	case TCP_Client:
+		if (connecting_) {
+			memset(&PRIVATE->addr_, 0, sizeof(PRIVATE->addr_));
+			addr_r.set(path());
+			PRIVATE->addr_.sin_port = htons(addr_r.port());
+			PRIVATE->addr_.sin_addr.s_addr = addr_r.ip();
+			PRIVATE->addr_.sin_family = AF_INET;
+#ifdef QNX
+			PRIVATE->addr_.sin_len = sizeof(PRIVATE->addr_);
+#endif
+			//piCoutObj << "connect to " << ip << ":" << port_;
+			connected_ = (::connect(sock, (sockaddr * )&PRIVATE->addr_, sizeof(PRIVATE->addr_)) == 0);
+			if (!connected_)
+				piCoutObj << "Can`t connect to" << addr_r << "," << ethErrorString();
+			opened_ = connected_;
+			if (connected_) {
+				connecting_ = false;
+				connected();
+			}
+		}
+		if (!connected_) return -1;
+		ret = ::send(sock, (const char *)data, max_size, 0);
+		if (ret < 0) {
+			connected_ = false;
+			piCoutObj << "Disconnect on write," << ethErrorString();
+			init();
+			disconnected(true);
+		}
+		return ret;
+	default: break;
+	}
+	return -1;
+}
+
+
+PIIODevice::DeviceInfoFlags PIEthernet::deviceInfoFlags() const {
+	switch (type()) {
+	case UDP: return 0;
+	case TCP_Client:
+	case TCP_Server:
+	case TCP_SingleTCP: return Sequential | Reliable;
+	default: break;
+	}
+	return 0;
+}
+
+
+void PIEthernet::clientDeleted() {
+	clients_mutex.lock();
+	clients_.removeOne((PIEthernet*)emitter());
+	clients_mutex.unlock();
+}
+
+
+void PIEthernet::server_func(void * eth) {
+	PIEthernet * ce = (PIEthernet * )eth;
+	if (ce->listen_threaded) {
+		if (!ce->server_bounded) {
+			if (!ce->listen(false)) {
+				ce->listen_threaded = true;
+				piMSleep(100);
+				return;
+			}
+		}
+	}
+	sockaddr_in client_addr;
+	socklen_t slen = sizeof(client_addr);
+	int s = accept(ce->sock, (sockaddr * )&client_addr, &slen);
+	if (s == -1) {
+		int lerr = ethErrorCore();
+#ifdef WINDOWS
+		if (lerr == WSAETIMEDOUT) {
+#elif defined(ANDROID)
+		if ((lerr == EAGAIN || lerr == EINTR)) {
+#else
+		if (lerr == EAGAIN) {
+#endif
+			piMSleep(10);
+			return;
+		}
+		if (ce->debug()) piCout << "[PIEthernet] Can`t accept new connection," << ethErrorString();
+		piMSleep(10);
+		return;
+	}
+	PIString ip = PIStringAscii(inet_ntoa(client_addr.sin_addr));
+	ip += ":" + PIString::fromNumber(htons(client_addr.sin_port));
+	PIEthernet * e = new PIEthernet(s, ip);
+	ce->clients_mutex.lock();
+	CONNECTU(e, deleted, ce, clientDeleted)
+	ce->clients_ << e;
+	ce->clients_mutex.unlock();
+	ce->newConnection(e);
+	//cout << "connected " << ip << endl;
+}
+
+
+bool PIEthernet::configureDevice(const void * e_main, const void * e_parent) {
+	PIConfig::Entry * em = (PIConfig::Entry * )e_main;
+	PIConfig::Entry * ep = (PIConfig::Entry * )e_parent;
+	setReadIP(readDeviceSetting<PIString>("ip", readIP(), em, ep));
+	setReadPort(readDeviceSetting<int>("port", readPort(), em, ep));
+	setParameter(PIEthernet::Broadcast, readDeviceSetting<bool>("broadcast", isParameterSet(PIEthernet::Broadcast), em, ep));
+	setParameter(PIEthernet::ReuseAddress, readDeviceSetting<bool>("reuseAddress", isParameterSet(PIEthernet::ReuseAddress), em, ep));
+	return true;
+}
+
+
+void PIEthernet::propertyChanged(const PIString & name) {
+	if (name.endsWith("Timeout")) applyTimeouts();
+	if (name == "TTL") applyOptInt(IPPROTO_IP, IP_TTL, TTL());
+	if (name == "MulticastTTL") applyOptInt(IPPROTO_IP, IP_MULTICAST_TTL, multicastTTL());
+}
+
+
+PIString PIEthernet::constructFullPathDevice() const {
+	PIString ret;
+	ret << (type() == PIEthernet::UDP ? "UDP" : "TCP") << ":" << readIP() << ":" << readPort();
+	if (type() == PIEthernet::UDP) {
+		ret << ":" << sendIP() << ":" << sendPort();
+		piForeachC (PIString & m, multicastGroups())
+			ret << ":mcast:" << m;
+	}
+	return ret;
+}
+
+
+void PIEthernet::configureFromFullPathDevice(const PIString & full_path) {
+	PIStringList pl = full_path.split(":");
+	bool mcast = false;
+	for (int i = 0; i < pl.size_s(); ++i) {
+		PIString p(pl[i]);
+		switch (i) {
+		case 0:
+			p = p.toLowerCase();
+			if (p == "udp") setType(UDP);
+			if (p == "tcp") setType(TCP_Client);
+			break;
+		case 1: setReadIP(p); setSendIP(p); break;
+		case 2: setReadPort(p.toInt()); setSendPort(p.toInt()); break;
+		case 3: setSendIP(p); break;
+		case 4: setSendPort(p.toInt()); break;
+		}
+		if (i <= 4) continue;
+		if (i % 2 == 1) {if (p.toLowerCase() == "mcast") mcast = true;}
+		else {if (mcast) {joinMulticastGroup(p); mcast = false;}}
+	}
+}
+
+
+PIPropertyStorage PIEthernet::constructVariantDevice() const {
+	PIPropertyStorage ret;
+	PIVariantTypes::Enum e;
+
+	e << "UDP" << "TCP";
+	if (type() == PIEthernet::UDP)
+		e.selectValue(0);
+	else
+		e.selectValue(1);
+	ret.addProperty("protocol", e);
+
+	ret.addProperty("read IP", readIP());
+	ret.addProperty("read port", readPort());
+	ret.addProperty("send IP", sendIP());
+	ret.addProperty("send port", sendPort());
+	ret.addProperty("multicast", multicastGroups());
+	return ret;
+}
+
+
+void PIEthernet::configureFromVariantDevice(const PIPropertyStorage & d) {
+	setType(d.propertyValueByName("protocol").toEnum().selectedValue() == 0 ? UDP : TCP_Client);
+	setReadIP(d.propertyValueByName("read IP").toString());
+	setReadPort(d.propertyValueByName("read port").toInt());
+	setSendIP(d.propertyValueByName("send IP").toString());
+	setSendPort(d.propertyValueByName("send port").toInt());
+	PIStringList mcgl = d.propertyValueByName("multicast").toStringList();
+	piForeachC (PIString & g, mcgl) {
+		joinMulticastGroup(g);
+	}
+}
+
+
+PIEthernet::InterfaceList PIEthernet::interfaces() {
+	PIEthernet::InterfaceList il;
+	Interface ci;
+	ci.index = -1;
+	ci.mtu = 1500;
+#ifdef WINDOWS
+	PIP_ADAPTER_INFO pAdapterInfo, pAdapter = 0;
+	int ret = 0;
+	ulong ulOutBufLen = sizeof(IP_ADAPTER_INFO);
+	pAdapterInfo = (IP_ADAPTER_INFO * ) HeapAlloc(GetProcessHeap(), 0, (sizeof (IP_ADAPTER_INFO)));
+	if (pAdapterInfo == 0) {
+		piCout << "[PIEthernet] Error allocating memory needed to call GetAdaptersinfo";
+		return il;
+	}
+	if (GetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) {
+		HeapFree(GetProcessHeap(), 0, (pAdapterInfo));
+		pAdapterInfo = (IP_ADAPTER_INFO *) HeapAlloc(GetProcessHeap(), 0, (ulOutBufLen));
+		if (pAdapterInfo == 0) {
+			piCout << "[PIEthernet] Error allocating memory needed to call GetAdaptersinfo";
+			return il;
+		}
+	}
+	if ((ret = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == NO_ERROR) {
+		pAdapter = pAdapterInfo;
+		while (pAdapter) {
+			ci.name = PIString(pAdapter->AdapterName);
+			ci.index = pAdapter->Index;
+			ci.mac = macFromBytes(PIByteArray(pAdapter->Address, pAdapter->AddressLength));
+			ci.flags = PIEthernet::ifActive | PIEthernet::ifRunning;
+			if (pAdapter->Type == MIB_IF_TYPE_PPP) ci.flags |= PIEthernet::ifPTP;
+			if (pAdapter->Type == MIB_IF_TYPE_LOOPBACK) ci.flags |= PIEthernet::ifLoopback;
+			ci.broadcast.clear();
+			ci.ptp.clear();
+			IP_ADDR_STRING * as = &(pAdapter->IpAddressList);
+			while (as) {
+//				piCout << "[pAdapter]" << ci.name << PIString(as->IpAddress.String);
+				ci.address = PIString(as->IpAddress.String);
+				ci.netmask = PIString(as->IpMask.String);
+				if (ci.address == "0.0.0.0") {
+					as = as->Next;
+					continue;
+				}
+				il << ci;
+				as = as->Next;
+			}
+			pAdapter = pAdapter->Next;
+		}
+	} else
+		piCout << "[PIEthernet] GetAdaptersInfo failed with error:" << ret;
+	if (pAdapterInfo)
+		HeapFree(GetProcessHeap(), 0, (pAdapterInfo));
+#else
+#ifdef FREERTOS
+#else
+#  ifdef ANDROID
+	struct ifconf ifc;
+	int s = ::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+	ifc.ifc_len = 256;
+	ifc.ifc_buf = new char[ifc.ifc_len];
+	if (ioctl(s, SIOCGIFCONF, &ifc) < 0) {
+		piCout << "[PIEthernet] Can`t get interfaces:" << errorString();
+		delete[] ifc.ifc_buf;
+		return il;
+	}
+	int icnt = ifc.ifc_len / sizeof(ifreq);
+	PIStringList inl;
+	struct ifreq ir;
+	for (int i = 0; i < icnt; ++i) {
+		ci.flags = 0;
+		PIString in = PIStringAscii(ifc.ifc_req[i].ifr_name);
+		if (in.isEmpty()) continue;
+		ci.name = in;
+		strcpy(ir.ifr_name, in.dataAscii());
+		if (ioctl(s, SIOCGIFHWADDR, &ir) == 0)
+			ci.mac = macFromBytes(PIByteArray(ir.ifr_hwaddr.sa_data, 6));
+		if (ioctl(s, SIOCGIFADDR, &ir) >= 0)
+			ci.address = getSockAddr(&ir.ifr_addr);
+		if (ioctl(s, SIOCGIFNETMASK, &ir) >= 0)
+			ci.netmask = getSockAddr(&ir.ifr_addr);
+		ioctl(s, SIOCGIFMTU, &ci.mtu);
+		if (ci.address == "127.0.0.1") ci.flags |= PIEthernet::ifLoopback;
+		il << ci;
+	}
+	delete ifc.ifc_buf;
+#  else
+	struct ifaddrs * ret, * cif = 0;
+	int s = ::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+	if (getifaddrs(&ret) == 0) {
+		cif = ret;
+		while (cif != 0) {
+			if (cif->ifa_addr == 0) {
+				cif = cif->ifa_next;
+				continue;
+			}
+			if (cif->ifa_addr->sa_family != AF_INET) {
+				cif = cif->ifa_next;
+				continue;
+			}
+			ci.name = PIString(cif->ifa_name);
+			ci.address = getSockAddr(cif->ifa_addr);
+			ci.netmask = getSockAddr(cif->ifa_netmask);
+			ci.mac.clear();
+#    ifdef QNX
+#      ifndef BLACKBERRY
+			int fd = ::open((PIString("/dev/io-net/") + ci.name).dataAscii(), O_RDONLY);
+			if (fd != 0) {
+				nic_config_t nic;
+				devctl(fd, DCMD_IO_NET_GET_CONFIG, &nic, sizeof(nic), 0);
+				::close(fd);
+				ci.mac = macFromBytes(PIByteArray(nic.permanent_address, 6));
+			}
+#      endif
+#    else
+#      ifdef MAC_OS
+			PIString req = PISystemInfo::instance()->ifconfigPath + " " + ci.name + " | grep ether";
+			FILE * fp = popen(req.dataAscii(), "r");
+			if (fp != 0) {
+				char in[256];
+				if (fgets(in, 256, fp) != 0) {
+					req = PIString(in).trim();
+					ci.mac = req.cutLeft(req.find(" ") + 1).trim().toUpperCase();
+				}
+				pclose(fp);
+			}
+#      else
+			if (s != -1) {
+				struct ifreq ir;
+				strcpy(ir.ifr_name, cif->ifa_name);
+				if (ioctl(s, SIOCGIFHWADDR, &ir) == 0) {
+					ci.mac = macFromBytes(PIByteArray(ir.ifr_hwaddr.sa_data, 6));
+					ci.mtu = ir.ifr_mtu;
+				}
+			}
+#      endif
+#    endif
+			ci.flags = 0;
+			if (cif->ifa_flags & IFF_UP) ci.flags |= PIEthernet::ifActive;
+			if (cif->ifa_flags & IFF_RUNNING) ci.flags |= PIEthernet::ifRunning;
+			if (cif->ifa_flags & IFF_BROADCAST) ci.flags |= PIEthernet::ifBroadcast;
+			if (cif->ifa_flags & IFF_MULTICAST) ci.flags |= PIEthernet::ifMulticast;
+			if (cif->ifa_flags & IFF_LOOPBACK) ci.flags |= PIEthernet::ifLoopback;
+			if (cif->ifa_flags & IFF_POINTOPOINT) ci.flags |= PIEthernet::ifPTP;
+			ci.broadcast.clear();
+			ci.ptp.clear();
+			if (ci.flags[PIEthernet::ifBroadcast])
+				ci.broadcast = getSockAddr(cif->ifa_broadaddr);
+			if (ci.flags[PIEthernet::ifPTP])
+				ci.ptp = getSockAddr(cif->ifa_dstaddr);
+			ci.index = if_nametoindex(cif->ifa_name);
+			il << ci;
+			cif = cif->ifa_next;
+		}
+		freeifaddrs(ret);
+	} else
+		piCout << "[PIEthernet] Can`t get interfaces:" << errorString();
+	if (s != -1) ::close(s);
+#  endif
+#  endif
+#endif
+	return il;
+}
+
+
+PIEthernet::Address PIEthernet::interfaceAddress(const PIString & interface_) {
+#if defined(WINDOWS) || defined(FREERTOS)
+	piCout << "[PIEthernet] Not implemented, use \"PIEthernet::allAddresses\" or \"PIEthernet::interfaces\" instead";
+	return Address();
+#else
+	struct ifreq ifr;
+	memset(&ifr, 0, sizeof(ifr));
+	strcpy(ifr.ifr_name, interface_.dataAscii());
+	int s = ::socket(AF_INET, SOCK_DGRAM, 0);
+	ioctl(s, SIOCGIFADDR, &ifr);
+	::close(s);
+	struct sockaddr_in * sa = (struct sockaddr_in * )&ifr.ifr_addr;
+	return Address(uint(sa->sin_addr.s_addr));
+#endif
+
+}
+
+
+PIVector<PIEthernet::Address> PIEthernet::allAddresses() {
+	PIEthernet::InterfaceList il = interfaces();
+	PIVector<Address> ret;
+	bool has_127 = false;
+	piForeachC (PIEthernet::Interface & i, il) {
+		if (i.address == "127.0.0.1") has_127 = true;
+		Address a(i.address);
+		if (a.ip() == 0) continue;
+		ret << a;
+	}
+//	piCout << "[PIEthernet::allAddresses]" << al;
+	if (!has_127) ret << Address("127.0.0.1");
+	return ret;
+}
+
+
+// System wrap
+
+int PIEthernet::ethErrorCore() {
+#ifdef WINDOWS
+	return WSAGetLastError();
+#else
+	return errno;
+#endif
+}
+
+
+PIString PIEthernet::ethErrorString() {
+#ifdef WINDOWS
+	char * msg;
+	int err = WSAGetLastError();
+	FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&msg, 0, NULL);
+	return "code " + PIString::fromNumber(err) + " - " + PIString(msg);
+#else
+	return errorString();
+#endif
+}
+
+
+int PIEthernet::ethRecv(int sock, void * buf, int size, int flags) {
+	if (sock < 0) return -1;
+	return recv(sock,
+#ifdef WINDOWS
+					 (char*)
+#endif
+							buf, size, flags);
+}
+
+
+int PIEthernet::ethRecvfrom(int sock, void * buf, int size, int flags, sockaddr * addr) {
+	if (sock < 0) return -1;
+#ifdef QNX
+	return recv(sock, buf, size, flags);
+#else
+	socklen_t len = sizeof(sockaddr);
+	return recvfrom(sock,
+#  ifdef WINDOWS
+					 (char*)
+#  endif
+							buf, size, flags, addr, &len);
+#endif
+}
+
+
+int PIEthernet::ethSendto(int sock, const void * buf, int size, int flags, sockaddr * addr, int addr_len) {
+	if (sock < 0) return -1;
+	return sendto(sock,
+#ifdef WINDOWS
+					   (const char*)
+#endif
+									buf, size, flags, addr, addr_len);
+}
+
+
+void PIEthernet::ethClosesocket(int sock, bool shutdown) {
+	//piCout << "close socket" << sock << shutdown;
+	if (sock < 0) return;
+		if (shutdown) ::shutdown(sock,
+#ifdef WINDOWS
+					SD_BOTH);
+		closesocket(sock);
+#else
+					SHUT_RDWR);
+		::close(sock);
+#endif
+}
+
+
+int PIEthernet::ethSetsockopt(int sock, int level, int optname, const void * optval, int optlen) {
+	if (sock < 0) return -1;
+	return setsockopt(sock, level, optname,
+#ifdef WINDOWS
+											(char*)
+#endif
+													optval, optlen);
+}
+
+
+int PIEthernet::ethSetsockoptInt(int sock, int level, int optname, int value) {
+	if (sock < 0) return -1;
+#ifdef WINDOWS
+	DWORD
+#else
+	int
+#endif
+			so = value;
+	return ethSetsockopt(sock, level, optname, &so, sizeof(so));
+}
+
+
+int PIEthernet::ethSetsockoptBool(int sock, int level, int optname, bool value) {
+	if (sock < 0) return -1;
+#ifdef WINDOWS
+	BOOL
+#else
+	int
+#endif
+			so = (value ? 1 : 0);
+	return ethSetsockopt(sock, level, optname, &so, sizeof(so));
+}
diff --git a/src_main/io_devices/piethernet.h b/lib/main/io_devices/piethernet.h
old mode 100755
new mode 100644
similarity index 97%
rename from src_main/io_devices/piethernet.h
rename to lib/main/io_devices/piethernet.h
index bab074b3..574f9fab
--- a/src_main/io_devices/piethernet.h
+++ b/lib/main/io_devices/piethernet.h
@@ -1,525 +1,525 @@
-/*! \file piethernet.h
- * \brief Ethernet device
-*/
-/*
-	PIP - Platform Independent Primitives
-	Ethernet, UDP/TCP Broadcast/Multicast
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIETHERNET_H
-#define PIETHERNET_H
-
-#include "pitimer.h"
-#include "piiodevice.h"
-
-#ifdef ANDROID
-struct 
-#else
-class 
-#endif
-	sockaddr;
-
-class PIP_EXPORT PIEthernet: public PIIODevice
-{
-	PIIODEVICE(PIEthernet)
-	friend class PIPeer;
-public:
-	
-	//! Contructs UDP %PIEthernet with empty read address
-	explicit PIEthernet();
-
-	//! \brief Type of %PIEthernet
-	enum PIP_EXPORT Type {
-		UDP /** UDP - User Datagram Protocol */ ,
-		TCP_Client /** TCP client - allow connection to TCP server */ ,
-		TCP_Server /** TCP server - receive connections from TCP clients */ ,
-		TCP_SingleTCP /** TCP client single mode - connect & send & disconnect, on each packet */
-	};
-	
-	//! \brief Parameters of %PIEthernet
-	enum PIP_EXPORT Parameters {
-		ReuseAddress /** Rebind address if there is already binded. Enabled by default */ = 0x1,
-		Broadcast /** Broadcast send. Disabled by default */ = 0x2,
-		SeparateSockets /** If this parameter is set, %PIEthernet will initialize two different sockets,
-							for receive and send, instead of single one. Disabled by default */ = 0x4,
-		MulticastLoop /** Enable receiving multicast packets from same host. Enabled by default */ = 0x8,
-		KeepConnection /** Automatic reconnect TCP connection on disconnect. Enabled by default */ = 0x10,
-		DisonnectOnTimeout /** Disconnect TCP connection on read timeout expired. Disabled by default */ = 0x20
-	};
-
-
-	//! \brief IPv4 network address, IP and port
-	class Address {
-		friend class PIEthernet;
-		friend inline PIByteArray & operator <<(PIByteArray & s, const PIEthernet::Address & v);
-		friend inline PIByteArray & operator >>(PIByteArray & s, PIEthernet::Address & v);
-	public:
-
-		//! Contructs %Address with binary representation of IP and port
-		Address(uint ip = 0, ushort port = 0);
-
-		//! Contructs %Address with string representation "i.i.i.i:p"
-		Address(const PIString & ip_port);
-
-		//! Contructs %Address with IP string representation "i.i.i.i" and port
-		Address(const PIString & ip, ushort port);
-
-		//! Returns binary IP
-		uint ip() const {return ip_;}
-
-		//! Returns port
-		ushort port() const {return port_;}
-
-		//! Returns string IP
-		PIString ipString() const;
-
-		//! Returns string representation of IP and port "i.i.i.i:p"
-		PIString toString() const;
-
-		//! Set address IP
-		void setIP(uint ip);
-
-		//! Set address IP
-		void setIP(const PIString & ip);
-
-		//! Set address port
-		void setPort(ushort port);
-
-		//! Set address IP and port, "i.i.i.i:p"
-		void set(const PIString & ip_port);
-
-		//! Set address IP and port, "i.i.i.i"
-		void set(const PIString & ip, ushort port);
-
-		//! Set address binary IP and port
-		void set(uint ip, ushort port);
-
-		//! Set IP and port to 0
-		void clear();
-
-		//! Returns if IP and port is 0
-		bool isNull() const;
-
-		//! Resolve hostname "host:port" and return it address or null address on error
-		static Address resolve(const PIString & host_port);
-
-		//! Resolve hostname "host" with port "port" and return it address or null address on error
-		static Address resolve(const PIString & host, ushort port);
-
-		static void splitIPPort(const PIString & ipp, PIString * ip, int * port);
-	private:
-		void initIP(const PIString & _ip);
-		union {
-			uint ip_;
-			uchar ip_b[4];
-		};
-		ushort port_;
-	};
-
-
-	//! Contructs %PIEthernet with type "type", read address "ip_port" and parameters "params"
-	explicit PIEthernet(Type type, const PIString & ip_port = PIString(), const PIFlags<Parameters> params = PIEthernet::ReuseAddress | PIEthernet::MulticastLoop | PIEthernet::KeepConnection);
-	
-	virtual ~PIEthernet();
-
-	
-	//! Set read address
-	void setReadAddress(const PIString & ip, int port) {addr_r.set(ip, port); setPath(addr_r.toString());}
-	
-	//! Set read address in format "i.i.i.i:p"
-	void setReadAddress(const PIString & ip_port) {addr_r.set(ip_port); setPath(addr_r.toString());}
-
-	//! Set read address
-	void setReadAddress(const Address & addr) {addr_r = addr; setPath(addr_r.toString());}
-	
-	//! Set read IP
-	void setReadIP(const PIString & ip) {addr_r.setIP(ip); setPath(addr_r.toString());}
-	
-	//! Set read port
-	void setReadPort(int port) {addr_r.setPort(port); setPath(addr_r.toString());}
-	
-	
-	//! Set send address
-	void setSendAddress(const PIString & ip, int port) {addr_s.set(ip, port);}
-	
-	//! Set send address in format "i.i.i.i:p"
-	void setSendAddress(const PIString & ip_port) {addr_s.set(ip_port);}
-
-	//! Set send address
-	void setSendAddress(const Address & addr) {addr_s = addr;}
-	
-	//! Set send IP
-	void setSendIP(const PIString & ip) {addr_s.setIP(ip);}
-	
-	//! Set send port
-	void setSendPort(int port) {addr_s.setPort(port);}
-	
-	
-	//! Returns read address in format "i.i.i.i:p"
-	Address readAddress() const {return addr_r;}
-	
-	//! Returns read IP
-	PIString readIP() const {return addr_r.ipString();}
-	
-	//! Returns read port
-	int readPort() const {return addr_r.port();}
-	
-	
-	//! Returns send address in format "i.i.i.i:p"
-	Address sendAddress() const {return addr_s;}
-	
-	//! Returns send IP
-	PIString sendIP() const {return addr_s.ipString();}
-	
-	//! Returns send port
-	int sendPort() const {return addr_s.port();}
-	
-	
-	//! Returns address of last received UDP packet in format "i.i.i.i:p"
-	Address lastReadAddress() const {return addr_lr;}
-	
-	//! Returns IP of last received UDP packet
-	PIString lastReadIP() const {return addr_lr.ipString();}
-	
-	//! Returns port of last received UDP packet
-	int lastReadPort() const {return addr_lr.port();}
-
-	
-	//! Set parameters to "parameters_". You should to reopen %PIEthernet to apply them
-	void setParameters(PIFlags<PIEthernet::Parameters> parameters_) {setProperty(PIStringAscii("parameters"), (int)parameters_);}
-	
-	//! Set parameter "parameter" to state "on". You should to reopen %PIEthernet to apply this
-	void setParameter(PIEthernet::Parameters parameter, bool on = true);
-	
-	//! Returns if parameter "parameter" is set
-	bool isParameterSet(PIEthernet::Parameters parameter) const {return ((PIFlags<PIEthernet::Parameters>)(property(PIStringAscii("parameters")).toInt()))[parameter];}
-	
-	//! Returns parameters
-	PIFlags<PIEthernet::Parameters> parameters() const {return (PIFlags<PIEthernet::Parameters>)(property(PIStringAscii("parameters")).toInt());}
-
-	//! Returns %PIEthernet type
-	Type type() const {return (Type)(property(PIStringAscii("type")).toInt());}
-	
-	//! Returns read timeout
-	double readTimeout() const {return property(PIStringAscii("readTimeout")).toDouble();}
-	
-	//! Returns write timeout
-	double writeTimeout() const {return property(PIStringAscii("writeTimeout")).toDouble();}
-	
-	//! Set timeout for read
-	void setReadTimeout(double ms) {setProperty(PIStringAscii("readTimeout"), ms);}
-	
-	//! Set timeout for write
-	void setWriteTimeout(double ms) {setProperty(PIStringAscii("writeTimeout"), ms);}
-	
-	
-	//! Returns TTL (Time To Live)
-	int TTL() const {return property(PIStringAscii("TTL")).toInt();}
-	
-	//! Returns multicast TTL (Time To Live)
-	int multicastTTL() const {return property(PIStringAscii("MulticastTTL")).toInt();}
-	
-	//! Set TTL (Time To Live), default is 64
-	void setTTL(int ttl) {setProperty(PIStringAscii("TTL"), ttl);}
-	
-	//! Set multicast TTL (Time To Live), default is 1
-	void setMulticastTTL(int ttl) {setProperty(PIStringAscii("MulticastTTL"), ttl);}
-
-	
-	//! Join to multicast group with address "group". Use only for UDP
-	bool joinMulticastGroup(const PIString & group);
-	
-	//! Leave multicast group with address "group". Use only for UDP
-	bool leaveMulticastGroup(const PIString & group);
-	
-	//! Returns joined multicast groups. Use only for UDP
-	const PIStringList & multicastGroups() const {return mcast_groups;}
-	
-	
-	//! If \"threaded\" queue connect to TCP server with address \a readAddress() in
-	//! any \a read() or \a write() call. Otherwise connect immediate.
-	//! Use only for TCP_Client
-	bool connect(bool threaded = true);
-	
-	//! Connect to TCP server with address "ip":"port". Use only for TCP_Client
-	bool connect(const PIString & ip, int port, bool threaded = true) {setPath(ip + PIStringAscii(":") + PIString::fromNumber(port)); return connect(threaded);}
-	
-	//! Connect to TCP server with address "ip_port". Use only for TCP_Client
-	bool connect(const PIString & ip_port, bool threaded = true) {setPath(ip_port); return connect(threaded);}
-
-	//! Connect to TCP server with address "addr". Use only for TCP_Client
-	bool connect(const Address & addr, bool threaded = true) {setPath(addr.toString()); return connect(threaded);}
-	
-	//! Returns if %PIEthernet connected to TCP server. Use only for TCP_Client
-	bool isConnected() const {return connected_;}
-	
-	//! Returns if %PIEthernet is connecting to TCP server. Use only for TCP_Client
-	bool isConnecting() const {return connecting_;}
-	
-	
-	//! Start listen for incoming TCP connections on address \a readAddress(). Use only for TCP_Server
-	bool listen(bool threaded = false);
-	
-	//! Start listen for incoming TCP connections on address "ip":"port". Use only for TCP_Server
-	bool listen(const PIString & ip, int port, bool threaded = false) {setReadAddress(ip, port); return listen(threaded);}
-	
-	//! Start listen for incoming TCP connections on address "ip_port". Use only for TCP_Server
-	bool listen(const PIString & ip_port, bool threaded = false) {setReadAddress(ip_port); return listen(threaded);}
-
-	//! Start listen for incoming TCP connections on address "addr". Use only for TCP_Server
-	bool listen(const Address & addr, bool threaded = false) {setReadAddress(addr); return listen(threaded);}
-
-	PIEthernet * client(int index) {return clients_[index];}
-	int clientsCount() const {return clients_.size_s();}
-	PIVector<PIEthernet * > clients() const {return clients_;}
-
-	
-	//! Send data "data" with size "size" to address \a sendAddress() for UDP or \a readAddress() for TCP_Client
-	bool send(const void * data, int size, bool threaded = false) {if (threaded) {writeThreaded(data, size); return true;} return (write(data, size) == size);}
-	
-	//! Send data "data" with size "size" to address "ip":"port"
-	bool send(const PIString & ip, int port, const void * data, int size, bool threaded = false) {addr_s.set(ip, port); if (threaded) {writeThreaded(data, size); return true;} return send(data, size);}
-	
-	//! Send data "data" with size "size" to address "ip_port"
-	bool send(const PIString & ip_port, const void * data, int size, bool threaded = false) {addr_s.set(ip_port); if (threaded) {writeThreaded(data, size); return true;} return send(data, size);}
-
-	//! Send data "data" with size "size" to address "addr"
-	bool send(const Address & addr, const void * data, int size, bool threaded = false) {addr_s = addr; if (threaded) {writeThreaded(data, size); return true;} return send(data, size);}
-	
-	//! Send data "data" to address \a sendAddress() for UDP or \a readAddress() for TCP_Client
-	bool send(const PIByteArray & data, bool threaded = false) {if (threaded) {writeThreaded(data); return true;} return (write(data) == data.size_s());}
-	
-	//! Send data "data" to address "ip":"port" for UDP
-	bool send(const PIString & ip, int port, const PIByteArray & data, bool threaded = false) {addr_s.set(ip, port); if (threaded) {writeThreaded(data); return true;} return send(data);}
-	
-	//! Send data "data" to address "ip_port" for UDP
-	bool send(const PIString & ip_port, const PIByteArray & data, bool threaded = false) {addr_s.set(ip_port); if (threaded) {writeThreaded(data); return true;} return (write(data) == data.size_s());}
-
-	//! Send data "data" to address "addr" for UDP
-	bool send(const Address & addr, const PIByteArray & data, bool threaded = false) {addr_s = addr; if (threaded) {writeThreaded(data); return true;} return (write(data) == data.size_s());}
-	
-	virtual bool canWrite() const {return mode() & WriteOnly;}
-
-	int socket() const {return sock;}
-	
-	EVENT1(newConnection, PIEthernet * , client)
-	EVENT0(connected)
-	EVENT1(disconnected, bool, withError)
-	
-	
-	//! Flags of network interface
-	enum PIP_EXPORT InterfaceFlag {
-		ifActive /** Is active */ = 0x1,
-		ifRunning /** Is running */ = 0x2,
-		ifBroadcast /** Support broadcast */ = 0x4,
-		ifMulticast /** Support multicast */ = 0x8,
-		ifLoopback /** Is loopback */ = 0x10,
-		ifPTP /** Is point-to-point */ = 0x20
-	};
-	
-	//! %PIFlags of network interface flags
-	typedef PIFlags<InterfaceFlag> InterfaceFlags;
-	
-	
-	//! Network interface descriptor
-	struct PIP_EXPORT Interface {
-		
-		//! System index
-		int index;
-		
-		//! MTU
-		int mtu;
-		
-		//! System name
-		PIString name;
-		
-		//! MAC address in format "hh:hh:hh:hh:hh:hh" or empty if there is no MAC address
-		PIString mac;
-		
-		//! IP address in format "i.i.i.i" or empty if there is no IP address
-		PIString address;
-		
-		//! Netmask of IP address in format "i.i.i.i" or empty if there is no netmask
-		PIString netmask;
-		
-		//! Broadcast address in format "i.i.i.i" or empty if there is no broadcast address
-		PIString broadcast;
-		
-		//! Point-to-point address or empty if there is no point-to-point address
-		PIString ptp;
-		
-		//! Flags of interface
-		InterfaceFlags flags;
-		
-		//! Returns if interface is active
-		bool isActive() const {return flags[PIEthernet::ifActive];}
-		
-		//! Returns if interface is running
-		bool isRunning() const {return flags[PIEthernet::ifRunning];}
-		
-		//! Returns if interface support broadcast
-		bool isBroadcast() const {return flags[PIEthernet::ifBroadcast];}
-		
-		//! Returns if interface support multicast
-		bool isMulticast() const {return flags[PIEthernet::ifMulticast];}
-		
-		//! Returns if interface is loopback
-		bool isLoopback() const {return flags[PIEthernet::ifLoopback];}
-		
-		//! Returns if interface is point-to-point
-		bool isPTP() const {return flags[PIEthernet::ifPTP];}
-	};
-	
-	
-	//! Array of \a Interface with some features
-	class PIP_EXPORT InterfaceList: public PIVector<PIEthernet::Interface> {
-	public:
-		InterfaceList(): PIVector<PIEthernet::Interface>() {}
-		
-		//! Get interface with system index "index" or 0 if there is no one
-		const Interface * getByIndex(int index) const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].index == index) return &((*this)[i]); return 0;}
-		
-		//! Get interface with system name "name" or 0 if there is no one
-		const Interface * getByName(const PIString & name) const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].name == name) return &((*this)[i]); return 0;}
-		
-		//! Get interface with IP address "address" or 0 if there is no one
-		const Interface * getByAddress(const PIString & address) const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].address == address) return &((*this)[i]); return 0;}
-		
-		//! Get loopback interface or 0 if there is no one
-		const Interface * getLoopback() const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].isLoopback()) return &((*this)[i]); return 0;}
-	};
-
-	
-	//! Returns all system network interfaces
-	static InterfaceList interfaces();
-	
-	static PIEthernet::Address interfaceAddress(const PIString & interface_);
-	
-	//! Returns all system network IP addresses
-	static PIVector<PIEthernet::Address> allAddresses();
-
-	static PIString macFromBytes(const PIByteArray & mac);
-	static PIByteArray macToBytes(const PIString & mac);
-	static PIString applyMask(const PIString & ip, const PIString & mask);
-	static  Address applyMask(const Address & ip, const Address & mask);
-	static PIString getBroadcast(const PIString & ip, const PIString & mask);
-	static  Address getBroadcast(const Address & ip, const Address & mask);
-
-//! \events
-//! \{
-
-	//! \fn void newConnection(PIEthernet * client)
-	//! \brief Raise on new TCP connection received
-	
-	//! \fn void connected()
-	//! \brief Raise if succesfull TCP connection
-
-	//! \fn void disconnected(bool withError)
-	//! \brief Raise if TCP connection was closed
-
-//! \}
-//! \ioparams
-//! \{
-#ifdef DOXYGEN
-	//! \brief read ip, default ""
-	string ip;
-	
-	//! \brief read port, default 0
-	int port;
-	
-	//! \brief ethernet parameters
-	int parameters;
-	
-	//! \brief read timeout, default 1000 ms
-	double readTimeout;
-	
-	//! \brief write timeout, default 1000 ms
-	double writeTimeout;
-	
-	//! \brief time-to-live, default 64
-	int TTL;
-	
-	//! \brief time-to-live for multicast, default 1
-	int multicastTTL;
-#endif
-//! \}
-
-protected:
-	explicit PIEthernet(int sock, PIString ip_port);
-
-	void propertyChanged(const PIString & name);
-	
-	PIString fullPathPrefix() const {return PIStringAscii("eth");}
-	PIString constructFullPathDevice() const;
-	void configureFromFullPathDevice(const PIString & full_path);
-	PIPropertyStorage constructVariantDevice() const;
-	void configureFromVariantDevice(const PIPropertyStorage & d);
-	bool configureDevice(const void * e_main, const void * e_parent = 0);
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int max_size);
-	DeviceInfoFlags deviceInfoFlags() const;
-
-	//! Executes when any read function was successful. Default implementation does nothing
-	virtual void received(const void * data, int size) {;}
-
-	void construct();
-	bool init();
-	bool openDevice();
-	bool closeDevice();
-	void closeSocket(int & sd);
-	void applyTimeouts();
-	void applyTimeout(int fd, int opt, double ms);
-	void applyOptInt(int level, int opt, int val);
-	
-	PRIVATE_DECLARATION
-	int sock, sock_s;
-	bool connected_, connecting_, listen_threaded, server_bounded;
-	mutable Address addr_r, addr_s, addr_lr;
-	PIThread server_thread_;
-	PIMutex clients_mutex;
-	PIVector<PIEthernet * > clients_;
-	PIQueue<PIString> mcast_queue;
-	PIStringList mcast_groups;
-
-private:
-	EVENT_HANDLER(void, clientDeleted);
-	static void server_func(void * eth);
-	void setType(Type t, bool reopen = true) {setProperty(PIStringAscii("type"), (int)t); if (reopen && isOpened()) {closeDevice(); init(); openDevice();}}
-
-	static int ethErrorCore();
-	static PIString ethErrorString();
-	static int ethRecv(int sock, void * buf, int size, int flags = 0);
-	static int ethRecvfrom(int sock, void * buf, int size, int flags, sockaddr * addr);
-	static int ethSendto(int sock, const void * buf, int size, int flags, sockaddr * addr, int addr_len);
-	static void ethClosesocket(int sock, bool shutdown);
-	static int ethSetsockopt(int sock, int level, int optname, const void * optval, int optlen);
-	static int ethSetsockoptInt(int sock, int level, int optname, int value = 1);
-	static int ethSetsockoptBool(int sock, int level, int optname, bool value = true);
-
-};
-
-inline bool operator <(const PIEthernet::Interface & v0, const PIEthernet::Interface & v1) {return (v0.name < v1.name);}
-inline bool operator ==(const PIEthernet::Interface & v0, const PIEthernet::Interface & v1) {return (v0.name == v1.name && v0.address == v1.address && v0.netmask == v1.netmask);}
-inline bool operator !=(const PIEthernet::Interface & v0, const PIEthernet::Interface & v1) {return (v0.name != v1.name || v0.address != v1.address || v0.netmask != v1.netmask);}
-inline PICout operator <<(PICout s, const PIEthernet::Address & v) {s.space(); s.setControl(0, true); s << "Address(" << v.toString() << ")"; s.restoreControl(); return s;}
-
-inline bool operator ==(const PIEthernet::Address & v0, const PIEthernet::Address & v1) {return (v0.ip() == v1.ip() && v0.port() == v1.port());}
-inline bool operator !=(const PIEthernet::Address & v0, const PIEthernet::Address & v1) {return (v0.ip() != v1.ip() || v0.port() != v1.port());}
-inline PIByteArray & operator <<(PIByteArray & s, const PIEthernet::Address & v) {s << v.ip_ << v.port_; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIEthernet::Address & v) {s >> v.ip_ >> v.port_; return s;}
-
-#endif // PIETHERNET_H
+/*! \file piethernet.h
+ * \brief Ethernet device
+*/
+/*
+	PIP - Platform Independent Primitives
+	Ethernet, UDP/TCP Broadcast/Multicast
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIETHERNET_H
+#define PIETHERNET_H
+
+#include "pitimer.h"
+#include "piiodevice.h"
+
+#ifdef ANDROID
+struct 
+#else
+class 
+#endif
+	sockaddr;
+
+class PIP_EXPORT PIEthernet: public PIIODevice
+{
+	PIIODEVICE(PIEthernet)
+	friend class PIPeer;
+public:
+	
+	//! Contructs UDP %PIEthernet with empty read address
+	explicit PIEthernet();
+
+	//! \brief Type of %PIEthernet
+	enum PIP_EXPORT Type {
+		UDP /** UDP - User Datagram Protocol */ ,
+		TCP_Client /** TCP client - allow connection to TCP server */ ,
+		TCP_Server /** TCP server - receive connections from TCP clients */ ,
+		TCP_SingleTCP /** TCP client single mode - connect & send & disconnect, on each packet */
+	};
+	
+	//! \brief Parameters of %PIEthernet
+	enum PIP_EXPORT Parameters {
+		ReuseAddress /** Rebind address if there is already binded. Enabled by default */ = 0x1,
+		Broadcast /** Broadcast send. Disabled by default */ = 0x2,
+		SeparateSockets /** If this parameter is set, %PIEthernet will initialize two different sockets,
+							for receive and send, instead of single one. Disabled by default */ = 0x4,
+		MulticastLoop /** Enable receiving multicast packets from same host. Enabled by default */ = 0x8,
+		KeepConnection /** Automatic reconnect TCP connection on disconnect. Enabled by default */ = 0x10,
+		DisonnectOnTimeout /** Disconnect TCP connection on read timeout expired. Disabled by default */ = 0x20
+	};
+
+
+	//! \brief IPv4 network address, IP and port
+	class Address {
+		friend class PIEthernet;
+		friend inline PIByteArray & operator <<(PIByteArray & s, const PIEthernet::Address & v);
+		friend inline PIByteArray & operator >>(PIByteArray & s, PIEthernet::Address & v);
+	public:
+
+		//! Contructs %Address with binary representation of IP and port
+		Address(uint ip = 0, ushort port = 0);
+
+		//! Contructs %Address with string representation "i.i.i.i:p"
+		Address(const PIString & ip_port);
+
+		//! Contructs %Address with IP string representation "i.i.i.i" and port
+		Address(const PIString & ip, ushort port);
+
+		//! Returns binary IP
+		uint ip() const {return ip_;}
+
+		//! Returns port
+		ushort port() const {return port_;}
+
+		//! Returns string IP
+		PIString ipString() const;
+
+		//! Returns string representation of IP and port "i.i.i.i:p"
+		PIString toString() const;
+
+		//! Set address IP
+		void setIP(uint ip);
+
+		//! Set address IP
+		void setIP(const PIString & ip);
+
+		//! Set address port
+		void setPort(ushort port);
+
+		//! Set address IP and port, "i.i.i.i:p"
+		void set(const PIString & ip_port);
+
+		//! Set address IP and port, "i.i.i.i"
+		void set(const PIString & ip, ushort port);
+
+		//! Set address binary IP and port
+		void set(uint ip, ushort port);
+
+		//! Set IP and port to 0
+		void clear();
+
+		//! Returns if IP and port is 0
+		bool isNull() const;
+
+		//! Resolve hostname "host:port" and return it address or null address on error
+		static Address resolve(const PIString & host_port);
+
+		//! Resolve hostname "host" with port "port" and return it address or null address on error
+		static Address resolve(const PIString & host, ushort port);
+
+		static void splitIPPort(const PIString & ipp, PIString * ip, int * port);
+	private:
+		void initIP(const PIString & _ip);
+		union {
+			uint ip_;
+			uchar ip_b[4];
+		};
+		ushort port_;
+	};
+
+
+	//! Contructs %PIEthernet with type "type", read address "ip_port" and parameters "params"
+	explicit PIEthernet(Type type, const PIString & ip_port = PIString(), const PIFlags<Parameters> params = PIEthernet::ReuseAddress | PIEthernet::MulticastLoop | PIEthernet::KeepConnection);
+	
+	virtual ~PIEthernet();
+
+	
+	//! Set read address
+	void setReadAddress(const PIString & ip, int port) {addr_r.set(ip, port); setPath(addr_r.toString());}
+	
+	//! Set read address in format "i.i.i.i:p"
+	void setReadAddress(const PIString & ip_port) {addr_r.set(ip_port); setPath(addr_r.toString());}
+
+	//! Set read address
+	void setReadAddress(const Address & addr) {addr_r = addr; setPath(addr_r.toString());}
+	
+	//! Set read IP
+	void setReadIP(const PIString & ip) {addr_r.setIP(ip); setPath(addr_r.toString());}
+	
+	//! Set read port
+	void setReadPort(int port) {addr_r.setPort(port); setPath(addr_r.toString());}
+	
+	
+	//! Set send address
+	void setSendAddress(const PIString & ip, int port) {addr_s.set(ip, port);}
+	
+	//! Set send address in format "i.i.i.i:p"
+	void setSendAddress(const PIString & ip_port) {addr_s.set(ip_port);}
+
+	//! Set send address
+	void setSendAddress(const Address & addr) {addr_s = addr;}
+	
+	//! Set send IP
+	void setSendIP(const PIString & ip) {addr_s.setIP(ip);}
+	
+	//! Set send port
+	void setSendPort(int port) {addr_s.setPort(port);}
+	
+	
+	//! Returns read address in format "i.i.i.i:p"
+	Address readAddress() const {return addr_r;}
+	
+	//! Returns read IP
+	PIString readIP() const {return addr_r.ipString();}
+	
+	//! Returns read port
+	int readPort() const {return addr_r.port();}
+	
+	
+	//! Returns send address in format "i.i.i.i:p"
+	Address sendAddress() const {return addr_s;}
+	
+	//! Returns send IP
+	PIString sendIP() const {return addr_s.ipString();}
+	
+	//! Returns send port
+	int sendPort() const {return addr_s.port();}
+	
+	
+	//! Returns address of last received UDP packet in format "i.i.i.i:p"
+	Address lastReadAddress() const {return addr_lr;}
+	
+	//! Returns IP of last received UDP packet
+	PIString lastReadIP() const {return addr_lr.ipString();}
+	
+	//! Returns port of last received UDP packet
+	int lastReadPort() const {return addr_lr.port();}
+
+	
+	//! Set parameters to "parameters_". You should to reopen %PIEthernet to apply them
+	void setParameters(PIFlags<PIEthernet::Parameters> parameters_) {setProperty(PIStringAscii("parameters"), (int)parameters_);}
+	
+	//! Set parameter "parameter" to state "on". You should to reopen %PIEthernet to apply this
+	void setParameter(PIEthernet::Parameters parameter, bool on = true);
+	
+	//! Returns if parameter "parameter" is set
+	bool isParameterSet(PIEthernet::Parameters parameter) const {return ((PIFlags<PIEthernet::Parameters>)(property(PIStringAscii("parameters")).toInt()))[parameter];}
+	
+	//! Returns parameters
+	PIFlags<PIEthernet::Parameters> parameters() const {return (PIFlags<PIEthernet::Parameters>)(property(PIStringAscii("parameters")).toInt());}
+
+	//! Returns %PIEthernet type
+	Type type() const {return (Type)(property(PIStringAscii("type")).toInt());}
+	
+	//! Returns read timeout
+	double readTimeout() const {return property(PIStringAscii("readTimeout")).toDouble();}
+	
+	//! Returns write timeout
+	double writeTimeout() const {return property(PIStringAscii("writeTimeout")).toDouble();}
+	
+	//! Set timeout for read
+	void setReadTimeout(double ms) {setProperty(PIStringAscii("readTimeout"), ms);}
+	
+	//! Set timeout for write
+	void setWriteTimeout(double ms) {setProperty(PIStringAscii("writeTimeout"), ms);}
+	
+	
+	//! Returns TTL (Time To Live)
+	int TTL() const {return property(PIStringAscii("TTL")).toInt();}
+	
+	//! Returns multicast TTL (Time To Live)
+	int multicastTTL() const {return property(PIStringAscii("MulticastTTL")).toInt();}
+	
+	//! Set TTL (Time To Live), default is 64
+	void setTTL(int ttl) {setProperty(PIStringAscii("TTL"), ttl);}
+	
+	//! Set multicast TTL (Time To Live), default is 1
+	void setMulticastTTL(int ttl) {setProperty(PIStringAscii("MulticastTTL"), ttl);}
+
+	
+	//! Join to multicast group with address "group". Use only for UDP
+	bool joinMulticastGroup(const PIString & group);
+	
+	//! Leave multicast group with address "group". Use only for UDP
+	bool leaveMulticastGroup(const PIString & group);
+	
+	//! Returns joined multicast groups. Use only for UDP
+	const PIStringList & multicastGroups() const {return mcast_groups;}
+	
+	
+	//! If \"threaded\" queue connect to TCP server with address \a readAddress() in
+	//! any \a read() or \a write() call. Otherwise connect immediate.
+	//! Use only for TCP_Client
+	bool connect(bool threaded = true);
+	
+	//! Connect to TCP server with address "ip":"port". Use only for TCP_Client
+	bool connect(const PIString & ip, int port, bool threaded = true) {setPath(ip + PIStringAscii(":") + PIString::fromNumber(port)); return connect(threaded);}
+	
+	//! Connect to TCP server with address "ip_port". Use only for TCP_Client
+	bool connect(const PIString & ip_port, bool threaded = true) {setPath(ip_port); return connect(threaded);}
+
+	//! Connect to TCP server with address "addr". Use only for TCP_Client
+	bool connect(const Address & addr, bool threaded = true) {setPath(addr.toString()); return connect(threaded);}
+	
+	//! Returns if %PIEthernet connected to TCP server. Use only for TCP_Client
+	bool isConnected() const {return connected_;}
+	
+	//! Returns if %PIEthernet is connecting to TCP server. Use only for TCP_Client
+	bool isConnecting() const {return connecting_;}
+	
+	
+	//! Start listen for incoming TCP connections on address \a readAddress(). Use only for TCP_Server
+	bool listen(bool threaded = false);
+	
+	//! Start listen for incoming TCP connections on address "ip":"port". Use only for TCP_Server
+	bool listen(const PIString & ip, int port, bool threaded = false) {setReadAddress(ip, port); return listen(threaded);}
+	
+	//! Start listen for incoming TCP connections on address "ip_port". Use only for TCP_Server
+	bool listen(const PIString & ip_port, bool threaded = false) {setReadAddress(ip_port); return listen(threaded);}
+
+	//! Start listen for incoming TCP connections on address "addr". Use only for TCP_Server
+	bool listen(const Address & addr, bool threaded = false) {setReadAddress(addr); return listen(threaded);}
+
+	PIEthernet * client(int index) {return clients_[index];}
+	int clientsCount() const {return clients_.size_s();}
+	PIVector<PIEthernet * > clients() const {return clients_;}
+
+	
+	//! Send data "data" with size "size" to address \a sendAddress() for UDP or \a readAddress() for TCP_Client
+	bool send(const void * data, int size, bool threaded = false) {if (threaded) {writeThreaded(data, size); return true;} return (write(data, size) == size);}
+	
+	//! Send data "data" with size "size" to address "ip":"port"
+	bool send(const PIString & ip, int port, const void * data, int size, bool threaded = false) {addr_s.set(ip, port); if (threaded) {writeThreaded(data, size); return true;} return send(data, size);}
+	
+	//! Send data "data" with size "size" to address "ip_port"
+	bool send(const PIString & ip_port, const void * data, int size, bool threaded = false) {addr_s.set(ip_port); if (threaded) {writeThreaded(data, size); return true;} return send(data, size);}
+
+	//! Send data "data" with size "size" to address "addr"
+	bool send(const Address & addr, const void * data, int size, bool threaded = false) {addr_s = addr; if (threaded) {writeThreaded(data, size); return true;} return send(data, size);}
+	
+	//! Send data "data" to address \a sendAddress() for UDP or \a readAddress() for TCP_Client
+	bool send(const PIByteArray & data, bool threaded = false) {if (threaded) {writeThreaded(data); return true;} return (write(data) == data.size_s());}
+	
+	//! Send data "data" to address "ip":"port" for UDP
+	bool send(const PIString & ip, int port, const PIByteArray & data, bool threaded = false) {addr_s.set(ip, port); if (threaded) {writeThreaded(data); return true;} return send(data);}
+	
+	//! Send data "data" to address "ip_port" for UDP
+	bool send(const PIString & ip_port, const PIByteArray & data, bool threaded = false) {addr_s.set(ip_port); if (threaded) {writeThreaded(data); return true;} return (write(data) == data.size_s());}
+
+	//! Send data "data" to address "addr" for UDP
+	bool send(const Address & addr, const PIByteArray & data, bool threaded = false) {addr_s = addr; if (threaded) {writeThreaded(data); return true;} return (write(data) == data.size_s());}
+	
+	virtual bool canWrite() const {return mode() & WriteOnly;}
+
+	int socket() const {return sock;}
+	
+	EVENT1(newConnection, PIEthernet * , client)
+	EVENT0(connected)
+	EVENT1(disconnected, bool, withError)
+	
+	
+	//! Flags of network interface
+	enum PIP_EXPORT InterfaceFlag {
+		ifActive /** Is active */ = 0x1,
+		ifRunning /** Is running */ = 0x2,
+		ifBroadcast /** Support broadcast */ = 0x4,
+		ifMulticast /** Support multicast */ = 0x8,
+		ifLoopback /** Is loopback */ = 0x10,
+		ifPTP /** Is point-to-point */ = 0x20
+	};
+	
+	//! %PIFlags of network interface flags
+	typedef PIFlags<InterfaceFlag> InterfaceFlags;
+	
+	
+	//! Network interface descriptor
+	struct PIP_EXPORT Interface {
+		
+		//! System index
+		int index;
+		
+		//! MTU
+		int mtu;
+		
+		//! System name
+		PIString name;
+		
+		//! MAC address in format "hh:hh:hh:hh:hh:hh" or empty if there is no MAC address
+		PIString mac;
+		
+		//! IP address in format "i.i.i.i" or empty if there is no IP address
+		PIString address;
+		
+		//! Netmask of IP address in format "i.i.i.i" or empty if there is no netmask
+		PIString netmask;
+		
+		//! Broadcast address in format "i.i.i.i" or empty if there is no broadcast address
+		PIString broadcast;
+		
+		//! Point-to-point address or empty if there is no point-to-point address
+		PIString ptp;
+		
+		//! Flags of interface
+		InterfaceFlags flags;
+		
+		//! Returns if interface is active
+		bool isActive() const {return flags[PIEthernet::ifActive];}
+		
+		//! Returns if interface is running
+		bool isRunning() const {return flags[PIEthernet::ifRunning];}
+		
+		//! Returns if interface support broadcast
+		bool isBroadcast() const {return flags[PIEthernet::ifBroadcast];}
+		
+		//! Returns if interface support multicast
+		bool isMulticast() const {return flags[PIEthernet::ifMulticast];}
+		
+		//! Returns if interface is loopback
+		bool isLoopback() const {return flags[PIEthernet::ifLoopback];}
+		
+		//! Returns if interface is point-to-point
+		bool isPTP() const {return flags[PIEthernet::ifPTP];}
+	};
+	
+	
+	//! Array of \a Interface with some features
+	class PIP_EXPORT InterfaceList: public PIVector<PIEthernet::Interface> {
+	public:
+		InterfaceList(): PIVector<PIEthernet::Interface>() {}
+		
+		//! Get interface with system index "index" or 0 if there is no one
+		const Interface * getByIndex(int index) const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].index == index) return &((*this)[i]); return 0;}
+		
+		//! Get interface with system name "name" or 0 if there is no one
+		const Interface * getByName(const PIString & name) const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].name == name) return &((*this)[i]); return 0;}
+		
+		//! Get interface with IP address "address" or 0 if there is no one
+		const Interface * getByAddress(const PIString & address) const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].address == address) return &((*this)[i]); return 0;}
+		
+		//! Get loopback interface or 0 if there is no one
+		const Interface * getLoopback() const {for (int i = 0; i < size_s(); ++i) if ((*this)[i].isLoopback()) return &((*this)[i]); return 0;}
+	};
+
+	
+	//! Returns all system network interfaces
+	static InterfaceList interfaces();
+	
+	static PIEthernet::Address interfaceAddress(const PIString & interface_);
+	
+	//! Returns all system network IP addresses
+	static PIVector<PIEthernet::Address> allAddresses();
+
+	static PIString macFromBytes(const PIByteArray & mac);
+	static PIByteArray macToBytes(const PIString & mac);
+	static PIString applyMask(const PIString & ip, const PIString & mask);
+	static  Address applyMask(const Address & ip, const Address & mask);
+	static PIString getBroadcast(const PIString & ip, const PIString & mask);
+	static  Address getBroadcast(const Address & ip, const Address & mask);
+
+//! \events
+//! \{
+
+	//! \fn void newConnection(PIEthernet * client)
+	//! \brief Raise on new TCP connection received
+	
+	//! \fn void connected()
+	//! \brief Raise if succesfull TCP connection
+
+	//! \fn void disconnected(bool withError)
+	//! \brief Raise if TCP connection was closed
+
+//! \}
+//! \ioparams
+//! \{
+#ifdef DOXYGEN
+	//! \brief read ip, default ""
+	string ip;
+	
+	//! \brief read port, default 0
+	int port;
+	
+	//! \brief ethernet parameters
+	int parameters;
+	
+	//! \brief read timeout, default 1000 ms
+	double readTimeout;
+	
+	//! \brief write timeout, default 1000 ms
+	double writeTimeout;
+	
+	//! \brief time-to-live, default 64
+	int TTL;
+	
+	//! \brief time-to-live for multicast, default 1
+	int multicastTTL;
+#endif
+//! \}
+
+protected:
+	explicit PIEthernet(int sock, PIString ip_port);
+
+	void propertyChanged(const PIString & name);
+	
+	PIString fullPathPrefix() const {return PIStringAscii("eth");}
+	PIString constructFullPathDevice() const;
+	void configureFromFullPathDevice(const PIString & full_path);
+	PIPropertyStorage constructVariantDevice() const;
+	void configureFromVariantDevice(const PIPropertyStorage & d);
+	bool configureDevice(const void * e_main, const void * e_parent = 0);
+	int readDevice(void * read_to, int max_size);
+	int writeDevice(const void * data, int max_size);
+	DeviceInfoFlags deviceInfoFlags() const;
+
+	//! Executes when any read function was successful. Default implementation does nothing
+	virtual void received(const void * data, int size) {;}
+
+	void construct();
+	bool init();
+	bool openDevice();
+	bool closeDevice();
+	void closeSocket(int & sd);
+	void applyTimeouts();
+	void applyTimeout(int fd, int opt, double ms);
+	void applyOptInt(int level, int opt, int val);
+	
+	PRIVATE_DECLARATION
+	int sock, sock_s;
+	bool connected_, connecting_, listen_threaded, server_bounded;
+	mutable Address addr_r, addr_s, addr_lr;
+	PIThread server_thread_;
+	PIMutex clients_mutex;
+	PIVector<PIEthernet * > clients_;
+	PIQueue<PIString> mcast_queue;
+	PIStringList mcast_groups;
+
+private:
+	EVENT_HANDLER(void, clientDeleted);
+	static void server_func(void * eth);
+	void setType(Type t, bool reopen = true) {setProperty(PIStringAscii("type"), (int)t); if (reopen && isOpened()) {closeDevice(); init(); openDevice();}}
+
+	static int ethErrorCore();
+	static PIString ethErrorString();
+	static int ethRecv(int sock, void * buf, int size, int flags = 0);
+	static int ethRecvfrom(int sock, void * buf, int size, int flags, sockaddr * addr);
+	static int ethSendto(int sock, const void * buf, int size, int flags, sockaddr * addr, int addr_len);
+	static void ethClosesocket(int sock, bool shutdown);
+	static int ethSetsockopt(int sock, int level, int optname, const void * optval, int optlen);
+	static int ethSetsockoptInt(int sock, int level, int optname, int value = 1);
+	static int ethSetsockoptBool(int sock, int level, int optname, bool value = true);
+
+};
+
+inline bool operator <(const PIEthernet::Interface & v0, const PIEthernet::Interface & v1) {return (v0.name < v1.name);}
+inline bool operator ==(const PIEthernet::Interface & v0, const PIEthernet::Interface & v1) {return (v0.name == v1.name && v0.address == v1.address && v0.netmask == v1.netmask);}
+inline bool operator !=(const PIEthernet::Interface & v0, const PIEthernet::Interface & v1) {return (v0.name != v1.name || v0.address != v1.address || v0.netmask != v1.netmask);}
+inline PICout operator <<(PICout s, const PIEthernet::Address & v) {s.space(); s.setControl(0, true); s << "Address(" << v.toString() << ")"; s.restoreControl(); return s;}
+
+inline bool operator ==(const PIEthernet::Address & v0, const PIEthernet::Address & v1) {return (v0.ip() == v1.ip() && v0.port() == v1.port());}
+inline bool operator !=(const PIEthernet::Address & v0, const PIEthernet::Address & v1) {return (v0.ip() != v1.ip() || v0.port() != v1.port());}
+inline PIByteArray & operator <<(PIByteArray & s, const PIEthernet::Address & v) {s << v.ip_ << v.port_; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIEthernet::Address & v) {s >> v.ip_ >> v.port_; return s;}
+
+#endif // PIETHERNET_H
diff --git a/src_main/io_devices/pifile.cpp b/lib/main/io_devices/pifile.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/pifile.cpp
rename to lib/main/io_devices/pifile.cpp
diff --git a/src_main/io_devices/pifile.h b/lib/main/io_devices/pifile.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/pifile.h
rename to lib/main/io_devices/pifile.h
diff --git a/src_main/io_devices/pigpio.cpp b/lib/main/io_devices/pigpio.cpp
similarity index 100%
rename from src_main/io_devices/pigpio.cpp
rename to lib/main/io_devices/pigpio.cpp
diff --git a/src_main/io_devices/pigpio.h b/lib/main/io_devices/pigpio.h
similarity index 100%
rename from src_main/io_devices/pigpio.h
rename to lib/main/io_devices/pigpio.h
diff --git a/src_main/io_devices/piiobytearray.cpp b/lib/main/io_devices/piiobytearray.cpp
similarity index 96%
rename from src_main/io_devices/piiobytearray.cpp
rename to lib/main/io_devices/piiobytearray.cpp
index 395c5f03..67f45a21 100644
--- a/src_main/io_devices/piiobytearray.cpp
+++ b/lib/main/io_devices/piiobytearray.cpp
@@ -1,93 +1,93 @@
-/*
-	PIP - Platform Independent Primitives
-	PIIODevice wrapper around PIByteArray
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piiobytearray.h"
-
-
-/*! \class PIIOByteArray
- * \brief PIIODevice wrapper around PIByteArray
- * 
- * \section  PIIOByteArray_sec0 Synopsis
- * This class sllow you to use PIByteArray as PIIODevice and pass it to, e.g. PIConfig
- */
-
-
-PIIOByteArray::PIIOByteArray(PIByteArray *buffer, PIIODevice::DeviceMode mode) {
-	open(buffer, mode);
-}
-
-
-PIIOByteArray::PIIOByteArray(const PIByteArray &buffer) {
-	open(buffer);
-}
-
-
-bool PIIOByteArray::open(PIByteArray *buffer, PIIODevice::DeviceMode mode) {
-	data_ = buffer;
-	mode_ = mode;
-	return PIIODevice::open(mode);
-}
-
-
-bool PIIOByteArray::open(const PIByteArray &buffer) {
-	data_ = const_cast<PIByteArray*>(&buffer);
-	mode_ = PIIODevice::ReadOnly;
-	return PIIODevice::open(PIIODevice::ReadOnly);
-}
-
-
-int PIIOByteArray::readDevice(void * read_to, int size) {
-//	piCout << "PIIOByteArray::read" << data_ << size << canRead();
-	if (!canRead() || !data_) return -1;
-	int ret = piMini(size, data_->size_s() - pos);
-	if (ret <= 0) return -1;
-	memcpy(read_to, data_->data(pos), ret);
-//	piCout << "readed" << ret;
-	pos += size;
-	if (pos > data_->size_s()) pos = data_->size_s();
-	return ret;
-}
-
-
-int PIIOByteArray::writeDevice(const void * data, int size) {
-//	piCout << "PIIOByteArray::write" << data << size << canWrite();
-	if (!canWrite() || !data) return -1;
-	//piCout << "write" << data;
-	if (pos > data_->size_s()) pos = data_->size_s();
-	PIByteArray rs = PIByteArray(data, size);
-//	piCoutObj << rs;
-	data_->insert(pos, rs);
-	pos += rs.size_s();
-	return rs.size_s();
-}
-
-
-int PIIOByteArray::writeByteArray(const PIByteArray &ba) {
-	if (!canWrite() || !data_) return -1;
-	if (pos > data_->size_s()) pos = data_->size_s();
-	data_->insert(pos, ba);
-	pos += ba.size_s();
-	return ba.size_s();
-}
-
-
-bool PIIOByteArray::openDevice() {
-	pos = 0;
-	return (data_ != 0);
-}
+/*
+	PIP - Platform Independent Primitives
+	PIIODevice wrapper around PIByteArray
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piiobytearray.h"
+
+
+/*! \class PIIOByteArray
+ * \brief PIIODevice wrapper around PIByteArray
+ * 
+ * \section  PIIOByteArray_sec0 Synopsis
+ * This class sllow you to use PIByteArray as PIIODevice and pass it to, e.g. PIConfig
+ */
+
+
+PIIOByteArray::PIIOByteArray(PIByteArray *buffer, PIIODevice::DeviceMode mode) {
+	open(buffer, mode);
+}
+
+
+PIIOByteArray::PIIOByteArray(const PIByteArray &buffer) {
+	open(buffer);
+}
+
+
+bool PIIOByteArray::open(PIByteArray *buffer, PIIODevice::DeviceMode mode) {
+	data_ = buffer;
+	mode_ = mode;
+	return PIIODevice::open(mode);
+}
+
+
+bool PIIOByteArray::open(const PIByteArray &buffer) {
+	data_ = const_cast<PIByteArray*>(&buffer);
+	mode_ = PIIODevice::ReadOnly;
+	return PIIODevice::open(PIIODevice::ReadOnly);
+}
+
+
+int PIIOByteArray::readDevice(void * read_to, int size) {
+//	piCout << "PIIOByteArray::read" << data_ << size << canRead();
+	if (!canRead() || !data_) return -1;
+	int ret = piMini(size, data_->size_s() - pos);
+	if (ret <= 0) return -1;
+	memcpy(read_to, data_->data(pos), ret);
+//	piCout << "readed" << ret;
+	pos += size;
+	if (pos > data_->size_s()) pos = data_->size_s();
+	return ret;
+}
+
+
+int PIIOByteArray::writeDevice(const void * data, int size) {
+//	piCout << "PIIOByteArray::write" << data << size << canWrite();
+	if (!canWrite() || !data) return -1;
+	//piCout << "write" << data;
+	if (pos > data_->size_s()) pos = data_->size_s();
+	PIByteArray rs = PIByteArray(data, size);
+//	piCoutObj << rs;
+	data_->insert(pos, rs);
+	pos += rs.size_s();
+	return rs.size_s();
+}
+
+
+int PIIOByteArray::writeByteArray(const PIByteArray &ba) {
+	if (!canWrite() || !data_) return -1;
+	if (pos > data_->size_s()) pos = data_->size_s();
+	data_->insert(pos, ba);
+	pos += ba.size_s();
+	return ba.size_s();
+}
+
+
+bool PIIOByteArray::openDevice() {
+	pos = 0;
+	return (data_ != 0);
+}
diff --git a/src_main/io_devices/piiobytearray.h b/lib/main/io_devices/piiobytearray.h
similarity index 96%
rename from src_main/io_devices/piiobytearray.h
rename to lib/main/io_devices/piiobytearray.h
index 1656519f..64212646 100644
--- a/src_main/io_devices/piiobytearray.h
+++ b/lib/main/io_devices/piiobytearray.h
@@ -1,82 +1,82 @@
-/*! \file piiobytearray.h
- * \brief PIIODevice wrapper around PIByteArray
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIIODevice wrapper around PIByteArray
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIIOBYTEARRAY_H
-#define PIIOBYTEARRAY_H
-
-#include "piiodevice.h"
-
-
-class PIP_EXPORT PIIOByteArray: public PIIODevice
-{
-	PIIODEVICE(PIIOByteArray)
-public:
-	
-	//! Contructs %PIIOByteArray with \"buffer\" content and \"mode\" open mode
-	explicit PIIOByteArray(PIByteArray * buffer = 0, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
-	
-	//! Contructs %PIIOByteArray with \"buffer\" content only for read
-	explicit PIIOByteArray(const PIByteArray & buffer);
-	
-	~PIIOByteArray() {closeDevice();}
-	
-	//! Returns content
-	PIByteArray * byteArray() const {return data_;}
-	
-	//! Clear content buffer
-	void clear() {if (data_) data_->clear(); pos = 0;}
-	
-	//! Open \"buffer\" content with \"mode\" open mode
-	bool open(PIByteArray * buffer, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
-	
-	//! Open \"buffer\" content only for read
-	bool open(const PIByteArray & buffer);
-	
-	//! Returns if position is at the end of content
-	bool isEnd() const {if (!data_) return true; return pos >= data_->size_s();}
-	
-	
-	//! Move read/write position to \"position\"
-	void seek(llong position) {pos = position;}
-	
-	//! Move read/write position to the begin of the string
-	void seekToBegin() {if (data_) pos = 0;}
-	
-	//! Move read/write position to the end of the string
-	void seekToEnd() {if (data_) pos = data_->size_s();}
-	
-	
-	//! Insert data \"ba\" into content at current position
-	int writeByteArray(const PIByteArray & ba);
-	
-protected:
-	bool openDevice();
-	int readDevice(void * read_to, int size);
-	int writeDevice(const void * data_, int size);
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential | PIIODevice::Reliable;}
-
-	ssize_t pos;
-	PIByteArray * data_;
-
-};
-
-#endif // PIIOBYTEARRAY_H
+/*! \file piiobytearray.h
+ * \brief PIIODevice wrapper around PIByteArray
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIIODevice wrapper around PIByteArray
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIIOBYTEARRAY_H
+#define PIIOBYTEARRAY_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PIIOByteArray: public PIIODevice
+{
+	PIIODEVICE(PIIOByteArray)
+public:
+	
+	//! Contructs %PIIOByteArray with \"buffer\" content and \"mode\" open mode
+	explicit PIIOByteArray(PIByteArray * buffer = 0, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
+	
+	//! Contructs %PIIOByteArray with \"buffer\" content only for read
+	explicit PIIOByteArray(const PIByteArray & buffer);
+	
+	~PIIOByteArray() {closeDevice();}
+	
+	//! Returns content
+	PIByteArray * byteArray() const {return data_;}
+	
+	//! Clear content buffer
+	void clear() {if (data_) data_->clear(); pos = 0;}
+	
+	//! Open \"buffer\" content with \"mode\" open mode
+	bool open(PIByteArray * buffer, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
+	
+	//! Open \"buffer\" content only for read
+	bool open(const PIByteArray & buffer);
+	
+	//! Returns if position is at the end of content
+	bool isEnd() const {if (!data_) return true; return pos >= data_->size_s();}
+	
+	
+	//! Move read/write position to \"position\"
+	void seek(llong position) {pos = position;}
+	
+	//! Move read/write position to the begin of the string
+	void seekToBegin() {if (data_) pos = 0;}
+	
+	//! Move read/write position to the end of the string
+	void seekToEnd() {if (data_) pos = data_->size_s();}
+	
+	
+	//! Insert data \"ba\" into content at current position
+	int writeByteArray(const PIByteArray & ba);
+	
+protected:
+	bool openDevice();
+	int readDevice(void * read_to, int size);
+	int writeDevice(const void * data_, int size);
+	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential | PIIODevice::Reliable;}
+
+	ssize_t pos;
+	PIByteArray * data_;
+
+};
+
+#endif // PIIOBYTEARRAY_H
diff --git a/src_main/io_devices/piiodevice.cpp b/lib/main/io_devices/piiodevice.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/piiodevice.cpp
rename to lib/main/io_devices/piiodevice.cpp
diff --git a/src_main/io_devices/piiodevice.h b/lib/main/io_devices/piiodevice.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/piiodevice.h
rename to lib/main/io_devices/piiodevice.h
diff --git a/src_main/io_devices/piiodevicesmodule.h b/lib/main/io_devices/piiodevicesmodule.h
similarity index 100%
rename from src_main/io_devices/piiodevicesmodule.h
rename to lib/main/io_devices/piiodevicesmodule.h
diff --git a/src_main/io_devices/piiostring.cpp b/lib/main/io_devices/piiostring.cpp
similarity index 96%
rename from src_main/io_devices/piiostring.cpp
rename to lib/main/io_devices/piiostring.cpp
index 62999b10..d2587cec 100644
--- a/src_main/io_devices/piiostring.cpp
+++ b/lib/main/io_devices/piiostring.cpp
@@ -1,100 +1,100 @@
-/*
-	PIP - Platform Independent Primitives
-	PIIODevice wrapper around PIString
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piiostring.h"
-
-
-/*! \class PIIOString
- * \brief PIIODevice wrapper around PIString
- * 
- * \section  PIIOString_sec0 Synopsis
- * This class allow you to use PIString as PIIODevice and pass it to, e.g. PIConfig
- */
-
-
-PIIOString::PIIOString(PIString * string, PIIODevice::DeviceMode mode) {
-	open(string, mode);
-}
-
-
-PIIOString::PIIOString(const PIString & string) {
-	open(string);
-}
-
-
-bool PIIOString::open(PIString * string, PIIODevice::DeviceMode mode) {
-	str = string;
-	return PIIODevice::open(mode);
-}
-
-
-bool PIIOString::open(const PIString & string) {
-	str = const_cast<PIString*>(&string);
-	return PIIODevice::open(PIIODevice::ReadOnly);
-}
-
-
-PIString PIIOString::readLine() {
-	if (!canRead() || !str) return PIString();
-	int np = pos;
-	while (++np < str->size_s())
-		if ((*str)[np] == '\n')
-			break;
-	PIString ret = str->mid(pos, np - pos);
-	pos = piMini(np + 1, str->size_s());
-	return ret;
-}
-
-
-int PIIOString::readDevice(void * read_to, int max_size) {
-	if (!canRead() || !str) return -1;
-	PIString rs = str->mid(pos, max_size);
-	pos += max_size;
-	if (pos > str->size_s()) pos = str->size_s();
-	int ret = rs.lengthAscii();
-	memcpy(read_to, rs.data(), rs.lengthAscii());
-	return ret;
-}
-
-
-int PIIOString::writeDevice(const void * data, int max_size) {
-	if (!canWrite() || !str) return -1;
-	//piCout << "write" << data;
-	if (pos > str->size_s()) pos = str->size_s();
-	PIString rs = PIString::fromUTF8((const char *)data);
-	if (rs.size_s() > max_size) rs.resize(max_size);
-	str->insert(pos, rs);
-	pos += rs.size_s();
-	return rs.lengthAscii();
-}
-
-
-int PIIOString::writeString(const PIString & string) {
-	if (!canWrite() || !str) return -1;
-	if (pos > str->size_s()) pos = str->size_s();
-	str->insert(pos, string);
-	pos += string.size_s();
-	return string.lengthAscii();
-}
-
-
-bool PIIOString::openDevice() {
-	pos = 0;
-	return (str != 0);
-}
+/*
+	PIP - Platform Independent Primitives
+	PIIODevice wrapper around PIString
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piiostring.h"
+
+
+/*! \class PIIOString
+ * \brief PIIODevice wrapper around PIString
+ * 
+ * \section  PIIOString_sec0 Synopsis
+ * This class allow you to use PIString as PIIODevice and pass it to, e.g. PIConfig
+ */
+
+
+PIIOString::PIIOString(PIString * string, PIIODevice::DeviceMode mode) {
+	open(string, mode);
+}
+
+
+PIIOString::PIIOString(const PIString & string) {
+	open(string);
+}
+
+
+bool PIIOString::open(PIString * string, PIIODevice::DeviceMode mode) {
+	str = string;
+	return PIIODevice::open(mode);
+}
+
+
+bool PIIOString::open(const PIString & string) {
+	str = const_cast<PIString*>(&string);
+	return PIIODevice::open(PIIODevice::ReadOnly);
+}
+
+
+PIString PIIOString::readLine() {
+	if (!canRead() || !str) return PIString();
+	int np = pos;
+	while (++np < str->size_s())
+		if ((*str)[np] == '\n')
+			break;
+	PIString ret = str->mid(pos, np - pos);
+	pos = piMini(np + 1, str->size_s());
+	return ret;
+}
+
+
+int PIIOString::readDevice(void * read_to, int max_size) {
+	if (!canRead() || !str) return -1;
+	PIString rs = str->mid(pos, max_size);
+	pos += max_size;
+	if (pos > str->size_s()) pos = str->size_s();
+	int ret = rs.lengthAscii();
+	memcpy(read_to, rs.data(), rs.lengthAscii());
+	return ret;
+}
+
+
+int PIIOString::writeDevice(const void * data, int max_size) {
+	if (!canWrite() || !str) return -1;
+	//piCout << "write" << data;
+	if (pos > str->size_s()) pos = str->size_s();
+	PIString rs = PIString::fromUTF8((const char *)data);
+	if (rs.size_s() > max_size) rs.resize(max_size);
+	str->insert(pos, rs);
+	pos += rs.size_s();
+	return rs.lengthAscii();
+}
+
+
+int PIIOString::writeString(const PIString & string) {
+	if (!canWrite() || !str) return -1;
+	if (pos > str->size_s()) pos = str->size_s();
+	str->insert(pos, string);
+	pos += string.size_s();
+	return string.lengthAscii();
+}
+
+
+bool PIIOString::openDevice() {
+	pos = 0;
+	return (str != 0);
+}
diff --git a/src_main/io_devices/piiostring.h b/lib/main/io_devices/piiostring.h
similarity index 96%
rename from src_main/io_devices/piiostring.h
rename to lib/main/io_devices/piiostring.h
index e16b7244..c195c0cd 100644
--- a/src_main/io_devices/piiostring.h
+++ b/lib/main/io_devices/piiostring.h
@@ -1,85 +1,85 @@
-/*! \file piiostring.h
- * \brief PIIODevice wrapper around PIString
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIIODevice wrapper around PIString
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIIOSTRING_H
-#define PIIOSTRING_H
-
-#include "piiodevice.h"
-
-
-class PIP_EXPORT PIIOString: public PIIODevice
-{
-	PIIODEVICE(PIIOString)
-public:
-	
-	//! Contructs %PIIOString with \"string\" content and \"mode\" open mode
-	explicit PIIOString(PIString * string = 0, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
-	
-	//! Contructs %PIIOString with \"string\" content only for read
-	explicit PIIOString(const PIString & string);
-	
-	~PIIOString() {closeDevice();}
-	
-	//! Returns content
-	PIString * string() const {return str;}
-	
-	//! Clear content string
-	void clear() {if (str) str->clear(); pos = 0;}
-	
-	//! Open \"string\" content with \"mode\" open mode
-	bool open(PIString * string, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
-	
-	//! Open \"string\" content only for read
-	bool open(const PIString & string);
-	
-	//! Returns if position is at the end of content
-	bool isEnd() const {if (!str) return true; return pos >= str->size_s();}
-	
-	
-	//! Move read/write position to \"position\"
-	void seek(llong position) {pos = position;}
-	
-	//! Move read/write position to the begin of the string
-	void seekToBegin() {if (str) pos = 0;}
-	
-	//! Move read/write position to the end of the string
-	void seekToEnd() {if (str) pos = str->size_s();}
-	
-	
-	//! Read one text line and return it
-	PIString readLine();
-	
-	//! Insert string \"string\" into content at current position
-	int writeString(const PIString & string);
-	
-protected:
-	bool openDevice();
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int max_size);
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential | PIIODevice::Reliable;}
-
-	ssize_t pos;
-	PIString * str;
-
-};
-
-#endif // PIIOSTRING_H
+/*! \file piiostring.h
+ * \brief PIIODevice wrapper around PIString
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIIODevice wrapper around PIString
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIIOSTRING_H
+#define PIIOSTRING_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PIIOString: public PIIODevice
+{
+	PIIODEVICE(PIIOString)
+public:
+	
+	//! Contructs %PIIOString with \"string\" content and \"mode\" open mode
+	explicit PIIOString(PIString * string = 0, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
+	
+	//! Contructs %PIIOString with \"string\" content only for read
+	explicit PIIOString(const PIString & string);
+	
+	~PIIOString() {closeDevice();}
+	
+	//! Returns content
+	PIString * string() const {return str;}
+	
+	//! Clear content string
+	void clear() {if (str) str->clear(); pos = 0;}
+	
+	//! Open \"string\" content with \"mode\" open mode
+	bool open(PIString * string, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
+	
+	//! Open \"string\" content only for read
+	bool open(const PIString & string);
+	
+	//! Returns if position is at the end of content
+	bool isEnd() const {if (!str) return true; return pos >= str->size_s();}
+	
+	
+	//! Move read/write position to \"position\"
+	void seek(llong position) {pos = position;}
+	
+	//! Move read/write position to the begin of the string
+	void seekToBegin() {if (str) pos = 0;}
+	
+	//! Move read/write position to the end of the string
+	void seekToEnd() {if (str) pos = str->size_s();}
+	
+	
+	//! Read one text line and return it
+	PIString readLine();
+	
+	//! Insert string \"string\" into content at current position
+	int writeString(const PIString & string);
+	
+protected:
+	bool openDevice();
+	int readDevice(void * read_to, int max_size);
+	int writeDevice(const void * data, int max_size);
+	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential | PIIODevice::Reliable;}
+
+	ssize_t pos;
+	PIString * str;
+
+};
+
+#endif // PIIOSTRING_H
diff --git a/src_main/io_devices/pipeer.cpp b/lib/main/io_devices/pipeer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/pipeer.cpp
rename to lib/main/io_devices/pipeer.cpp
diff --git a/src_main/io_devices/pipeer.h b/lib/main/io_devices/pipeer.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/pipeer.h
rename to lib/main/io_devices/pipeer.h
diff --git a/src_main/io_devices/piserial.cpp b/lib/main/io_devices/piserial.cpp
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/io_devices/piserial.cpp
rename to lib/main/io_devices/piserial.cpp
index 88d24bf1..b39fad68
--- a/src_main/io_devices/piserial.cpp
+++ b/lib/main/io_devices/piserial.cpp
@@ -1,1083 +1,1083 @@
-/*
-	PIP - Platform Independent Primitives
-	COM
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piincludes_p.h"
-#include "piserial.h"
-#include "piconfig.h"
-#include "pidir.h"
-#include "pipropertystorage.h"
-#include <errno.h>
-
-#if defined(FREERTOS)
-#  define PISERIAL_NO_PINS
-#endif
-#if defined(PISERIAL_NO_PINS) || defined(WINDOWS)
-#  define TIOCM_LE   1
-#  define TIOCM_DTR  4
-#  define TIOCM_RTS  7
-#  define TIOCM_CTS  8
-#  define TIOCM_ST   3
-#  define TIOCM_SR   2
-#  define TIOCM_CAR  1
-#  define TIOCM_RNG  9
-#  define TIOCM_DSR  6
-#endif
-#ifdef WINDOWS
-#  ifndef INITGUID
-#    define INITGUID
-#    include <guiddef.h>
-#    undef INITGUID
-#  else
-#    include <guiddef.h>
-#  endif
-#  include <ntddmodm.h>
-#  include <winreg.h>
-#  include <windows.h>
-#  include <winioctl.h>
-#  include <cfgmgr32.h>
-#  include <setupapi.h>
-#  define B50       50
-#  define B75       75
-#  define B110      110
-#  define B300      300
-#  define B600      600
-#  define B1200     1200
-#  define B2400     2400
-#  define B4800     4800
-#  define B9600     9600
-#  define B14400    14400
-#  define B19200    19200
-#  define B38400    38400
-#  define B57600    57600
-#  define B115200   115200
-#  define B230400   230400
-#  define B460800   460800
-#  define B500000   500000
-#  define B576000   576000
-#  define B921600   921600
-#  define B1000000  1000000
-#  define B1152000  1152000
-#  define B1500000  1500000
-#  define B2000000  2000000
-#  define B2500000  2500000
-#  define B3000000  3000000
-#  define B3500000  3500000
-#  define B4000000  4000000
-#else
-#  include <termios.h>
-#  include <fcntl.h>
-#  include <sys/ioctl.h>
-#  ifndef B50
-#    define B50       0000001
-#  endif
-#  ifndef B75
-#    define B75       0000002
-#  endif
-#  ifndef B230400
-#    define B230400   0010003
-#  endif
-#  ifndef B460800
-#    define B460800   0010004
-#  endif
-#  ifndef B500000
-#    define B500000   0010005
-#  endif
-#  ifndef B576000
-#    define B576000   0010006
-#  endif
-#  ifndef B921600
-#    define B921600   0010007
-#  endif
-#  ifndef B1000000
-#    define B1000000  0010010
-#  endif
-#  ifndef B1152000
-#    define B1152000  0010011
-#  endif
-#  ifndef B1500000
-#    define B1500000  0010012
-#  endif
-#  ifndef B2000000
-#    define B2000000  0010013
-#  endif
-#  ifndef B2500000
-#    define B2500000  0010014
-#  endif
-#  ifndef B3000000
-#    define B3000000  0010015
-#  endif
-#  ifndef B3500000
-#    define B3500000  0010016
-#  endif
-#  ifndef B4000000
-#    define B4000000  0010017
-#  endif
-#endif
-#ifndef CRTSCTS
-#  define CRTSCTS 020000000000
-#endif
-#ifdef LINUX
-#  include <linux/serial.h>
-#endif
-
-
-/*! \class PISerial
- * \brief Serial device
- * 
- * \section  PISerial_sec0 Synopsis
- * This class provide access to serial device, e.g. COM port. It can read,
- * write, wait for write. There are several read and write functions.
- *
- * \section  PISerial_sec1 FullPath
- * Since version 1.16.0 you can use as \a path DeviceInfo::id() USB identifier.
- * \code
- * PISerial * s = new PISerial("0403:6001");
- * PIIODevice * d = PIIODevice::createFromFullPath("ser://0403:6001:115200");
- * \endcode
- * 
- */
-
-REGISTER_DEVICE(PISerial)
-
-
-PRIVATE_DEFINITION_START(PISerial)
-#ifdef WINDOWS
-	DCB desc, sdesc;
-	void * hCom;
-	DWORD readed, mask;
-#else
-	termios desc, sdesc;
-	uint readed;
-#endif
-PRIVATE_DEFINITION_END(PISerial)
-
-
-
-
-PISerial::DeviceInfo::DeviceInfo() {
-	vID = pID = 0;
-}
-
-
-PIString PISerial::DeviceInfo::id() const {
-	return PIString::fromNumber(vID, 16).toLowerCase().expandLeftTo(4, '0') + ":" +
-			PIString::fromNumber(pID, 16).toLowerCase().expandLeftTo(4, '0');
-}
-
-
-
-
-PISerial::PISerial(): PIIODevice("", ReadWrite) {
-	construct();
-}
-
-
-PISerial::PISerial(const PIString & device_, PISerial::Speed speed_, PIFlags<PISerial::Parameters> params_): PIIODevice(device_, ReadWrite) {
-	construct();
-	setPath(device_);
-	setSpeed(speed_);
-	setParameters(params_);
-}
-
-
-PISerial::~PISerial() {
-	closeDevice();
-}
-
-
-void PISerial::construct() {
-#ifdef WINDOWS
-	PRIVATE->hCom = 0;
-#endif
-	fd = -1;
-	setPriority(piHigh);
-	vtime = 10;
-	sending = false;
-	setParameters(0);
-	setSpeed(S115200);
-	setDataBitsCount(8);
-}
-
-
-void PISerial::setParameter(PISerial::Parameters parameter, bool on) {
-	PIFlags<Parameters> cp = (PIFlags<Parameters>)(property("parameters").toInt());
-	cp.setFlag(parameter, on);
-	setParameters(cp);
-}
-
-
-bool PISerial::isParameterSet(PISerial::Parameters parameter) const {
-	PIFlags<Parameters> cp = (PIFlags<Parameters>)(property("parameters").toInt());
-	return cp[parameter];
-}
-
-
-bool PISerial::setPin(int number, bool on) {
-	switch (number) {
-	case 1: return setCAR(on); break;
-	case 2: return setSR(on); break;
-	case 3: return setST(on); break;
-	case 4: return setDTR(on); break;
-	case 5:
-		piCoutObj << "Pin number 5 is ground";
-		return false;
-	case 6: return setDSR(on); break;
-	case 7: return setRTS(on); break;
-	case 8: return setCTS(on); break;
-	case 9: return setRNG(on); break;
-	default:
-		piCoutObj << "Pin number " << number << " doesn`t exists!";
-		return false;
-	}
-	return false;
-}
-
-
-bool PISerial::isPin(int number) const {
-	switch (number) {
-	case 1: return isCAR(); break;
-	case 2: return isSR(); break;
-	case 3: return isST(); break;
-	case 4: return isDTR(); break;
-	case 5: return false;
-	case 6: return isDSR(); break;
-	case 7: return isRTS(); break;
-	case 8: return isCTS(); break;
-	case 9: return isRNG(); break;
-	default:
-		piCoutObj << "Pin number " << number << " doesn`t exists!";
-		return false;
-	}
-	return false;
-}
-
-bool PISerial::setLE(bool on) {return setBit(TIOCM_LE, on, "LE");}
-bool PISerial::setDTR(bool on) {return setBit(TIOCM_DTR, on, "DTR");}
-bool PISerial::setRTS(bool on) {return setBit(TIOCM_RTS, on, "RTS");}
-bool PISerial::setCTS(bool on) {return setBit(TIOCM_CTS, on, "CTS");}
-bool PISerial::setST(bool on) {return setBit(TIOCM_ST, on, "ST");}
-bool PISerial::setSR(bool on) {return setBit(TIOCM_SR, on, "SR");}
-bool PISerial::setCAR(bool on) {return setBit(TIOCM_CAR, on, "CAR");}
-bool PISerial::setRNG(bool on) {return setBit(TIOCM_RNG, on, "RNG");}
-bool PISerial::setDSR(bool on) {return setBit(TIOCM_DSR, on, "DSR");}
-
-bool PISerial::isLE() const {return isBit(TIOCM_LE, "LE");}
-bool PISerial::isDTR() const {return isBit(TIOCM_DTR, "DTR");}
-bool PISerial::isRTS() const {return isBit(TIOCM_RTS, "RTS");}
-bool PISerial::isCTS() const {return isBit(TIOCM_CTS, "CTS");}
-bool PISerial::isST() const {return isBit(TIOCM_ST, "ST");}
-bool PISerial::isSR() const {return isBit(TIOCM_SR, "SR");}
-bool PISerial::isCAR() const {return isBit(TIOCM_CAR, "CAR");}
-bool PISerial::isRNG() const {return isBit(TIOCM_RNG, "RNG");}
-bool PISerial::isDSR() const {return isBit(TIOCM_DSR, "DSR");}
-
-
-bool PISerial::setBit(int bit, bool on, const PIString & bname) {
-	if (fd < 0) {
-		piCoutObj << "setBit" << bname << " error: \"" << path() << "\" is not opened!";
-		return false;
-	}
-#ifndef PISERIAL_NO_PINS
-#  ifdef WINDOWS
-	static int bit_map_on [] = {0, 0, 0, 0, SETDTR, 0, 0, SETRTS, 0, 0, 0};
-	static int bit_map_off[] = {0, 0, 0, 0, CLRDTR, 0, 0, CLRRTS, 0, 0, 0};
-	int action = (on ? bit_map_on : bit_map_off)[bit];
-	if (action > 0) {
-		if (EscapeCommFunction(PRIVATE->hCom, action) == 0) {
-			piCoutObj << "setBit" << bname << " error: " << errorString();
-			return false;
-		}
-		return true;
-	}
-#  else
-	if (ioctl(fd, on ? TIOCMBIS : TIOCMBIC, &bit) < 0) {
-		piCoutObj << "setBit" << bname << " error: " << errorString();
-		return false;
-	}
-	return true;
-#  endif
-#endif
-	piCoutObj << "setBit" << bname << " doesn`t implemented, sorry :-(";
-	return false;
-}
-
-
-bool PISerial::isBit(int bit, const PIString & bname) const {
-	if (fd < 0) {
-		piCoutObj << "isBit" << bname << " error: \"" << path() << "\" is not opened!";
-		return false;
-	}
-#ifndef PISERIAL_NO_PINS
-#  ifdef WINDOWS
-#  else
-	int ret = 0;
-	if (ioctl(fd, TIOCMGET, &ret) < 0)
-		piCoutObj << "isBit" << bname << " error: " << errorString();
-	return ret & bit;
-#  endif
-#endif
-	piCoutObj << "isBit" << bname << " doesn`t implemented, sorry :-(";
-	return false;
-}
-
-
-void PISerial::flush() {
-#ifndef WINDOWS
-	if (fd != -1) tcflush(fd, TCIOFLUSH);
-#endif
-}
-
-
-int PISerial::convertSpeed(PISerial::Speed speed) {
-	switch (speed) {
-	case S50: return B50;
-	case S75: return B75;
-	case S110: return B110;
-	case S300: return B300;
-	case S600: return B600;
-	case S1200: return B1200;
-	case S2400: return B2400;
-	case S4800: return B4800;
-	case S9600: return B9600;
-	case S19200: return B19200;
-	case S38400: return B38400;
-	case S57600: return B57600;
-	case S115200: return B115200;
-	case S230400: return B230400;
-	case S460800: return B460800;
-	case S500000: return B500000;
-	case S576000: return B576000;
-	case S921600: return B921600;
-	case S1000000: return B1000000;
-	case S1152000: return B1152000;
-	case S1500000: return B1500000;
-	case S2000000: return B2000000;
-	case S2500000: return B2500000;
-	case S3000000: return B3000000;
-	case S3500000: return B3500000;
-	case S4000000: return B4000000;
-	default: break;
-	}
-	piCoutObj << "Warning: Unknown speed" << (int)speed << ", using 115200";
-	return B115200;
-}
-
-
-/** \brief Advanced read function
-* \details Read to pointer "read_to" no more than "max_size" and no longer
-* than "timeout_ms" milliseconds. If "timeout_ms" < 0 function will be
-* wait forever until "max_size" will be readed. If size <= 0 function
-* immediate returns \b false. For read data with unknown size use function
-* \a readData().
-* \returns \b True if readed bytes count = "max_size", else \b false
-* \sa \a readData() */
-bool PISerial::read(void * data, int size, double timeout_ms) {
-	if (data == 0 || size <= 0) return false;
-	int ret, all = 0;
-	if (timeout_ms > 0.) {
-		bool br = setOption(BlockingRead, false);
-		all = readDevice(data, 1);
-		tm_.reset();
-		while (all < size && tm_.elapsed_m() < timeout_ms) {
-			ret = readDevice(&((uchar * )data)[all], size - all);
-			if (ret > 0) all += ret;
-			else msleep(PIP_MIN_MSLEEP);
-		}
-		setOption(BlockingRead, br);
-		received(data, all);
-		return (all == size);
-	} else {
-		bool br = setOption(BlockingRead, true);
-		all = readDevice(data, 1);
-		while (all < size) {
-			ret = readDevice(&((uchar * )data)[all], size - all);
-			if (ret > 0) all += ret;
-		}
-		setOption(BlockingRead, br);
-		received(data, all);
-		return (all == size);
-	}
-	return false;
-}
-
-
-/** \brief Advanced read function
-* \details Read all or no more than "size" and no longer than
-* "timeout_ms" milliseconds. If "timeout_ms" < 0 function will be
-* wait forever until "size" will be readed. If "size" <= 0 
-* function will be read all until "timeout_ms" elaped. \n If size <= 0
-* and "timeout_ms" <= 0 function immediate returns empty string.
-* \n This function similar to \a readData() but returns data as string.
-* \sa \a readData() */
-PIString PISerial::read(int size, double timeout_ms) {
-	PIString str;
-	if (size <= 0 && timeout_ms <= 0.) return str;
-	int ret, all = 0;
-	uchar td[1024];
-	if (timeout_ms > 0.) {
-		bool br = setOption(BlockingRead, false);
-		tm_.reset();
-		if (size <= 0) {
-			while (tm_.elapsed_m() < timeout_ms) {
-				ret = readDevice(td, 1024);
-				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
-				else str << PIString((char*)td, ret);
-			}
-		} else {
-			while (all < size && tm_.elapsed_m() < timeout_ms) {
-				ret = readDevice(td, size - all);
-				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
-				else {
-					str << PIString((char*)td, ret);
-					all += ret;
-				}
-			}
-		}
-		setOption(BlockingRead, br);
-	} else {
-		bool br = setOption(BlockingRead, true);
-		all = readDevice(td, 1);
-		str << PIString((char*)td, all);
-		while (all < size) {
-			ret = readDevice(td, size - all);
-			if (ret <= 0) msleep(PIP_MIN_MSLEEP);
-			else {
-				str << PIString((char*)td, ret);
-				all += ret;
-			}
-		}
-		setOption(BlockingRead, br);
-	}
-	received(str.data(), str.size_s());
-	return str;
-}
-
-
-/** \brief Advanced read function
-* \details Read all or no more than "size" and no longer than
-* "timeout_ms" milliseconds. If "timeout_ms" < 0 function will be
-* wait forever until "size" will be readed. If "size" <= 0 
-* function will be read all until "timeout_ms" elaped. \n If size <= 0
-* and "timeout_ms" <= 0 function immediate returns empty byte array.
-* \n This function similar to \a read() but returns data as byte array.
-* \sa \a read() */
-PIByteArray PISerial::readData(int size, double timeout_ms) {
-	PIByteArray str;
-	if (size <= 0 && timeout_ms <= 0.) return str;
-	int ret, all = 0;
-	uchar td[1024];
-	if (timeout_ms > 0.) {
-		bool br = setOption(BlockingRead, false);
-		tm_.reset();
-		if (size <= 0) {
-			while (tm_.elapsed_m() < timeout_ms) {
-				ret = readDevice(td, 1024);
-				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
-				else str.append(td, ret);
-			}
-		} else {
-			while (all < size && tm_.elapsed_m() < timeout_ms) {
-				ret = readDevice(td, size - all);
-				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
-				else {
-					str.append(td, ret);
-					all += ret;
-				}
-			}
-		}
-		setOption(BlockingRead, br);
-	} else {
-		bool br = setOption(BlockingRead, true);
-		all = readDevice(td, 1);
-		str.append(td, all);
-		while (all < size) {
-			ret = readDevice(td, size - all);
-			if (ret <= 0) msleep(PIP_MIN_MSLEEP);
-			else {
-				str.append(td, ret);
-				all += ret;
-			}
-		}
-		setOption(BlockingRead, br);
-	}
-	received(str.data(), str.size_s());
-	return str;
-}
-
-
-bool PISerial::send(const void * data, int size) {
-	int ret = 0;
-	int wsz = 0;
-	do {
-		ret = write(&(((uchar*)data)[wsz]), size - wsz);
-		if (ret > 0) wsz += ret;
-		//piCout << ret << wsz;
-		else return false;
-	} while (wsz < size);
-	return (wsz == size);
-}
-
-
-bool PISerial::openDevice() {
-	PIString p = path();
-	//piCout << "ser open" << p;
-	PIString pl = p.toLowerCase().removeAll(' ');
-	if (!pl.startsWith("/") && !pl.startsWith("com")) {
-		p.clear();
-		PIVector<DeviceInfo> devs = availableDevicesInfo();
-		piForeachC (DeviceInfo & d, devs) {
-			if (d.id() == pl) {
-				p = d.path;
-				piBreak;
-			}
-		}
-		if (p.isEmpty()) {
-			piCoutObj << "Unable to find device \"" << pl << "\"";
-		}
-	}
-	if (p.isEmpty()) return false;
-#ifdef WINDOWS
-	DWORD ds = 0, sm = 0;
-	if (isReadable()) {ds |= GENERIC_READ; sm |= FILE_SHARE_READ;}
-	if (isWriteable()) {ds |= GENERIC_WRITE; sm |= FILE_SHARE_WRITE;}
-	PIString wp = "//./" + p;
-	PRIVATE->hCom = CreateFileA(wp.dataAscii(), ds, sm, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
-	if (PRIVATE->hCom == INVALID_HANDLE_VALUE) {
-		piCoutObj << "Unable to open \"" << p << "\"";
-		fd = -1;
-		return false;
-	}
-	fd = 0;
-#else
-	int om = 0;
-	switch (mode()) {
-	case PIIODevice::ReadOnly: om = O_RDONLY; break;
-	case PIIODevice::WriteOnly: om = O_WRONLY; break;
-	case PIIODevice::ReadWrite: om = O_RDWR; break;
-	}
-	fd = ::open(p.data(), O_NOCTTY | om);
-	if (fd == -1) {
-		piCoutObj << "Unable to open \"" << p << "\"";
-		return false;
-	}
-	tcgetattr(fd, &PRIVATE->desc);
-	PRIVATE->sdesc = PRIVATE->desc;
-	//piCoutObj << "Initialized " << p;
-#endif
-	applySettings();
-	return true;
-}
-
-
-bool PISerial::closeDevice() {
-	if (isRunning() && !isStopping()) {
-		stop();
-		PIThread::terminate();
-	}
-	if (fd != -1) {
-#ifdef WINDOWS
-		SetCommState(PRIVATE->hCom, &PRIVATE->sdesc);
-		SetCommMask(PRIVATE->hCom, PRIVATE->mask);
-//		piCoutObj << "close" <<
-		CloseHandle(PRIVATE->hCom);
-		PRIVATE->hCom = 0;
-#else
-		tcsetattr(fd, TCSANOW, &PRIVATE->sdesc);
-		::close(fd);
-#endif
-		fd = -1;
-	}
-	return true;
-}
-
-
-void PISerial::applySettings() {
-#ifdef WINDOWS
-	if (fd == -1) return;
-	setTimeouts();
-	GetCommMask(PRIVATE->hCom, &PRIVATE->mask);
-	SetCommMask(PRIVATE->hCom, EV_RXCHAR);
-	GetCommState(PRIVATE->hCom, &PRIVATE->sdesc);
-//	piCoutObj << PRIVATE->sdesc.fBinary << PRIVATE->sdesc.fAbortOnError << PRIVATE->sdesc.fDsrSensitivity << PRIVATE->sdesc.fDtrControl << PRIVATE->sdesc.fDummy2 << PRIVATE->sdesc.fErrorChar;
-	PRIVATE->desc = PRIVATE->sdesc;
-	PRIVATE->desc.DCBlength = sizeof(PRIVATE->desc);
-	PRIVATE->desc.BaudRate = convertSpeed(outSpeed());
-	if (dataBitsCount() >= 5 && dataBitsCount() <= 8)
-		PRIVATE->desc.ByteSize = dataBitsCount();
-	else
-		PRIVATE->desc.ByteSize = 8;
-	PIFlags<Parameters> params = parameters();
-	if (params[PISerial::ParityControl]) {
-		PRIVATE->desc.fParity = 1;
-		PRIVATE->desc.Parity = params[PISerial::ParityOdd] ? 1 : 2;
-	}
-	PRIVATE->desc.StopBits = params[PISerial::TwoStopBits] ? TWOSTOPBITS : ONESTOPBIT;
-	if (SetCommState(PRIVATE->hCom, &PRIVATE->desc) == -1) {
-		piCoutObj << "Unable to set comm state for \"" << path() << "\"";
-		return;
-	}
-#else
-	if (fd == -1) return;
-	tcgetattr(fd, &PRIVATE->desc);
-	PRIVATE->desc.c_oflag = PRIVATE->desc.c_lflag = PRIVATE->desc.c_cflag = 0;
-	PRIVATE->desc.c_iflag = IGNBRK;
-	PRIVATE->desc.c_cflag = CLOCAL | HUPCL;
-	switch (dataBitsCount()) {
-	case 5: PRIVATE->desc.c_cflag |= (CSIZE & CS5); break;
-	case 6: PRIVATE->desc.c_cflag |= (CSIZE & CS6); break;
-	case 7: PRIVATE->desc.c_cflag |= (CSIZE & CS7); break;
-	case 8: default: PRIVATE->desc.c_cflag |= (CSIZE & CS8); break;
-	};
-	if (isReadable()) PRIVATE->desc.c_cflag |= CREAD;
-	PIFlags<Parameters> params = parameters();
-	if (params[PISerial::TwoStopBits]) PRIVATE->desc.c_cflag |= CSTOPB;
-	if (params[PISerial::ParityControl]) {
-		PRIVATE->desc.c_iflag |= INPCK;
-		PRIVATE->desc.c_cflag |= PARENB;
-		if (params[PISerial::ParityOdd]) PRIVATE->desc.c_cflag |= PARODD;
-	}
-	PRIVATE->desc.c_cc[VMIN] = 1;
-	PRIVATE->desc.c_cc[VTIME] = vtime;
-
-	cfsetispeed(&PRIVATE->desc, convertSpeed(inSpeed()));
-	cfsetospeed(&PRIVATE->desc, convertSpeed(outSpeed()));
-
-	tcflush(fd, TCIOFLUSH);
-	setTimeouts();
-
-	if (tcsetattr(fd, TCSANOW, &PRIVATE->desc) < 0) {
-		piCoutObj << "Can`t set attributes for \"" << path() << "\"";
-		return;
-	}
-#endif
-}
-
-
-void PISerial::setTimeouts() {
-#ifdef WINDOWS
-	COMMTIMEOUTS times;
-	times.ReadIntervalTimeout = isOptionSet(BlockingRead) ? vtime : MAXDWORD;
-	times.ReadTotalTimeoutConstant = isOptionSet(BlockingRead) ? 0 : 1;
-	times.ReadTotalTimeoutMultiplier = isOptionSet(BlockingRead) ? 0 : MAXDWORD;
-	times.WriteTotalTimeoutConstant = isOptionSet(BlockingWrite) ? 0 : 1;
-	times.WriteTotalTimeoutMultiplier = 0;
-	if (SetCommTimeouts(PRIVATE->hCom, &times) == -1)
-		piCoutObj << "Unable to set timeouts for \"" << path() << "\"";
-#else
-	fcntl(fd, F_SETFL, isOptionSet(BlockingRead) ? 0 : O_NONBLOCK);
-#endif
-}
-
-
-/** \brief Basic read function
-* \details Read to pointer "read_to" no more than "max_size". If read is
-* set to blocking this function will be wait at least one byte.
-* \returns Readed bytes count
-* \sa \a readData() */
-int PISerial::readDevice(void * read_to, int max_size) {
-#ifdef WINDOWS
-		if (!canRead()) return -1;
-		if (sending) return -1;
-//		piCoutObj << "com event ...";
-		//piCoutObj << "read ..." << PRIVATE->hCom;
-		ReadFile(PRIVATE->hCom, read_to, max_size, &PRIVATE->readed, 0);
-		DWORD err = GetLastError();
-		//piCout << err;
-		if (err == ERROR_BAD_COMMAND || err == ERROR_ACCESS_DENIED) {
-			PIThread::stop(false);
-			close();
-			return 0;
-		}
-		//piCoutObj << "read" << (PRIVATE->readed) << errorString();
-		return PRIVATE->readed;
-#else
-		if (!canRead()) return -1;
-		return ::read(fd, read_to, max_size);
-#endif
-}
-
-
-int PISerial::writeDevice(const void * data, int max_size) {
-	if (fd == -1 || !canWrite()) {
-		//piCoutObj << "Can`t write to uninitialized COM";
-		return -1;
-	}
-#ifdef WINDOWS
-	DWORD wrote;
-//	piCoutObj << "send ...";// << max_size;// << ": " << PIString((char*)data, max_size);
-	sending = true;
-	WriteFile(PRIVATE->hCom, data, max_size, &wrote, 0);
-	sending = false;
-//	piCoutObj << "send ok";// << wrote << " bytes in " << path();
-#else
-	int wrote;
-	wrote = ::write(fd, data, max_size);
-	if (isOptionSet(BlockingWrite)) tcdrain(fd);
-#endif
-	return (int)wrote;
-	//piCoutObj << "Error while sending";
-}
-
-
-bool PISerial::configureDevice(const void * e_main, const void * e_parent) {
-	PIConfig::Entry * em = (PIConfig::Entry * )e_main;
-	PIConfig::Entry * ep = (PIConfig::Entry * )e_parent;
-	setDevice(readDeviceSetting<PIString>("device", device(), em, ep));
-	setSpeed((PISerial::Speed)(readDeviceSetting<int>("speed", (int)outSpeed(), em, ep)));
-	setDataBitsCount(readDeviceSetting<int>("dataBitsCount", dataBitsCount(), em, ep));
-	setParameter(PISerial::ParityControl, readDeviceSetting<bool>("parityControl", isParameterSet(PISerial::ParityControl), em, ep));
-	setParameter(PISerial::ParityOdd, readDeviceSetting<bool>("parityOdd", isParameterSet(PISerial::ParityOdd), em, ep));
-	setParameter(PISerial::TwoStopBits, readDeviceSetting<bool>("twoStopBits", isParameterSet(PISerial::TwoStopBits), em, ep));
-	return true;
-}
-
-
-PIString PISerial::constructFullPathDevice() const {
-	PIString ret;
-	ret << path() << ":" << int(inSpeed()) << ":" << dataBitsCount();
-	if (parameters()[ParityControl]) {
-		if (parameters()[ParityOdd]) ret << ":O";
-		else ret << ":E";
-	} else ret << ":N";
-	if (parameters()[TwoStopBits]) ret << ":2";
-	else ret << ":1";
-	return ret;
-}
-
-
-void PISerial::configureFromFullPathDevice(const PIString & full_path) {
-	PIStringList pl = full_path.split(":");
-	if (pl.size_s() > 1) {
-		PIString _s = pl[0].toLowerCase().removeAll(' ').trim();
-		if (!_s.startsWith("/") && !_s.startsWith("com")) {
-			pl[0] += ":" + pl[1];
-			pl.remove(1);
-		}
-	}
-	for (int i = 0; i < pl.size_s(); ++i) {
-		PIString p(pl[i]);
-		switch (i) {
-		case 0: setProperty("path", p); break;
-		case 1: setProperty("outSpeed", p.toInt()); setProperty("inSpeed", p.toInt()); break;
-		case 2: setProperty("dataBitsCount", p.toInt()); break;
-		case 3:
-			p = p.left(1).toLowerCase();
-			if (p != "n") setParameter(ParityControl);
-			if (p == "o") setParameter(ParityOdd);
-			break;
-		case 4: if (p.toInt() == 2) setParameter(TwoStopBits); break;
-		}
-	}
-	applySettings();
-}
-
-
-PIPropertyStorage PISerial::constructVariantDevice() const {
-	PIPropertyStorage ret;
-	ret.addProperty("path", path());
-	PIVariantTypes::Enum e;
-
-	PIVector<int> as = availableSpeeds();
-	piForeachC (int s, as) {e << PIVariantTypes::Enumerator(s, PIString::fromNumber(s));}
-	e.selectValue((int)inSpeed());
-	ret.addProperty("speed", e);
-
-	e = PIVariantTypes::Enum();
-	for (int i = 5; i <= 8; ++i) {e << PIVariantTypes::Enumerator(i, PIString::fromNumber(i));}
-	e.selectValue(dataBitsCount());
-	ret.addProperty("dataBits", e);
-
-	e = PIVariantTypes::Enum();
-	e << "None" << "Odd" << "Even";
-	if (parameters()[ParityControl]) {
-		if (parameters()[ParityOdd])
-			e.selectValue(1);
-		else
-			e.selectValue(2);
-	} else
-		e.selectValue(0);
-	ret.addProperty("parity", e);
-
-	e = PIVariantTypes::Enum();
-	for (int i = 1; i <= 2; ++i) {e << PIVariantTypes::Enumerator(i, PIString::fromNumber(i));}
-	e.selectValue(parameters()[TwoStopBits] ? 2 : 1);
-	ret.addProperty("stopBits", e);
-	return ret;
-}
-
-
-void PISerial::configureFromVariantDevice(const PIPropertyStorage & d) {
-	setPath(d.propertyValueByName("path").toString());
-	setSpeed((Speed)d.propertyValueByName("speed").toEnum().selectedValue());
-	setDataBitsCount(d.propertyValueByName("dataBits").toEnum().selectedValue());
-	PIVariantTypes::Enum e = d.propertyValueByName("parity").toEnum();
-	setParameter(ParityControl, e.selectedValue() > 0);
-	setParameter(ParityOdd    , e.selectedValue() == 1);
-	setParameter(TwoStopBits  , d.propertyValueByName("stopBits").toEnum().selectedValue() == 2);
-}
-
-
-PIVector<int> PISerial::availableSpeeds() {
-	PIVector<int> spds;
-	spds << 50 << 75 << 110 << 300 << 600 << 1200 << 2400 << 4800 <<
-			9600 << 19200 << 38400 << 57600 << 115200 << 230400 << 460800 <<
-			500000 << 576000 << 921600 << 1000000 << 1152000 << 1500000 <<
-			2000000 << 2500000 << 3000000 << 3500000 << 4000000;
-	return spds;
-}
-
-
-PIStringList PISerial::availableDevices(bool test) {
-	PIVector<DeviceInfo> devs = availableDevicesInfo(test);
-	PIStringList ret;
-	piForeachC (DeviceInfo & d, devs)
-		ret << d.path;
-	return ret;
-}
-
-
-#ifdef WINDOWS
-PIString devicePortName(HDEVINFO deviceInfoSet, PSP_DEVINFO_DATA deviceInfoData) {
-	PIString ret;
-	const HKEY key = SetupDiOpenDevRegKey(deviceInfoSet, deviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ);
-	if (key == INVALID_HANDLE_VALUE)
-		return ret;
-	static const wchar_t * const keyTokens[] = {
-		L"PortName\0",
-		L"PortNumber\0"
-	};
-	static const int keys_count = sizeof(keyTokens) / sizeof(keyTokens[0]);
-	for (int i = 0; i < keys_count; ++i) {
-		DWORD dataType = 0;
-		DWORD bytesRequired = MAX_PATH;
-		PIVector<wchar_t> outputBuffer(MAX_PATH + 1);
-		for (;;) {
-			LONG res = RegQueryValueExW(key, keyTokens[i], NULL, &dataType, (LPBYTE)outputBuffer.data(), &bytesRequired);
-			if (res == ERROR_MORE_DATA) {
-				outputBuffer.resize(bytesRequired / sizeof(wchar_t) + 2);
-				continue;
-			} else if (res == ERROR_SUCCESS) {
-				if (dataType == REG_SZ)
-					ret = PIString(outputBuffer.data());
-				else if (dataType == REG_DWORD)
-					ret = PIStringAscii("COM") + PIString::fromNumber(*(PDWORD(&outputBuffer[0])));
-			}
-			break;
-		}
-		if (!ret.isEmpty())
-			break;
-	}
-	RegCloseKey(key);
-	return ret;
-}
-
-
-PIString deviceRegistryProperty(HDEVINFO deviceInfoSet, PSP_DEVINFO_DATA deviceInfoData, DWORD property) {
-	DWORD dataType = 0;
-	DWORD bytesRequired = MAX_PATH;
-	PIVector<wchar_t> outputBuffer(MAX_PATH + 1);
-	for (;;) {
-		if (SetupDiGetDeviceRegistryPropertyW(deviceInfoSet, deviceInfoData, property, &dataType, (PBYTE)outputBuffer.data(), bytesRequired, &bytesRequired))
-			break;
-		if ((GetLastError() != ERROR_INSUFFICIENT_BUFFER) || (dataType != REG_SZ && dataType != REG_EXPAND_SZ))
-			return PIString();
-		outputBuffer.resize(bytesRequired / sizeof(wchar_t) + 2, 0);
-	}
-	return PIString(outputBuffer.data());
-}
-
-
-PIString deviceInstanceIdentifier(DEVINST deviceInstanceNumber) {
-	PIVector<wchar_t> outputBuffer(MAX_DEVICE_ID_LEN + 1);
-	if (CM_Get_Device_IDW(deviceInstanceNumber, (PWCHAR)outputBuffer.data(), MAX_DEVICE_ID_LEN, 0) != CR_SUCCESS) {
-		return PIString();
-	}
-	return PIString(outputBuffer.data());
-}
-
-
-bool parseID(PIString str, PISerial::DeviceInfo & di) {
-	if (str.isEmpty()) return false;
-	int i = str.find("VID_");
-	if (i > 0) di.vID = str.mid(i + 4, 4).toInt(16);
-	i = str.find("PID_");
-	if (i > 0) di.pID = str.mid(i + 4, 4).toInt(16);
-	return (di.vID > 0) && (di.pID > 0);
-}
-#endif
-
-
-PIVector<PISerial::DeviceInfo> PISerial::availableDevicesInfo(bool test) {
-	PIVector<DeviceInfo> ret;
-	DeviceInfo di;
-#ifdef WINDOWS
-	static const GUID guids[] = {GUID_DEVINTERFACE_MODEM, GUID_DEVINTERFACE_COMPORT};
-	static const int guids_cnt = sizeof(guids) / sizeof(GUID);
-	for (int i = 0; i < guids_cnt; ++i) {
-		const HDEVINFO dis = SetupDiGetClassDevs(&(guids[i]), NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-		if (dis == INVALID_HANDLE_VALUE) continue;
-		SP_DEVINFO_DATA did;
-		memset(&did, 0, sizeof(did));
-		did.cbSize = sizeof(did);
-		DWORD index = 0;
-		while (SetupDiEnumDeviceInfo(dis, index++, &did)) {
-			di = DeviceInfo();
-			di.path = devicePortName(dis, &did);
-			if (!di.path.startsWith("COM")) continue;
-			di.description = deviceRegistryProperty(dis, &did, SPDRP_DEVICEDESC);
-			di.manufacturer = deviceRegistryProperty(dis, &did, SPDRP_MFG);
-			PIString id_str = deviceInstanceIdentifier(did.DevInst);
-			if (!parseID(id_str, di)) {
-				DEVINST pdev = 0;
-				if (CM_Get_Parent(&pdev, did.DevInst, 0) == CR_SUCCESS) {
-					id_str = deviceInstanceIdentifier(pdev);
-					parseID(id_str, di);
-				}
-			}
-			ret << di;
-			//piCout << "dev" << did.DevInst << di;
-		}
-		SetupDiDestroyDeviceInfoList(dis);
-	}
-#else
-#  ifndef ANDROID
-	PIStringList prefixes;
-#    ifdef QNX
-	prefixes << "ser";
-#    else
-	prefixes << "ttyS" << "ttyO" << "ttyUSB" << "ttyACM" << "ttyGS"
-			<< "ttyMI" << "ttymxc" << "ttyAMA" << "rfcomm" << "ircomm";
-#      ifdef FREE_BSD
-	prefixes << "cu";
-#      endif
-#      ifdef MAC_OS
-	prefixes.clear();
-	prefixes << "cu." << "tty.";
-#      endif
-	PIFile file_prefixes("/proc/tty/drivers", PIIODevice::ReadOnly);
-	if (file_prefixes.open()) {
-		PIString fc = file_prefixes.readAll(true), line, cpref;
-		PIStringList words;
-		file_prefixes.close();
-		while (!fc.isEmpty()) {
-			words.clear();
-			line = fc.takeLine();
-			if (line.isEmpty()) break;
-			while (!line.isEmpty())
-				words << line.takeWord();
-			if (words.size_s() < 2) break;
-			if (words.back() != "serial") continue;
-			cpref = words[1];
-			int li = cpref.findLast("/");
-			if (li > 0) cpref.cutLeft(li + 1);
-			prefixes << cpref;
-		}
-		prefixes.removeDuplicates();
-	}
-#    endif
-	PIDir dir("/dev");
-	PIVector<PIFile::FileInfo> de = dir.entries();
-#    ifdef LINUX
-	char linkbuf[1024];
-#    endif
-	piForeachC (PIFile::FileInfo & e, de) { // TODO changes in FileInfo
-		piForeachC (PIString & p, prefixes) {
-			if (e.name().startsWith(p)) {
-				di = DeviceInfo();
-				di.path = e.path;
-#    ifdef LINUX
-				ssize_t lsz = readlink(("/sys/class/tty/" + e.name()).dataAscii(), linkbuf, 1024);
-				if (lsz > 0) {
-					PIString fpath = "/sys/class/tty/" + PIString(linkbuf, lsz) + "/";
-					PIFile _f;
-					for (int i = 0; i < 5; ++i) {
-						fpath += "../";
-						//piCout << "try" << fpath;
-						if (_f.open(fpath + "idVendor", PIIODevice::ReadOnly))
-							di.vID = PIString(_f.readAll()).trim().toInt(16);
-						if (_f.open(fpath + "idProduct", PIIODevice::ReadOnly))
-							di.pID = PIString(_f.readAll()).trim().toInt(16);
-						if (_f.open(fpath + "product", PIIODevice::ReadOnly))
-							di.description = PIString(_f.readAll()).trim();
-						if (_f.open(fpath + "manufacturer", PIIODevice::ReadOnly))
-							di.manufacturer = PIString(_f.readAll()).trim();
-						if (di.pID > 0)
-							break;
-					}
-				}
-#    endif
-				ret << di;
-			}
-		}
-	}
-#  endif
-#endif
-	if (test) {
-		for (int i = 0; i < ret.size_s(); ++i) {
-#ifdef WINDOWS
-			void * hComm = CreateFileA(ret[i].path.dataAscii(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
-			if (hComm == INVALID_HANDLE_VALUE) {
-#else
-			int fd = ::open(ret[i].path.dataAscii(), O_NOCTTY | O_RDONLY);
-			if (fd == -1) {
-#endif
-				ret.remove(i);
-				--i;
-				continue;
-			}
-			bool rok = true;
-#ifndef WINDOWS
-			int void_ = 0;
-			fcntl(fd, F_SETFL, O_NONBLOCK);
-			if (::read(fd, &void_, 1) == -1)
-				rok = errno != EIO;
-			
-#endif
-			if (!rok) {
-				ret.remove(i);
-				--i;
-				continue;
-			}
-#ifdef WINDOWS
-			CloseHandle(hComm);
-#else
-			::close(fd);
-#endif
-		}
-	}
-	return ret;
-}
-
-
-void PISerial::optionsChanged() {
-	if (isOpened()) setTimeouts();
-}
-
-
-void PISerial::threadedReadBufferSizeChanged() {
-	if (!isOpened()) return;
-#if defined(LINUX)
-	serial_struct ss;
-	ioctl(fd, TIOCGSERIAL, &ss);
-	//piCoutObj << "b" << ss.xmit_fifo_size;
-	ss.xmit_fifo_size = piMaxi(threadedReadBufferSize(), 4096);
-	ioctl(fd, TIOCSSERIAL, &ss);
-	//piCoutObj << "a" << ss.xmit_fifo_size;
-#endif
-}
+/*
+	PIP - Platform Independent Primitives
+	COM
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piincludes_p.h"
+#include "piserial.h"
+#include "piconfig.h"
+#include "pidir.h"
+#include "pipropertystorage.h"
+#include <errno.h>
+
+#if defined(FREERTOS)
+#  define PISERIAL_NO_PINS
+#endif
+#if defined(PISERIAL_NO_PINS) || defined(WINDOWS)
+#  define TIOCM_LE   1
+#  define TIOCM_DTR  4
+#  define TIOCM_RTS  7
+#  define TIOCM_CTS  8
+#  define TIOCM_ST   3
+#  define TIOCM_SR   2
+#  define TIOCM_CAR  1
+#  define TIOCM_RNG  9
+#  define TIOCM_DSR  6
+#endif
+#ifdef WINDOWS
+#  ifndef INITGUID
+#    define INITGUID
+#    include <guiddef.h>
+#    undef INITGUID
+#  else
+#    include <guiddef.h>
+#  endif
+#  include <ntddmodm.h>
+#  include <winreg.h>
+#  include <windows.h>
+#  include <winioctl.h>
+#  include <cfgmgr32.h>
+#  include <setupapi.h>
+#  define B50       50
+#  define B75       75
+#  define B110      110
+#  define B300      300
+#  define B600      600
+#  define B1200     1200
+#  define B2400     2400
+#  define B4800     4800
+#  define B9600     9600
+#  define B14400    14400
+#  define B19200    19200
+#  define B38400    38400
+#  define B57600    57600
+#  define B115200   115200
+#  define B230400   230400
+#  define B460800   460800
+#  define B500000   500000
+#  define B576000   576000
+#  define B921600   921600
+#  define B1000000  1000000
+#  define B1152000  1152000
+#  define B1500000  1500000
+#  define B2000000  2000000
+#  define B2500000  2500000
+#  define B3000000  3000000
+#  define B3500000  3500000
+#  define B4000000  4000000
+#else
+#  include <termios.h>
+#  include <fcntl.h>
+#  include <sys/ioctl.h>
+#  ifndef B50
+#    define B50       0000001
+#  endif
+#  ifndef B75
+#    define B75       0000002
+#  endif
+#  ifndef B230400
+#    define B230400   0010003
+#  endif
+#  ifndef B460800
+#    define B460800   0010004
+#  endif
+#  ifndef B500000
+#    define B500000   0010005
+#  endif
+#  ifndef B576000
+#    define B576000   0010006
+#  endif
+#  ifndef B921600
+#    define B921600   0010007
+#  endif
+#  ifndef B1000000
+#    define B1000000  0010010
+#  endif
+#  ifndef B1152000
+#    define B1152000  0010011
+#  endif
+#  ifndef B1500000
+#    define B1500000  0010012
+#  endif
+#  ifndef B2000000
+#    define B2000000  0010013
+#  endif
+#  ifndef B2500000
+#    define B2500000  0010014
+#  endif
+#  ifndef B3000000
+#    define B3000000  0010015
+#  endif
+#  ifndef B3500000
+#    define B3500000  0010016
+#  endif
+#  ifndef B4000000
+#    define B4000000  0010017
+#  endif
+#endif
+#ifndef CRTSCTS
+#  define CRTSCTS 020000000000
+#endif
+#ifdef LINUX
+#  include <linux/serial.h>
+#endif
+
+
+/*! \class PISerial
+ * \brief Serial device
+ * 
+ * \section  PISerial_sec0 Synopsis
+ * This class provide access to serial device, e.g. COM port. It can read,
+ * write, wait for write. There are several read and write functions.
+ *
+ * \section  PISerial_sec1 FullPath
+ * Since version 1.16.0 you can use as \a path DeviceInfo::id() USB identifier.
+ * \code
+ * PISerial * s = new PISerial("0403:6001");
+ * PIIODevice * d = PIIODevice::createFromFullPath("ser://0403:6001:115200");
+ * \endcode
+ * 
+ */
+
+REGISTER_DEVICE(PISerial)
+
+
+PRIVATE_DEFINITION_START(PISerial)
+#ifdef WINDOWS
+	DCB desc, sdesc;
+	void * hCom;
+	DWORD readed, mask;
+#else
+	termios desc, sdesc;
+	uint readed;
+#endif
+PRIVATE_DEFINITION_END(PISerial)
+
+
+
+
+PISerial::DeviceInfo::DeviceInfo() {
+	vID = pID = 0;
+}
+
+
+PIString PISerial::DeviceInfo::id() const {
+	return PIString::fromNumber(vID, 16).toLowerCase().expandLeftTo(4, '0') + ":" +
+			PIString::fromNumber(pID, 16).toLowerCase().expandLeftTo(4, '0');
+}
+
+
+
+
+PISerial::PISerial(): PIIODevice("", ReadWrite) {
+	construct();
+}
+
+
+PISerial::PISerial(const PIString & device_, PISerial::Speed speed_, PIFlags<PISerial::Parameters> params_): PIIODevice(device_, ReadWrite) {
+	construct();
+	setPath(device_);
+	setSpeed(speed_);
+	setParameters(params_);
+}
+
+
+PISerial::~PISerial() {
+	closeDevice();
+}
+
+
+void PISerial::construct() {
+#ifdef WINDOWS
+	PRIVATE->hCom = 0;
+#endif
+	fd = -1;
+	setPriority(piHigh);
+	vtime = 10;
+	sending = false;
+	setParameters(0);
+	setSpeed(S115200);
+	setDataBitsCount(8);
+}
+
+
+void PISerial::setParameter(PISerial::Parameters parameter, bool on) {
+	PIFlags<Parameters> cp = (PIFlags<Parameters>)(property("parameters").toInt());
+	cp.setFlag(parameter, on);
+	setParameters(cp);
+}
+
+
+bool PISerial::isParameterSet(PISerial::Parameters parameter) const {
+	PIFlags<Parameters> cp = (PIFlags<Parameters>)(property("parameters").toInt());
+	return cp[parameter];
+}
+
+
+bool PISerial::setPin(int number, bool on) {
+	switch (number) {
+	case 1: return setCAR(on); break;
+	case 2: return setSR(on); break;
+	case 3: return setST(on); break;
+	case 4: return setDTR(on); break;
+	case 5:
+		piCoutObj << "Pin number 5 is ground";
+		return false;
+	case 6: return setDSR(on); break;
+	case 7: return setRTS(on); break;
+	case 8: return setCTS(on); break;
+	case 9: return setRNG(on); break;
+	default:
+		piCoutObj << "Pin number " << number << " doesn`t exists!";
+		return false;
+	}
+	return false;
+}
+
+
+bool PISerial::isPin(int number) const {
+	switch (number) {
+	case 1: return isCAR(); break;
+	case 2: return isSR(); break;
+	case 3: return isST(); break;
+	case 4: return isDTR(); break;
+	case 5: return false;
+	case 6: return isDSR(); break;
+	case 7: return isRTS(); break;
+	case 8: return isCTS(); break;
+	case 9: return isRNG(); break;
+	default:
+		piCoutObj << "Pin number " << number << " doesn`t exists!";
+		return false;
+	}
+	return false;
+}
+
+bool PISerial::setLE(bool on) {return setBit(TIOCM_LE, on, "LE");}
+bool PISerial::setDTR(bool on) {return setBit(TIOCM_DTR, on, "DTR");}
+bool PISerial::setRTS(bool on) {return setBit(TIOCM_RTS, on, "RTS");}
+bool PISerial::setCTS(bool on) {return setBit(TIOCM_CTS, on, "CTS");}
+bool PISerial::setST(bool on) {return setBit(TIOCM_ST, on, "ST");}
+bool PISerial::setSR(bool on) {return setBit(TIOCM_SR, on, "SR");}
+bool PISerial::setCAR(bool on) {return setBit(TIOCM_CAR, on, "CAR");}
+bool PISerial::setRNG(bool on) {return setBit(TIOCM_RNG, on, "RNG");}
+bool PISerial::setDSR(bool on) {return setBit(TIOCM_DSR, on, "DSR");}
+
+bool PISerial::isLE() const {return isBit(TIOCM_LE, "LE");}
+bool PISerial::isDTR() const {return isBit(TIOCM_DTR, "DTR");}
+bool PISerial::isRTS() const {return isBit(TIOCM_RTS, "RTS");}
+bool PISerial::isCTS() const {return isBit(TIOCM_CTS, "CTS");}
+bool PISerial::isST() const {return isBit(TIOCM_ST, "ST");}
+bool PISerial::isSR() const {return isBit(TIOCM_SR, "SR");}
+bool PISerial::isCAR() const {return isBit(TIOCM_CAR, "CAR");}
+bool PISerial::isRNG() const {return isBit(TIOCM_RNG, "RNG");}
+bool PISerial::isDSR() const {return isBit(TIOCM_DSR, "DSR");}
+
+
+bool PISerial::setBit(int bit, bool on, const PIString & bname) {
+	if (fd < 0) {
+		piCoutObj << "setBit" << bname << " error: \"" << path() << "\" is not opened!";
+		return false;
+	}
+#ifndef PISERIAL_NO_PINS
+#  ifdef WINDOWS
+	static int bit_map_on [] = {0, 0, 0, 0, SETDTR, 0, 0, SETRTS, 0, 0, 0};
+	static int bit_map_off[] = {0, 0, 0, 0, CLRDTR, 0, 0, CLRRTS, 0, 0, 0};
+	int action = (on ? bit_map_on : bit_map_off)[bit];
+	if (action > 0) {
+		if (EscapeCommFunction(PRIVATE->hCom, action) == 0) {
+			piCoutObj << "setBit" << bname << " error: " << errorString();
+			return false;
+		}
+		return true;
+	}
+#  else
+	if (ioctl(fd, on ? TIOCMBIS : TIOCMBIC, &bit) < 0) {
+		piCoutObj << "setBit" << bname << " error: " << errorString();
+		return false;
+	}
+	return true;
+#  endif
+#endif
+	piCoutObj << "setBit" << bname << " doesn`t implemented, sorry :-(";
+	return false;
+}
+
+
+bool PISerial::isBit(int bit, const PIString & bname) const {
+	if (fd < 0) {
+		piCoutObj << "isBit" << bname << " error: \"" << path() << "\" is not opened!";
+		return false;
+	}
+#ifndef PISERIAL_NO_PINS
+#  ifdef WINDOWS
+#  else
+	int ret = 0;
+	if (ioctl(fd, TIOCMGET, &ret) < 0)
+		piCoutObj << "isBit" << bname << " error: " << errorString();
+	return ret & bit;
+#  endif
+#endif
+	piCoutObj << "isBit" << bname << " doesn`t implemented, sorry :-(";
+	return false;
+}
+
+
+void PISerial::flush() {
+#ifndef WINDOWS
+	if (fd != -1) tcflush(fd, TCIOFLUSH);
+#endif
+}
+
+
+int PISerial::convertSpeed(PISerial::Speed speed) {
+	switch (speed) {
+	case S50: return B50;
+	case S75: return B75;
+	case S110: return B110;
+	case S300: return B300;
+	case S600: return B600;
+	case S1200: return B1200;
+	case S2400: return B2400;
+	case S4800: return B4800;
+	case S9600: return B9600;
+	case S19200: return B19200;
+	case S38400: return B38400;
+	case S57600: return B57600;
+	case S115200: return B115200;
+	case S230400: return B230400;
+	case S460800: return B460800;
+	case S500000: return B500000;
+	case S576000: return B576000;
+	case S921600: return B921600;
+	case S1000000: return B1000000;
+	case S1152000: return B1152000;
+	case S1500000: return B1500000;
+	case S2000000: return B2000000;
+	case S2500000: return B2500000;
+	case S3000000: return B3000000;
+	case S3500000: return B3500000;
+	case S4000000: return B4000000;
+	default: break;
+	}
+	piCoutObj << "Warning: Unknown speed" << (int)speed << ", using 115200";
+	return B115200;
+}
+
+
+/** \brief Advanced read function
+* \details Read to pointer "read_to" no more than "max_size" and no longer
+* than "timeout_ms" milliseconds. If "timeout_ms" < 0 function will be
+* wait forever until "max_size" will be readed. If size <= 0 function
+* immediate returns \b false. For read data with unknown size use function
+* \a readData().
+* \returns \b True if readed bytes count = "max_size", else \b false
+* \sa \a readData() */
+bool PISerial::read(void * data, int size, double timeout_ms) {
+	if (data == 0 || size <= 0) return false;
+	int ret, all = 0;
+	if (timeout_ms > 0.) {
+		bool br = setOption(BlockingRead, false);
+		all = readDevice(data, 1);
+		tm_.reset();
+		while (all < size && tm_.elapsed_m() < timeout_ms) {
+			ret = readDevice(&((uchar * )data)[all], size - all);
+			if (ret > 0) all += ret;
+			else msleep(PIP_MIN_MSLEEP);
+		}
+		setOption(BlockingRead, br);
+		received(data, all);
+		return (all == size);
+	} else {
+		bool br = setOption(BlockingRead, true);
+		all = readDevice(data, 1);
+		while (all < size) {
+			ret = readDevice(&((uchar * )data)[all], size - all);
+			if (ret > 0) all += ret;
+		}
+		setOption(BlockingRead, br);
+		received(data, all);
+		return (all == size);
+	}
+	return false;
+}
+
+
+/** \brief Advanced read function
+* \details Read all or no more than "size" and no longer than
+* "timeout_ms" milliseconds. If "timeout_ms" < 0 function will be
+* wait forever until "size" will be readed. If "size" <= 0 
+* function will be read all until "timeout_ms" elaped. \n If size <= 0
+* and "timeout_ms" <= 0 function immediate returns empty string.
+* \n This function similar to \a readData() but returns data as string.
+* \sa \a readData() */
+PIString PISerial::read(int size, double timeout_ms) {
+	PIString str;
+	if (size <= 0 && timeout_ms <= 0.) return str;
+	int ret, all = 0;
+	uchar td[1024];
+	if (timeout_ms > 0.) {
+		bool br = setOption(BlockingRead, false);
+		tm_.reset();
+		if (size <= 0) {
+			while (tm_.elapsed_m() < timeout_ms) {
+				ret = readDevice(td, 1024);
+				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
+				else str << PIString((char*)td, ret);
+			}
+		} else {
+			while (all < size && tm_.elapsed_m() < timeout_ms) {
+				ret = readDevice(td, size - all);
+				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
+				else {
+					str << PIString((char*)td, ret);
+					all += ret;
+				}
+			}
+		}
+		setOption(BlockingRead, br);
+	} else {
+		bool br = setOption(BlockingRead, true);
+		all = readDevice(td, 1);
+		str << PIString((char*)td, all);
+		while (all < size) {
+			ret = readDevice(td, size - all);
+			if (ret <= 0) msleep(PIP_MIN_MSLEEP);
+			else {
+				str << PIString((char*)td, ret);
+				all += ret;
+			}
+		}
+		setOption(BlockingRead, br);
+	}
+	received(str.data(), str.size_s());
+	return str;
+}
+
+
+/** \brief Advanced read function
+* \details Read all or no more than "size" and no longer than
+* "timeout_ms" milliseconds. If "timeout_ms" < 0 function will be
+* wait forever until "size" will be readed. If "size" <= 0 
+* function will be read all until "timeout_ms" elaped. \n If size <= 0
+* and "timeout_ms" <= 0 function immediate returns empty byte array.
+* \n This function similar to \a read() but returns data as byte array.
+* \sa \a read() */
+PIByteArray PISerial::readData(int size, double timeout_ms) {
+	PIByteArray str;
+	if (size <= 0 && timeout_ms <= 0.) return str;
+	int ret, all = 0;
+	uchar td[1024];
+	if (timeout_ms > 0.) {
+		bool br = setOption(BlockingRead, false);
+		tm_.reset();
+		if (size <= 0) {
+			while (tm_.elapsed_m() < timeout_ms) {
+				ret = readDevice(td, 1024);
+				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
+				else str.append(td, ret);
+			}
+		} else {
+			while (all < size && tm_.elapsed_m() < timeout_ms) {
+				ret = readDevice(td, size - all);
+				if (ret <= 0) msleep(PIP_MIN_MSLEEP);
+				else {
+					str.append(td, ret);
+					all += ret;
+				}
+			}
+		}
+		setOption(BlockingRead, br);
+	} else {
+		bool br = setOption(BlockingRead, true);
+		all = readDevice(td, 1);
+		str.append(td, all);
+		while (all < size) {
+			ret = readDevice(td, size - all);
+			if (ret <= 0) msleep(PIP_MIN_MSLEEP);
+			else {
+				str.append(td, ret);
+				all += ret;
+			}
+		}
+		setOption(BlockingRead, br);
+	}
+	received(str.data(), str.size_s());
+	return str;
+}
+
+
+bool PISerial::send(const void * data, int size) {
+	int ret = 0;
+	int wsz = 0;
+	do {
+		ret = write(&(((uchar*)data)[wsz]), size - wsz);
+		if (ret > 0) wsz += ret;
+		//piCout << ret << wsz;
+		else return false;
+	} while (wsz < size);
+	return (wsz == size);
+}
+
+
+bool PISerial::openDevice() {
+	PIString p = path();
+	//piCout << "ser open" << p;
+	PIString pl = p.toLowerCase().removeAll(' ');
+	if (!pl.startsWith("/") && !pl.startsWith("com")) {
+		p.clear();
+		PIVector<DeviceInfo> devs = availableDevicesInfo();
+		piForeachC (DeviceInfo & d, devs) {
+			if (d.id() == pl) {
+				p = d.path;
+				piBreak;
+			}
+		}
+		if (p.isEmpty()) {
+			piCoutObj << "Unable to find device \"" << pl << "\"";
+		}
+	}
+	if (p.isEmpty()) return false;
+#ifdef WINDOWS
+	DWORD ds = 0, sm = 0;
+	if (isReadable()) {ds |= GENERIC_READ; sm |= FILE_SHARE_READ;}
+	if (isWriteable()) {ds |= GENERIC_WRITE; sm |= FILE_SHARE_WRITE;}
+	PIString wp = "//./" + p;
+	PRIVATE->hCom = CreateFileA(wp.dataAscii(), ds, sm, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
+	if (PRIVATE->hCom == INVALID_HANDLE_VALUE) {
+		piCoutObj << "Unable to open \"" << p << "\"";
+		fd = -1;
+		return false;
+	}
+	fd = 0;
+#else
+	int om = 0;
+	switch (mode()) {
+	case PIIODevice::ReadOnly: om = O_RDONLY; break;
+	case PIIODevice::WriteOnly: om = O_WRONLY; break;
+	case PIIODevice::ReadWrite: om = O_RDWR; break;
+	}
+	fd = ::open(p.data(), O_NOCTTY | om);
+	if (fd == -1) {
+		piCoutObj << "Unable to open \"" << p << "\"";
+		return false;
+	}
+	tcgetattr(fd, &PRIVATE->desc);
+	PRIVATE->sdesc = PRIVATE->desc;
+	//piCoutObj << "Initialized " << p;
+#endif
+	applySettings();
+	return true;
+}
+
+
+bool PISerial::closeDevice() {
+	if (isRunning() && !isStopping()) {
+		stop();
+		PIThread::terminate();
+	}
+	if (fd != -1) {
+#ifdef WINDOWS
+		SetCommState(PRIVATE->hCom, &PRIVATE->sdesc);
+		SetCommMask(PRIVATE->hCom, PRIVATE->mask);
+//		piCoutObj << "close" <<
+		CloseHandle(PRIVATE->hCom);
+		PRIVATE->hCom = 0;
+#else
+		tcsetattr(fd, TCSANOW, &PRIVATE->sdesc);
+		::close(fd);
+#endif
+		fd = -1;
+	}
+	return true;
+}
+
+
+void PISerial::applySettings() {
+#ifdef WINDOWS
+	if (fd == -1) return;
+	setTimeouts();
+	GetCommMask(PRIVATE->hCom, &PRIVATE->mask);
+	SetCommMask(PRIVATE->hCom, EV_RXCHAR);
+	GetCommState(PRIVATE->hCom, &PRIVATE->sdesc);
+//	piCoutObj << PRIVATE->sdesc.fBinary << PRIVATE->sdesc.fAbortOnError << PRIVATE->sdesc.fDsrSensitivity << PRIVATE->sdesc.fDtrControl << PRIVATE->sdesc.fDummy2 << PRIVATE->sdesc.fErrorChar;
+	PRIVATE->desc = PRIVATE->sdesc;
+	PRIVATE->desc.DCBlength = sizeof(PRIVATE->desc);
+	PRIVATE->desc.BaudRate = convertSpeed(outSpeed());
+	if (dataBitsCount() >= 5 && dataBitsCount() <= 8)
+		PRIVATE->desc.ByteSize = dataBitsCount();
+	else
+		PRIVATE->desc.ByteSize = 8;
+	PIFlags<Parameters> params = parameters();
+	if (params[PISerial::ParityControl]) {
+		PRIVATE->desc.fParity = 1;
+		PRIVATE->desc.Parity = params[PISerial::ParityOdd] ? 1 : 2;
+	}
+	PRIVATE->desc.StopBits = params[PISerial::TwoStopBits] ? TWOSTOPBITS : ONESTOPBIT;
+	if (SetCommState(PRIVATE->hCom, &PRIVATE->desc) == -1) {
+		piCoutObj << "Unable to set comm state for \"" << path() << "\"";
+		return;
+	}
+#else
+	if (fd == -1) return;
+	tcgetattr(fd, &PRIVATE->desc);
+	PRIVATE->desc.c_oflag = PRIVATE->desc.c_lflag = PRIVATE->desc.c_cflag = 0;
+	PRIVATE->desc.c_iflag = IGNBRK;
+	PRIVATE->desc.c_cflag = CLOCAL | HUPCL;
+	switch (dataBitsCount()) {
+	case 5: PRIVATE->desc.c_cflag |= (CSIZE & CS5); break;
+	case 6: PRIVATE->desc.c_cflag |= (CSIZE & CS6); break;
+	case 7: PRIVATE->desc.c_cflag |= (CSIZE & CS7); break;
+	case 8: default: PRIVATE->desc.c_cflag |= (CSIZE & CS8); break;
+	};
+	if (isReadable()) PRIVATE->desc.c_cflag |= CREAD;
+	PIFlags<Parameters> params = parameters();
+	if (params[PISerial::TwoStopBits]) PRIVATE->desc.c_cflag |= CSTOPB;
+	if (params[PISerial::ParityControl]) {
+		PRIVATE->desc.c_iflag |= INPCK;
+		PRIVATE->desc.c_cflag |= PARENB;
+		if (params[PISerial::ParityOdd]) PRIVATE->desc.c_cflag |= PARODD;
+	}
+	PRIVATE->desc.c_cc[VMIN] = 1;
+	PRIVATE->desc.c_cc[VTIME] = vtime;
+
+	cfsetispeed(&PRIVATE->desc, convertSpeed(inSpeed()));
+	cfsetospeed(&PRIVATE->desc, convertSpeed(outSpeed()));
+
+	tcflush(fd, TCIOFLUSH);
+	setTimeouts();
+
+	if (tcsetattr(fd, TCSANOW, &PRIVATE->desc) < 0) {
+		piCoutObj << "Can`t set attributes for \"" << path() << "\"";
+		return;
+	}
+#endif
+}
+
+
+void PISerial::setTimeouts() {
+#ifdef WINDOWS
+	COMMTIMEOUTS times;
+	times.ReadIntervalTimeout = isOptionSet(BlockingRead) ? vtime : MAXDWORD;
+	times.ReadTotalTimeoutConstant = isOptionSet(BlockingRead) ? 0 : 1;
+	times.ReadTotalTimeoutMultiplier = isOptionSet(BlockingRead) ? 0 : MAXDWORD;
+	times.WriteTotalTimeoutConstant = isOptionSet(BlockingWrite) ? 0 : 1;
+	times.WriteTotalTimeoutMultiplier = 0;
+	if (SetCommTimeouts(PRIVATE->hCom, &times) == -1)
+		piCoutObj << "Unable to set timeouts for \"" << path() << "\"";
+#else
+	fcntl(fd, F_SETFL, isOptionSet(BlockingRead) ? 0 : O_NONBLOCK);
+#endif
+}
+
+
+/** \brief Basic read function
+* \details Read to pointer "read_to" no more than "max_size". If read is
+* set to blocking this function will be wait at least one byte.
+* \returns Readed bytes count
+* \sa \a readData() */
+int PISerial::readDevice(void * read_to, int max_size) {
+#ifdef WINDOWS
+		if (!canRead()) return -1;
+		if (sending) return -1;
+//		piCoutObj << "com event ...";
+		//piCoutObj << "read ..." << PRIVATE->hCom;
+		ReadFile(PRIVATE->hCom, read_to, max_size, &PRIVATE->readed, 0);
+		DWORD err = GetLastError();
+		//piCout << err;
+		if (err == ERROR_BAD_COMMAND || err == ERROR_ACCESS_DENIED) {
+			PIThread::stop(false);
+			close();
+			return 0;
+		}
+		//piCoutObj << "read" << (PRIVATE->readed) << errorString();
+		return PRIVATE->readed;
+#else
+		if (!canRead()) return -1;
+		return ::read(fd, read_to, max_size);
+#endif
+}
+
+
+int PISerial::writeDevice(const void * data, int max_size) {
+	if (fd == -1 || !canWrite()) {
+		//piCoutObj << "Can`t write to uninitialized COM";
+		return -1;
+	}
+#ifdef WINDOWS
+	DWORD wrote;
+//	piCoutObj << "send ...";// << max_size;// << ": " << PIString((char*)data, max_size);
+	sending = true;
+	WriteFile(PRIVATE->hCom, data, max_size, &wrote, 0);
+	sending = false;
+//	piCoutObj << "send ok";// << wrote << " bytes in " << path();
+#else
+	int wrote;
+	wrote = ::write(fd, data, max_size);
+	if (isOptionSet(BlockingWrite)) tcdrain(fd);
+#endif
+	return (int)wrote;
+	//piCoutObj << "Error while sending";
+}
+
+
+bool PISerial::configureDevice(const void * e_main, const void * e_parent) {
+	PIConfig::Entry * em = (PIConfig::Entry * )e_main;
+	PIConfig::Entry * ep = (PIConfig::Entry * )e_parent;
+	setDevice(readDeviceSetting<PIString>("device", device(), em, ep));
+	setSpeed((PISerial::Speed)(readDeviceSetting<int>("speed", (int)outSpeed(), em, ep)));
+	setDataBitsCount(readDeviceSetting<int>("dataBitsCount", dataBitsCount(), em, ep));
+	setParameter(PISerial::ParityControl, readDeviceSetting<bool>("parityControl", isParameterSet(PISerial::ParityControl), em, ep));
+	setParameter(PISerial::ParityOdd, readDeviceSetting<bool>("parityOdd", isParameterSet(PISerial::ParityOdd), em, ep));
+	setParameter(PISerial::TwoStopBits, readDeviceSetting<bool>("twoStopBits", isParameterSet(PISerial::TwoStopBits), em, ep));
+	return true;
+}
+
+
+PIString PISerial::constructFullPathDevice() const {
+	PIString ret;
+	ret << path() << ":" << int(inSpeed()) << ":" << dataBitsCount();
+	if (parameters()[ParityControl]) {
+		if (parameters()[ParityOdd]) ret << ":O";
+		else ret << ":E";
+	} else ret << ":N";
+	if (parameters()[TwoStopBits]) ret << ":2";
+	else ret << ":1";
+	return ret;
+}
+
+
+void PISerial::configureFromFullPathDevice(const PIString & full_path) {
+	PIStringList pl = full_path.split(":");
+	if (pl.size_s() > 1) {
+		PIString _s = pl[0].toLowerCase().removeAll(' ').trim();
+		if (!_s.startsWith("/") && !_s.startsWith("com")) {
+			pl[0] += ":" + pl[1];
+			pl.remove(1);
+		}
+	}
+	for (int i = 0; i < pl.size_s(); ++i) {
+		PIString p(pl[i]);
+		switch (i) {
+		case 0: setProperty("path", p); break;
+		case 1: setProperty("outSpeed", p.toInt()); setProperty("inSpeed", p.toInt()); break;
+		case 2: setProperty("dataBitsCount", p.toInt()); break;
+		case 3:
+			p = p.left(1).toLowerCase();
+			if (p != "n") setParameter(ParityControl);
+			if (p == "o") setParameter(ParityOdd);
+			break;
+		case 4: if (p.toInt() == 2) setParameter(TwoStopBits); break;
+		}
+	}
+	applySettings();
+}
+
+
+PIPropertyStorage PISerial::constructVariantDevice() const {
+	PIPropertyStorage ret;
+	ret.addProperty("path", path());
+	PIVariantTypes::Enum e;
+
+	PIVector<int> as = availableSpeeds();
+	piForeachC (int s, as) {e << PIVariantTypes::Enumerator(s, PIString::fromNumber(s));}
+	e.selectValue((int)inSpeed());
+	ret.addProperty("speed", e);
+
+	e = PIVariantTypes::Enum();
+	for (int i = 5; i <= 8; ++i) {e << PIVariantTypes::Enumerator(i, PIString::fromNumber(i));}
+	e.selectValue(dataBitsCount());
+	ret.addProperty("dataBits", e);
+
+	e = PIVariantTypes::Enum();
+	e << "None" << "Odd" << "Even";
+	if (parameters()[ParityControl]) {
+		if (parameters()[ParityOdd])
+			e.selectValue(1);
+		else
+			e.selectValue(2);
+	} else
+		e.selectValue(0);
+	ret.addProperty("parity", e);
+
+	e = PIVariantTypes::Enum();
+	for (int i = 1; i <= 2; ++i) {e << PIVariantTypes::Enumerator(i, PIString::fromNumber(i));}
+	e.selectValue(parameters()[TwoStopBits] ? 2 : 1);
+	ret.addProperty("stopBits", e);
+	return ret;
+}
+
+
+void PISerial::configureFromVariantDevice(const PIPropertyStorage & d) {
+	setPath(d.propertyValueByName("path").toString());
+	setSpeed((Speed)d.propertyValueByName("speed").toEnum().selectedValue());
+	setDataBitsCount(d.propertyValueByName("dataBits").toEnum().selectedValue());
+	PIVariantTypes::Enum e = d.propertyValueByName("parity").toEnum();
+	setParameter(ParityControl, e.selectedValue() > 0);
+	setParameter(ParityOdd    , e.selectedValue() == 1);
+	setParameter(TwoStopBits  , d.propertyValueByName("stopBits").toEnum().selectedValue() == 2);
+}
+
+
+PIVector<int> PISerial::availableSpeeds() {
+	PIVector<int> spds;
+	spds << 50 << 75 << 110 << 300 << 600 << 1200 << 2400 << 4800 <<
+			9600 << 19200 << 38400 << 57600 << 115200 << 230400 << 460800 <<
+			500000 << 576000 << 921600 << 1000000 << 1152000 << 1500000 <<
+			2000000 << 2500000 << 3000000 << 3500000 << 4000000;
+	return spds;
+}
+
+
+PIStringList PISerial::availableDevices(bool test) {
+	PIVector<DeviceInfo> devs = availableDevicesInfo(test);
+	PIStringList ret;
+	piForeachC (DeviceInfo & d, devs)
+		ret << d.path;
+	return ret;
+}
+
+
+#ifdef WINDOWS
+PIString devicePortName(HDEVINFO deviceInfoSet, PSP_DEVINFO_DATA deviceInfoData) {
+	PIString ret;
+	const HKEY key = SetupDiOpenDevRegKey(deviceInfoSet, deviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ);
+	if (key == INVALID_HANDLE_VALUE)
+		return ret;
+	static const wchar_t * const keyTokens[] = {
+		L"PortName\0",
+		L"PortNumber\0"
+	};
+	static const int keys_count = sizeof(keyTokens) / sizeof(keyTokens[0]);
+	for (int i = 0; i < keys_count; ++i) {
+		DWORD dataType = 0;
+		DWORD bytesRequired = MAX_PATH;
+		PIVector<wchar_t> outputBuffer(MAX_PATH + 1);
+		for (;;) {
+			LONG res = RegQueryValueExW(key, keyTokens[i], NULL, &dataType, (LPBYTE)outputBuffer.data(), &bytesRequired);
+			if (res == ERROR_MORE_DATA) {
+				outputBuffer.resize(bytesRequired / sizeof(wchar_t) + 2);
+				continue;
+			} else if (res == ERROR_SUCCESS) {
+				if (dataType == REG_SZ)
+					ret = PIString(outputBuffer.data());
+				else if (dataType == REG_DWORD)
+					ret = PIStringAscii("COM") + PIString::fromNumber(*(PDWORD(&outputBuffer[0])));
+			}
+			break;
+		}
+		if (!ret.isEmpty())
+			break;
+	}
+	RegCloseKey(key);
+	return ret;
+}
+
+
+PIString deviceRegistryProperty(HDEVINFO deviceInfoSet, PSP_DEVINFO_DATA deviceInfoData, DWORD property) {
+	DWORD dataType = 0;
+	DWORD bytesRequired = MAX_PATH;
+	PIVector<wchar_t> outputBuffer(MAX_PATH + 1);
+	for (;;) {
+		if (SetupDiGetDeviceRegistryPropertyW(deviceInfoSet, deviceInfoData, property, &dataType, (PBYTE)outputBuffer.data(), bytesRequired, &bytesRequired))
+			break;
+		if ((GetLastError() != ERROR_INSUFFICIENT_BUFFER) || (dataType != REG_SZ && dataType != REG_EXPAND_SZ))
+			return PIString();
+		outputBuffer.resize(bytesRequired / sizeof(wchar_t) + 2, 0);
+	}
+	return PIString(outputBuffer.data());
+}
+
+
+PIString deviceInstanceIdentifier(DEVINST deviceInstanceNumber) {
+	PIVector<wchar_t> outputBuffer(MAX_DEVICE_ID_LEN + 1);
+	if (CM_Get_Device_IDW(deviceInstanceNumber, (PWCHAR)outputBuffer.data(), MAX_DEVICE_ID_LEN, 0) != CR_SUCCESS) {
+		return PIString();
+	}
+	return PIString(outputBuffer.data());
+}
+
+
+bool parseID(PIString str, PISerial::DeviceInfo & di) {
+	if (str.isEmpty()) return false;
+	int i = str.find("VID_");
+	if (i > 0) di.vID = str.mid(i + 4, 4).toInt(16);
+	i = str.find("PID_");
+	if (i > 0) di.pID = str.mid(i + 4, 4).toInt(16);
+	return (di.vID > 0) && (di.pID > 0);
+}
+#endif
+
+
+PIVector<PISerial::DeviceInfo> PISerial::availableDevicesInfo(bool test) {
+	PIVector<DeviceInfo> ret;
+	DeviceInfo di;
+#ifdef WINDOWS
+	static const GUID guids[] = {GUID_DEVINTERFACE_MODEM, GUID_DEVINTERFACE_COMPORT};
+	static const int guids_cnt = sizeof(guids) / sizeof(GUID);
+	for (int i = 0; i < guids_cnt; ++i) {
+		const HDEVINFO dis = SetupDiGetClassDevs(&(guids[i]), NULL, NULL, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+		if (dis == INVALID_HANDLE_VALUE) continue;
+		SP_DEVINFO_DATA did;
+		memset(&did, 0, sizeof(did));
+		did.cbSize = sizeof(did);
+		DWORD index = 0;
+		while (SetupDiEnumDeviceInfo(dis, index++, &did)) {
+			di = DeviceInfo();
+			di.path = devicePortName(dis, &did);
+			if (!di.path.startsWith("COM")) continue;
+			di.description = deviceRegistryProperty(dis, &did, SPDRP_DEVICEDESC);
+			di.manufacturer = deviceRegistryProperty(dis, &did, SPDRP_MFG);
+			PIString id_str = deviceInstanceIdentifier(did.DevInst);
+			if (!parseID(id_str, di)) {
+				DEVINST pdev = 0;
+				if (CM_Get_Parent(&pdev, did.DevInst, 0) == CR_SUCCESS) {
+					id_str = deviceInstanceIdentifier(pdev);
+					parseID(id_str, di);
+				}
+			}
+			ret << di;
+			//piCout << "dev" << did.DevInst << di;
+		}
+		SetupDiDestroyDeviceInfoList(dis);
+	}
+#else
+#  ifndef ANDROID
+	PIStringList prefixes;
+#    ifdef QNX
+	prefixes << "ser";
+#    else
+	prefixes << "ttyS" << "ttyO" << "ttyUSB" << "ttyACM" << "ttyGS"
+			<< "ttyMI" << "ttymxc" << "ttyAMA" << "rfcomm" << "ircomm";
+#      ifdef FREE_BSD
+	prefixes << "cu";
+#      endif
+#      ifdef MAC_OS
+	prefixes.clear();
+	prefixes << "cu." << "tty.";
+#      endif
+	PIFile file_prefixes("/proc/tty/drivers", PIIODevice::ReadOnly);
+	if (file_prefixes.open()) {
+		PIString fc = file_prefixes.readAll(true), line, cpref;
+		PIStringList words;
+		file_prefixes.close();
+		while (!fc.isEmpty()) {
+			words.clear();
+			line = fc.takeLine();
+			if (line.isEmpty()) break;
+			while (!line.isEmpty())
+				words << line.takeWord();
+			if (words.size_s() < 2) break;
+			if (words.back() != "serial") continue;
+			cpref = words[1];
+			int li = cpref.findLast("/");
+			if (li > 0) cpref.cutLeft(li + 1);
+			prefixes << cpref;
+		}
+		prefixes.removeDuplicates();
+	}
+#    endif
+	PIDir dir("/dev");
+	PIVector<PIFile::FileInfo> de = dir.entries();
+#    ifdef LINUX
+	char linkbuf[1024];
+#    endif
+	piForeachC (PIFile::FileInfo & e, de) { // TODO changes in FileInfo
+		piForeachC (PIString & p, prefixes) {
+			if (e.name().startsWith(p)) {
+				di = DeviceInfo();
+				di.path = e.path;
+#    ifdef LINUX
+				ssize_t lsz = readlink(("/sys/class/tty/" + e.name()).dataAscii(), linkbuf, 1024);
+				if (lsz > 0) {
+					PIString fpath = "/sys/class/tty/" + PIString(linkbuf, lsz) + "/";
+					PIFile _f;
+					for (int i = 0; i < 5; ++i) {
+						fpath += "../";
+						//piCout << "try" << fpath;
+						if (_f.open(fpath + "idVendor", PIIODevice::ReadOnly))
+							di.vID = PIString(_f.readAll()).trim().toInt(16);
+						if (_f.open(fpath + "idProduct", PIIODevice::ReadOnly))
+							di.pID = PIString(_f.readAll()).trim().toInt(16);
+						if (_f.open(fpath + "product", PIIODevice::ReadOnly))
+							di.description = PIString(_f.readAll()).trim();
+						if (_f.open(fpath + "manufacturer", PIIODevice::ReadOnly))
+							di.manufacturer = PIString(_f.readAll()).trim();
+						if (di.pID > 0)
+							break;
+					}
+				}
+#    endif
+				ret << di;
+			}
+		}
+	}
+#  endif
+#endif
+	if (test) {
+		for (int i = 0; i < ret.size_s(); ++i) {
+#ifdef WINDOWS
+			void * hComm = CreateFileA(ret[i].path.dataAscii(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, 0);
+			if (hComm == INVALID_HANDLE_VALUE) {
+#else
+			int fd = ::open(ret[i].path.dataAscii(), O_NOCTTY | O_RDONLY);
+			if (fd == -1) {
+#endif
+				ret.remove(i);
+				--i;
+				continue;
+			}
+			bool rok = true;
+#ifndef WINDOWS
+			int void_ = 0;
+			fcntl(fd, F_SETFL, O_NONBLOCK);
+			if (::read(fd, &void_, 1) == -1)
+				rok = errno != EIO;
+			
+#endif
+			if (!rok) {
+				ret.remove(i);
+				--i;
+				continue;
+			}
+#ifdef WINDOWS
+			CloseHandle(hComm);
+#else
+			::close(fd);
+#endif
+		}
+	}
+	return ret;
+}
+
+
+void PISerial::optionsChanged() {
+	if (isOpened()) setTimeouts();
+}
+
+
+void PISerial::threadedReadBufferSizeChanged() {
+	if (!isOpened()) return;
+#if defined(LINUX)
+	serial_struct ss;
+	ioctl(fd, TIOCGSERIAL, &ss);
+	//piCoutObj << "b" << ss.xmit_fifo_size;
+	ss.xmit_fifo_size = piMaxi(threadedReadBufferSize(), 4096);
+	ioctl(fd, TIOCSSERIAL, &ss);
+	//piCoutObj << "a" << ss.xmit_fifo_size;
+#endif
+}
diff --git a/src_main/io_devices/piserial.h b/lib/main/io_devices/piserial.h
old mode 100755
new mode 100644
similarity index 97%
rename from src_main/io_devices/piserial.h
rename to lib/main/io_devices/piserial.h
index bd264b98..8ef9e9d7
--- a/src_main/io_devices/piserial.h
+++ b/lib/main/io_devices/piserial.h
@@ -1,268 +1,268 @@
-/*! \file piserial.h
- * \brief Serial device
-*/
-/*
-	PIP - Platform Independent Primitives
-	COM
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISERIAL_H
-#define PISERIAL_H
-
-#include "pitimer.h"
-#include "piiodevice.h"
-
-class PIP_EXPORT PISerial: public PIIODevice
-{
-	PIIODEVICE(PISerial)
-public:
-	
-	//! Contructs an empty %PISerial
-	explicit PISerial();
-
-	//! \brief Parameters of PISerial
-	enum Parameters {
-		ParityControl /*! Enable parity check and generate */ = 0x1,
-		ParityOdd /*! Parity is odd instead of even */ = 0x2,
-		TwoStopBits /*! Two stop bits instead of one */ = 0x4
-	};
-
-	//! \brief Speed of PISerial
-	enum Speed {
-		S50 /*! 50 baud */ = 50,
-		S75 /*! 75 baud */ = 75,
-		S110 /*! 110 baud */ = 110,
-		S300 /*! 300 baud */ = 300,
-		S600 /*! 600 baud */ = 600,
-		S1200 /*! 1200 baud */ = 1200,
-		S2400 /*! 2400 baud */ = 2400,
-		S4800 /*! 4800 baud */ = 4800,
-		S9600 /*! 9600 baud */ = 9600,
-		S19200 /*! 19200 baud */ = 19200,
-		S38400 /*! 38400 baud */ = 38400,
-		S57600 /*! 57600 baud */ = 57600,
-		S115200 /*! 115200 baud */ = 115200,
-		S230400 /*! 230400 baud */ = 230400,
-		S460800 /*! 460800 baud */ = 460800,
-		S500000 /*! 500000 baud */ = 500000,
-		S576000 /*! 576000 baud */ = 576000,
-		S921600 /*! 921600 baud */ = 921600,
-		S1000000 /*! 1000000 baud */ = 1000000,
-		S1152000 /*! 1152000 baud */ = 1152000,
-		S1500000 /*! 1500000 baud */ = 1500000,
-		S2000000 /*! 2000000 baud */ = 2000000,
-		S2500000 /*! 2500000 baud */ = 2500000,
-		S3000000 /*! 3000000 baud */ = 3000000,
-		S3500000 /*! 3500000 baud */ = 3500000,
-		S4000000 /*! 4000000 baud */ = 4000000
-	};
-
-	//! \brief Information about serial device
-	struct DeviceInfo {
-		DeviceInfo();
-
-		//! \brief String representation of USB ID in format \"xxxx:xxxx\"
-		PIString id() const;
-
-		//! \brief USB Vendor ID
-		uint vID;
-
-		//! \brief USB Product ID
-		uint pID;
-
-		//! \brief Path to device, e.g. "COM2" or "/dev/ttyUSB0"
-		PIString path;
-
-		//! \brief Device description
-		PIString description;
-
-		//! \brief Device manufacturer
-		PIString manufacturer;
-	};
-
-	//! Contructs %PISerial with device name "device", speed "speed" and parameters "params"
-	explicit PISerial(const PIString & device, PISerial::Speed speed = S115200, PIFlags<PISerial::Parameters> params = 0);
-	
-	~PISerial();
-
-	
-	//! Set both input and output speed to "speed"
-	void setSpeed(PISerial::Speed speed) {setProperty("outSpeed", (int)speed); setProperty("inSpeed", (int)speed); applySettings();}
-	
-	//! Set output speed to "speed"
-	void setOutSpeed(PISerial::Speed speed) {setProperty("outSpeed", (int)speed); applySettings();}
-	
-	//! Set input speed to "speed"
-	void setInSpeed(PISerial::Speed speed) {setProperty("inSpeed", (int)speed); applySettings();}
-	
-	//! Set device name to "dev"
-	void setDevice(const PIString & dev) {setPath(dev); if (isOpened()) {close(); open();};}
-
-	
-	//! Set parameters to "parameters_"
-	void setParameters(PIFlags<PISerial::Parameters> parameters_) {setProperty("parameters", (int)parameters_); applySettings();}
-	
-	//! Set parameter "parameter" to "on" state
-	void setParameter(PISerial::Parameters parameter, bool on = true);
-	
-	//! Returns if parameter "parameter" is set
-	bool isParameterSet(PISerial::Parameters parameter) const;
-	
-	//! Returns parameters
-	PIFlags<PISerial::Parameters> parameters() const {return (PIFlags<Parameters>)(property("parameters").toInt());}
-
-	
-	//! Set data bits count. Valid range is from 5 to 8, befault is 8
-	void setDataBitsCount(int bits) {setProperty("dataBitsCount", bits); applySettings();}
-	
-	//! Returns data bits count
-	int dataBitsCount() const {return property("dataBitsCount").toInt();}
-
-	
-	//! Set pin number "number" to logic level "on". Valid numbers are 4 (DTR) and 7 (RTS)
-	bool setPin(int number, bool on);
-	
-	//! Returns pin number "number" logic level. Valid numbers range is from 1 to 9
-	bool isPin(int number) const;
-
-	bool setLE(bool on);  // useless function, just formally
-	bool setDTR(bool on);
-	bool setRTS(bool on);
-	bool setCTS(bool on); // useless function, just formally
-	bool setST(bool on);  // useless function, just formally
-	bool setSR(bool on);  // useless function, just formally
-	bool setCAR(bool on); // useless function, just formally
-	bool setRNG(bool on); // useless function, just formally
-	bool setDSR(bool on); // useless function, just formally
-
-	bool isLE() const;
-	bool isDTR() const;
-	bool isRTS() const;
-	bool isCTS() const;
-	bool isST() const;
-	bool isSR() const;
-	bool isCAR() const;
-	bool isRNG() const;
-	bool isDSR() const;
-
-	void setVTime(int t) {vtime = t; applySettings();}
-
-	//! Returns device name
-	PIString device() const {return path();}
-	
-	//! Returns output speed
-	PISerial::Speed outSpeed() const {return (PISerial::Speed)(property("outSpeed").toInt());}
-	
-	//! Returns input speed
-	PISerial::Speed inSpeed() const {return (PISerial::Speed)(property("inSpeed").toInt());}
-	
-	int VTime() const {return vtime;}
-
-	//! Discard all buffered input and output data
-	void flush();
-
-	int read(void * read_to, int max_size) {return readDevice(read_to, max_size);}
-	bool read(void * read_to, int max_size, double timeout_ms);
-	PIString read(int size = -1, double timeout_ms = 1000.);
-	PIByteArray readData(int size = -1, double timeout_ms = 1000.);
-
-	//! \brief Write to device data "data" with maximum size "size" and wait for data written if "wait" is \b true.
-	//! \returns \b true if sended bytes count = "size"
-	bool send(const void * data, int size);
-
-	//! \brief Write to device byte array "data"
-	//! \returns \b true if sended bytes count = size of string
-	bool send(const PIByteArray & data) {return send(data.data(), data.size_s());}
-	
-	//! \brief Returns all available speeds for serial devices
-	static PIVector<int> availableSpeeds();
-	
-	//! \brief Returns all available system devices path. If "test" each device will be tried to open
-	static PIStringList availableDevices(bool test = false);
-
-	//! \brief Returns all available system devices. If "test" each device will be tried to open
-	static PIVector<DeviceInfo> availableDevicesInfo(bool test = false);
-
-//! \ioparams
-//! \{
-#ifdef DOXYGEN
-	//! \brief device, default ""
-	string device;
-	
-	//! \brief input/output speed, default 115200
-	int speed;
-	
-	//! \brief dataBitsCount, default 8
-	int dataBitsCount;
-	
-	//! \brief parityControl, default false
-	bool parityControl;
-	
-	//! \brief parityOdd, default false
-	bool parityOdd;
-	
-	//! \brief twoStopBits, default false
-	bool twoStopBits;
-#endif
-//! \}
-	
-protected:
-	PIString fullPathPrefix() const {return PIStringAscii("ser");}
-	PIString constructFullPathDevice() const;
-	void configureFromFullPathDevice(const PIString & full_path);
-	PIPropertyStorage constructVariantDevice() const;
-	void configureFromVariantDevice(const PIPropertyStorage & d);
-	bool configureDevice(const void * e_main, const void * e_parent = 0);
-	void optionsChanged();
-	void threadedReadBufferSizeChanged();
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int max_size);
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential;}
-
-	//! Executes when any read function was successful. Default implementation does nothing
-	virtual void received(const void * data, int size) {;}
-
-	void construct();
-	void applySettings();
-	void setTimeouts();
-	int convertSpeed(PISerial::Speed speed);
-	bool setBit(int bit, bool on, const PIString & bname);
-	bool isBit(int bit, const PIString & bname) const;
-
-	bool openDevice();
-	bool closeDevice();
-
-	PRIVATE_DECLARATION
-	int fd, vtime;
-	bool sending;
-	PITimeMeasurer tm_;
-
-};
-
-
-inline PICout operator <<(PICout s, const PISerial::DeviceInfo & v) {
-	s << v.path << " (" << v.id() << ", \"" << v.manufacturer << "\", \"" << v.description << "\")";
-	return s;
-}
-
-inline bool operator ==(const PISerial::DeviceInfo & v0, const PISerial::DeviceInfo & v1) {return v0.path == v1.path;}
-inline bool operator !=(const PISerial::DeviceInfo & v0, const PISerial::DeviceInfo & v1) {return v0.path != v1.path;}
-inline PIByteArray & operator <<(PIByteArray & s, const PISerial::DeviceInfo & v) {s << v.vID << v.pID << v.path << v.description << v.manufacturer; return s;}
-inline PIByteArray & operator >>(PIByteArray & s,       PISerial::DeviceInfo & v) {s >> v.vID >> v.pID >> v.path >> v.description >> v.manufacturer; return s;}
-
-
-#endif // PISERIAL_H
+/*! \file piserial.h
+ * \brief Serial device
+*/
+/*
+	PIP - Platform Independent Primitives
+	COM
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISERIAL_H
+#define PISERIAL_H
+
+#include "pitimer.h"
+#include "piiodevice.h"
+
+class PIP_EXPORT PISerial: public PIIODevice
+{
+	PIIODEVICE(PISerial)
+public:
+	
+	//! Contructs an empty %PISerial
+	explicit PISerial();
+
+	//! \brief Parameters of PISerial
+	enum Parameters {
+		ParityControl /*! Enable parity check and generate */ = 0x1,
+		ParityOdd /*! Parity is odd instead of even */ = 0x2,
+		TwoStopBits /*! Two stop bits instead of one */ = 0x4
+	};
+
+	//! \brief Speed of PISerial
+	enum Speed {
+		S50 /*! 50 baud */ = 50,
+		S75 /*! 75 baud */ = 75,
+		S110 /*! 110 baud */ = 110,
+		S300 /*! 300 baud */ = 300,
+		S600 /*! 600 baud */ = 600,
+		S1200 /*! 1200 baud */ = 1200,
+		S2400 /*! 2400 baud */ = 2400,
+		S4800 /*! 4800 baud */ = 4800,
+		S9600 /*! 9600 baud */ = 9600,
+		S19200 /*! 19200 baud */ = 19200,
+		S38400 /*! 38400 baud */ = 38400,
+		S57600 /*! 57600 baud */ = 57600,
+		S115200 /*! 115200 baud */ = 115200,
+		S230400 /*! 230400 baud */ = 230400,
+		S460800 /*! 460800 baud */ = 460800,
+		S500000 /*! 500000 baud */ = 500000,
+		S576000 /*! 576000 baud */ = 576000,
+		S921600 /*! 921600 baud */ = 921600,
+		S1000000 /*! 1000000 baud */ = 1000000,
+		S1152000 /*! 1152000 baud */ = 1152000,
+		S1500000 /*! 1500000 baud */ = 1500000,
+		S2000000 /*! 2000000 baud */ = 2000000,
+		S2500000 /*! 2500000 baud */ = 2500000,
+		S3000000 /*! 3000000 baud */ = 3000000,
+		S3500000 /*! 3500000 baud */ = 3500000,
+		S4000000 /*! 4000000 baud */ = 4000000
+	};
+
+	//! \brief Information about serial device
+	struct DeviceInfo {
+		DeviceInfo();
+
+		//! \brief String representation of USB ID in format \"xxxx:xxxx\"
+		PIString id() const;
+
+		//! \brief USB Vendor ID
+		uint vID;
+
+		//! \brief USB Product ID
+		uint pID;
+
+		//! \brief Path to device, e.g. "COM2" or "/dev/ttyUSB0"
+		PIString path;
+
+		//! \brief Device description
+		PIString description;
+
+		//! \brief Device manufacturer
+		PIString manufacturer;
+	};
+
+	//! Contructs %PISerial with device name "device", speed "speed" and parameters "params"
+	explicit PISerial(const PIString & device, PISerial::Speed speed = S115200, PIFlags<PISerial::Parameters> params = 0);
+	
+	~PISerial();
+
+	
+	//! Set both input and output speed to "speed"
+	void setSpeed(PISerial::Speed speed) {setProperty("outSpeed", (int)speed); setProperty("inSpeed", (int)speed); applySettings();}
+	
+	//! Set output speed to "speed"
+	void setOutSpeed(PISerial::Speed speed) {setProperty("outSpeed", (int)speed); applySettings();}
+	
+	//! Set input speed to "speed"
+	void setInSpeed(PISerial::Speed speed) {setProperty("inSpeed", (int)speed); applySettings();}
+	
+	//! Set device name to "dev"
+	void setDevice(const PIString & dev) {setPath(dev); if (isOpened()) {close(); open();};}
+
+	
+	//! Set parameters to "parameters_"
+	void setParameters(PIFlags<PISerial::Parameters> parameters_) {setProperty("parameters", (int)parameters_); applySettings();}
+	
+	//! Set parameter "parameter" to "on" state
+	void setParameter(PISerial::Parameters parameter, bool on = true);
+	
+	//! Returns if parameter "parameter" is set
+	bool isParameterSet(PISerial::Parameters parameter) const;
+	
+	//! Returns parameters
+	PIFlags<PISerial::Parameters> parameters() const {return (PIFlags<Parameters>)(property("parameters").toInt());}
+
+	
+	//! Set data bits count. Valid range is from 5 to 8, befault is 8
+	void setDataBitsCount(int bits) {setProperty("dataBitsCount", bits); applySettings();}
+	
+	//! Returns data bits count
+	int dataBitsCount() const {return property("dataBitsCount").toInt();}
+
+	
+	//! Set pin number "number" to logic level "on". Valid numbers are 4 (DTR) and 7 (RTS)
+	bool setPin(int number, bool on);
+	
+	//! Returns pin number "number" logic level. Valid numbers range is from 1 to 9
+	bool isPin(int number) const;
+
+	bool setLE(bool on);  // useless function, just formally
+	bool setDTR(bool on);
+	bool setRTS(bool on);
+	bool setCTS(bool on); // useless function, just formally
+	bool setST(bool on);  // useless function, just formally
+	bool setSR(bool on);  // useless function, just formally
+	bool setCAR(bool on); // useless function, just formally
+	bool setRNG(bool on); // useless function, just formally
+	bool setDSR(bool on); // useless function, just formally
+
+	bool isLE() const;
+	bool isDTR() const;
+	bool isRTS() const;
+	bool isCTS() const;
+	bool isST() const;
+	bool isSR() const;
+	bool isCAR() const;
+	bool isRNG() const;
+	bool isDSR() const;
+
+	void setVTime(int t) {vtime = t; applySettings();}
+
+	//! Returns device name
+	PIString device() const {return path();}
+	
+	//! Returns output speed
+	PISerial::Speed outSpeed() const {return (PISerial::Speed)(property("outSpeed").toInt());}
+	
+	//! Returns input speed
+	PISerial::Speed inSpeed() const {return (PISerial::Speed)(property("inSpeed").toInt());}
+	
+	int VTime() const {return vtime;}
+
+	//! Discard all buffered input and output data
+	void flush();
+
+	int read(void * read_to, int max_size) {return readDevice(read_to, max_size);}
+	bool read(void * read_to, int max_size, double timeout_ms);
+	PIString read(int size = -1, double timeout_ms = 1000.);
+	PIByteArray readData(int size = -1, double timeout_ms = 1000.);
+
+	//! \brief Write to device data "data" with maximum size "size" and wait for data written if "wait" is \b true.
+	//! \returns \b true if sended bytes count = "size"
+	bool send(const void * data, int size);
+
+	//! \brief Write to device byte array "data"
+	//! \returns \b true if sended bytes count = size of string
+	bool send(const PIByteArray & data) {return send(data.data(), data.size_s());}
+	
+	//! \brief Returns all available speeds for serial devices
+	static PIVector<int> availableSpeeds();
+	
+	//! \brief Returns all available system devices path. If "test" each device will be tried to open
+	static PIStringList availableDevices(bool test = false);
+
+	//! \brief Returns all available system devices. If "test" each device will be tried to open
+	static PIVector<DeviceInfo> availableDevicesInfo(bool test = false);
+
+//! \ioparams
+//! \{
+#ifdef DOXYGEN
+	//! \brief device, default ""
+	string device;
+	
+	//! \brief input/output speed, default 115200
+	int speed;
+	
+	//! \brief dataBitsCount, default 8
+	int dataBitsCount;
+	
+	//! \brief parityControl, default false
+	bool parityControl;
+	
+	//! \brief parityOdd, default false
+	bool parityOdd;
+	
+	//! \brief twoStopBits, default false
+	bool twoStopBits;
+#endif
+//! \}
+	
+protected:
+	PIString fullPathPrefix() const {return PIStringAscii("ser");}
+	PIString constructFullPathDevice() const;
+	void configureFromFullPathDevice(const PIString & full_path);
+	PIPropertyStorage constructVariantDevice() const;
+	void configureFromVariantDevice(const PIPropertyStorage & d);
+	bool configureDevice(const void * e_main, const void * e_parent = 0);
+	void optionsChanged();
+	void threadedReadBufferSizeChanged();
+	int readDevice(void * read_to, int max_size);
+	int writeDevice(const void * data, int max_size);
+	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential;}
+
+	//! Executes when any read function was successful. Default implementation does nothing
+	virtual void received(const void * data, int size) {;}
+
+	void construct();
+	void applySettings();
+	void setTimeouts();
+	int convertSpeed(PISerial::Speed speed);
+	bool setBit(int bit, bool on, const PIString & bname);
+	bool isBit(int bit, const PIString & bname) const;
+
+	bool openDevice();
+	bool closeDevice();
+
+	PRIVATE_DECLARATION
+	int fd, vtime;
+	bool sending;
+	PITimeMeasurer tm_;
+
+};
+
+
+inline PICout operator <<(PICout s, const PISerial::DeviceInfo & v) {
+	s << v.path << " (" << v.id() << ", \"" << v.manufacturer << "\", \"" << v.description << "\")";
+	return s;
+}
+
+inline bool operator ==(const PISerial::DeviceInfo & v0, const PISerial::DeviceInfo & v1) {return v0.path == v1.path;}
+inline bool operator !=(const PISerial::DeviceInfo & v0, const PISerial::DeviceInfo & v1) {return v0.path != v1.path;}
+inline PIByteArray & operator <<(PIByteArray & s, const PISerial::DeviceInfo & v) {s << v.vID << v.pID << v.path << v.description << v.manufacturer; return s;}
+inline PIByteArray & operator >>(PIByteArray & s,       PISerial::DeviceInfo & v) {s >> v.vID >> v.pID >> v.path >> v.description >> v.manufacturer; return s;}
+
+
+#endif // PISERIAL_H
diff --git a/src_main/io_devices/pisharedmemory.cpp b/lib/main/io_devices/pisharedmemory.cpp
similarity index 100%
rename from src_main/io_devices/pisharedmemory.cpp
rename to lib/main/io_devices/pisharedmemory.cpp
diff --git a/src_main/io_devices/pisharedmemory.h b/lib/main/io_devices/pisharedmemory.h
similarity index 100%
rename from src_main/io_devices/pisharedmemory.h
rename to lib/main/io_devices/pisharedmemory.h
diff --git a/src_main/io_devices/pispi.cpp b/lib/main/io_devices/pispi.cpp
similarity index 96%
rename from src_main/io_devices/pispi.cpp
rename to lib/main/io_devices/pispi.cpp
index eaa26732..55bcc99e 100644
--- a/src_main/io_devices/pispi.cpp
+++ b/lib/main/io_devices/pispi.cpp
@@ -1,191 +1,191 @@
-/*
-	PIP - Platform Independent Primitives
-	SPI
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pispi.h"
-#include "pipropertystorage.h"
-#include "piincludes_p.h"
-#ifdef LINUX
-#  define PIP_SPI
-#endif
-#ifdef PIP_SPI
-# include <fcntl.h>
-# include <sys/ioctl.h>
-# include <linux/spi/spidev.h>
-#endif
-
-
-PRIVATE_DEFINITION_START(PISPI)
-#ifdef PIP_SPI
-int fd;
-spi_ioc_transfer spi_ioc_tr;
-#endif
-PRIVATE_DEFINITION_END(PISPI)
-
-
-REGISTER_DEVICE(PISPI)
-
-
-PISPI::PISPI(const PIString & path, uint speed, PIIODevice::DeviceMode mode) : PIIODevice(path, mode) {
-#ifdef FREERTOS
-	setThreadedReadBufferSize(512);
-#else
-	setThreadedReadBufferSize(1024);
-#endif
-	setPath(path);
-	setSpeed(speed);
-	setBits(8);
-	spi_mode = 0;
-	if (mode == ReadOnly)
-		piCoutObj << "error, SPI can't work in ReadOnly mode";
-#ifdef PIP_SPI
-	PRIVATE->fd = 0;
-#endif
-}
-
-
-void PISPI::setSpeed(uint speed_hz) {
-	spi_speed = speed_hz;
-}
-
-
-void PISPI::setBits(uchar bits) {
-	spi_bits = bits;
-}
-
-
-void PISPI::setParameter(PISPI::Parameters parameter, bool on) {
-	PIFlags<Parameters> cp = (PIFlags<Parameters>)spi_mode;
-	cp.setFlag(parameter, on);
-	spi_mode = (int)cp;
-}
-
-
-bool PISPI::isParameterSet(PISPI::Parameters parameter) const {
-	PIFlags<Parameters> cp = (PIFlags<Parameters>)spi_mode;
-	return cp[parameter];
-}
-
-
-bool PISPI::openDevice() {
-#ifdef PIP_SPI
-	int ret = 0;
-	//piCoutObj << "open device" << path();
-	PRIVATE->fd = ::open(path().dataAscii(), O_RDWR);
-	if (PRIVATE->fd < 0) {piCoutObj << "can't open device";return false;}
-	//piCoutObj << "set mode" << spi_mode;
-	ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MODE, &spi_mode);
-	if (ret == -1) {piCoutObj << "can't set spi write mode";return false;}
-	//piCoutObj << "set bits" << spi_bits;
-	ret = ioctl(PRIVATE->fd, SPI_IOC_WR_BITS_PER_WORD, &spi_bits);
-	if (ret == -1) {piCoutObj << "can't set bits per word";return false;}
-	//piCoutObj << "set speed" << spi_speed;
-	ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MAX_SPEED_HZ, &spi_speed);
-	if (ret == -1) {piCoutObj << "can't set max write speed hz";return false;}
-	piCoutObj << "SPI open" << path() << "speed:" << spi_speed/1000 << "KHz" << "mode" << spi_mode << "bits" << spi_bits;
-	PRIVATE->spi_ioc_tr.delay_usecs = 0;
-	PRIVATE->spi_ioc_tr.speed_hz = 0;
-	PRIVATE->spi_ioc_tr.bits_per_word = spi_bits;
-	return true;
-#else
-	piCoutObj << "PISPI not implemented on windows";
-	return false;
-#endif
-}
-
-
-bool PISPI::closeDevice() {
-#ifdef PIP_SPI
-	if (PRIVATE->fd) ::close(PRIVATE->fd);
-#endif
-	return true;
-}
-
-
-int PISPI::readDevice(void * read_to, int max_size) {
-	int sz = piMini(recv_buf.size_s(), max_size);
-	memcpy(read_to, recv_buf.data(), sz);
-	recv_buf.resize(recv_buf.size_s() - sz);
-	return sz;
-}
-
-
-int PISPI::writeDevice(const void * data, int max_size) {
-#ifdef PIP_SPI
-	if (max_size > 0) {
-		if (tx_buf.size_s() != max_size) {
-			tx_buf.resize(max_size);
-			rx_buf.resize(max_size);
-			PRIVATE->spi_ioc_tr.tx_buf = (ulong)(tx_buf.data());
-			PRIVATE->spi_ioc_tr.rx_buf = (ulong)(rx_buf.data());
-			PRIVATE->spi_ioc_tr.len = max_size;
-		}
-		memcpy(tx_buf.data(), data, max_size);
-		int ret;
-		//piCoutObj << "write" << max_size << tx_buf.size();
-		ret = ioctl(PRIVATE->fd, SPI_IOC_MESSAGE(1), &PRIVATE->spi_ioc_tr);
-		if (ret < 1) {piCoutObj << "can't send spi message" << ret; return -1;}
-		if (canRead()) recv_buf.append(rx_buf);
-		if (recv_buf.size_s() > threadedReadBufferSize()) recv_buf.resize(threadedReadBufferSize());
-		return max_size;
-	}
-#endif
-	return 0;
-}
-
-
-PIString PISPI::constructFullPathDevice() const {
-	PIString ret;
-	ret << path() << ":" << int(speed()) << ":" << int(bits()) << ":" << (int)parameters();
-	return ret;
-}
-
-
-void PISPI::configureFromFullPathDevice(const PIString & full_path) {
-	PIStringList pl = full_path.split(":");
-	for (int i = 0; i < pl.size_s(); ++i) {
-		PIString p(pl[i]);
-		switch (i) {
-		case 0: setPath(p); break;
-		case 1: setSpeed(p.toInt()); break;
-		case 2: setBits(p.toInt()); break;
-		case 3: setParameters(p.toInt()); break;
-		default: break;
-		}
-	}
-}
-
-
-PIPropertyStorage PISPI::constructVariantDevice() const {
-	PIPropertyStorage ret;
-	ret.addProperty("path", path());
-	ret.addProperty("speed", int(speed()));
-	ret.addProperty("bits", int(bits()));
-	ret.addProperty("clock inverse", isParameterSet(ClockInverse));
-	ret.addProperty("clock phase shift", isParameterSet(ClockPhaseShift));
-	return ret;
-}
-
-
-void PISPI::configureFromVariantDevice(const PIPropertyStorage & d) {
-	setPath(d.propertyValueByName("path").toString());
-	setSpeed(d.propertyValueByName("speed").toInt());
-	setBits(d.propertyValueByName("bits").toInt());
-	setParameter(ClockInverse, d.propertyValueByName("clock inverse").toBool());
-	setParameter(ClockPhaseShift, d.propertyValueByName("clock phase shift").toBool());
-}
+/*
+	PIP - Platform Independent Primitives
+	SPI
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pispi.h"
+#include "pipropertystorage.h"
+#include "piincludes_p.h"
+#ifdef LINUX
+#  define PIP_SPI
+#endif
+#ifdef PIP_SPI
+# include <fcntl.h>
+# include <sys/ioctl.h>
+# include <linux/spi/spidev.h>
+#endif
+
+
+PRIVATE_DEFINITION_START(PISPI)
+#ifdef PIP_SPI
+int fd;
+spi_ioc_transfer spi_ioc_tr;
+#endif
+PRIVATE_DEFINITION_END(PISPI)
+
+
+REGISTER_DEVICE(PISPI)
+
+
+PISPI::PISPI(const PIString & path, uint speed, PIIODevice::DeviceMode mode) : PIIODevice(path, mode) {
+#ifdef FREERTOS
+	setThreadedReadBufferSize(512);
+#else
+	setThreadedReadBufferSize(1024);
+#endif
+	setPath(path);
+	setSpeed(speed);
+	setBits(8);
+	spi_mode = 0;
+	if (mode == ReadOnly)
+		piCoutObj << "error, SPI can't work in ReadOnly mode";
+#ifdef PIP_SPI
+	PRIVATE->fd = 0;
+#endif
+}
+
+
+void PISPI::setSpeed(uint speed_hz) {
+	spi_speed = speed_hz;
+}
+
+
+void PISPI::setBits(uchar bits) {
+	spi_bits = bits;
+}
+
+
+void PISPI::setParameter(PISPI::Parameters parameter, bool on) {
+	PIFlags<Parameters> cp = (PIFlags<Parameters>)spi_mode;
+	cp.setFlag(parameter, on);
+	spi_mode = (int)cp;
+}
+
+
+bool PISPI::isParameterSet(PISPI::Parameters parameter) const {
+	PIFlags<Parameters> cp = (PIFlags<Parameters>)spi_mode;
+	return cp[parameter];
+}
+
+
+bool PISPI::openDevice() {
+#ifdef PIP_SPI
+	int ret = 0;
+	//piCoutObj << "open device" << path();
+	PRIVATE->fd = ::open(path().dataAscii(), O_RDWR);
+	if (PRIVATE->fd < 0) {piCoutObj << "can't open device";return false;}
+	//piCoutObj << "set mode" << spi_mode;
+	ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MODE, &spi_mode);
+	if (ret == -1) {piCoutObj << "can't set spi write mode";return false;}
+	//piCoutObj << "set bits" << spi_bits;
+	ret = ioctl(PRIVATE->fd, SPI_IOC_WR_BITS_PER_WORD, &spi_bits);
+	if (ret == -1) {piCoutObj << "can't set bits per word";return false;}
+	//piCoutObj << "set speed" << spi_speed;
+	ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MAX_SPEED_HZ, &spi_speed);
+	if (ret == -1) {piCoutObj << "can't set max write speed hz";return false;}
+	piCoutObj << "SPI open" << path() << "speed:" << spi_speed/1000 << "KHz" << "mode" << spi_mode << "bits" << spi_bits;
+	PRIVATE->spi_ioc_tr.delay_usecs = 0;
+	PRIVATE->spi_ioc_tr.speed_hz = 0;
+	PRIVATE->spi_ioc_tr.bits_per_word = spi_bits;
+	return true;
+#else
+	piCoutObj << "PISPI not implemented on windows";
+	return false;
+#endif
+}
+
+
+bool PISPI::closeDevice() {
+#ifdef PIP_SPI
+	if (PRIVATE->fd) ::close(PRIVATE->fd);
+#endif
+	return true;
+}
+
+
+int PISPI::readDevice(void * read_to, int max_size) {
+	int sz = piMini(recv_buf.size_s(), max_size);
+	memcpy(read_to, recv_buf.data(), sz);
+	recv_buf.resize(recv_buf.size_s() - sz);
+	return sz;
+}
+
+
+int PISPI::writeDevice(const void * data, int max_size) {
+#ifdef PIP_SPI
+	if (max_size > 0) {
+		if (tx_buf.size_s() != max_size) {
+			tx_buf.resize(max_size);
+			rx_buf.resize(max_size);
+			PRIVATE->spi_ioc_tr.tx_buf = (ulong)(tx_buf.data());
+			PRIVATE->spi_ioc_tr.rx_buf = (ulong)(rx_buf.data());
+			PRIVATE->spi_ioc_tr.len = max_size;
+		}
+		memcpy(tx_buf.data(), data, max_size);
+		int ret;
+		//piCoutObj << "write" << max_size << tx_buf.size();
+		ret = ioctl(PRIVATE->fd, SPI_IOC_MESSAGE(1), &PRIVATE->spi_ioc_tr);
+		if (ret < 1) {piCoutObj << "can't send spi message" << ret; return -1;}
+		if (canRead()) recv_buf.append(rx_buf);
+		if (recv_buf.size_s() > threadedReadBufferSize()) recv_buf.resize(threadedReadBufferSize());
+		return max_size;
+	}
+#endif
+	return 0;
+}
+
+
+PIString PISPI::constructFullPathDevice() const {
+	PIString ret;
+	ret << path() << ":" << int(speed()) << ":" << int(bits()) << ":" << (int)parameters();
+	return ret;
+}
+
+
+void PISPI::configureFromFullPathDevice(const PIString & full_path) {
+	PIStringList pl = full_path.split(":");
+	for (int i = 0; i < pl.size_s(); ++i) {
+		PIString p(pl[i]);
+		switch (i) {
+		case 0: setPath(p); break;
+		case 1: setSpeed(p.toInt()); break;
+		case 2: setBits(p.toInt()); break;
+		case 3: setParameters(p.toInt()); break;
+		default: break;
+		}
+	}
+}
+
+
+PIPropertyStorage PISPI::constructVariantDevice() const {
+	PIPropertyStorage ret;
+	ret.addProperty("path", path());
+	ret.addProperty("speed", int(speed()));
+	ret.addProperty("bits", int(bits()));
+	ret.addProperty("clock inverse", isParameterSet(ClockInverse));
+	ret.addProperty("clock phase shift", isParameterSet(ClockPhaseShift));
+	return ret;
+}
+
+
+void PISPI::configureFromVariantDevice(const PIPropertyStorage & d) {
+	setPath(d.propertyValueByName("path").toString());
+	setSpeed(d.propertyValueByName("speed").toInt());
+	setBits(d.propertyValueByName("bits").toInt());
+	setParameter(ClockInverse, d.propertyValueByName("clock inverse").toBool());
+	setParameter(ClockPhaseShift, d.propertyValueByName("clock phase shift").toBool());
+}
diff --git a/src_main/io_devices/pispi.h b/lib/main/io_devices/pispi.h
similarity index 96%
rename from src_main/io_devices/pispi.h
rename to lib/main/io_devices/pispi.h
index 82d19ef5..f6705f81 100644
--- a/src_main/io_devices/pispi.h
+++ b/lib/main/io_devices/pispi.h
@@ -1,83 +1,83 @@
-/*! \file pispi.h
- * \brief SPI device
-*/
-/*
-	PIP - Platform Independent Primitives
-	SPI
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISPI_H
-#define PISPI_H
-
-#include "piiodevice.h"
-
-
-class PIP_EXPORT PISPI: public PIIODevice
-{
-	PIIODEVICE(PISPI)
-public:
-	explicit PISPI(const PIString & path = PIString(), uint speed_hz = 1000000, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
-	~PISPI() {}
-
-	//! \brief Parameters of PISPI
-	enum Parameters {
-		ClockInverse /*! SPI clk polarity control*/ = 0x1,
-		ClockPhaseShift /*! SPI clk phase control */ = 0x2,
-	};
-
-	void setSpeed(uint speed_hz);
-	uint speed() const {return spi_speed;}
-
-	void setBits(uchar bits = 8);
-	uchar bits() const {return spi_bits;}
-
-	//! Set parameters to "parameters_"
-	void setParameters(PIFlags<PISPI::Parameters> parameters_) {spi_mode = (int)parameters_;}
-
-	//! Set parameter "parameter" to "on" state
-	void setParameter(PISPI::Parameters parameter, bool on = true);
-
-	//! Returns if parameter "parameter" is set
-	bool isParameterSet(PISPI::Parameters parameter) const;
-
-	//! Returns parameters
-	PIFlags<PISPI::Parameters> parameters() const {return spi_mode;}
-
-
-protected:
-	bool openDevice();
-	bool closeDevice();
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int max_size);
-
-	PIString fullPathPrefix() const {return PIStringAscii("spi");}
-	PIString constructFullPathDevice() const;
-	void configureFromFullPathDevice(const PIString & full_path);
-	PIPropertyStorage constructVariantDevice() const;
-	void configureFromVariantDevice(const PIPropertyStorage & d);
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential;}
-
-private:
-	uint spi_speed;
-	uchar spi_mode;
-	uchar spi_bits;
-	PIByteArray tx_buf, rx_buf;
-	PIByteArray recv_buf;
-	PRIVATE_DECLARATION
-};
-
-#endif // PISPI_H
+/*! \file pispi.h
+ * \brief SPI device
+*/
+/*
+	PIP - Platform Independent Primitives
+	SPI
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISPI_H
+#define PISPI_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PISPI: public PIIODevice
+{
+	PIIODEVICE(PISPI)
+public:
+	explicit PISPI(const PIString & path = PIString(), uint speed_hz = 1000000, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
+	~PISPI() {}
+
+	//! \brief Parameters of PISPI
+	enum Parameters {
+		ClockInverse /*! SPI clk polarity control*/ = 0x1,
+		ClockPhaseShift /*! SPI clk phase control */ = 0x2,
+	};
+
+	void setSpeed(uint speed_hz);
+	uint speed() const {return spi_speed;}
+
+	void setBits(uchar bits = 8);
+	uchar bits() const {return spi_bits;}
+
+	//! Set parameters to "parameters_"
+	void setParameters(PIFlags<PISPI::Parameters> parameters_) {spi_mode = (int)parameters_;}
+
+	//! Set parameter "parameter" to "on" state
+	void setParameter(PISPI::Parameters parameter, bool on = true);
+
+	//! Returns if parameter "parameter" is set
+	bool isParameterSet(PISPI::Parameters parameter) const;
+
+	//! Returns parameters
+	PIFlags<PISPI::Parameters> parameters() const {return spi_mode;}
+
+
+protected:
+	bool openDevice();
+	bool closeDevice();
+	int readDevice(void * read_to, int max_size);
+	int writeDevice(const void * data, int max_size);
+
+	PIString fullPathPrefix() const {return PIStringAscii("spi");}
+	PIString constructFullPathDevice() const;
+	void configureFromFullPathDevice(const PIString & full_path);
+	PIPropertyStorage constructVariantDevice() const;
+	void configureFromVariantDevice(const PIPropertyStorage & d);
+	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Sequential;}
+
+private:
+	uint spi_speed;
+	uchar spi_mode;
+	uchar spi_bits;
+	PIByteArray tx_buf, rx_buf;
+	PIByteArray recv_buf;
+	PRIVATE_DECLARATION
+};
+
+#endif // PISPI_H
diff --git a/src_main/io_devices/pitransparentdevice.cpp b/lib/main/io_devices/pitransparentdevice.cpp
similarity index 96%
rename from src_main/io_devices/pitransparentdevice.cpp
rename to lib/main/io_devices/pitransparentdevice.cpp
index a82d301f..6ea60f2b 100644
--- a/src_main/io_devices/pitransparentdevice.cpp
+++ b/lib/main/io_devices/pitransparentdevice.cpp
@@ -1,74 +1,74 @@
-/*
-	PIP - Platform Independent Primitives
-	PIIODevice that pass write to read
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pitransparentdevice.h"
-
-
-/*! \class PITransparentDevice
- * \brief PIIODevice that pass write to read
- * 
- * \section  PITransparentDevice_sec0 Synopsis
- * This class pass all data from \a write() function to \a read().
- * %PITransparentDevice contains internal queue and works in
- * packets mode. If you write 3 different  packets into this device,
- * read will return this 3 packets.
- */
-
-REGISTER_DEVICE(PITransparentDevice)
-
-
-PITransparentDevice::PITransparentDevice() {
-}
-
-
-int PITransparentDevice::readDevice(void * read_to, int max_size) {
-	if (!canRead()) return -1;
-	que_mutex.lock();
-	if (que.isEmpty()) {
-		que_mutex.unlock();
-		return 0;
-	}
-	PIByteArray ba = que.dequeue();
-	que_mutex.unlock();
-	int ret = piMini(max_size, ba.size_s());
-	memcpy(read_to, ba.data(), ret);
-	return ret;
-}
-
-
-int PITransparentDevice::writeDevice(const void * data, int max_size) {
-	if (!canWrite()) return -1;
-	que_mutex.lock();
-	que.enqueue(PIByteArray(data, max_size));
-	que_mutex.unlock();
-	return max_size;
-}
-
-
-bool PITransparentDevice::openDevice() {
-	return true;
-}
-
-
-bool PITransparentDevice::closeDevice() {
-	que_mutex.lock();
-	que.clear();
-	que_mutex.unlock();
-	return true;
-}
+/*
+	PIP - Platform Independent Primitives
+	PIIODevice that pass write to read
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pitransparentdevice.h"
+
+
+/*! \class PITransparentDevice
+ * \brief PIIODevice that pass write to read
+ * 
+ * \section  PITransparentDevice_sec0 Synopsis
+ * This class pass all data from \a write() function to \a read().
+ * %PITransparentDevice contains internal queue and works in
+ * packets mode. If you write 3 different  packets into this device,
+ * read will return this 3 packets.
+ */
+
+REGISTER_DEVICE(PITransparentDevice)
+
+
+PITransparentDevice::PITransparentDevice() {
+}
+
+
+int PITransparentDevice::readDevice(void * read_to, int max_size) {
+	if (!canRead()) return -1;
+	que_mutex.lock();
+	if (que.isEmpty()) {
+		que_mutex.unlock();
+		return 0;
+	}
+	PIByteArray ba = que.dequeue();
+	que_mutex.unlock();
+	int ret = piMini(max_size, ba.size_s());
+	memcpy(read_to, ba.data(), ret);
+	return ret;
+}
+
+
+int PITransparentDevice::writeDevice(const void * data, int max_size) {
+	if (!canWrite()) return -1;
+	que_mutex.lock();
+	que.enqueue(PIByteArray(data, max_size));
+	que_mutex.unlock();
+	return max_size;
+}
+
+
+bool PITransparentDevice::openDevice() {
+	return true;
+}
+
+
+bool PITransparentDevice::closeDevice() {
+	que_mutex.lock();
+	que.clear();
+	que_mutex.unlock();
+	return true;
+}
diff --git a/src_main/io_devices/pitransparentdevice.h b/lib/main/io_devices/pitransparentdevice.h
similarity index 96%
rename from src_main/io_devices/pitransparentdevice.h
rename to lib/main/io_devices/pitransparentdevice.h
index c3cb73ad..f1478668 100644
--- a/src_main/io_devices/pitransparentdevice.h
+++ b/lib/main/io_devices/pitransparentdevice.h
@@ -1,52 +1,52 @@
-/*! \file pitransparentdevice.h
- * \brief PIIODevice that pass write to read
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIIODevice that pass write to read
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PITRANSPARENTDEVICE_H
-#define PITRANSPARENTDEVICE_H
-
-#include "piiodevice.h"
-
-
-class PIP_EXPORT PITransparentDevice: public PIIODevice
-{
-	PIIODEVICE(PITransparentDevice)
-public:
-	
-	//! Contructs empty %PITransparentDevice
-	explicit PITransparentDevice();
-	
-	~PITransparentDevice() {closeDevice();}
-	
-protected:
-	bool openDevice();
-	bool closeDevice();
-	int readDevice(void * read_to, int max_size);
-	int writeDevice(const void * data, int max_size);
-	PIString fullPathPrefix() const {return PIStringAscii("tr");}
-	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
-
-	PIMutex que_mutex;
-	PIQueue<PIByteArray> que;
-
-};
-
-#endif // PITRANSPARENTDEVICE_H
+/*! \file pitransparentdevice.h
+ * \brief PIIODevice that pass write to read
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIIODevice that pass write to read
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PITRANSPARENTDEVICE_H
+#define PITRANSPARENTDEVICE_H
+
+#include "piiodevice.h"
+
+
+class PIP_EXPORT PITransparentDevice: public PIIODevice
+{
+	PIIODEVICE(PITransparentDevice)
+public:
+	
+	//! Contructs empty %PITransparentDevice
+	explicit PITransparentDevice();
+	
+	~PITransparentDevice() {closeDevice();}
+	
+protected:
+	bool openDevice();
+	bool closeDevice();
+	int readDevice(void * read_to, int max_size);
+	int writeDevice(const void * data, int max_size);
+	PIString fullPathPrefix() const {return PIStringAscii("tr");}
+	DeviceInfoFlags deviceInfoFlags() const {return PIIODevice::Reliable;}
+
+	PIMutex que_mutex;
+	PIQueue<PIByteArray> que;
+
+};
+
+#endif // PITRANSPARENTDEVICE_H
diff --git a/src_main/io_devices/piusb.h b/lib/main/io_devices/piusb.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/io_devices/piusb.h
rename to lib/main/io_devices/piusb.h
diff --git a/src_main/io_utils/pibasetransfer.cpp b/lib/main/io_utils/pibasetransfer.cpp
similarity index 96%
rename from src_main/io_utils/pibasetransfer.cpp
rename to lib/main/io_utils/pibasetransfer.cpp
index 59a00ea1..0d3cef9a 100644
--- a/src_main/io_utils/pibasetransfer.cpp
+++ b/lib/main/io_utils/pibasetransfer.cpp
@@ -1,611 +1,611 @@
-/*
-	PIP - Platform Independent Primitives
-	Base class for reliable send and receive data in fixed packets with error correction, pause and resume
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pibasetransfer.h"
-
-const uint PIBaseTransfer::signature = 0x54424950;
-
-PIBaseTransfer::PIBaseTransfer(): crc(standardCRC_16()), diag(false) {
-	header.sig = signature;
-	crc_enabled = true;
-	header.session_id = 0;
-	packet_header_size = sizeof(PacketHeader) + customHeader().size();
-	part_header_size = sizeof(Part) + sizeof(int);
-	is_sending = is_receiving = is_pause = false;
-	break_ = true;
-	bytes_all = bytes_cur = 0;
-	send_queue = 0;
-	send_up = 0;
-	timeout_ = 10.;
-	diag.setDisconnectTimeout(timeout_ / 10);
-	diag.setName("PIBaseTransfer");
-	diag.start(50);
-	packets_count = 10;
-#ifdef FREERTOS
-	setPacketSize(512);
-#else
-	setPacketSize(4096);
-#endif
-	randomize();
-}
-
-
-PIBaseTransfer::~PIBaseTransfer() {
-	diag.stop();
-	break_ = true;
-}
-
-
-void PIBaseTransfer::stopSend() {
-	if (!is_sending) return;
-	break_ = true;
-}
-
-
-void PIBaseTransfer::stopReceive() {
-	if (!is_receiving) return;
-	break_ = true;
-	//piCoutObj << "stopReceive()";
-	finish_receive(false);
-}
-
-
-void PIBaseTransfer::setPause(bool pause_) {
-	if (is_pause == pause_) return;
-	pause_tm.reset();
-	is_pause = pause_;
-	if (pause_) paused();
-	else resumed();
-}
-
-
-void PIBaseTransfer::received(PIByteArray data) {
-	packet_header_size = sizeof(PacketHeader) + customHeader().size();
-	if (data.size() < sizeof(PacketHeader)) {
-		diag.received(data.size(), false);
-		return;
-	}
-	PacketHeader h;
-	data >> h;
-	PacketType pt = (PacketType)h.type;
-	if (!h.check_sig()) {
-		piCoutObj << "invalid packet signature";
-		diag.received(data.size(), false);
-		return;
-	} else diag.received(data.size(), true);
-	//piCoutObj << "receive" << h.session_id << h.type << h.id;
-	switch (pt) {
-		case pt_Unknown: break;
-		case pt_Data:
-			mutex_header.lock();
-			if (h.session_id != header.session_id || !is_receiving) {
-				sendBreak(h.session_id);
-				mutex_header.unlock();
-				return;
-			} else {
-				uint rcrc = h.crc;
-				uint ccrc;
-				if (crc_enabled) ccrc = crc.calculate(data.data(), data.size_s());
-				else ccrc = 0;
-				if (rcrc != ccrc) {
-					header.id = h.id;
-					piCoutObj << "invalid CRC";
-					sendReply(pt_ReplyInvalid);
-				} else {
-					mutex_session.lock();
-					processData(h.id, data);
-					mutex_session.unlock();
-				}
-				if (is_pause) sendReply(pt_Pause);
-			}
-			mutex_header.unlock();
-		break;
-		case pt_ReplySuccess:
-		case pt_ReplyInvalid:
-			mutex_header.lock();
-			if (h.session_id != header.session_id) {
-				mutex_header.unlock();
-				return;
-			}
-			if (is_pause) sendReply(pt_Pause);
-			mutex_header.unlock();
-			if (pt == pt_ReplySuccess) {
-				mutex_send.lock();
-				send_queue--;
-				if (send_queue < 0) send_queue = 0;
-				send_tm.reset();
-				mutex_send.unlock();
-			}
-			if (is_sending) {
-				mutex_session.lock();
-				if (h.id < replies.size()) {
-					replies[h.id] = pt;
-					pm_string[h.id] = pt == pt_ReplySuccess ? '#' : '-';
-					int s = pm_string.find('+'), s1 = send_queue;
-					while (s <= (int)h.id && s > 0) {
-						send_queue--;
-						if (s >= 0) {
-							pm_string[s] = '-';
-							bytes_cur -= packet_size;
-						}
-						send_up = 0;
-						if (send_queue < 0) {
-							send_queue = 0;
-							break;
-						}
-						s = pm_string.find('+');
-					}
-					if (s1-send_queue > 1 && packets_count > 2) packets_count-= piMaxi(packets_count/10,1);
-					if (s1 == send_queue && s1 < piMaxi(packets_count/2, 2) && packets_count < 100) send_up++;
-					if (send_up > 20 && send_up > packets_count*2) packets_count+= piMaxi(packets_count/10,1);
-					//piCoutObj << packets_count;
-				} else
-					piCoutObj << "invalid reply id";
-				mutex_session.unlock();
-//				piCoutObj << "Done Packet" << h.id;
-			}
-			if (is_receiving && h.id == 0) {
-				if (pt == pt_ReplySuccess) {
-					mutex_session.lock();
-					int cs = checkSession();
-					mutex_session.unlock();
-					//piCoutObj << "Success receive";
-					if (cs == 0) finish_receive(true);
-				}
-			}
-		break;
-		case pt_Break:
-			break_ = true;
-			//piCoutObj << "BREAK";
-			if (is_receiving) {
-				stopReceive();
-				return;
-			}
-			if (is_sending) {
-				stopSend();
-				return;
-			}
-		break;
-		case pt_Start:
-			mutex_header.lock();
-			if (is_pause && (is_sending || is_receiving)) {
-				if (header.session_id == h.session_id) {
-					is_pause = false;
-					mutex_header.unlock();
-					resumed();
-					return;
-				}
-			}
-			if (is_sending && header.session_id != h.session_id) {
-				sendBreak(h.session_id);
-				mutex_header.unlock();
-				return;
-			}
-			if (is_receiving) {
-				if (header.session_id != h.session_id) {
-					piCoutObj << "restart receive";
-					mutex_header.unlock();
-					finish_receive(false, true);
-				} else {
-					header.id = 0;
-					sendReply(pt_ReplySuccess);
-					mutex_header.unlock();
-					return;
-				}
-			}
-			mutex_header.unlock();
-			if (data.size() == sizeof(StartRequest)) {
-				StartRequest sr;
-				data >> sr;
-				mutex_session.lock();
-				mutex_header.lock();
-				bytes_cur = 0;
-				state_string = "start request";
-				bytes_all = sr.size;
-				header.session_id = h.session_id;
-				header.id = 0;
-				packets_count = 10;
-				session.clear();
-				replies.clear();
-				session.resize(sr.packets);
-				replies.resize(sr.packets + 1);
-				replies.fill(pt_Unknown);
-				pm_string.resize(replies.size(), '-');
-				diag.reset();
-				//piCoutObj << "receiveStarted()";
-				is_receiving = true;
-				break_ = false;
-				mutex_send.lock();
-				send_queue = 0;
-				mutex_send.unlock();
-				receiveStarted();
-				state_string = "receiving";
-				replies[0] = pt_ReplySuccess;
-				pm_string[0] = '#';
-				mutex_session.unlock();
-				sendReply(pt_ReplySuccess);
-				mutex_header.unlock();
-			}
-		break;
-		case pt_Pause:
-			mutex_header.lock();
-			if (header.session_id == h.session_id) {
-				//piCout << "receive pause";
-				if (!is_pause && pause_tm.elapsed_s() < timeout_/10) {
-					//piCout << "resume";
-					sendReply(pt_Start);
-					mutex_header.unlock();
-					return;
-				}
-				if (!is_pause) paused();
-				is_pause = true;
-				if (is_receiving && pause_tm.elapsed_m() > 40) {
-					//piCout << "send pause";
-					sendReply(pt_Pause);
-				}
-				if (is_sending) send_tm.reset();
-				pause_tm.reset();
-			}
-			mutex_header.unlock();
-			break;
-		default: break;
-	}
-}
-
-
-bool PIBaseTransfer::send_process() {
-	mutex_session.lock();
-	packet_header_size = sizeof(PacketHeader) + customHeader().size();
-	break_ = false;
-	diag.reset();
-	sendStarted();
-	is_sending = true;
-	int session_size = session.size();
-	replies.resize(session_size + 1);
-	replies.fill(pt_Unknown);
-	pm_string.resize(replies.size(), '-');
-	mutex_session.unlock();
-	PIByteArray ba;
-	if (!getStartRequest()) return finish_send(false);
-	state_string = "sending";
-	PITimeMeasurer stm;
-	mutex_send.lock();
-	send_queue = 0;
-	send_up = 0;
-	send_tm.reset();
-	mutex_send.unlock();
-	for (int i = 0; i < session_size; i++) {
-		mutex_send.lock();
-		int sq = send_queue;
-		mutex_send.unlock();
-		if (sq >= packets_count || is_pause) {
-			--i;
-			if (is_pause) {
-				piMSleep(40);
-				//piCout << "send pause";
-				mutex_header.lock();
-				sendReply(pt_Pause);
-				mutex_header.unlock();
-				if (pause_tm.elapsed_s() > timeout()) {
-					return finish_send(false);
-				}
-			}
-			mutex_send.lock();
-			if (send_tm.elapsed_s() > timeout_) {
-				mutex_send.unlock();
-				return finish_send(false);
-			}
-			if (stm.elapsed_s() > timeout_ / 2.) {
-				send_up = 0;
-				send_queue = 0;
-				pm_string.replaceAll("+", "-");
-			}
-			mutex_send.unlock();
-			continue;
-		}
-		stm.reset();
-		ba = build_packet(i);
-		diag.sended(ba.size_s());
-		sendRequest(ba);
-		pm_string[i+1] = '+';
-		mutex_send.lock();
-		send_queue++;
-		mutex_send.unlock();
-		if (break_) return finish_send(false);
-	}
-//	piCoutObj << "send done, checking";
-	PITimeMeasurer rtm;
-	int prev_chk = 0;
-	mutex_send.lock();
-	send_queue = 0;
-	mutex_send.unlock();
-	piMSleep(10);
-	state_string = "sending more";
-	while (rtm.elapsed_s() < timeout_) {
-		//piCoutObj << "recovering...";
-		mutex_session.lock();
-		int chk = checkSession();
-		mutex_session.unlock();
-		if (chk == 0) return finish_send(true);
-		if (chk != prev_chk) rtm.reset();
-		else if (rtm.elapsed_m() < 100) {
-			piMSleep(PIP_MIN_MSLEEP);
-			continue;
-		}
-		if (is_pause) {
-			piMSleep(40);
-			//piCout << "send pause";
-			mutex_header.lock();
-			sendReply(pt_Pause);
-			mutex_header.unlock();
-			if (pause_tm.elapsed_s() > timeout())return finish_send(false);
-			else continue;
-		}
-		prev_chk = chk;
-		if (chk > 0) {
-			//piCoutObj << "recovery packet" << chk;
-			mutex_send.lock();
-			int sq = send_queue;
-			mutex_send.unlock();
-			if (sq >= packets_count) {
-				piMSleep(10);
-				send_queue = 0;
-				send_up = 0;
-				pm_string.replaceAll("+", "-");
-				continue;
-			}
-			ba = build_packet(chk - 1);
-			diag.sended(ba.size_s());
-			sendRequest(ba);
-			pm_string[chk] = '+';
-			mutex_send.lock();
-			send_queue++;
-			mutex_send.unlock();
-		}
-		if (break_) return finish_send(false);
-	}
-	return finish_send(false);
-}
-
-
-int PIBaseTransfer::checkSession() {
-	if (!(is_receiving || is_sending)) return -1;
-	int miss = 0;
-	for (int i = 1; i < replies.size_s(); i++) {
-		if (replies[i] != pt_ReplySuccess) miss++;
-		if (replies[i] == pt_ReplyInvalid) return i;
-	}
-	for (int i = 1; i < replies.size_s(); i++) {
-		if (replies[i] !=  pt_ReplySuccess) return i;
-	}
-	if (miss > 0) {
-		//piCoutObj << "missing" << miss << "packets";
-		return -miss;
-	} else return 0;
-}
-
-
-void PIBaseTransfer::buildSession(PIVector<Part> parts) {
-	mutex_session.lock();
-	mutex_header.lock();
-	state_string = "calculating parts ... ";
-	session.clear();
-	header.session_id = randomi();
-	bytes_all = 0;
-	Part fi;
-	int fi_index, fi_prts;
-	PIVector<Part> lfi;
-	int min_size = packet_header_size + part_header_size;
-	int cur_size = min_size;
-	for (int i = 0; i < parts.size_s(); i++) {
-		state_string = "calculating parts ... " + PIString::fromNumber(i) + " of " + PIString::fromNumber(parts.size());
-		fi.id = parts[i].id;
-		//piCout << fi.id << state_string;
-		bytes_all += parts[i].size;
-		fi.start = 0;
-		llong rest = parts[i].size - (packet_size - cur_size);
-		//piCout << i << fi.size << rest << bytes_all;
-		if (rest <= 0) {
-			fi.size = parts[i].size;
-			lfi << fi;
-			cur_size += fi.size + part_header_size;
-		} else {
-			fi.size = parts[i].size - rest;
-			fi_index = 1;
-			fi_prts = 1 + 1 + piMaxi(1, rest / (packet_size - min_size));
-			//piCout << fi_prts;
-			lfi << fi;
-			session << lfi;
-			lfi.clear();
-			cur_size = min_size;
-			llong fs = fi.size;
-			for (int j = 1; j < fi_prts; j++) {
-				fi_index++;
-				fi.start = fs;
-				fi.size = piMin<ullong>(parts[i].size - fs, packet_size - min_size);
-				lfi << fi;
-				cur_size += fi.size + part_header_size;
-				if (fi_index != fi_prts) {
-					session << lfi;
-					lfi.clear();
-					cur_size = min_size;
-					fs += fi.size;
-				}
-			}
-		}
-		if (packet_size - cur_size < min_size) {
-			session << lfi;
-			lfi.clear();
-			cur_size = min_size;
-		}
-	}
-	if (cur_size > min_size) session << lfi;
-	mutex_header.unlock();
-	mutex_session.unlock();
-}
-
-
-void PIBaseTransfer::sendBreak(int session_id) {
-	//piCoutObj << "sendBreak";
-	uint psid = header.session_id;
-	header.session_id = session_id;
-	sendReply(pt_Break);
-	header.session_id = psid;
-}
-
-
-void PIBaseTransfer::sendReply(PacketType reply) {
-	//piCoutObj << "sendReply" << reply;
-	header.type = reply;
-	PIByteArray ba;
-	ba << header;
-	if (is_sending || is_receiving) diag.sended(ba.size_s());
-	sendRequest(ba);
-}
-
-
-bool PIBaseTransfer::getStartRequest() {
-	mutex_header.lock();
-	header.type = pt_Start;
-	header.id = 0;
-	PIByteArray ba;
-	StartRequest st;
-	st.packets = (uint)session.size();
-	st.size = bytes_all;
-	ba << header;
-	mutex_header.unlock();
-	ba << st;
-	state_string = "send request";
-	PITimeMeasurer tm;
-	while (tm.elapsed_s() < timeout_) {
-		diag.sended(ba.size_s());
-		sendRequest(ba);
-		if (break_) return false;
-//		piCoutObj << replies[0];
-		mutex_session.lock();
-		if (replies[0] == pt_ReplySuccess) {
-			state_string = "send permited!";
-			//piCoutObj << "ping " << tm.elapsed_m();
-			mutex_session.unlock();
-			return true;
-		}
-		mutex_session.unlock();
-		piMSleep(PIP_MIN_MSLEEP);
-	}
-	return false;
-}
-
-
-void PIBaseTransfer::processData(int id, PIByteArray & data) {
-//	piCoutObj << "received packet" << id << ", size" << data.size();
-	if (id < 1 || id > replies.size_s()) return;
-	if (!session[id - 1].isEmpty()) {
-		header.id = id;
-		replies[id] = pt_ReplySuccess;
-		pm_string[id] = '#';
-		sendReply(pt_ReplySuccess);
-		if (replies[replies.size()-1] == pt_ReplySuccess)
-			if (checkSession() == 0) state_string = "receive ok";
-		return;
-	}
-	Part fi;
-	PIByteArray ba, pheader;
-	pheader.resize(packet_header_size - sizeof(PacketHeader));
-	if (!pheader.isEmpty()) {
-		memcpy(pheader.data(), data.data(), pheader.size());
-		data.remove(0, pheader.size_s());
-	}
-	while (!data.isEmpty()) {
-		ba.clear();
-		data >> fi;
-		data >> ba;
-		bytes_cur += fi.size;
-		//piCoutObj << "recv" << fi;
-		session[id - 1] << fi;
-		state_string = "receiving...";
-		receivePart(fi, ba, pheader);
-	}
-	header.id = id;
-	replies[id] = pt_ReplySuccess;
-	pm_string[id] = '#';
-	sendReply(pt_ReplySuccess);
-	if (checkSession() == 0) state_string = "receive ok";
-}
-
-
-PIByteArray PIBaseTransfer::build_packet(int id) {
-	PIByteArray ret;
-	PIByteArray ba;
-	//piCoutObj << "session id" << header.session_id;
-	ret.append(customHeader());
-	mutex_session.lock();
-	for (int i = 0; i < session[id].size_s(); i++) {
-		Part fi = session[id][i];
-		ret << fi;
-		//piCout << "build" << fi;
-		ba = buildPacket(fi);
-		bytes_cur += ba.size();
-		if (ba.size() != fi.size) piCoutObj << "***error while build packet, wrong part size";
-		ret << ba;
-	}
-	mutex_session.unlock();
-	PIByteArray hdr;
-	mutex_header.lock();
-	header.id = id + 1;
-	header.type = pt_Data;
-	if (crc_enabled) header.crc = crc.calculate(ret);
-	else header.crc = 0;
-	hdr << header;
-	mutex_header.unlock();
-	ret.insert(0, hdr);
-//	piCoutObj << "Send Packet" << header.id << ret.size();
-	return ret;
-}
-
-
-bool PIBaseTransfer::finish_send(bool ok) {
-	is_sending = false;
-	if (ok) state_string = "send done";
-	else state_string = "send failed";
-	mutex_header.lock();
-	header.id = 0;
-	if (!ok) sendBreak(header.session_id);
-	else sendReply(pt_ReplySuccess);
-	mutex_header.unlock();
-	//piCoutObj << state_string << PIString::readableSize(bytes_all);
-	sendFinished(ok);
-	bytes_all = bytes_cur = 0;
-	return ok;
-}
-
-
-void PIBaseTransfer::finish_receive(bool ok, bool quet) {
-	is_receiving = false;
-	if (ok) state_string = "receive done";
-	else state_string = "receive failed";
-	if (!ok && !quet) {
-		mutex_header.lock();
-		sendBreak(header.session_id);
-		mutex_header.unlock();
-	}
-	//piCoutObj << state_string << PIString::readableSize(bytes_all);
-	receiveFinished(ok);
-	bytes_all = bytes_cur = 0;
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Base class for reliable send and receive data in fixed packets with error correction, pause and resume
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pibasetransfer.h"
+
+const uint PIBaseTransfer::signature = 0x54424950;
+
+PIBaseTransfer::PIBaseTransfer(): crc(standardCRC_16()), diag(false) {
+	header.sig = signature;
+	crc_enabled = true;
+	header.session_id = 0;
+	packet_header_size = sizeof(PacketHeader) + customHeader().size();
+	part_header_size = sizeof(Part) + sizeof(int);
+	is_sending = is_receiving = is_pause = false;
+	break_ = true;
+	bytes_all = bytes_cur = 0;
+	send_queue = 0;
+	send_up = 0;
+	timeout_ = 10.;
+	diag.setDisconnectTimeout(timeout_ / 10);
+	diag.setName("PIBaseTransfer");
+	diag.start(50);
+	packets_count = 10;
+#ifdef FREERTOS
+	setPacketSize(512);
+#else
+	setPacketSize(4096);
+#endif
+	randomize();
+}
+
+
+PIBaseTransfer::~PIBaseTransfer() {
+	diag.stop();
+	break_ = true;
+}
+
+
+void PIBaseTransfer::stopSend() {
+	if (!is_sending) return;
+	break_ = true;
+}
+
+
+void PIBaseTransfer::stopReceive() {
+	if (!is_receiving) return;
+	break_ = true;
+	//piCoutObj << "stopReceive()";
+	finish_receive(false);
+}
+
+
+void PIBaseTransfer::setPause(bool pause_) {
+	if (is_pause == pause_) return;
+	pause_tm.reset();
+	is_pause = pause_;
+	if (pause_) paused();
+	else resumed();
+}
+
+
+void PIBaseTransfer::received(PIByteArray data) {
+	packet_header_size = sizeof(PacketHeader) + customHeader().size();
+	if (data.size() < sizeof(PacketHeader)) {
+		diag.received(data.size(), false);
+		return;
+	}
+	PacketHeader h;
+	data >> h;
+	PacketType pt = (PacketType)h.type;
+	if (!h.check_sig()) {
+		piCoutObj << "invalid packet signature";
+		diag.received(data.size(), false);
+		return;
+	} else diag.received(data.size(), true);
+	//piCoutObj << "receive" << h.session_id << h.type << h.id;
+	switch (pt) {
+		case pt_Unknown: break;
+		case pt_Data:
+			mutex_header.lock();
+			if (h.session_id != header.session_id || !is_receiving) {
+				sendBreak(h.session_id);
+				mutex_header.unlock();
+				return;
+			} else {
+				uint rcrc = h.crc;
+				uint ccrc;
+				if (crc_enabled) ccrc = crc.calculate(data.data(), data.size_s());
+				else ccrc = 0;
+				if (rcrc != ccrc) {
+					header.id = h.id;
+					piCoutObj << "invalid CRC";
+					sendReply(pt_ReplyInvalid);
+				} else {
+					mutex_session.lock();
+					processData(h.id, data);
+					mutex_session.unlock();
+				}
+				if (is_pause) sendReply(pt_Pause);
+			}
+			mutex_header.unlock();
+		break;
+		case pt_ReplySuccess:
+		case pt_ReplyInvalid:
+			mutex_header.lock();
+			if (h.session_id != header.session_id) {
+				mutex_header.unlock();
+				return;
+			}
+			if (is_pause) sendReply(pt_Pause);
+			mutex_header.unlock();
+			if (pt == pt_ReplySuccess) {
+				mutex_send.lock();
+				send_queue--;
+				if (send_queue < 0) send_queue = 0;
+				send_tm.reset();
+				mutex_send.unlock();
+			}
+			if (is_sending) {
+				mutex_session.lock();
+				if (h.id < replies.size()) {
+					replies[h.id] = pt;
+					pm_string[h.id] = pt == pt_ReplySuccess ? '#' : '-';
+					int s = pm_string.find('+'), s1 = send_queue;
+					while (s <= (int)h.id && s > 0) {
+						send_queue--;
+						if (s >= 0) {
+							pm_string[s] = '-';
+							bytes_cur -= packet_size;
+						}
+						send_up = 0;
+						if (send_queue < 0) {
+							send_queue = 0;
+							break;
+						}
+						s = pm_string.find('+');
+					}
+					if (s1-send_queue > 1 && packets_count > 2) packets_count-= piMaxi(packets_count/10,1);
+					if (s1 == send_queue && s1 < piMaxi(packets_count/2, 2) && packets_count < 100) send_up++;
+					if (send_up > 20 && send_up > packets_count*2) packets_count+= piMaxi(packets_count/10,1);
+					//piCoutObj << packets_count;
+				} else
+					piCoutObj << "invalid reply id";
+				mutex_session.unlock();
+//				piCoutObj << "Done Packet" << h.id;
+			}
+			if (is_receiving && h.id == 0) {
+				if (pt == pt_ReplySuccess) {
+					mutex_session.lock();
+					int cs = checkSession();
+					mutex_session.unlock();
+					//piCoutObj << "Success receive";
+					if (cs == 0) finish_receive(true);
+				}
+			}
+		break;
+		case pt_Break:
+			break_ = true;
+			//piCoutObj << "BREAK";
+			if (is_receiving) {
+				stopReceive();
+				return;
+			}
+			if (is_sending) {
+				stopSend();
+				return;
+			}
+		break;
+		case pt_Start:
+			mutex_header.lock();
+			if (is_pause && (is_sending || is_receiving)) {
+				if (header.session_id == h.session_id) {
+					is_pause = false;
+					mutex_header.unlock();
+					resumed();
+					return;
+				}
+			}
+			if (is_sending && header.session_id != h.session_id) {
+				sendBreak(h.session_id);
+				mutex_header.unlock();
+				return;
+			}
+			if (is_receiving) {
+				if (header.session_id != h.session_id) {
+					piCoutObj << "restart receive";
+					mutex_header.unlock();
+					finish_receive(false, true);
+				} else {
+					header.id = 0;
+					sendReply(pt_ReplySuccess);
+					mutex_header.unlock();
+					return;
+				}
+			}
+			mutex_header.unlock();
+			if (data.size() == sizeof(StartRequest)) {
+				StartRequest sr;
+				data >> sr;
+				mutex_session.lock();
+				mutex_header.lock();
+				bytes_cur = 0;
+				state_string = "start request";
+				bytes_all = sr.size;
+				header.session_id = h.session_id;
+				header.id = 0;
+				packets_count = 10;
+				session.clear();
+				replies.clear();
+				session.resize(sr.packets);
+				replies.resize(sr.packets + 1);
+				replies.fill(pt_Unknown);
+				pm_string.resize(replies.size(), '-');
+				diag.reset();
+				//piCoutObj << "receiveStarted()";
+				is_receiving = true;
+				break_ = false;
+				mutex_send.lock();
+				send_queue = 0;
+				mutex_send.unlock();
+				receiveStarted();
+				state_string = "receiving";
+				replies[0] = pt_ReplySuccess;
+				pm_string[0] = '#';
+				mutex_session.unlock();
+				sendReply(pt_ReplySuccess);
+				mutex_header.unlock();
+			}
+		break;
+		case pt_Pause:
+			mutex_header.lock();
+			if (header.session_id == h.session_id) {
+				//piCout << "receive pause";
+				if (!is_pause && pause_tm.elapsed_s() < timeout_/10) {
+					//piCout << "resume";
+					sendReply(pt_Start);
+					mutex_header.unlock();
+					return;
+				}
+				if (!is_pause) paused();
+				is_pause = true;
+				if (is_receiving && pause_tm.elapsed_m() > 40) {
+					//piCout << "send pause";
+					sendReply(pt_Pause);
+				}
+				if (is_sending) send_tm.reset();
+				pause_tm.reset();
+			}
+			mutex_header.unlock();
+			break;
+		default: break;
+	}
+}
+
+
+bool PIBaseTransfer::send_process() {
+	mutex_session.lock();
+	packet_header_size = sizeof(PacketHeader) + customHeader().size();
+	break_ = false;
+	diag.reset();
+	sendStarted();
+	is_sending = true;
+	int session_size = session.size();
+	replies.resize(session_size + 1);
+	replies.fill(pt_Unknown);
+	pm_string.resize(replies.size(), '-');
+	mutex_session.unlock();
+	PIByteArray ba;
+	if (!getStartRequest()) return finish_send(false);
+	state_string = "sending";
+	PITimeMeasurer stm;
+	mutex_send.lock();
+	send_queue = 0;
+	send_up = 0;
+	send_tm.reset();
+	mutex_send.unlock();
+	for (int i = 0; i < session_size; i++) {
+		mutex_send.lock();
+		int sq = send_queue;
+		mutex_send.unlock();
+		if (sq >= packets_count || is_pause) {
+			--i;
+			if (is_pause) {
+				piMSleep(40);
+				//piCout << "send pause";
+				mutex_header.lock();
+				sendReply(pt_Pause);
+				mutex_header.unlock();
+				if (pause_tm.elapsed_s() > timeout()) {
+					return finish_send(false);
+				}
+			}
+			mutex_send.lock();
+			if (send_tm.elapsed_s() > timeout_) {
+				mutex_send.unlock();
+				return finish_send(false);
+			}
+			if (stm.elapsed_s() > timeout_ / 2.) {
+				send_up = 0;
+				send_queue = 0;
+				pm_string.replaceAll("+", "-");
+			}
+			mutex_send.unlock();
+			continue;
+		}
+		stm.reset();
+		ba = build_packet(i);
+		diag.sended(ba.size_s());
+		sendRequest(ba);
+		pm_string[i+1] = '+';
+		mutex_send.lock();
+		send_queue++;
+		mutex_send.unlock();
+		if (break_) return finish_send(false);
+	}
+//	piCoutObj << "send done, checking";
+	PITimeMeasurer rtm;
+	int prev_chk = 0;
+	mutex_send.lock();
+	send_queue = 0;
+	mutex_send.unlock();
+	piMSleep(10);
+	state_string = "sending more";
+	while (rtm.elapsed_s() < timeout_) {
+		//piCoutObj << "recovering...";
+		mutex_session.lock();
+		int chk = checkSession();
+		mutex_session.unlock();
+		if (chk == 0) return finish_send(true);
+		if (chk != prev_chk) rtm.reset();
+		else if (rtm.elapsed_m() < 100) {
+			piMSleep(PIP_MIN_MSLEEP);
+			continue;
+		}
+		if (is_pause) {
+			piMSleep(40);
+			//piCout << "send pause";
+			mutex_header.lock();
+			sendReply(pt_Pause);
+			mutex_header.unlock();
+			if (pause_tm.elapsed_s() > timeout())return finish_send(false);
+			else continue;
+		}
+		prev_chk = chk;
+		if (chk > 0) {
+			//piCoutObj << "recovery packet" << chk;
+			mutex_send.lock();
+			int sq = send_queue;
+			mutex_send.unlock();
+			if (sq >= packets_count) {
+				piMSleep(10);
+				send_queue = 0;
+				send_up = 0;
+				pm_string.replaceAll("+", "-");
+				continue;
+			}
+			ba = build_packet(chk - 1);
+			diag.sended(ba.size_s());
+			sendRequest(ba);
+			pm_string[chk] = '+';
+			mutex_send.lock();
+			send_queue++;
+			mutex_send.unlock();
+		}
+		if (break_) return finish_send(false);
+	}
+	return finish_send(false);
+}
+
+
+int PIBaseTransfer::checkSession() {
+	if (!(is_receiving || is_sending)) return -1;
+	int miss = 0;
+	for (int i = 1; i < replies.size_s(); i++) {
+		if (replies[i] != pt_ReplySuccess) miss++;
+		if (replies[i] == pt_ReplyInvalid) return i;
+	}
+	for (int i = 1; i < replies.size_s(); i++) {
+		if (replies[i] !=  pt_ReplySuccess) return i;
+	}
+	if (miss > 0) {
+		//piCoutObj << "missing" << miss << "packets";
+		return -miss;
+	} else return 0;
+}
+
+
+void PIBaseTransfer::buildSession(PIVector<Part> parts) {
+	mutex_session.lock();
+	mutex_header.lock();
+	state_string = "calculating parts ... ";
+	session.clear();
+	header.session_id = randomi();
+	bytes_all = 0;
+	Part fi;
+	int fi_index, fi_prts;
+	PIVector<Part> lfi;
+	int min_size = packet_header_size + part_header_size;
+	int cur_size = min_size;
+	for (int i = 0; i < parts.size_s(); i++) {
+		state_string = "calculating parts ... " + PIString::fromNumber(i) + " of " + PIString::fromNumber(parts.size());
+		fi.id = parts[i].id;
+		//piCout << fi.id << state_string;
+		bytes_all += parts[i].size;
+		fi.start = 0;
+		llong rest = parts[i].size - (packet_size - cur_size);
+		//piCout << i << fi.size << rest << bytes_all;
+		if (rest <= 0) {
+			fi.size = parts[i].size;
+			lfi << fi;
+			cur_size += fi.size + part_header_size;
+		} else {
+			fi.size = parts[i].size - rest;
+			fi_index = 1;
+			fi_prts = 1 + 1 + piMaxi(1, rest / (packet_size - min_size));
+			//piCout << fi_prts;
+			lfi << fi;
+			session << lfi;
+			lfi.clear();
+			cur_size = min_size;
+			llong fs = fi.size;
+			for (int j = 1; j < fi_prts; j++) {
+				fi_index++;
+				fi.start = fs;
+				fi.size = piMin<ullong>(parts[i].size - fs, packet_size - min_size);
+				lfi << fi;
+				cur_size += fi.size + part_header_size;
+				if (fi_index != fi_prts) {
+					session << lfi;
+					lfi.clear();
+					cur_size = min_size;
+					fs += fi.size;
+				}
+			}
+		}
+		if (packet_size - cur_size < min_size) {
+			session << lfi;
+			lfi.clear();
+			cur_size = min_size;
+		}
+	}
+	if (cur_size > min_size) session << lfi;
+	mutex_header.unlock();
+	mutex_session.unlock();
+}
+
+
+void PIBaseTransfer::sendBreak(int session_id) {
+	//piCoutObj << "sendBreak";
+	uint psid = header.session_id;
+	header.session_id = session_id;
+	sendReply(pt_Break);
+	header.session_id = psid;
+}
+
+
+void PIBaseTransfer::sendReply(PacketType reply) {
+	//piCoutObj << "sendReply" << reply;
+	header.type = reply;
+	PIByteArray ba;
+	ba << header;
+	if (is_sending || is_receiving) diag.sended(ba.size_s());
+	sendRequest(ba);
+}
+
+
+bool PIBaseTransfer::getStartRequest() {
+	mutex_header.lock();
+	header.type = pt_Start;
+	header.id = 0;
+	PIByteArray ba;
+	StartRequest st;
+	st.packets = (uint)session.size();
+	st.size = bytes_all;
+	ba << header;
+	mutex_header.unlock();
+	ba << st;
+	state_string = "send request";
+	PITimeMeasurer tm;
+	while (tm.elapsed_s() < timeout_) {
+		diag.sended(ba.size_s());
+		sendRequest(ba);
+		if (break_) return false;
+//		piCoutObj << replies[0];
+		mutex_session.lock();
+		if (replies[0] == pt_ReplySuccess) {
+			state_string = "send permited!";
+			//piCoutObj << "ping " << tm.elapsed_m();
+			mutex_session.unlock();
+			return true;
+		}
+		mutex_session.unlock();
+		piMSleep(PIP_MIN_MSLEEP);
+	}
+	return false;
+}
+
+
+void PIBaseTransfer::processData(int id, PIByteArray & data) {
+//	piCoutObj << "received packet" << id << ", size" << data.size();
+	if (id < 1 || id > replies.size_s()) return;
+	if (!session[id - 1].isEmpty()) {
+		header.id = id;
+		replies[id] = pt_ReplySuccess;
+		pm_string[id] = '#';
+		sendReply(pt_ReplySuccess);
+		if (replies[replies.size()-1] == pt_ReplySuccess)
+			if (checkSession() == 0) state_string = "receive ok";
+		return;
+	}
+	Part fi;
+	PIByteArray ba, pheader;
+	pheader.resize(packet_header_size - sizeof(PacketHeader));
+	if (!pheader.isEmpty()) {
+		memcpy(pheader.data(), data.data(), pheader.size());
+		data.remove(0, pheader.size_s());
+	}
+	while (!data.isEmpty()) {
+		ba.clear();
+		data >> fi;
+		data >> ba;
+		bytes_cur += fi.size;
+		//piCoutObj << "recv" << fi;
+		session[id - 1] << fi;
+		state_string = "receiving...";
+		receivePart(fi, ba, pheader);
+	}
+	header.id = id;
+	replies[id] = pt_ReplySuccess;
+	pm_string[id] = '#';
+	sendReply(pt_ReplySuccess);
+	if (checkSession() == 0) state_string = "receive ok";
+}
+
+
+PIByteArray PIBaseTransfer::build_packet(int id) {
+	PIByteArray ret;
+	PIByteArray ba;
+	//piCoutObj << "session id" << header.session_id;
+	ret.append(customHeader());
+	mutex_session.lock();
+	for (int i = 0; i < session[id].size_s(); i++) {
+		Part fi = session[id][i];
+		ret << fi;
+		//piCout << "build" << fi;
+		ba = buildPacket(fi);
+		bytes_cur += ba.size();
+		if (ba.size() != fi.size) piCoutObj << "***error while build packet, wrong part size";
+		ret << ba;
+	}
+	mutex_session.unlock();
+	PIByteArray hdr;
+	mutex_header.lock();
+	header.id = id + 1;
+	header.type = pt_Data;
+	if (crc_enabled) header.crc = crc.calculate(ret);
+	else header.crc = 0;
+	hdr << header;
+	mutex_header.unlock();
+	ret.insert(0, hdr);
+//	piCoutObj << "Send Packet" << header.id << ret.size();
+	return ret;
+}
+
+
+bool PIBaseTransfer::finish_send(bool ok) {
+	is_sending = false;
+	if (ok) state_string = "send done";
+	else state_string = "send failed";
+	mutex_header.lock();
+	header.id = 0;
+	if (!ok) sendBreak(header.session_id);
+	else sendReply(pt_ReplySuccess);
+	mutex_header.unlock();
+	//piCoutObj << state_string << PIString::readableSize(bytes_all);
+	sendFinished(ok);
+	bytes_all = bytes_cur = 0;
+	return ok;
+}
+
+
+void PIBaseTransfer::finish_receive(bool ok, bool quet) {
+	is_receiving = false;
+	if (ok) state_string = "receive done";
+	else state_string = "receive failed";
+	if (!ok && !quet) {
+		mutex_header.lock();
+		sendBreak(header.session_id);
+		mutex_header.unlock();
+	}
+	//piCoutObj << state_string << PIString::readableSize(bytes_all);
+	receiveFinished(ok);
+	bytes_all = bytes_cur = 0;
+}
+
diff --git a/src_main/io_utils/pibasetransfer.h b/lib/main/io_utils/pibasetransfer.h
similarity index 97%
rename from src_main/io_utils/pibasetransfer.h
rename to lib/main/io_utils/pibasetransfer.h
index 3cf281f1..a11909da 100644
--- a/src_main/io_utils/pibasetransfer.h
+++ b/lib/main/io_utils/pibasetransfer.h
@@ -1,156 +1,156 @@
-/*! \file pibasetransfer.h
- * \brief Base class for reliable send and receive data in fixed packets with error correction, pause and resume
-*/
-/*
-	PIP - Platform Independent Primitives
-	Base class for reliable send and receive data in fixed packets with error correction, pause and resume
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIBASETRANSFER_H
-#define PIBASETRANSFER_H
-
-#include "picrc.h"
-#include "pidiagnostics.h"
-
-class PIP_EXPORT PIBaseTransfer: public PIObject
-{
-	PIOBJECT_SUBCLASS(PIBaseTransfer, PIObject)
-public:
-	PIBaseTransfer();
-	~PIBaseTransfer();
-
-# pragma pack(push,1)
-	struct PIP_EXPORT PacketHeader {
-		uint sig;
-		int type; // PacketType
-		int session_id;
-		uint id;
-		uint crc;
-		bool check_sig() {return (sig == signature);}
-	};
-	
-	struct PIP_EXPORT Part {
-		Part(uint id_ = 0, ullong size_ = 0, ullong start_ = 0) : id(id_), size(size_), start(start_) {}
-		uint id;
-		ullong size;
-		ullong start;
-	};
-# pragma pack(pop)
-
-	void stopSend();
-	void stopReceive();
-
-	bool isSending() const {return is_sending;}
-	bool isReceiving() const {return is_receiving;}
-	bool isPause() const {return is_pause;}
-	void setPause(bool pause_);
-
-	void setPacketSize(int size) {packet_size = size;}
-	int packetSize() const {return packet_size;}
-
-	void setTimeout(double sec) {timeout_ = sec; diag.setDisconnectTimeout(sec);}
-	double timeout() const {return timeout_;}
-
-	void setCRCEnabled(bool en = true) {crc_enabled = en;}
-	bool isCRCEnabled() const {return crc_enabled;}
-
-	PIString stateString() const {return state_string;}
-	PIString packetMap() const {return pm_string;}
-	llong bytesAll() const {return bytes_all;}
-	llong bytesCur() const {return bytes_cur;}
-	const PIDiagnostics &diagnostic() {return diag;}
-
-	static uint packetSignature() {return signature;}
-
-	EVENT_HANDLER1(void, received, PIByteArray, data);
-	EVENT_HANDLER(void, stop) {stopSend(); stopReceive();}
-	EVENT_HANDLER(void, pause) {setPause(true);}
-	EVENT_HANDLER(void, resume) {setPause(false);}
-	
-	EVENT(receiveStarted)
-	EVENT(paused)
-	EVENT(resumed)
-	EVENT1(receiveFinished, bool, ok)
-	EVENT(sendStarted)
-	EVENT1(sendFinished, bool, ok)
-	EVENT1(sendRequest, PIByteArray &, data)
-
-protected:
-	void buildSession(PIVector<Part> parts);
-	virtual PIByteArray buildPacket(Part fi) = 0;
-	virtual void receivePart(Part fi, PIByteArray ba, PIByteArray pheader) = 0;
-	virtual PIByteArray customHeader() {return PIByteArray();}
-	bool send_process();
-	
-	uint packet_header_size, part_header_size;
-	bool break_, is_sending, is_receiving, is_pause;
-	PIString state_string;
-	llong bytes_all, bytes_cur;
-
-private:
-	enum PIP_EXPORT PacketType {pt_Unknown, pt_Data, pt_ReplySuccess, pt_ReplyInvalid, pt_Break, pt_Start, pt_Pause};
-
-# pragma pack(push,1)
-	struct PIP_EXPORT StartRequest {
-		uint packets;
-		ullong size;
-	};
-# pragma pack(pop)
-	
-	friend PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::StartRequest & v);
-	friend PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::StartRequest & v);
-
-	void processData(int id, PIByteArray &data);
-	PIByteArray build_packet(int id);
-	int checkSession();
-	void sendBreak(int session_id);
-	void sendReply(PacketType reply);
-	bool getStartRequest();
-	bool finish_send(bool ok);
-	void finish_receive(bool ok, bool quet = false);
-
-	static const uint signature;
-	int packet_size, packets_count;
-	double timeout_;
-	PIVector<PIVector<Part> > session;
-	PIVector<PacketType> replies;
-	PITimeMeasurer send_tm, pause_tm;
-	PacketHeader header;
-	CRC_16 crc;
-	int send_queue;
-	int send_up;
-	PIDiagnostics diag;
-	PIMutex mutex_session;
-	PIMutex mutex_send;
-	PIMutex mutex_header;
-	bool crc_enabled;
-	PIString pm_string;
-};
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::PacketHeader & v) {s << v.sig << v.type << v.session_id << v.id << v.crc; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::PacketHeader & v) {s >> v.sig >> v.type >> v.session_id >> v.id >> v.crc; return s;}
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::Part & v) {s << v.id << v.size << v.start; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::Part & v) {s >> v.id >> v.size >> v.start; return s;}
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::StartRequest & v) {s << v.packets << v.size; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::StartRequest & v) {s >> v.packets >> v.size; return s;}
-
-inline PICout operator <<(PICout s, const PIBaseTransfer::Part & v) {s.setControl(0, true); s << "Part(\"" << v.id  << "\", " << PIString::readableSize(v.start) << " b | " << PIString::readableSize(v.size) << " b)"; s.restoreControl(); return s;}
-
-
-#endif // PIBASETRANSFER_H
+/*! \file pibasetransfer.h
+ * \brief Base class for reliable send and receive data in fixed packets with error correction, pause and resume
+*/
+/*
+	PIP - Platform Independent Primitives
+	Base class for reliable send and receive data in fixed packets with error correction, pause and resume
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIBASETRANSFER_H
+#define PIBASETRANSFER_H
+
+#include "picrc.h"
+#include "pidiagnostics.h"
+
+class PIP_EXPORT PIBaseTransfer: public PIObject
+{
+	PIOBJECT_SUBCLASS(PIBaseTransfer, PIObject)
+public:
+	PIBaseTransfer();
+	~PIBaseTransfer();
+
+# pragma pack(push,1)
+	struct PIP_EXPORT PacketHeader {
+		uint sig;
+		int type; // PacketType
+		int session_id;
+		uint id;
+		uint crc;
+		bool check_sig() {return (sig == signature);}
+	};
+	
+	struct PIP_EXPORT Part {
+		Part(uint id_ = 0, ullong size_ = 0, ullong start_ = 0) : id(id_), size(size_), start(start_) {}
+		uint id;
+		ullong size;
+		ullong start;
+	};
+# pragma pack(pop)
+
+	void stopSend();
+	void stopReceive();
+
+	bool isSending() const {return is_sending;}
+	bool isReceiving() const {return is_receiving;}
+	bool isPause() const {return is_pause;}
+	void setPause(bool pause_);
+
+	void setPacketSize(int size) {packet_size = size;}
+	int packetSize() const {return packet_size;}
+
+	void setTimeout(double sec) {timeout_ = sec; diag.setDisconnectTimeout(sec);}
+	double timeout() const {return timeout_;}
+
+	void setCRCEnabled(bool en = true) {crc_enabled = en;}
+	bool isCRCEnabled() const {return crc_enabled;}
+
+	PIString stateString() const {return state_string;}
+	PIString packetMap() const {return pm_string;}
+	llong bytesAll() const {return bytes_all;}
+	llong bytesCur() const {return bytes_cur;}
+	const PIDiagnostics &diagnostic() {return diag;}
+
+	static uint packetSignature() {return signature;}
+
+	EVENT_HANDLER1(void, received, PIByteArray, data);
+	EVENT_HANDLER(void, stop) {stopSend(); stopReceive();}
+	EVENT_HANDLER(void, pause) {setPause(true);}
+	EVENT_HANDLER(void, resume) {setPause(false);}
+	
+	EVENT(receiveStarted)
+	EVENT(paused)
+	EVENT(resumed)
+	EVENT1(receiveFinished, bool, ok)
+	EVENT(sendStarted)
+	EVENT1(sendFinished, bool, ok)
+	EVENT1(sendRequest, PIByteArray &, data)
+
+protected:
+	void buildSession(PIVector<Part> parts);
+	virtual PIByteArray buildPacket(Part fi) = 0;
+	virtual void receivePart(Part fi, PIByteArray ba, PIByteArray pheader) = 0;
+	virtual PIByteArray customHeader() {return PIByteArray();}
+	bool send_process();
+	
+	uint packet_header_size, part_header_size;
+	bool break_, is_sending, is_receiving, is_pause;
+	PIString state_string;
+	llong bytes_all, bytes_cur;
+
+private:
+	enum PIP_EXPORT PacketType {pt_Unknown, pt_Data, pt_ReplySuccess, pt_ReplyInvalid, pt_Break, pt_Start, pt_Pause};
+
+# pragma pack(push,1)
+	struct PIP_EXPORT StartRequest {
+		uint packets;
+		ullong size;
+	};
+# pragma pack(pop)
+	
+	friend PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::StartRequest & v);
+	friend PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::StartRequest & v);
+
+	void processData(int id, PIByteArray &data);
+	PIByteArray build_packet(int id);
+	int checkSession();
+	void sendBreak(int session_id);
+	void sendReply(PacketType reply);
+	bool getStartRequest();
+	bool finish_send(bool ok);
+	void finish_receive(bool ok, bool quet = false);
+
+	static const uint signature;
+	int packet_size, packets_count;
+	double timeout_;
+	PIVector<PIVector<Part> > session;
+	PIVector<PacketType> replies;
+	PITimeMeasurer send_tm, pause_tm;
+	PacketHeader header;
+	CRC_16 crc;
+	int send_queue;
+	int send_up;
+	PIDiagnostics diag;
+	PIMutex mutex_session;
+	PIMutex mutex_send;
+	PIMutex mutex_header;
+	bool crc_enabled;
+	PIString pm_string;
+};
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::PacketHeader & v) {s << v.sig << v.type << v.session_id << v.id << v.crc; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::PacketHeader & v) {s >> v.sig >> v.type >> v.session_id >> v.id >> v.crc; return s;}
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::Part & v) {s << v.id << v.size << v.start; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::Part & v) {s >> v.id >> v.size >> v.start; return s;}
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIBaseTransfer::StartRequest & v) {s << v.packets << v.size; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIBaseTransfer::StartRequest & v) {s >> v.packets >> v.size; return s;}
+
+inline PICout operator <<(PICout s, const PIBaseTransfer::Part & v) {s.setControl(0, true); s << "Part(\"" << v.id  << "\", " << PIString::readableSize(v.start) << " b | " << PIString::readableSize(v.size) << " b)"; s.restoreControl(); return s;}
+
+
+#endif // PIBASETRANSFER_H
diff --git a/src_main/io_utils/pibroadcast.h b/lib/main/io_utils/pibroadcast.h
similarity index 96%
rename from src_main/io_utils/pibroadcast.h
rename to lib/main/io_utils/pibroadcast.h
index 481820d6..b099e43e 100644
--- a/src_main/io_utils/pibroadcast.h
+++ b/lib/main/io_utils/pibroadcast.h
@@ -1,149 +1,149 @@
-/*! \file pibroadcast.h
- * \brief Broadcast for all interfaces, including loopback
-*/
-/*
-	PIP - Platform Independent Primitives
-	Broadcast for all interfaces, including loopback
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIBROADCAST_H
-#define PIBROADCAST_H
-
-#include "piethutilbase.h"
-#include "piethernet.h"
-
-
-class PIBroadcast: public PIThread, public PIEthUtilBase {
-	PIOBJECT_SUBCLASS(PIBroadcast, PIThread)
-public:
-
-	//! %PIBroadcast channels, can be used independently
-	enum Channel {
-		Multicast /** Use multicast addresses */ = 0x01,
-		Broadcast /** Use broadcast addresses */ = 0x02,
-		Loopback  /** Use loopback addresses */ = 0x04,
-		All /** Use all channels */ = 0xFFFF,
-	};
-
-	typedef PIFlags<Channel> Channels;
-
-	/** Contructs %PIBroadcast, if \"send_only\" not set
-	 * all PIEthernets will be binded to receive data
-	 * */
-	PIBroadcast(bool send_only = false);
-
-	~PIBroadcast();
-
-	//! Set channels to \"ch\" and queue to reinit
-	void setChannels(Channels ch);
-
-	//! Returns channels
-	Channels channels() const {return _channels;}
-
-	//! Returns if is send_only
-	bool isSendOnly() const {return _send_only;}
-
-
-	//! Set multicast IP to \"mg\" and queue to reinit
-	void setMulticastGroup(const PIString & mg);
-
-	//! Returns multicast IP
-	PIString multicastGroup() const {return mcast_address.ipString();}
-
-	//! Set multicast port to \"port\" and queue to reinit
-	void setMulticastPort(ushort port);
-
-	//! Returns multicast port
-	ushort multicastPort() const {return mcast_address.port();}
-
-	//! Set multicast address to \"addr\" and queue to reinit
-	void setMulticastAddress(const PIEthernet::Address & addr);
-
-	//! Returns multicast address
-	PIEthernet::Address multicastAddress() const {return mcast_address;}
-
-
-	//! Set broadcast port to \"port\" and queue to reinit
-	void setBroadcastPort(ushort port);
-
-	//! Returns broadcast port
-	ushort broadcastPort() {return bcast_port;}
-
-
-	//! Set loopback start port to \"port\" and queue to reinit
-	void setLoopbackPort(ushort port);
-
-	//! Returns loopback start port
-	ushort loopbackPort() {return lo_port;}
-
-	//! Set loopback ports count to \"count\" and queue to reinit
-	void setLoopbackPortsCount(int count);
-
-	//! Returns loopback ports count
-	int loopbackPortsCount() const {return lo_pcnt;}
-
-
-	//! If not send_only starts all threaded reads
-	void startRead();
-
-	//! Stop all threaded reads
-	void stopRead();
-
-	//! Reinit all PIEthernets with current \a PIEthernet::allAddresses()
-	void reinit();
-
-
-	//! Send packet
-	void send(const PIByteArray & data);
-
-	EVENT1(receiveEvent, PIByteArray, data)
-
-	//! \events
-	//! \{
-
-		//! \fn void receiveEvent(PIByteArray data)
-		//! \brief Raise on packet received
-
-	//! \}
-
-protected:
-
-	//! Called when packet received
-	virtual void received(PIByteArray data) {}
-
-	//! Called when addresses are changed
-	virtual void addressesChanged() {}
-
-private:
-	EVENT_HANDLER2(void, mcastRead, uchar * , data, int, size);
-	void destroyAll();
-	void initAll(PIVector<PIEthernet::Address> al);
-	void run();
-
-	Channels _channels;
-	PIEthernet::Address mcast_address;
-	PIMutex mcast_mutex;
-	PIVector<PIEthernet*> eth_mcast;
-	PIEthernet * eth_lo;
-	PIVector<PIEthernet::Address> prev_al;
-	ushort lo_port, bcast_port;
-	int lo_pcnt;
-	bool _started, _send_only, _reinit;
-
-};
-
-#endif // PIBROADCAST_H
+/*! \file pibroadcast.h
+ * \brief Broadcast for all interfaces, including loopback
+*/
+/*
+	PIP - Platform Independent Primitives
+	Broadcast for all interfaces, including loopback
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIBROADCAST_H
+#define PIBROADCAST_H
+
+#include "piethutilbase.h"
+#include "piethernet.h"
+
+
+class PIBroadcast: public PIThread, public PIEthUtilBase {
+	PIOBJECT_SUBCLASS(PIBroadcast, PIThread)
+public:
+
+	//! %PIBroadcast channels, can be used independently
+	enum Channel {
+		Multicast /** Use multicast addresses */ = 0x01,
+		Broadcast /** Use broadcast addresses */ = 0x02,
+		Loopback  /** Use loopback addresses */ = 0x04,
+		All /** Use all channels */ = 0xFFFF,
+	};
+
+	typedef PIFlags<Channel> Channels;
+
+	/** Contructs %PIBroadcast, if \"send_only\" not set
+	 * all PIEthernets will be binded to receive data
+	 * */
+	PIBroadcast(bool send_only = false);
+
+	~PIBroadcast();
+
+	//! Set channels to \"ch\" and queue to reinit
+	void setChannels(Channels ch);
+
+	//! Returns channels
+	Channels channels() const {return _channels;}
+
+	//! Returns if is send_only
+	bool isSendOnly() const {return _send_only;}
+
+
+	//! Set multicast IP to \"mg\" and queue to reinit
+	void setMulticastGroup(const PIString & mg);
+
+	//! Returns multicast IP
+	PIString multicastGroup() const {return mcast_address.ipString();}
+
+	//! Set multicast port to \"port\" and queue to reinit
+	void setMulticastPort(ushort port);
+
+	//! Returns multicast port
+	ushort multicastPort() const {return mcast_address.port();}
+
+	//! Set multicast address to \"addr\" and queue to reinit
+	void setMulticastAddress(const PIEthernet::Address & addr);
+
+	//! Returns multicast address
+	PIEthernet::Address multicastAddress() const {return mcast_address;}
+
+
+	//! Set broadcast port to \"port\" and queue to reinit
+	void setBroadcastPort(ushort port);
+
+	//! Returns broadcast port
+	ushort broadcastPort() {return bcast_port;}
+
+
+	//! Set loopback start port to \"port\" and queue to reinit
+	void setLoopbackPort(ushort port);
+
+	//! Returns loopback start port
+	ushort loopbackPort() {return lo_port;}
+
+	//! Set loopback ports count to \"count\" and queue to reinit
+	void setLoopbackPortsCount(int count);
+
+	//! Returns loopback ports count
+	int loopbackPortsCount() const {return lo_pcnt;}
+
+
+	//! If not send_only starts all threaded reads
+	void startRead();
+
+	//! Stop all threaded reads
+	void stopRead();
+
+	//! Reinit all PIEthernets with current \a PIEthernet::allAddresses()
+	void reinit();
+
+
+	//! Send packet
+	void send(const PIByteArray & data);
+
+	EVENT1(receiveEvent, PIByteArray, data)
+
+	//! \events
+	//! \{
+
+		//! \fn void receiveEvent(PIByteArray data)
+		//! \brief Raise on packet received
+
+	//! \}
+
+protected:
+
+	//! Called when packet received
+	virtual void received(PIByteArray data) {}
+
+	//! Called when addresses are changed
+	virtual void addressesChanged() {}
+
+private:
+	EVENT_HANDLER2(void, mcastRead, uchar * , data, int, size);
+	void destroyAll();
+	void initAll(PIVector<PIEthernet::Address> al);
+	void run();
+
+	Channels _channels;
+	PIEthernet::Address mcast_address;
+	PIMutex mcast_mutex;
+	PIVector<PIEthernet*> eth_mcast;
+	PIEthernet * eth_lo;
+	PIVector<PIEthernet::Address> prev_al;
+	ushort lo_port, bcast_port;
+	int lo_pcnt;
+	bool _started, _send_only, _reinit;
+
+};
+
+#endif // PIBROADCAST_H
diff --git a/src_main/io_utils/piconnection.cpp b/lib/main/io_utils/piconnection.cpp
similarity index 100%
rename from src_main/io_utils/piconnection.cpp
rename to lib/main/io_utils/piconnection.cpp
diff --git a/src_main/io_utils/piconnection.h b/lib/main/io_utils/piconnection.h
similarity index 100%
rename from src_main/io_utils/piconnection.h
rename to lib/main/io_utils/piconnection.h
diff --git a/src_main/io_utils/pidatatransfer.cpp b/lib/main/io_utils/pidatatransfer.cpp
similarity index 96%
rename from src_main/io_utils/pidatatransfer.cpp
rename to lib/main/io_utils/pidatatransfer.cpp
index b6e2eba0..9a5aff4a 100644
--- a/src_main/io_utils/pidatatransfer.cpp
+++ b/lib/main/io_utils/pidatatransfer.cpp
@@ -1,43 +1,43 @@
-/*
-	PIP - Platform Independent Primitives
-	Class for send and receive PIByteArray via PIBaseTransfer
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pidatatransfer.h"
-
-
-PIByteArray PIDataTransfer::buildPacket(Part fi) {
-	PIByteArray ba;
-	ba.resize(fi.size);
-	memcpy(ba.data(), data_.data(fi.start), fi.size);
-	return ba;
-}
-
-
-void PIDataTransfer::receivePart(Part fi, PIByteArray ba, PIByteArray pheader) {
-	if (data_.size() < fi.start + fi.size) data_.resize(fi.start + fi.size);
-	memcpy(data_.data(fi.start), ba.data(), ba.size_s());
-}
-
-
-bool PIDataTransfer::send(const PIByteArray& ba) {
-	data_ = ba;
-	buildSession(PIVector<Part>() << Part(0, data_.size()));
-	return send_process();
-}
-
-
+/*
+	PIP - Platform Independent Primitives
+	Class for send and receive PIByteArray via PIBaseTransfer
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pidatatransfer.h"
+
+
+PIByteArray PIDataTransfer::buildPacket(Part fi) {
+	PIByteArray ba;
+	ba.resize(fi.size);
+	memcpy(ba.data(), data_.data(fi.start), fi.size);
+	return ba;
+}
+
+
+void PIDataTransfer::receivePart(Part fi, PIByteArray ba, PIByteArray pheader) {
+	if (data_.size() < fi.start + fi.size) data_.resize(fi.start + fi.size);
+	memcpy(data_.data(fi.start), ba.data(), ba.size_s());
+}
+
+
+bool PIDataTransfer::send(const PIByteArray& ba) {
+	data_ = ba;
+	buildSession(PIVector<Part>() << Part(0, data_.size()));
+	return send_process();
+}
+
+
diff --git a/src_main/io_utils/pidatatransfer.h b/lib/main/io_utils/pidatatransfer.h
similarity index 96%
rename from src_main/io_utils/pidatatransfer.h
rename to lib/main/io_utils/pidatatransfer.h
index 4dce5b17..f1cddf18 100644
--- a/src_main/io_utils/pidatatransfer.h
+++ b/lib/main/io_utils/pidatatransfer.h
@@ -1,46 +1,46 @@
-/*! \file pidatatransfer.h
- * \brief Class for send and receive PIByteArray via \a PIBaseTransfer
-*/
-/*
-	PIP - Platform Independent Primitives
-	Class for send and receive PIByteArray via PIBaseTransfer
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIDATATRANSFER_H
-#define PIDATATRANSFER_H
-
-#include "pibasetransfer.h"
-
-
-class PIP_EXPORT PIDataTransfer: public PIBaseTransfer
-{
-	PIOBJECT_SUBCLASS(PIDataTransfer, PIBaseTransfer)
-public:
-	PIDataTransfer() {;}
-	~PIDataTransfer() {;}
-	
-	bool send(const PIByteArray &ba);
-	const PIByteArray & data() {return data_;}
-	
-private:
-	virtual PIByteArray buildPacket(Part p);
-	virtual void receivePart(PIBaseTransfer::Part fi, PIByteArray ba, PIByteArray pheader);
-	PIByteArray data_;
-};
-
-
-#endif // PIDATATRANSFER_H
+/*! \file pidatatransfer.h
+ * \brief Class for send and receive PIByteArray via \a PIBaseTransfer
+*/
+/*
+	PIP - Platform Independent Primitives
+	Class for send and receive PIByteArray via PIBaseTransfer
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIDATATRANSFER_H
+#define PIDATATRANSFER_H
+
+#include "pibasetransfer.h"
+
+
+class PIP_EXPORT PIDataTransfer: public PIBaseTransfer
+{
+	PIOBJECT_SUBCLASS(PIDataTransfer, PIBaseTransfer)
+public:
+	PIDataTransfer() {;}
+	~PIDataTransfer() {;}
+	
+	bool send(const PIByteArray &ba);
+	const PIByteArray & data() {return data_;}
+	
+private:
+	virtual PIByteArray buildPacket(Part p);
+	virtual void receivePart(PIBaseTransfer::Part fi, PIByteArray ba, PIByteArray pheader);
+	PIByteArray data_;
+};
+
+
+#endif // PIDATATRANSFER_H
diff --git a/src_main/io_utils/pidiagnostics.cpp b/lib/main/io_utils/pidiagnostics.cpp
similarity index 96%
rename from src_main/io_utils/pidiagnostics.cpp
rename to lib/main/io_utils/pidiagnostics.cpp
index 35ff2197..bb54d881 100644
--- a/src_main/io_utils/pidiagnostics.cpp
+++ b/lib/main/io_utils/pidiagnostics.cpp
@@ -1,249 +1,249 @@
-/*
-	PIP - Platform Independent Primitives
-	Speed and quality in/out diagnostics
-	Andrey Bychkov work.a.b@yandex.ru, Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pidiagnostics.h"
-
-
-/** \class PIDiagnostics
- * \brief Connection quality diagnostics
- * \details
- * \section PIDiagnostics_sec0 Synopsis
- * This class provide abstract connection quality diagnostics and
- * counting. You should create instance of %PIDiagnostics and on
- * packet receive call function \a received(), on packet send call
- * function \a sended(). %PIDiagnostics calculates correct, wrong
- * and sended counters, packets per second, bytes per seconds,
- * immediate and integral receive frequencies and receive/send speeds
- * in human readable representation. There statistics are calculates
- * one time per period, by default 1 second. To calculate them you
- * should start %PIDiagnostics with function \a start() or pass \b true
- * to constructor.
- * */
-
-
-PIDiagnostics::State::State() {
-	immediate_freq = integral_freq = 0.f;
-	received_packets_per_sec = 0ull;
-	received_packets = 0ull;
-	received_packets_wrong = 0ull;
-	received_bytes_per_sec = 0ull;
-	received_bytes = 0ull;
-	received_bytes_wrong = 0ull;
-	sended_packets_per_sec = 0ull;
-	sended_packets = 0ull;
-	sended_bytes_per_sec = 0ull;
-	sended_bytes = 0ull;
-	receive_speed = send_speed = PIString::readableSize(0) + "/s";
-	quality = PIDiagnostics::Unknown;
-}
-
-
-
-
-PIDiagnostics::PIDiagnostics(bool start_): PITimer(/*PITimer::Pool*/) {
-	disconn_ = 0.;
-	//piCout << "PIDiagnostics construct";
-	setInterval(100);
-	reset();
-	setDisconnectTimeout(3.);
-	changeDisconnectTimeout(3.);
-	if (start_) PITimer::start(100);
-	//piCout << "PIDiagnostics construct done";
-}
-
-PIDiagnostics::~PIDiagnostics() {
-	//piCout << "~PIDiagnostics start...";
-	//piCout << "~PIDiagnostics done!";
-}
-
-
-PIDiagnostics::State PIDiagnostics::state() const {
-	mutex_state.lock();
-	State ret = cur_state;
-	mutex_state.unlock();
-	return ret;
-}
-
-PIDiagnostics::Quality PIDiagnostics::quality() const {
-	PIDiagnostics::Quality ret;
-	mutex_state.lock();
-	ret = cur_state.quality;
-	mutex_state.unlock();
-	return ret;
-}
-
-
-PIString PIDiagnostics::receiveSpeed() const {
-	mutex_state.lock();
-	PIString ret = cur_state.receive_speed;
-	mutex_state.unlock();
-	return ret;
-}
-
-
-PIString PIDiagnostics::sendSpeed() const {
-	mutex_state.lock();
-	PIString ret = cur_state.send_speed;
-	mutex_state.unlock();
-	return ret;
-}
-
-
-void PIDiagnostics::reset() {
-	mutex_state.lock();
-	cur_state = State();
-	if (disconn_ != 0.) {
-		int hist_size = history_rec.size();
-		history_rec.clear();
-		history_send.clear();
-		history_rec.resize(hist_size);
-		history_send.resize(hist_size);
-	}
-	mutex_state.unlock();
-}
-
-
-void PIDiagnostics::received(int size, bool correct) {
-	mutex_state.lock();
-	Entry & e(history_rec.front());
-	if (correct) {
-		e.cnt_ok++;
-		e.bytes_ok += size;
-		cur_state.received_packets++;
-		cur_state.received_bytes += size;
-	} else {
-		e.cnt_fail++;
-		e.bytes_fail += size;
-		cur_state.received_packets_wrong++;
-		cur_state.received_bytes_wrong += size;
-	}
-	e.empty = false;
-	mutex_state.unlock();
-}
-
-
-void PIDiagnostics::sended(int size) {
-	mutex_state.lock();
-	Entry & e(history_send.front());
-	e.cnt_ok++;
-	e.bytes_ok += size;
-	cur_state.sended_packets++;
-	cur_state.sended_bytes += size;
-	e.empty = false;
-	mutex_state.unlock();
-}
-
-
-void PIDiagnostics::tick(void * , int ) {
-	mutex_state.lock();
-	//piCoutObj << "lock";
-	int tcnt_recv = 0;
-	int tcnt_send = 0;
-	Entry send = calcHistory(history_send, tcnt_send);
-	Entry recv = calcHistory(history_rec, tcnt_recv);
-	float itr = disconn_ * (float(tcnt_recv) / history_rec.size());
-	float its = disconn_ * (float(tcnt_send) / history_send.size());
-	float hz = interval() / 1000.f;
-	if (tcnt_recv == 0) {
-		cur_state.integral_freq = cur_state.immediate_freq = 0;
-		cur_state.received_packets_per_sec = cur_state.received_bytes_per_sec = 0;
-	} else {
-		cur_state.integral_freq = recv.cnt_ok / itr;
-		cur_state.received_packets_per_sec = ullong(float(recv.cnt_ok) / itr);
-		cur_state.received_bytes_per_sec = ullong(double(recv.bytes_ok) / itr);
-		cur_state.immediate_freq = double(history_rec.front().cnt_ok) / hz;
-	}
-	if (tcnt_send == 0) {
-		cur_state.sended_packets_per_sec = cur_state.sended_bytes_per_sec = 0;
-	} else {
-		cur_state.sended_packets_per_sec = ullong(float(send.cnt_ok) / its);
-		cur_state.sended_bytes_per_sec = ullong(double(send.bytes_ok) / its);
-	}
-	//piCoutObj << "tick" << recv.cnt_ok << send.cnt_ok;
-	cur_state.receive_speed = PIString::readableSize(cur_state.received_bytes_per_sec) + "/s";
-	cur_state.send_speed = PIString::readableSize(cur_state.sended_bytes_per_sec) + "/s";
-	int arc = recv.cnt_ok + recv.cnt_fail;
-	float good_percents = 0.f;
-	if (arc > 0) good_percents = (float)recv.cnt_ok / arc * 100.f;
-	PIDiagnostics::Quality diag;
-	if (tcnt_recv == 0) {
-		diag = PIDiagnostics::Unknown;
-	} else {
-		if (good_percents == 0.f) diag = PIDiagnostics::Failure;
-		else if (good_percents <= 20.f) diag = PIDiagnostics::Bad;
-		else if (good_percents > 20.f && good_percents <= 80.f) diag = PIDiagnostics::Average;
-		else diag = PIDiagnostics::Good;
-
-	}
-	if ((tcnt_send + tcnt_recv) != 0) {
-//		piCoutObj << tcnt_recv << tcnt_send;
-		history_rec.dequeue();
-		history_send.dequeue();
-		Entry e;
-		e.empty = false;
-		history_rec.enqueue(e);
-		history_send.enqueue(e);
-	}
-	if (diag != cur_state.quality) {
-		qualityChanged(diag, cur_state.quality);
-		cur_state.quality = diag;
-	}
-	mutex_state.unlock();
-	//piCoutObj << "unlock";
-}
-
-
-PIDiagnostics::Entry PIDiagnostics::calcHistory(PIQueue<Entry> & hist, int & cnt) {
-	Entry e;
-	cnt = 0;
-	for (int i = 0; i < hist.size_s(); ++i) {
-		e.bytes_ok += hist[i].bytes_ok;
-		e.bytes_fail += hist[i].bytes_fail;
-		e.cnt_ok += hist[i].cnt_ok;
-		e.cnt_fail += hist[i].cnt_fail;
-		if (!hist[i].empty) cnt++;
-	}
-	e.empty = false;
-//	piCoutObj << hist.size() << cnt;
-	return e;
-}
-
-
-void PIDiagnostics::propertyChanged(const PIString &) {
-	float disct = property("disconnectTimeout").toFloat();
-	changeDisconnectTimeout(disct);
-}
-
-
-void PIDiagnostics::changeDisconnectTimeout(float disct) {
-	mutex_state.lock();
-	disconn_ = piMaxf(disct, interval() / 1000.f);
-	if (interval() > 0) {
-		int hist_size = piClampi(int(disconn_ * 1000.f / float(interval())), 1, 65536);
-		//piCoutObj << hist_size << interval();
-		history_rec.resize(hist_size);
-		history_send.resize(hist_size);
-	} else {
-		history_rec.resize(1);
-		history_send.resize(1);
-	}
-	//piCoutObj << hist_size << disconn_ << interval();
-	mutex_state.unlock();
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Speed and quality in/out diagnostics
+	Andrey Bychkov work.a.b@yandex.ru, Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pidiagnostics.h"
+
+
+/** \class PIDiagnostics
+ * \brief Connection quality diagnostics
+ * \details
+ * \section PIDiagnostics_sec0 Synopsis
+ * This class provide abstract connection quality diagnostics and
+ * counting. You should create instance of %PIDiagnostics and on
+ * packet receive call function \a received(), on packet send call
+ * function \a sended(). %PIDiagnostics calculates correct, wrong
+ * and sended counters, packets per second, bytes per seconds,
+ * immediate and integral receive frequencies and receive/send speeds
+ * in human readable representation. There statistics are calculates
+ * one time per period, by default 1 second. To calculate them you
+ * should start %PIDiagnostics with function \a start() or pass \b true
+ * to constructor.
+ * */
+
+
+PIDiagnostics::State::State() {
+	immediate_freq = integral_freq = 0.f;
+	received_packets_per_sec = 0ull;
+	received_packets = 0ull;
+	received_packets_wrong = 0ull;
+	received_bytes_per_sec = 0ull;
+	received_bytes = 0ull;
+	received_bytes_wrong = 0ull;
+	sended_packets_per_sec = 0ull;
+	sended_packets = 0ull;
+	sended_bytes_per_sec = 0ull;
+	sended_bytes = 0ull;
+	receive_speed = send_speed = PIString::readableSize(0) + "/s";
+	quality = PIDiagnostics::Unknown;
+}
+
+
+
+
+PIDiagnostics::PIDiagnostics(bool start_): PITimer(/*PITimer::Pool*/) {
+	disconn_ = 0.;
+	//piCout << "PIDiagnostics construct";
+	setInterval(100);
+	reset();
+	setDisconnectTimeout(3.);
+	changeDisconnectTimeout(3.);
+	if (start_) PITimer::start(100);
+	//piCout << "PIDiagnostics construct done";
+}
+
+PIDiagnostics::~PIDiagnostics() {
+	//piCout << "~PIDiagnostics start...";
+	//piCout << "~PIDiagnostics done!";
+}
+
+
+PIDiagnostics::State PIDiagnostics::state() const {
+	mutex_state.lock();
+	State ret = cur_state;
+	mutex_state.unlock();
+	return ret;
+}
+
+PIDiagnostics::Quality PIDiagnostics::quality() const {
+	PIDiagnostics::Quality ret;
+	mutex_state.lock();
+	ret = cur_state.quality;
+	mutex_state.unlock();
+	return ret;
+}
+
+
+PIString PIDiagnostics::receiveSpeed() const {
+	mutex_state.lock();
+	PIString ret = cur_state.receive_speed;
+	mutex_state.unlock();
+	return ret;
+}
+
+
+PIString PIDiagnostics::sendSpeed() const {
+	mutex_state.lock();
+	PIString ret = cur_state.send_speed;
+	mutex_state.unlock();
+	return ret;
+}
+
+
+void PIDiagnostics::reset() {
+	mutex_state.lock();
+	cur_state = State();
+	if (disconn_ != 0.) {
+		int hist_size = history_rec.size();
+		history_rec.clear();
+		history_send.clear();
+		history_rec.resize(hist_size);
+		history_send.resize(hist_size);
+	}
+	mutex_state.unlock();
+}
+
+
+void PIDiagnostics::received(int size, bool correct) {
+	mutex_state.lock();
+	Entry & e(history_rec.front());
+	if (correct) {
+		e.cnt_ok++;
+		e.bytes_ok += size;
+		cur_state.received_packets++;
+		cur_state.received_bytes += size;
+	} else {
+		e.cnt_fail++;
+		e.bytes_fail += size;
+		cur_state.received_packets_wrong++;
+		cur_state.received_bytes_wrong += size;
+	}
+	e.empty = false;
+	mutex_state.unlock();
+}
+
+
+void PIDiagnostics::sended(int size) {
+	mutex_state.lock();
+	Entry & e(history_send.front());
+	e.cnt_ok++;
+	e.bytes_ok += size;
+	cur_state.sended_packets++;
+	cur_state.sended_bytes += size;
+	e.empty = false;
+	mutex_state.unlock();
+}
+
+
+void PIDiagnostics::tick(void * , int ) {
+	mutex_state.lock();
+	//piCoutObj << "lock";
+	int tcnt_recv = 0;
+	int tcnt_send = 0;
+	Entry send = calcHistory(history_send, tcnt_send);
+	Entry recv = calcHistory(history_rec, tcnt_recv);
+	float itr = disconn_ * (float(tcnt_recv) / history_rec.size());
+	float its = disconn_ * (float(tcnt_send) / history_send.size());
+	float hz = interval() / 1000.f;
+	if (tcnt_recv == 0) {
+		cur_state.integral_freq = cur_state.immediate_freq = 0;
+		cur_state.received_packets_per_sec = cur_state.received_bytes_per_sec = 0;
+	} else {
+		cur_state.integral_freq = recv.cnt_ok / itr;
+		cur_state.received_packets_per_sec = ullong(float(recv.cnt_ok) / itr);
+		cur_state.received_bytes_per_sec = ullong(double(recv.bytes_ok) / itr);
+		cur_state.immediate_freq = double(history_rec.front().cnt_ok) / hz;
+	}
+	if (tcnt_send == 0) {
+		cur_state.sended_packets_per_sec = cur_state.sended_bytes_per_sec = 0;
+	} else {
+		cur_state.sended_packets_per_sec = ullong(float(send.cnt_ok) / its);
+		cur_state.sended_bytes_per_sec = ullong(double(send.bytes_ok) / its);
+	}
+	//piCoutObj << "tick" << recv.cnt_ok << send.cnt_ok;
+	cur_state.receive_speed = PIString::readableSize(cur_state.received_bytes_per_sec) + "/s";
+	cur_state.send_speed = PIString::readableSize(cur_state.sended_bytes_per_sec) + "/s";
+	int arc = recv.cnt_ok + recv.cnt_fail;
+	float good_percents = 0.f;
+	if (arc > 0) good_percents = (float)recv.cnt_ok / arc * 100.f;
+	PIDiagnostics::Quality diag;
+	if (tcnt_recv == 0) {
+		diag = PIDiagnostics::Unknown;
+	} else {
+		if (good_percents == 0.f) diag = PIDiagnostics::Failure;
+		else if (good_percents <= 20.f) diag = PIDiagnostics::Bad;
+		else if (good_percents > 20.f && good_percents <= 80.f) diag = PIDiagnostics::Average;
+		else diag = PIDiagnostics::Good;
+
+	}
+	if ((tcnt_send + tcnt_recv) != 0) {
+//		piCoutObj << tcnt_recv << tcnt_send;
+		history_rec.dequeue();
+		history_send.dequeue();
+		Entry e;
+		e.empty = false;
+		history_rec.enqueue(e);
+		history_send.enqueue(e);
+	}
+	if (diag != cur_state.quality) {
+		qualityChanged(diag, cur_state.quality);
+		cur_state.quality = diag;
+	}
+	mutex_state.unlock();
+	//piCoutObj << "unlock";
+}
+
+
+PIDiagnostics::Entry PIDiagnostics::calcHistory(PIQueue<Entry> & hist, int & cnt) {
+	Entry e;
+	cnt = 0;
+	for (int i = 0; i < hist.size_s(); ++i) {
+		e.bytes_ok += hist[i].bytes_ok;
+		e.bytes_fail += hist[i].bytes_fail;
+		e.cnt_ok += hist[i].cnt_ok;
+		e.cnt_fail += hist[i].cnt_fail;
+		if (!hist[i].empty) cnt++;
+	}
+	e.empty = false;
+//	piCoutObj << hist.size() << cnt;
+	return e;
+}
+
+
+void PIDiagnostics::propertyChanged(const PIString &) {
+	float disct = property("disconnectTimeout").toFloat();
+	changeDisconnectTimeout(disct);
+}
+
+
+void PIDiagnostics::changeDisconnectTimeout(float disct) {
+	mutex_state.lock();
+	disconn_ = piMaxf(disct, interval() / 1000.f);
+	if (interval() > 0) {
+		int hist_size = piClampi(int(disconn_ * 1000.f / float(interval())), 1, 65536);
+		//piCoutObj << hist_size << interval();
+		history_rec.resize(hist_size);
+		history_send.resize(hist_size);
+	} else {
+		history_rec.resize(1);
+		history_send.resize(1);
+	}
+	//piCoutObj << hist_size << disconn_ << interval();
+	mutex_state.unlock();
+}
+
diff --git a/src_main/io_utils/pidiagnostics.h b/lib/main/io_utils/pidiagnostics.h
similarity index 100%
rename from src_main/io_utils/pidiagnostics.h
rename to lib/main/io_utils/pidiagnostics.h
diff --git a/src_main/io_utils/piethutilbase.h b/lib/main/io_utils/piethutilbase.h
similarity index 96%
rename from src_main/io_utils/piethutilbase.h
rename to lib/main/io_utils/piethutilbase.h
index cbd7ca19..8542ef36 100644
--- a/src_main/io_utils/piethutilbase.h
+++ b/lib/main/io_utils/piethutilbase.h
@@ -1,73 +1,73 @@
-/*! \file piethutilbase.h
- * \brief Base class for ethernet utils
-*/
-/*
-	PIP - Platform Independent Primitives
-	Base class for ethernet utils
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIETHUTILBASE_H
-#define PIETHUTILBASE_H
-
-#include "pibytearray.h"
-
-class PIEthUtilBase {
-public:
-	PIEthUtilBase();
-	~PIEthUtilBase();
-
-	//! Set crypt layer enabled
-	void setCryptEnabled(bool on);
-
-	//! Enable crypt layer
-	void cryptEnable();
-
-	//! Disable crypt layer
-	void cryptDisable();
-
-	//! Returns if crypt layer enabled
-	bool isCryptEnabled() const;
-
-
-	//! Set crypt layer key to \"k\"
-	void setCryptKey(const PIByteArray & k);
-
-	//! Generate crypt layer key by \a PICrypt::hash and
-	//! set crypt layer enabled
-	void createCryptKey(const PIString & k);
-
-	//! Returns crypt layer key
-	PIByteArray cryptKey() const;
-
-protected:
-
-	/*! \brief Returns encrypted data if layer enabled,
-	 *  otherwise returns unchanged \"data\" */
-	PIByteArray   cryptData(const PIByteArray & data);
-
-	/*! \brief Returns decrypted data if layer enabled,
-	 *  otherwise returns unchanged \"data\". If decryption
-	 *  was unsuccessfull returns empty %PIByteArray. */
-	PIByteArray decryptData(const PIByteArray & data);
-
-private:
-	PIByteArray _key;
-	bool _crypt;
-
-};
-
-#endif // PIETHUTILBASE_H
+/*! \file piethutilbase.h
+ * \brief Base class for ethernet utils
+*/
+/*
+	PIP - Platform Independent Primitives
+	Base class for ethernet utils
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIETHUTILBASE_H
+#define PIETHUTILBASE_H
+
+#include "pibytearray.h"
+
+class PIEthUtilBase {
+public:
+	PIEthUtilBase();
+	~PIEthUtilBase();
+
+	//! Set crypt layer enabled
+	void setCryptEnabled(bool on);
+
+	//! Enable crypt layer
+	void cryptEnable();
+
+	//! Disable crypt layer
+	void cryptDisable();
+
+	//! Returns if crypt layer enabled
+	bool isCryptEnabled() const;
+
+
+	//! Set crypt layer key to \"k\"
+	void setCryptKey(const PIByteArray & k);
+
+	//! Generate crypt layer key by \a PICrypt::hash and
+	//! set crypt layer enabled
+	void createCryptKey(const PIString & k);
+
+	//! Returns crypt layer key
+	PIByteArray cryptKey() const;
+
+protected:
+
+	/*! \brief Returns encrypted data if layer enabled,
+	 *  otherwise returns unchanged \"data\" */
+	PIByteArray   cryptData(const PIByteArray & data);
+
+	/*! \brief Returns decrypted data if layer enabled,
+	 *  otherwise returns unchanged \"data\". If decryption
+	 *  was unsuccessfull returns empty %PIByteArray. */
+	PIByteArray decryptData(const PIByteArray & data);
+
+private:
+	PIByteArray _key;
+	bool _crypt;
+
+};
+
+#endif // PIETHUTILBASE_H
diff --git a/src_main/io_utils/pifiletransfer.cpp b/lib/main/io_utils/pifiletransfer.cpp
similarity index 96%
rename from src_main/io_utils/pifiletransfer.cpp
rename to lib/main/io_utils/pifiletransfer.cpp
index 290e5c13..d5ec8c9c 100644
--- a/src_main/io_utils/pifiletransfer.cpp
+++ b/lib/main/io_utils/pifiletransfer.cpp
@@ -1,335 +1,335 @@
-/*
-	PIP - Platform Independent Primitives
-	Class for send and receive files and directories via PIBaseTransfer
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pifiletransfer.h"
-
-const char PIFileTransfer::sign[] = {'P', 'F', 'T'};
-
-PIFileTransfer::PIFileTransfer() {
-	for (uint i = 0; i < sizeof(sign); i++)
-		pftheader.sig[i] = sign[i];
-	pftheader.version = __PIFILETRANSFER_VERSION;
-	pftheader.session_id = 0;
-	pftheader.step = pft_None;
-	dir = PIDir::current();
-	started_ = scanning = false;
-	bytes_file_all = bytes_file_cur = 0;
-	CONNECT(void, this, receiveStarted, this, receive_started);
-	CONNECT1(void, bool, this, sendFinished, this, send_finished);
-	CONNECT1(void, bool, this, receiveFinished, this, receive_finished);
-}
-
-
-PIFileTransfer::~PIFileTransfer() {
-	stop();
-	work_file.close();
-}
-
-
-bool PIFileTransfer::send(const PIFile& file) {
-	return send(file.path());
-}
-
-
-bool PIFileTransfer::send(const PIString & file) {
-	return send(PIVector<PIFile::FileInfo>() << PIFile::fileInfo(file));
-}
-
-
-bool PIFileTransfer::send(const PIStringList& files) {
-	PIVector<PIFile::FileInfo> fil;
-	piForeachC(PIString &file, files) fil << PIFile::fileInfo(file);
-	return send(fil);
-}
-
-
-bool PIFileTransfer::send(PIVector<PIFile::FileInfo> entries) {
-	started_ = true;
-	PIVector<PFTFileInfo> allEntries;
-	for (int i = 0; i < entries.size_s(); i++) {
-		allEntries << PFTFileInfo(entries[i]);
-		allEntries.back().dest_path = entries[i].name();
-		if (entries[i].isDir()) {
-			cur_file_string = "scanning ... ";
-			scan_dir.setDir(entries[i].path);
-			scanning = true;
-			PIVector<PIFile::FileInfo> fls = scan_dir.allEntries();
-			scanning = false;
-			scan_dir.up();
-			//piCout << "files rel to" << d.absolutePath();
-			for (uint j = 0; j < fls.size(); j++) {
-				allEntries << PFTFileInfo(fls[j]);
-				allEntries.back().dest_path = scan_dir.relative(fls[j].path);
-				//piCout << "  abs path" << fls[j].path;
-				//piCout << "  rel path" << allEntries.back().dest_path;
-			}
-		}
-	}
-	return sendFiles(allEntries);
-}
-
-
-bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
-	files_ = files;
-	PIStringList names;
-	//piCoutObj << "prepare to send" << files_.size() << "files";
-	for (int i = 0; i < files_.size_s(); i++) {
-		if (names.contains(files_[i].path)) {
-			files_.remove(i);
-			--i;
-		}
-		else names << files_[i].path;
-		if (files_[i].isDir())
-			files_[i].size = 0;
-		//piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name();
-	}
-	randomize();
-	step_mutex.lock();
-	pftheader.session_id = randomi();
-	sendFilesStarted();
-	cur_file_string = "build session";
-	desc.clear();
-	desc << files_;
-	pftheader.step = pft_Description;
-	buildSession(PIVector<Part>() << Part(0, desc.size()));
-	cur_file_string = "";
-	step_mutex.unlock();
-	if (!send_process()) {
-		sendFilesFinished(false);
-		started_ = false;
-		return false;
-	}
-	step_mutex.lock();
-	pftheader.step = pft_Data;
-	PIVector<Part> pts;
-	for (int i = 0; i < files_.size_s(); i++) {
-		pts << Part(i + 1, files_[i].size);
-	}
-	buildSession(pts);
-	step_mutex.unlock();
-	bool ok = send_process();
-	sendFilesFinished(ok);
-	started_ = false;
-	return ok;
-}
-
-
-void PIFileTransfer::processFile(int id, ullong start, PIByteArray & data) {
-	//piCout << "processFile" << id << files_.size();
-	PFTFileInfo fi = files_[id-1];
-	bytes_file_all = fi.size;
-	bytes_file_cur = start;
-	cur_file_string = fi.dest_path;
-	PIString path = dir.absolutePath() + dir.separator + fi.dest_path;
-	//piCout << "receive" << path << fi.size << data.size();
-	if (fi.isDir()) {
-		//piCoutObj << "make dir" << fi.entry.path;
-		if (!PIDir::make(path)) {
-			cur_file_string = "Error: While create directory \"" + path + "\"";
-			piCoutObj << cur_file_string;
-			stopReceive();
-			return;
-		}
-	}
-	if (fi.isFile()) {
-		if (work_file.path() != path || !work_file.isOpened()) {
-			//piCout << "file close";
-			work_file.close();
-			//piCout << "new file" << path << work_file.path() << work_file.isOpened();
-			if (!work_file.open(path, PIIODevice::ReadWrite)) {
-				cur_file_string = "Error: While open file \"" + path + "\"";
-				piCoutObj << cur_file_string;
-				stopReceive();
-				return;
-			}
-			PIFile::applyFileInfo(path, fi);
-			if (work_file.size() > fi.size) {
-				//piCoutObj << "error size" << work_file.size() << fi.size;
-				work_file.clear();
-				work_file.resize(fi.size);
-				//piCoutObj << "correct size" << work_file.size() << fi.size;
-			}
-		}
-		//piCoutObj << "write file" << path << work_file.path() << work_file.size() << fi.entry.size << work_file.pos() << fi.fstart << fi.fsize;
-		if (work_file.size() < (llong)start) {
-			//piCoutObj << "error pos size" << work_file.pos() << fi.fstart;
-			work_file.resize(start);
-			//piCoutObj << "correct pos size" << work_file.pos() << fi.fstart;
-		}
-		if (work_file.size() > fi.size) {
-			piCoutObj << "****** error size" << work_file.size() << fi.size;
-			work_file.clear();
-			work_file.resize(fi.size);
-			piCoutObj << "****** correct size" << work_file.size() << fi.size;
-		}
-		//if (fi.fstart != work_file.pos()) piCoutObj << "error pos" << work_file.pos() << fi.fstart;
-		work_file.seek(start);
-		int rs = work_file.write(data.data(), data.size());
-		if (rs != data.size_s()) {
-			cur_file_string = "Error: While write file \"" + fi.path + "\" (must " + PIString::fromNumber(data.size()) + ", but write " + PIString::fromNumber(rs) + ")";
-			piCoutObj << cur_file_string;
-			stopReceive();
-			return;
-		}
-	}
-}
-
-
-PIByteArray PIFileTransfer::buildPacket(Part p) {
-	//piCoutObj << "Step" << pftheader.step;
-	//piCoutObj << "session id" << pftheader.session_id;
-	PIByteArray ba;
-	switch(pftheader.step) {
-		case pft_None:
-			stopSend();
-		return PIByteArray();
-		case pft_Description:
-			ba.resize(p.size);
-			memcpy(ba.data(), desc.data(p.start), p.size);
-		return ba;
-		case pft_Data:
-			//piCout << "send data" << p.id << files_.size();
-			PIFile::FileInfo fi = files_[p.id-1];
-			if (fi.isFile()) {
-				//piCout << "send file" << fi.name() << fi.size;
-				PIString path = fi.path;
-				if (work_file.path() != path || !work_file.isOpened()) {
-					if (!work_file.open(path, PIIODevice::ReadOnly)) {
-						break_ = true;
-						cur_file_string = "Error: While open file \"" + fi.path + "\"";
-						piCoutObj << cur_file_string;
-						stopSend();
-						return PIByteArray();
-					}
-				}
-				work_file.seek(p.start);
-				ba.resize(p.size);
-				int rs = work_file.read(ba.data(), ba.size());
-				if ((llong)rs != (llong)p.size) {
-					break_ = true;
-					cur_file_string = "Error: While read file \"" + fi.path + "\" (must " + PIString::fromNumber(p.size) + ", but read " + PIString::fromNumber(rs) + ")";
-					piCoutObj << cur_file_string;
-					stopSend();
-					return PIByteArray();
-				}
-			}
-			cur_file_string = fi.path;
-			bytes_file_all = fi.size;
-			bytes_file_cur = p.start;
-		return ba;
-	}
-	return ba;
-}
-
-
-void PIFileTransfer::receivePart(PIBaseTransfer::Part fi, PIByteArray ba, PIByteArray pheader) {
-	PFTHeader h;
-	// 	piCout << pheader.size() << sizeof(PFTHeader);
-	pheader >> h;
-	// 	piCout << h.session_id;
-	PIMutexLocker ml(step_mutex);
-	StepType st = (StepType)h.step;
-	pftheader.step = st;
-	if (!h.check_sig()) {
-		cur_file_string = "Error: Check signature: File Transfer incompatable or invalid version!";
-		piCoutObj << cur_file_string;
-		stopReceive();
-		return;
-	}
-	switch(st) {
-		case pft_None:
-		break;
-		case pft_Description:
-			pftheader.session_id = h.session_id;
-			if (desc.size() < fi.start + fi.size) desc.resize(fi.start + fi.size);
-			memcpy(desc.data(fi.start), ba.data(), ba.size_s());
-		break;
-		case pft_Data:
-			if (h.session_id == pftheader.session_id)
-				processFile(fi.id, fi.start, ba);
-			else stopReceive();
-		break;
-		default:
-		break;
-	}
-}
-
-
-PIString PIFileTransfer::curFile() const {
-	PIString s = cur_file_string;
-	if (scanning)
-		return s + scan_dir.scanDir();
-	return s;
-}
-
-
-PIByteArray PIFileTransfer::customHeader() {
-	PIByteArray ba;
-	ba << pftheader;
-	return ba;
-}
-
-
-void PIFileTransfer::receive_started() {
-	if (pftheader.step == pft_None) {
-		files_.clear();
-//		piCoutObj << "start receive"
-		started_ = true;
-		receiveFilesStarted();
-	}
-}
-
-
-void PIFileTransfer::receive_finished(bool ok) {
-	step_mutex.lock();
-	StepType st = (StepType)pftheader.step;
-	step_mutex.unlock();
-	if (st == pft_Description) {
-		bool user_ok = true;
-		if (ok) {
-//			piCoutObj << desc.size() << PICoutManipulators::Hex << desc;
-			desc >> files_;
-//			piCoutObj << files_;
-			PIStringList files;
-			piForeachC(PFTFileInfo &fi, files_) files << fi.dest_path;
-			pause();
-			receiveFilesRequest(files, bytesAll(), &user_ok);
-		}
-		if (!ok || !user_ok) {
-			pftheader.session_id--;
-			piCoutObj << "receive aborted";
-			receiveFilesFinished(false);
-			started_ = false;
-		} else resume();
-	}
-	if (st == pft_Data) {
-		//piCoutObj << "file close";
-		work_file.close();
-		receiveFilesFinished(ok);
-		started_ = false;
-	}
-}
-
-
-void PIFileTransfer::send_finished(bool ok) {
-//	piCoutObj << "file close";
-	if (pftheader.step == pft_Data) {
-		work_file.close();
-	}
-}
+/*
+	PIP - Platform Independent Primitives
+	Class for send and receive files and directories via PIBaseTransfer
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pifiletransfer.h"
+
+const char PIFileTransfer::sign[] = {'P', 'F', 'T'};
+
+PIFileTransfer::PIFileTransfer() {
+	for (uint i = 0; i < sizeof(sign); i++)
+		pftheader.sig[i] = sign[i];
+	pftheader.version = __PIFILETRANSFER_VERSION;
+	pftheader.session_id = 0;
+	pftheader.step = pft_None;
+	dir = PIDir::current();
+	started_ = scanning = false;
+	bytes_file_all = bytes_file_cur = 0;
+	CONNECT(void, this, receiveStarted, this, receive_started);
+	CONNECT1(void, bool, this, sendFinished, this, send_finished);
+	CONNECT1(void, bool, this, receiveFinished, this, receive_finished);
+}
+
+
+PIFileTransfer::~PIFileTransfer() {
+	stop();
+	work_file.close();
+}
+
+
+bool PIFileTransfer::send(const PIFile& file) {
+	return send(file.path());
+}
+
+
+bool PIFileTransfer::send(const PIString & file) {
+	return send(PIVector<PIFile::FileInfo>() << PIFile::fileInfo(file));
+}
+
+
+bool PIFileTransfer::send(const PIStringList& files) {
+	PIVector<PIFile::FileInfo> fil;
+	piForeachC(PIString &file, files) fil << PIFile::fileInfo(file);
+	return send(fil);
+}
+
+
+bool PIFileTransfer::send(PIVector<PIFile::FileInfo> entries) {
+	started_ = true;
+	PIVector<PFTFileInfo> allEntries;
+	for (int i = 0; i < entries.size_s(); i++) {
+		allEntries << PFTFileInfo(entries[i]);
+		allEntries.back().dest_path = entries[i].name();
+		if (entries[i].isDir()) {
+			cur_file_string = "scanning ... ";
+			scan_dir.setDir(entries[i].path);
+			scanning = true;
+			PIVector<PIFile::FileInfo> fls = scan_dir.allEntries();
+			scanning = false;
+			scan_dir.up();
+			//piCout << "files rel to" << d.absolutePath();
+			for (uint j = 0; j < fls.size(); j++) {
+				allEntries << PFTFileInfo(fls[j]);
+				allEntries.back().dest_path = scan_dir.relative(fls[j].path);
+				//piCout << "  abs path" << fls[j].path;
+				//piCout << "  rel path" << allEntries.back().dest_path;
+			}
+		}
+	}
+	return sendFiles(allEntries);
+}
+
+
+bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
+	files_ = files;
+	PIStringList names;
+	//piCoutObj << "prepare to send" << files_.size() << "files";
+	for (int i = 0; i < files_.size_s(); i++) {
+		if (names.contains(files_[i].path)) {
+			files_.remove(i);
+			--i;
+		}
+		else names << files_[i].path;
+		if (files_[i].isDir())
+			files_[i].size = 0;
+		//piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name();
+	}
+	randomize();
+	step_mutex.lock();
+	pftheader.session_id = randomi();
+	sendFilesStarted();
+	cur_file_string = "build session";
+	desc.clear();
+	desc << files_;
+	pftheader.step = pft_Description;
+	buildSession(PIVector<Part>() << Part(0, desc.size()));
+	cur_file_string = "";
+	step_mutex.unlock();
+	if (!send_process()) {
+		sendFilesFinished(false);
+		started_ = false;
+		return false;
+	}
+	step_mutex.lock();
+	pftheader.step = pft_Data;
+	PIVector<Part> pts;
+	for (int i = 0; i < files_.size_s(); i++) {
+		pts << Part(i + 1, files_[i].size);
+	}
+	buildSession(pts);
+	step_mutex.unlock();
+	bool ok = send_process();
+	sendFilesFinished(ok);
+	started_ = false;
+	return ok;
+}
+
+
+void PIFileTransfer::processFile(int id, ullong start, PIByteArray & data) {
+	//piCout << "processFile" << id << files_.size();
+	PFTFileInfo fi = files_[id-1];
+	bytes_file_all = fi.size;
+	bytes_file_cur = start;
+	cur_file_string = fi.dest_path;
+	PIString path = dir.absolutePath() + dir.separator + fi.dest_path;
+	//piCout << "receive" << path << fi.size << data.size();
+	if (fi.isDir()) {
+		//piCoutObj << "make dir" << fi.entry.path;
+		if (!PIDir::make(path)) {
+			cur_file_string = "Error: While create directory \"" + path + "\"";
+			piCoutObj << cur_file_string;
+			stopReceive();
+			return;
+		}
+	}
+	if (fi.isFile()) {
+		if (work_file.path() != path || !work_file.isOpened()) {
+			//piCout << "file close";
+			work_file.close();
+			//piCout << "new file" << path << work_file.path() << work_file.isOpened();
+			if (!work_file.open(path, PIIODevice::ReadWrite)) {
+				cur_file_string = "Error: While open file \"" + path + "\"";
+				piCoutObj << cur_file_string;
+				stopReceive();
+				return;
+			}
+			PIFile::applyFileInfo(path, fi);
+			if (work_file.size() > fi.size) {
+				//piCoutObj << "error size" << work_file.size() << fi.size;
+				work_file.clear();
+				work_file.resize(fi.size);
+				//piCoutObj << "correct size" << work_file.size() << fi.size;
+			}
+		}
+		//piCoutObj << "write file" << path << work_file.path() << work_file.size() << fi.entry.size << work_file.pos() << fi.fstart << fi.fsize;
+		if (work_file.size() < (llong)start) {
+			//piCoutObj << "error pos size" << work_file.pos() << fi.fstart;
+			work_file.resize(start);
+			//piCoutObj << "correct pos size" << work_file.pos() << fi.fstart;
+		}
+		if (work_file.size() > fi.size) {
+			piCoutObj << "****** error size" << work_file.size() << fi.size;
+			work_file.clear();
+			work_file.resize(fi.size);
+			piCoutObj << "****** correct size" << work_file.size() << fi.size;
+		}
+		//if (fi.fstart != work_file.pos()) piCoutObj << "error pos" << work_file.pos() << fi.fstart;
+		work_file.seek(start);
+		int rs = work_file.write(data.data(), data.size());
+		if (rs != data.size_s()) {
+			cur_file_string = "Error: While write file \"" + fi.path + "\" (must " + PIString::fromNumber(data.size()) + ", but write " + PIString::fromNumber(rs) + ")";
+			piCoutObj << cur_file_string;
+			stopReceive();
+			return;
+		}
+	}
+}
+
+
+PIByteArray PIFileTransfer::buildPacket(Part p) {
+	//piCoutObj << "Step" << pftheader.step;
+	//piCoutObj << "session id" << pftheader.session_id;
+	PIByteArray ba;
+	switch(pftheader.step) {
+		case pft_None:
+			stopSend();
+		return PIByteArray();
+		case pft_Description:
+			ba.resize(p.size);
+			memcpy(ba.data(), desc.data(p.start), p.size);
+		return ba;
+		case pft_Data:
+			//piCout << "send data" << p.id << files_.size();
+			PIFile::FileInfo fi = files_[p.id-1];
+			if (fi.isFile()) {
+				//piCout << "send file" << fi.name() << fi.size;
+				PIString path = fi.path;
+				if (work_file.path() != path || !work_file.isOpened()) {
+					if (!work_file.open(path, PIIODevice::ReadOnly)) {
+						break_ = true;
+						cur_file_string = "Error: While open file \"" + fi.path + "\"";
+						piCoutObj << cur_file_string;
+						stopSend();
+						return PIByteArray();
+					}
+				}
+				work_file.seek(p.start);
+				ba.resize(p.size);
+				int rs = work_file.read(ba.data(), ba.size());
+				if ((llong)rs != (llong)p.size) {
+					break_ = true;
+					cur_file_string = "Error: While read file \"" + fi.path + "\" (must " + PIString::fromNumber(p.size) + ", but read " + PIString::fromNumber(rs) + ")";
+					piCoutObj << cur_file_string;
+					stopSend();
+					return PIByteArray();
+				}
+			}
+			cur_file_string = fi.path;
+			bytes_file_all = fi.size;
+			bytes_file_cur = p.start;
+		return ba;
+	}
+	return ba;
+}
+
+
+void PIFileTransfer::receivePart(PIBaseTransfer::Part fi, PIByteArray ba, PIByteArray pheader) {
+	PFTHeader h;
+	// 	piCout << pheader.size() << sizeof(PFTHeader);
+	pheader >> h;
+	// 	piCout << h.session_id;
+	PIMutexLocker ml(step_mutex);
+	StepType st = (StepType)h.step;
+	pftheader.step = st;
+	if (!h.check_sig()) {
+		cur_file_string = "Error: Check signature: File Transfer incompatable or invalid version!";
+		piCoutObj << cur_file_string;
+		stopReceive();
+		return;
+	}
+	switch(st) {
+		case pft_None:
+		break;
+		case pft_Description:
+			pftheader.session_id = h.session_id;
+			if (desc.size() < fi.start + fi.size) desc.resize(fi.start + fi.size);
+			memcpy(desc.data(fi.start), ba.data(), ba.size_s());
+		break;
+		case pft_Data:
+			if (h.session_id == pftheader.session_id)
+				processFile(fi.id, fi.start, ba);
+			else stopReceive();
+		break;
+		default:
+		break;
+	}
+}
+
+
+PIString PIFileTransfer::curFile() const {
+	PIString s = cur_file_string;
+	if (scanning)
+		return s + scan_dir.scanDir();
+	return s;
+}
+
+
+PIByteArray PIFileTransfer::customHeader() {
+	PIByteArray ba;
+	ba << pftheader;
+	return ba;
+}
+
+
+void PIFileTransfer::receive_started() {
+	if (pftheader.step == pft_None) {
+		files_.clear();
+//		piCoutObj << "start receive"
+		started_ = true;
+		receiveFilesStarted();
+	}
+}
+
+
+void PIFileTransfer::receive_finished(bool ok) {
+	step_mutex.lock();
+	StepType st = (StepType)pftheader.step;
+	step_mutex.unlock();
+	if (st == pft_Description) {
+		bool user_ok = true;
+		if (ok) {
+//			piCoutObj << desc.size() << PICoutManipulators::Hex << desc;
+			desc >> files_;
+//			piCoutObj << files_;
+			PIStringList files;
+			piForeachC(PFTFileInfo &fi, files_) files << fi.dest_path;
+			pause();
+			receiveFilesRequest(files, bytesAll(), &user_ok);
+		}
+		if (!ok || !user_ok) {
+			pftheader.session_id--;
+			piCoutObj << "receive aborted";
+			receiveFilesFinished(false);
+			started_ = false;
+		} else resume();
+	}
+	if (st == pft_Data) {
+		//piCoutObj << "file close";
+		work_file.close();
+		receiveFilesFinished(ok);
+		started_ = false;
+	}
+}
+
+
+void PIFileTransfer::send_finished(bool ok) {
+//	piCoutObj << "file close";
+	if (pftheader.step == pft_Data) {
+		work_file.close();
+	}
+}
diff --git a/src_main/io_utils/pifiletransfer.h b/lib/main/io_utils/pifiletransfer.h
similarity index 97%
rename from src_main/io_utils/pifiletransfer.h
rename to lib/main/io_utils/pifiletransfer.h
index d4d778db..241b499c 100644
--- a/src_main/io_utils/pifiletransfer.h
+++ b/lib/main/io_utils/pifiletransfer.h
@@ -1,128 +1,128 @@
-/*! \file pifiletransfer.h
- * \brief Class for send and receive files and directories via \a PIBaseTransfer
-*/
-/*
-	PIP - Platform Independent Primitives
-	Class for send and receive files and directories via PIBaseTransfer
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIFILETRANSFER_H
-#define PIFILETRANSFER_H
-
-#include "pidir.h"
-#include "pibasetransfer.h"
-
-#define __PIFILETRANSFER_VERSION 2
-
-class PIP_EXPORT PIFileTransfer: public PIBaseTransfer
-{
-	PIOBJECT_SUBCLASS(PIFileTransfer, PIBaseTransfer)
-public:
-	PIFileTransfer();
-	~PIFileTransfer();
-
-	enum PIP_EXPORT StepType {pft_None, pft_Description, pft_Data};
-
-	struct PIP_EXPORT PFTFileInfo: public PIFile::FileInfo {
-		PFTFileInfo(const PIFile::FileInfo &fi = PIFile::FileInfo()): PIFile::FileInfo(fi) {}
-		PIString dest_path;
-	};
-
-#pragma pack(push,1)
-	struct PIP_EXPORT PFTHeader {
-		union {
-			struct {
-				char sig[3]; // PFT
-				uchar version;
-			};
-			uint raw_sig;
-		};
-		int step; // PacketType
-		int session_id;
-		bool check_sig() {
-			if (sig[0] != sign[0] || sig[1] != sign[1] || sig[2] != sign[2] || version != __PIFILETRANSFER_VERSION) return false;
-			return true;
-		}
-	};
-#pragma pack(pop)
-
-	bool send(const PIFile & file);
-	bool send(const PIString & file);
-	bool send(const PIStringList &files);
-	bool send(PIFile::FileInfo entry) {return send(PIVector<PIFile::FileInfo>() << entry);}
-	bool send(PIVector<PIFile::FileInfo> entries);
-
-	void setDirectory(const PIDir &d) {dir = d;}
-	void setDirectory(const PIString &path) {dir.setDir(path);}
-	PIDir directory() const {return dir;}
-
-	bool isStarted() const {return started_;}
-
-	PIString curFile() const;
-	llong bytesFileAll() const {return bytes_file_all;}
-	llong bytesFileCur() const {return bytes_file_cur;}
-	const PIString * curFile_ptr() const {return &cur_file_string;}
-	const llong * bytesFileAll_ptr() const {return &bytes_file_all;}
-	const llong * bytesFileCur_ptr() const {return &bytes_file_cur;}
-
-	EVENT(receiveFilesStarted)
-	EVENT1(receiveFilesFinished, bool, ok)
-	EVENT(sendFilesStarted)
-	EVENT1(sendFilesFinished, bool, ok)
-	EVENT3(receiveFilesRequest, PIStringList, files, llong, total_bytes, bool *, ok)
-	
-private:
-	static const char sign[];
-	PIVector<PFTFileInfo> files_;
-	PIString cur_file_string;
-	llong bytes_file_all, bytes_file_cur;
-	PFTHeader pftheader;
-	PIDir dir;
-	PIFile work_file;
-	PIByteArray desc;
-	PIDir scan_dir;
-	bool started_, scanning;
-	PIMutex step_mutex;
-
-	bool sendFiles(const PIVector<PFTFileInfo> &files);
-	void processFile(int id, ullong start, PIByteArray &data);
-	virtual void receivePart(Part fi, PIByteArray ba, PIByteArray pheader);
-	virtual PIByteArray buildPacket(Part fi);
-	virtual PIByteArray customHeader();
-	EVENT_HANDLER(void, receive_started);
-	EVENT_HANDLER1(void, send_finished, bool, ok);
-	EVENT_HANDLER1(void, receive_finished, bool, ok);
-};
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIFileTransfer::PFTHeader & v) {s << v.raw_sig << v.step << v.session_id; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIFileTransfer::PFTHeader & v) {s >> v.raw_sig >> v.step >> v.session_id; return s;}
-
-inline PIByteArray & operator <<(PIByteArray & s, const PIFileTransfer::PFTFileInfo & v) {s << v.dest_path << v.size << v.time_access << v.time_modification <<
-	v.flags << v.id_user << v.id_group << v.perm_user.raw << v.perm_group.raw << v.perm_other.raw; return s;}
-inline PIByteArray & operator >>(PIByteArray & s, PIFileTransfer::PFTFileInfo & v) {s >> v.dest_path >> v.size >> v.time_access >> v.time_modification >>
-	v.flags >> v.id_user >> v.id_group >> v.perm_user.raw >> v.perm_group.raw >> v.perm_other.raw; return s;}
-
-inline PICout operator <<(PICout s, const PIFileTransfer::PFTFileInfo & v) {
-	s.setControl(0, true);
-	s << "FileInfo(\"" << v.dest_path << "\", " << PIString::readableSize(v.size) << ", "
-		<< v.perm_user.toString() << " " << v.perm_group.toString() << " " << v.perm_other.toString() << ", "
-		<< v.time_access.toString() << ", " << v.time_modification.toString()
-		<< ", 0x" << PICoutManipulators::Hex << v.flags << ")";
-	s.restoreControl();
-	return s;
-}
-#endif // PIFILETRANSFER_H
+/*! \file pifiletransfer.h
+ * \brief Class for send and receive files and directories via \a PIBaseTransfer
+*/
+/*
+	PIP - Platform Independent Primitives
+	Class for send and receive files and directories via PIBaseTransfer
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIFILETRANSFER_H
+#define PIFILETRANSFER_H
+
+#include "pidir.h"
+#include "pibasetransfer.h"
+
+#define __PIFILETRANSFER_VERSION 2
+
+class PIP_EXPORT PIFileTransfer: public PIBaseTransfer
+{
+	PIOBJECT_SUBCLASS(PIFileTransfer, PIBaseTransfer)
+public:
+	PIFileTransfer();
+	~PIFileTransfer();
+
+	enum PIP_EXPORT StepType {pft_None, pft_Description, pft_Data};
+
+	struct PIP_EXPORT PFTFileInfo: public PIFile::FileInfo {
+		PFTFileInfo(const PIFile::FileInfo &fi = PIFile::FileInfo()): PIFile::FileInfo(fi) {}
+		PIString dest_path;
+	};
+
+#pragma pack(push,1)
+	struct PIP_EXPORT PFTHeader {
+		union {
+			struct {
+				char sig[3]; // PFT
+				uchar version;
+			};
+			uint raw_sig;
+		};
+		int step; // PacketType
+		int session_id;
+		bool check_sig() {
+			if (sig[0] != sign[0] || sig[1] != sign[1] || sig[2] != sign[2] || version != __PIFILETRANSFER_VERSION) return false;
+			return true;
+		}
+	};
+#pragma pack(pop)
+
+	bool send(const PIFile & file);
+	bool send(const PIString & file);
+	bool send(const PIStringList &files);
+	bool send(PIFile::FileInfo entry) {return send(PIVector<PIFile::FileInfo>() << entry);}
+	bool send(PIVector<PIFile::FileInfo> entries);
+
+	void setDirectory(const PIDir &d) {dir = d;}
+	void setDirectory(const PIString &path) {dir.setDir(path);}
+	PIDir directory() const {return dir;}
+
+	bool isStarted() const {return started_;}
+
+	PIString curFile() const;
+	llong bytesFileAll() const {return bytes_file_all;}
+	llong bytesFileCur() const {return bytes_file_cur;}
+	const PIString * curFile_ptr() const {return &cur_file_string;}
+	const llong * bytesFileAll_ptr() const {return &bytes_file_all;}
+	const llong * bytesFileCur_ptr() const {return &bytes_file_cur;}
+
+	EVENT(receiveFilesStarted)
+	EVENT1(receiveFilesFinished, bool, ok)
+	EVENT(sendFilesStarted)
+	EVENT1(sendFilesFinished, bool, ok)
+	EVENT3(receiveFilesRequest, PIStringList, files, llong, total_bytes, bool *, ok)
+	
+private:
+	static const char sign[];
+	PIVector<PFTFileInfo> files_;
+	PIString cur_file_string;
+	llong bytes_file_all, bytes_file_cur;
+	PFTHeader pftheader;
+	PIDir dir;
+	PIFile work_file;
+	PIByteArray desc;
+	PIDir scan_dir;
+	bool started_, scanning;
+	PIMutex step_mutex;
+
+	bool sendFiles(const PIVector<PFTFileInfo> &files);
+	void processFile(int id, ullong start, PIByteArray &data);
+	virtual void receivePart(Part fi, PIByteArray ba, PIByteArray pheader);
+	virtual PIByteArray buildPacket(Part fi);
+	virtual PIByteArray customHeader();
+	EVENT_HANDLER(void, receive_started);
+	EVENT_HANDLER1(void, send_finished, bool, ok);
+	EVENT_HANDLER1(void, receive_finished, bool, ok);
+};
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIFileTransfer::PFTHeader & v) {s << v.raw_sig << v.step << v.session_id; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIFileTransfer::PFTHeader & v) {s >> v.raw_sig >> v.step >> v.session_id; return s;}
+
+inline PIByteArray & operator <<(PIByteArray & s, const PIFileTransfer::PFTFileInfo & v) {s << v.dest_path << v.size << v.time_access << v.time_modification <<
+	v.flags << v.id_user << v.id_group << v.perm_user.raw << v.perm_group.raw << v.perm_other.raw; return s;}
+inline PIByteArray & operator >>(PIByteArray & s, PIFileTransfer::PFTFileInfo & v) {s >> v.dest_path >> v.size >> v.time_access >> v.time_modification >>
+	v.flags >> v.id_user >> v.id_group >> v.perm_user.raw >> v.perm_group.raw >> v.perm_other.raw; return s;}
+
+inline PICout operator <<(PICout s, const PIFileTransfer::PFTFileInfo & v) {
+	s.setControl(0, true);
+	s << "FileInfo(\"" << v.dest_path << "\", " << PIString::readableSize(v.size) << ", "
+		<< v.perm_user.toString() << " " << v.perm_group.toString() << " " << v.perm_other.toString() << ", "
+		<< v.time_access.toString() << ", " << v.time_modification.toString()
+		<< ", 0x" << PICoutManipulators::Hex << v.flags << ")";
+	s.restoreControl();
+	return s;
+}
+#endif // PIFILETRANSFER_H
diff --git a/src_main/io_utils/piioutilsmodule.h b/lib/main/io_utils/piioutilsmodule.h
similarity index 100%
rename from src_main/io_utils/piioutilsmodule.h
rename to lib/main/io_utils/piioutilsmodule.h
diff --git a/src_main/io_utils/pipacketextractor.cpp b/lib/main/io_utils/pipacketextractor.cpp
similarity index 100%
rename from src_main/io_utils/pipacketextractor.cpp
rename to lib/main/io_utils/pipacketextractor.cpp
diff --git a/src_main/io_utils/pipacketextractor.h b/lib/main/io_utils/pipacketextractor.h
similarity index 100%
rename from src_main/io_utils/pipacketextractor.h
rename to lib/main/io_utils/pipacketextractor.h
diff --git a/src_main/io_utils/pistreampacker.h b/lib/main/io_utils/pistreampacker.h
similarity index 96%
rename from src_main/io_utils/pistreampacker.h
rename to lib/main/io_utils/pistreampacker.h
index 20d2a07b..361e647c 100644
--- a/src_main/io_utils/pistreampacker.h
+++ b/lib/main/io_utils/pistreampacker.h
@@ -1,134 +1,134 @@
-/*! \file pistreampacker.h
- * \brief Simple packet wrap aroud any PIIODevice
-*/
-/*
-	PIP - Platform Independent Primitives
-	Simple packet wrap aroud any PIIODevice
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISTREAMPACKER_H
-#define PISTREAMPACKER_H
-
-#include "piobject.h"
-#include "piethutilbase.h"
-
-
-class PIIODevice;
-
-class PIP_EXPORT PIStreamPacker: public PIObject, public PIEthUtilBase {
-	PIOBJECT(PIStreamPacker)
-public:
-	//! Contructs packer and try to assign \"dev\"
-	PIStreamPacker(PIIODevice * dev = 0);
-
-	//! Progress info
-	struct Progress {
-		Progress();
-
-		//! Is send/receive in progress
-		bool active;
-
-		//! Overall send/receive packet size
-		int bytes_all;
-
-		//! Current send/receive size
-		int bytes_current;
-
-		//! Current send/receive progress from 0 to 1
-		double progress;
-	};
-
-	//! Set maximum size of single packet
-	void setMaxPacketSize(int max_size) {max_packet_size = max_size;}
-
-	//! Returns maximum size of single packet, default 1400 bytes
-	int maxPacketSize() {return max_packet_size;}
-
-
-	//! Set packet sinature
-	void setPacketSign(ushort sign_) {packet_sign = sign_;}
-
-	//! Returns packet sinature, default 0xAFBE
-	ushort packetSign() {return packet_sign;}
-
-
-	bool cryptFragmentationEnabled() const {return crypt_frag;}
-	void setCryptFragmentationEnabled(bool on) {crypt_frag = on;}
-	int cryptFragmentationSize() const {return crypt_frag_size;}
-	void setCryptFragmentationSize(int size_) {crypt_frag_size = size_;}
-
-
-	//! Prepare data for send and raise \a sendRequest() events
-	void send(const PIByteArray & data);
-
-	//! Receive data part. If packet is ready, raise \a received() event
-	void received(const PIByteArray & data);
-
-	EVENT_HANDLER2(void, received, uchar * , readed, int, size);
-
-	//! Connect \"dev\" \a PIIODevice::threadedReadEvent() event to \a received() handler
-	//! and \a sendRequest() event to \"dev\" \a PIIODevice::write() handler
-	void assignDevice(PIIODevice * dev);
-
-	//! Returns \a Progress info about sending
-	Progress progressSend() const;
-
-	//! Returns \a Progress info about receiving
-	Progress progressReceive() const;
-
-	EVENT1(packetReceiveEvent, PIByteArray, data)
-	EVENT1(sendRequest, PIByteArray, data)
-
-	//! \handlers
-	//! \{
-
-		//! \fn void received(uchar * readed, int size)
-		//! \brief Handler to receive data. \a PIIODevice::threadedReadEvent()
-		//! can be connected to this handler
-
-	//! \}
-
-	//! \events
-	//! \{
-
-		//! \fn void packetReceiveEvent(PIByteArray data)
-		//! \brief Raise on packet successfully received
-
-		//! \fn void sendRequest(PIByteArray data)
-		//! \brief Raise from \a send() function. This data should
-		//! be directly sended to your device. You can
-		//! connect this event to \a PIIODevice::write() handler
-
-	//! \}
-
-protected:
-
-	//! Packet successfully received, by default does nothing
-	virtual void packetReceived(PIByteArray data) {}
-
-private:
-	PIByteArray stream, packet;
-	bool crypt_frag;
-	int packet_size, crypt_frag_size;
-	ushort packet_sign;
-	int max_packet_size;
-	Progress prog_s, prog_r;
-	mutable PIMutex prog_s_mutex, prog_r_mutex;
-
-};
-
-#endif // PISTREAMPACKER_H
+/*! \file pistreampacker.h
+ * \brief Simple packet wrap aroud any PIIODevice
+*/
+/*
+	PIP - Platform Independent Primitives
+	Simple packet wrap aroud any PIIODevice
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISTREAMPACKER_H
+#define PISTREAMPACKER_H
+
+#include "piobject.h"
+#include "piethutilbase.h"
+
+
+class PIIODevice;
+
+class PIP_EXPORT PIStreamPacker: public PIObject, public PIEthUtilBase {
+	PIOBJECT(PIStreamPacker)
+public:
+	//! Contructs packer and try to assign \"dev\"
+	PIStreamPacker(PIIODevice * dev = 0);
+
+	//! Progress info
+	struct Progress {
+		Progress();
+
+		//! Is send/receive in progress
+		bool active;
+
+		//! Overall send/receive packet size
+		int bytes_all;
+
+		//! Current send/receive size
+		int bytes_current;
+
+		//! Current send/receive progress from 0 to 1
+		double progress;
+	};
+
+	//! Set maximum size of single packet
+	void setMaxPacketSize(int max_size) {max_packet_size = max_size;}
+
+	//! Returns maximum size of single packet, default 1400 bytes
+	int maxPacketSize() {return max_packet_size;}
+
+
+	//! Set packet sinature
+	void setPacketSign(ushort sign_) {packet_sign = sign_;}
+
+	//! Returns packet sinature, default 0xAFBE
+	ushort packetSign() {return packet_sign;}
+
+
+	bool cryptFragmentationEnabled() const {return crypt_frag;}
+	void setCryptFragmentationEnabled(bool on) {crypt_frag = on;}
+	int cryptFragmentationSize() const {return crypt_frag_size;}
+	void setCryptFragmentationSize(int size_) {crypt_frag_size = size_;}
+
+
+	//! Prepare data for send and raise \a sendRequest() events
+	void send(const PIByteArray & data);
+
+	//! Receive data part. If packet is ready, raise \a received() event
+	void received(const PIByteArray & data);
+
+	EVENT_HANDLER2(void, received, uchar * , readed, int, size);
+
+	//! Connect \"dev\" \a PIIODevice::threadedReadEvent() event to \a received() handler
+	//! and \a sendRequest() event to \"dev\" \a PIIODevice::write() handler
+	void assignDevice(PIIODevice * dev);
+
+	//! Returns \a Progress info about sending
+	Progress progressSend() const;
+
+	//! Returns \a Progress info about receiving
+	Progress progressReceive() const;
+
+	EVENT1(packetReceiveEvent, PIByteArray, data)
+	EVENT1(sendRequest, PIByteArray, data)
+
+	//! \handlers
+	//! \{
+
+		//! \fn void received(uchar * readed, int size)
+		//! \brief Handler to receive data. \a PIIODevice::threadedReadEvent()
+		//! can be connected to this handler
+
+	//! \}
+
+	//! \events
+	//! \{
+
+		//! \fn void packetReceiveEvent(PIByteArray data)
+		//! \brief Raise on packet successfully received
+
+		//! \fn void sendRequest(PIByteArray data)
+		//! \brief Raise from \a send() function. This data should
+		//! be directly sended to your device. You can
+		//! connect this event to \a PIIODevice::write() handler
+
+	//! \}
+
+protected:
+
+	//! Packet successfully received, by default does nothing
+	virtual void packetReceived(PIByteArray data) {}
+
+private:
+	PIByteArray stream, packet;
+	bool crypt_frag;
+	int packet_size, crypt_frag_size;
+	ushort packet_sign;
+	int max_packet_size;
+	Progress prog_s, prog_r;
+	mutable PIMutex prog_s_mutex, prog_r_mutex;
+
+};
+
+#endif // PISTREAMPACKER_H
diff --git a/src_main/math/picompress.h b/lib/main/math/picompress.h
similarity index 96%
rename from src_main/math/picompress.h
rename to lib/main/math/picompress.h
index ce7e8d89..187b019e 100644
--- a/src_main/math/picompress.h
+++ b/lib/main/math/picompress.h
@@ -1,32 +1,32 @@
-/*! \file picompress.h
- * \brief Compress class using zlib
-*/
-/*
-	PIP - Platform Independent Primitives
-	Compress class using zlib
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PICOMPRESS_H
-#define PICOMPRESS_H
-
-#include "pibytearray.h"
-
-PIByteArray piCompress(const PIByteArray & ba, int level = 6);
-
-PIByteArray piDecompress(const PIByteArray & zba);
-
-#endif // PICOMPRESS_H
+/*! \file picompress.h
+ * \brief Compress class using zlib
+*/
+/*
+	PIP - Platform Independent Primitives
+	Compress class using zlib
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PICOMPRESS_H
+#define PICOMPRESS_H
+
+#include "pibytearray.h"
+
+PIByteArray piCompress(const PIByteArray & ba, int level = 6);
+
+PIByteArray piDecompress(const PIByteArray & zba);
+
+#endif // PICOMPRESS_H
diff --git a/src_main/math/picrc.h b/lib/main/math/picrc.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/math/picrc.h
rename to lib/main/math/picrc.h
diff --git a/src_main/math/pievaluator.cpp b/lib/main/math/pievaluator.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/math/pievaluator.cpp
rename to lib/main/math/pievaluator.cpp
diff --git a/src_main/math/pievaluator.h b/lib/main/math/pievaluator.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/math/pievaluator.h
rename to lib/main/math/pievaluator.h
diff --git a/src_main/math/pifft.cpp b/lib/main/math/pifft.cpp
similarity index 96%
rename from src_main/math/pifft.cpp
rename to lib/main/math/pifft.cpp
index 1c9b7f8b..7fbb6ca7 100644
--- a/src_main/math/pifft.cpp
+++ b/lib/main/math/pifft.cpp
@@ -1,1893 +1,1893 @@
-/*
-	PIP - Platform Independent Primitives
-	Class for FFT, IFFT and Hilbert transformations
-	Andrey Bychkov work.a.b@yandex.ru, Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pifft.h"
-
-
-PIFFT_double::PIFFT_double() {
-}
-
-
-PIVector<complexd> * PIFFT_double::calcFFT(const PIVector<complexd> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1d(val, val.size());
-	return &result;
-}
-
-
-PIVector<complexd> * PIFFT_double::calcFFTinverse(const PIVector<complexd> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1dinv(val, val.size());
-	return &result;
-}
-
-
-PIVector<complexd> * PIFFT_double::calcHilbert(const PIVector<double> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1r(val, val.size());
-	for (uint i = 0; i < result.size() / 2; i++)             result[i] = result[i] * 2.;
-	for (uint i = result.size() / 2; i < result.size(); i++) result[i] = 0;
-	fftc1dinv(result, result.size());
-	return &result;
-}
-
-
-PIVector<complexd> * PIFFT_double::calcFFT(const PIVector<double> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1r(val, val.size());
-	return &result;
-}
-
-
-PIVector<double> PIFFT_double::getAmplitude() const {
-	PIVector<double> ret;
-	ret.resize(result.size());
-	double tmp;
-	for (uint i = 0; i < result.size(); i++) {
-		tmp = sqrt(result[i].real() * result[i].real() + result[i].imag() * result[i].imag());
-		ret[i] = tmp;
-	}
-	return ret;
-}
-
-
-PIVector<double> PIFFT_double::getReal() const {
-	PIVector<double> ret;
-	ret.resize(result.size());
-	for (uint i = 0; i < result.size(); i++)
-		ret[i] = result[i].real();
-	return ret;
-}
-
-
-PIVector<double> PIFFT_double::getImag() const {
-	PIVector<double> ret;
-	ret.resize(result.size());
-	for (uint i = 0; i < result.size(); i++)
-		ret[i] = result[i].imag();
-	return ret;
-}
-
-
-void PIFFT_double::fftc1d(const PIVector<complexd> & a, uint n) {
-	createPlan(n);
-	uint i;
-	PIVector<double> buf;
-	buf.resize(2 * n);
-	for (i = 0; i < n; i++) {
-		buf[2 * i + 0] = a[i].real();
-		buf[2 * i + 1] = a[i].imag();
-	}
-	ftbaseexecuteplan(&buf, 0, n, &curplan);
-	result.resize(n);
-	for (i = 0; i < n; i++)
-		result[i] = complexd(buf[2 * i + 0], buf[2 * i + 1]);
-}
-
-
-void PIFFT_double::fftc1r(const PIVector<double> & a, uint n) {
-	uint i;
-	if (n % 2 == 0) {
-		PIVector<double> buf;
-		uint n2 = n / 2;
-		buf = a;
-		createPlan(n2);
-		ftbaseexecuteplan(&buf, 0, n2, &curplan);
-		result.resize(n);
-		uint idx;
-		complexd hn, hmnc, v;
-		for (i = 0; i <= n2; i++) {
-			idx = 2 * (i % n2);
-			hn = complexd(buf[idx + 0], buf[idx + 1]);
-			idx = 2 * ((n2 - i) % n2);
-			hmnc = complexd(buf[idx + 0], -buf[idx + 1]);
-			v = complexd(sin(M_PI * i / n2), cos(M_PI * i / n2));
-			result[i] = ((hn + hmnc) - (v * (hn - hmnc)));
-			result[i] *= 0.5;
-		}
-		for (i = n2 + 1; i < n; i++)
-			result[i] = conj(result[n - i]);
-	} else {
-		PIVector<complexd> cbuf;
-		cbuf.resize(n);
-		for (i = 0; i < n; i++)
-			cbuf[i] = complexd(a[i], 0.);
-		fftc1d(cbuf, n);
-	}
-}
-
-
-void PIFFT_double::fftc1dinv(const PIVector<complexd> & a, uint n) {
-	PIVector<complexd> cbuf;
-	cbuf.resize(n);
-	uint i;
-	for (i = 0; i < n; i++) {
-		cbuf[i] = conj(a[i]);
-	}
-	fftc1d(cbuf, n);
-	for (i = 0; i < n; i++) {
-		result[i] = conj(result[i] / (double)n);
-	}
-}
-
-
-void PIFFT_double::createPlan(uint n) {
-	curplan.plan.clear();
-	curplan.precomputed.clear();
-	curplan.stackbuf.clear();
-	curplan.tmpbuf.clear();
-	if (n < 2) return;
-	ftbasegeneratecomplexfftplan(n, &curplan);
-}
-
-
-void PIFFT_double::ftbasegeneratecomplexfftplan(uint n, ftplan * plan) {
-	int planarraysize;
-	int plansize;
-	int precomputedsize;
-	int tmpmemsize;
-	int stackmemsize;
-	ae_int_t stackptr;
-	planarraysize = 1;
-	plansize = 0;
-	precomputedsize = 0;
-	stackmemsize = 0;
-	stackptr = 0;
-	tmpmemsize = 2 * n;
-	curplan.plan.resize(planarraysize);
-	int ftbase_ftbasecffttask = 0;
-	ftbase_ftbasegenerateplanrec(n, ftbase_ftbasecffttask, plan, &plansize, &precomputedsize, &planarraysize, &tmpmemsize, &stackmemsize, stackptr);
-	if (stackptr != 0) {
-		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
-	}
-	curplan.stackbuf.resize(piMax<int>(stackmemsize, 1)); //ae_vector_set_length(&curplan.stackbuf, ae_maxint(stackmemsize, 1));
-	curplan.tmpbuf.resize(piMax<int>(tmpmemsize, 1)); //ae_vector_set_length(&(curplan.tmpbuf), ae_maxint(tmpmemsize, 1));
-	curplan.precomputed.resize(piMax<int>(precomputedsize, 1)); //ae_vector_set_length(&curplan.precomputed, ae_maxint(precomputedsize, 1));
-	stackptr = 0;
-	ftbase_ftbaseprecomputeplanrec(plan, 0, stackptr);
-	if (stackptr != 0) {
-		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
-	}
-}
-
-
-/*************************************************************************
-Recurrent subroutine for the FFTGeneratePlan:
-
-PARAMETERS:
-	N                   plan size
-	IsReal              whether input is real or not.
-						subroutine MUST NOT ignore this flag because real
-						inputs comes with non-initialized imaginary parts,
-						so ignoring this flag will result in corrupted output
-	HalfOut             whether full output or only half of it from 0 to
-						floor(N/2) is needed. This flag may be ignored if
-						doing so will simplify calculations
-	Plan                plan array
-	PlanSize            size of used part (in integers)
-	PrecomputedSize     size of precomputed array allocated yet
-	PlanArraySize       plan array size (actual)
-	TmpMemSize          temporary memory required size
-	BluesteinMemSize    temporary memory required size
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_double::ftbase_ftbasegenerateplanrec(
-int n,
-int tasktype,
-ftplan * plan,
-int * plansize,
-int * precomputedsize,
-int * planarraysize,
-int * tmpmemsize,
-int * stackmemsize,
-ae_int_t stackptr, int debugi) {
-	int k, m, n1, n2, esize, entryoffset;
-	int ftbase_ftbaseplanentrysize = 8;
-	int ftbase_ftbasecffttask = 0;
-	int ftbase_fftcooleytukeyplan = 0;
-	int ftbase_fftbluesteinplan = 1;
-	int ftbase_fftcodeletplan = 2;
-	int ftbase_fftrealcooleytukeyplan = 5;
-	int ftbase_fftemptyplan = 6;
-	if (*plansize + ftbase_ftbaseplanentrysize > (*planarraysize)) {
-		curplan.plan.resize(8 * (*planarraysize));
-		*planarraysize = 8 * (*planarraysize);
-	}
-	entryoffset = *plansize;
-	esize = ftbase_ftbaseplanentrysize;
-	*plansize = *plansize + esize;
-	if (n == 1) {
-		curplan.plan[entryoffset + 0] = esize;
-		curplan.plan[entryoffset + 1] = -1;
-		curplan.plan[entryoffset + 2] = -1;
-		curplan.plan[entryoffset + 3] = ftbase_fftemptyplan;
-		curplan.plan[entryoffset + 4] = -1;
-		curplan.plan[entryoffset + 5] = -1;
-		curplan.plan[entryoffset + 6] = -1;
-		curplan.plan[entryoffset + 7] = -1;
-		return;
-	}
-	ftbasefactorize(n, &n1, &n2);
-	if (n1 != 1) {
-		*tmpmemsize = piMax<int>(*tmpmemsize, 2 * n1 * n2);
-		curplan.plan[entryoffset + 0] = esize;
-		curplan.plan[entryoffset + 1] = n1;
-		curplan.plan[entryoffset + 2] = n2;
-		if (tasktype == ftbase_ftbasecffttask)
-			curplan.plan[entryoffset + 3] = ftbase_fftcooleytukeyplan;
-		else
-			curplan.plan[entryoffset + 3] = ftbase_fftrealcooleytukeyplan;
-		curplan.plan[entryoffset + 4] = 0;
-		curplan.plan[entryoffset + 5] = *plansize;
-		debugi++;
-		ftbase_ftbasegenerateplanrec(n1, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
-		curplan.plan[entryoffset + 6] = *plansize;
-		ftbase_ftbasegenerateplanrec(n2, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
-		curplan.plan[entryoffset + 7] = -1;
-		return;
-	} else {
-		if (n >= 2 && n <= 5) {
-			curplan.plan[entryoffset + 0] = esize;
-			curplan.plan[entryoffset + 1] = n1;
-			curplan.plan[entryoffset + 2] = n2;
-			curplan.plan[entryoffset + 3] = ftbase_fftcodeletplan;
-			curplan.plan[entryoffset + 4] = 0;
-			curplan.plan[entryoffset + 5] = -1;
-			curplan.plan[entryoffset + 6] = -1;
-			curplan.plan[entryoffset + 7] = *precomputedsize;
-			if (n == 3)
-				*precomputedsize = *precomputedsize + 2;
-			if (n == 5)
-				*precomputedsize = *precomputedsize + 5;
-			return;
-		} else {
-			k = 2 * n2 - 1;
-			m = ftbasefindsmooth(k);
-			*tmpmemsize = piMax<int>(*tmpmemsize, 2 * m);
-			curplan.plan[entryoffset + 0] = esize;
-			curplan.plan[entryoffset + 1] = n2;
-			curplan.plan[entryoffset + 2] = -1;
-			curplan.plan[entryoffset + 3] = ftbase_fftbluesteinplan;
-			curplan.plan[entryoffset + 4] = m;
-			curplan.plan[entryoffset + 5] = *plansize;
-			stackptr = stackptr + 2 * 2 * m;
-			*stackmemsize = piMax<int>(*stackmemsize, stackptr);
-			ftbase_ftbasegenerateplanrec(m, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr);
-			stackptr = stackptr - 2 * 2 * m;
-			curplan.plan[entryoffset + 6] = -1;
-			curplan.plan[entryoffset + 7] = *precomputedsize;
-			*precomputedsize = *precomputedsize + 2 * m + 2 * n;
-			return;
-		}
-	}
-}
-
-
-/*************************************************************************
-Recurrent subroutine for precomputing FFT plans
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_double::ftbase_ftbaseprecomputeplanrec(ftplan * plan,
-int entryoffset,
-ae_int_t stackptr) {
-	int n1, n2, n, m, offs;
-	double v, bx, by;
-	int ftbase_fftcooleytukeyplan = 0;
-	int ftbase_fftbluesteinplan = 1;
-	int ftbase_fftcodeletplan = 2;
-	int ftbase_fhtcooleytukeyplan = 3;
-	int ftbase_fhtcodeletplan = 4;
-	int ftbase_fftrealcooleytukeyplan = 5;
-	if ((curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan || curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) || curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
-		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
-		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 6], stackptr);
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan || curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		if (n == 3) {
-			offs = curplan.plan[entryoffset + 7];
-			curplan.precomputed[offs + 0] = cos(2 * M_PI / 3) - 1;
-			curplan.precomputed[offs + 1] = sin(2 * M_PI / 3);
-			return;
-		}
-		if (n == 5) {
-			offs = curplan.plan[entryoffset + 7];
-			v = 2 * M_PI / 5;
-			curplan.precomputed[offs + 0] = (cos(v) + cos(2 * v)) / 2 - 1;
-			curplan.precomputed[offs + 1] = (cos(v) - cos(2 * v)) / 2;
-			curplan.precomputed[offs + 2] = -sin(v);
-			curplan.precomputed[offs + 3] = -(sin(v) + sin(2 * v));
-			curplan.precomputed[offs + 4] = sin(v) - sin(2 * v);
-			return;
-		}
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
-		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
-		n = curplan.plan[entryoffset + 1];
-		m = curplan.plan[entryoffset + 4];
-		offs = curplan.plan[entryoffset + 7];
-		for (int i = 0; i <= 2 * m - 1; i++)
-			curplan.precomputed[offs + i] = 0;
-		for (int i = 0; i < n; i++) {
-			bx = cos(M_PI * sqr(i) / n);
-			by = sin(M_PI * sqr(i) / n);
-			curplan.precomputed[offs + 2 * i + 0] = bx;
-			curplan.precomputed[offs + 2 * i + 1] = by;
-			curplan.precomputed[offs + 2 * m + 2 * i + 0] = bx;
-			curplan.precomputed[offs + 2 * m + 2 * i + 1] = by;
-			if (i > 0) {
-				curplan.precomputed[offs + 2 * (m - i) + 0] = bx;
-				curplan.precomputed[offs + 2 * (m - i) + 1] = by;
-			}
-		}
-		ftbaseexecuteplanrec(&curplan.precomputed, offs, plan, curplan.plan[entryoffset + 5], stackptr);
-		return;
-	}
-}
-
-
-void PIFFT_double::ftbasefactorize(int n, int * n1, int * n2) {
-	*n1 = *n2 = 0;
-	int ftbase_ftbasecodeletrecommended = 5;
-	if ((*n1) * (*n2) != n) {
-		for (int j = ftbase_ftbasecodeletrecommended; j >= 2; j--) {
-			if (n % j == 0) {
-				*n1 = j;
-				*n2 = n / j;
-				break;
-			}
-		}
-	}
-	if ((*n1) * (*n2) != n) {
-		for (int j = ftbase_ftbasecodeletrecommended + 1; j <= n - 1; j++) {
-			if (n % j == 0) {
-				*n1 = j;
-				*n2 = n / j;
-				break;
-			}
-		}
-	}
-	if ((*n1) * (*n2) != n) {
-		*n1 = 1;
-		*n2 = n;
-	}
-	if ((*n2) == 1 && (*n1) != 1) {
-		*n2 = *n1;
-		*n1 = 1;
-	}
-}
-
-
-/*************************************************************************
-Is number smooth?
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_double::ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int * best) {
-	if (seed >= n) {
-		*best = piMini(*best, seed);
-		return;
-	}
-	if (leastfactor <= 2)
-		ftbase_ftbasefindsmoothrec(n, seed * 2, 2, best);
-	if (leastfactor <= 3)
-		ftbase_ftbasefindsmoothrec(n, seed * 3, 3, best);
-	if (leastfactor <= 5)
-		ftbase_ftbasefindsmoothrec(n, seed * 5, 5, best);
-}
-
-
-int PIFFT_double::ftbasefindsmooth(int n) {
-	int best, result;
-	best = 2;
-	while (best < n)
-		best = 2 * best;
-	ftbase_ftbasefindsmoothrec(n, 1, 2, &best);
-	result = best;
-	return result;
-}
-
-
-void PIFFT_double::ftbase_internalreallintranspose(PIVector<double> * a, int m, int n, int astart, PIVector<double> * buf) {
-	ftbase_fftirltrec(a, astart, n, buf, 0, m, m, n);
-	for (int i = 0; i < 2 * m * n; i++) (*a)[astart + i] = (*buf)[i];
-}
-
-
-void PIFFT_double::ftbase_fftirltrec(PIVector<double> * a, int astart, int astride, PIVector<double> * b, int bstart, int bstride, int m, int n) {
-	int idx1, idx2;
-	int m1, n1;
-	if (m == 0 || n == 0)
-		return;
-	if (piMaxi(m, n) <= 8) {
-		for (int i = 0; i <= m - 1; i++) {
-			idx1 = bstart + i;
-			idx2 = astart + i * astride;
-			for (int j = 0; j <= n - 1; j++) {
-				(*b)[idx1] = a->at(idx2);
-				idx1 = idx1 + bstride;
-				idx2 = idx2 + 1;
-			}
-		}
-		return;
-	}
-	if (n > m) {
-		n1 = n / 2;
-		if (n - n1 >= 8 && n1 % 8 != 0)
-			n1 = n1 + (8 - n1 % 8);
-		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m, n1);
-		ftbase_fftirltrec(a, astart + n1, astride, b, bstart + n1 * bstride, bstride, m, n - n1);
-	} else {
-		m1 = m / 2;
-		if (m - m1 >= 8 && m1 % 8 != 0)
-			m1 = m1 + (8 - m1 % 8);
-		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m1, n);
-		ftbase_fftirltrec(a, astart + m1 * astride, astride, b, bstart + m1, bstride, m - m1, n);
-	}
-}
-
-
-void PIFFT_double::ftbase_internalcomplexlintranspose(PIVector<double> * a, int m, int n, int astart, PIVector<double> * buf) {
-	ftbase_ffticltrec(a, astart, n, buf, 0, m, m, n);
-	for (int i = 0; i < 2 * m * n; i++)
-		(*a)[astart + i] = (*buf)[i];
-}
-
-
-void PIFFT_double::ftbase_ffticltrec(PIVector<double> * a, int astart, int astride, PIVector<double> * b, int bstart, int bstride, int m, int n) {
-	int idx1, idx2, m2, m1, n1;
-	if (m == 0 || n == 0)
-		return;
-	if (piMax<int>(m, n) <= 8) {
-		m2 = 2 * bstride;
-		for (int i = 0; i <= m - 1; i++) {
-			idx1 = bstart + 2 * i;
-			idx2 = astart + 2 * i * astride;
-			for (int j = 0; j <= n - 1; j++) {
-				(*b)[idx1 + 0] = a->at(idx2 + 0);
-				(*b)[idx1 + 1] = a->at(idx2 + 1);
-				idx1 = idx1 + m2;
-				idx2 = idx2 + 2;
-			}
-		}
-		return;
-	}
-	if (n > m) {
-		n1 = n / 2;
-		if (n - n1 >= 8 && n1 % 8 != 0)
-			n1 = n1 + (8 - n1 % 8);
-		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m, n1);
-		ftbase_ffticltrec(a, astart + 2 * n1, astride, b, bstart + 2 * n1 * bstride, bstride, m, n - n1);
-	} else {
-		m1 = m / 2;
-		if (m - m1 >= 8 && m1 % 8 != 0)
-			m1 = m1 + (8 - m1 % 8);
-		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m1, n);
-		ftbase_ffticltrec(a, astart + 2 * m1 * astride, astride, b, bstart + 2 * m1, bstride, m - m1, n);
-	}
-}
-
-
-void PIFFT_double::ftbaseexecuteplan(PIVector<double> * a, int aoffset, int n, ftplan * plan) {
-	ae_int_t stackptr;
-	stackptr = 0;
-	ftbaseexecuteplanrec(a, aoffset, plan, 0, stackptr);
-}
-
-
-/*************************************************************************
-Recurrent subroutine for the FTBaseExecutePlan
-
-Parameters:
-	A           FFT'ed array
-	AOffset     offset of the FFT'ed part (distance is measured in doubles)
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_double::ftbaseexecuteplanrec(PIVector<double> * a, int aoffset, ftplan * plan, int entryoffset, ae_int_t stackptr) {
-	int n1, n2, n, m, offs, offs1, offs2, offsa, offsb, offsp;
-	double hk, hnk, x, y, bx, by, v0, v1, v2, v3;
-	double a0x, a0y, a1x, a1y, a2x, a2y, a3x, a3y;
-	double t1x, t1y, t2x, t2y, t3x, t3y, t4x, t4y, t5x, t5y;
-	double m1x, m1y, m2x, m2y, m3x, m3y, m4x, m4y, m5x, m5y;
-	double s1x, s1y, s2x, s2y, s3x, s3y, s4x, s4y, s5x, s5y;
-	double c1, c2, c3, c4, c5;
-	int ftbase_fftcooleytukeyplan = 0;
-	int ftbase_fftbluesteinplan = 1;
-	int ftbase_fftcodeletplan = 2;
-	int ftbase_fhtcooleytukeyplan = 3;
-	int ftbase_fhtcodeletplan = 4;
-	int ftbase_fftrealcooleytukeyplan = 5;
-	int ftbase_fftemptyplan = 6;
-	PIVector<double> & tmpb(curplan.tmpbuf);
-
-	if (curplan.plan[entryoffset + 3] == ftbase_fftemptyplan)
-		return;
-	if (curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n2 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
-		ftbase_ffttwcalc(a, aoffset, n1, n2);
-		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n1 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
-		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n1 / 2 - 1; i++) {
-			offs = aoffset + 2 * i * n2 * 2;
-			for (int k = 0; k <= n2 - 1; k++)
-				(*a)[offs + 2 * k + 1] = (*a)[offs + 2 * n2 + 2 * k + 0];
-			ftbaseexecuteplanrec(a, offs, plan, curplan.plan[entryoffset + 6], stackptr);
-			tmpb[0] = (*a)[offs + 0];
-			tmpb[1] = 0;
-			tmpb[2 * n2 + 0] = (*a)[offs + 1];
-			tmpb[2 * n2 + 1] = 0;
-			for (int k = 1; k <= n2 - 1; k++) {
-				offs1 = 2 * k;
-				offs2 = 2 * n2 + 2 * k;
-				hk = (*a)[offs + 2 * k + 0];
-				hnk = (*a)[offs + 2 * (n2 - k) + 0];
-				tmpb[offs1 + 0] = 0.5 * (hk + hnk);
-				tmpb[offs2 + 1] = -0.5 * (hk - hnk);
-				hk = (*a)[offs + 2 * k + 1];
-				hnk = (*a)[offs + 2 * (n2 - k) + 1];
-				tmpb[offs2 + 0] = 0.5 * (hk + hnk);
-				tmpb[offs1 + 1] = 0.5 * (hk - hnk);
-			}
-			for (int k = 0; k < 2 * n2 * 2; k++) (*a)[offs + k] = tmpb[k];
-		}
-		if (n1 % 2 != 0)
-			ftbaseexecuteplanrec(a, aoffset + (n1 - 1)*n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
-		ftbase_ffttwcalc(a, aoffset, n2, n1);
-		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n2 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
-		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n2 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n1, plan, curplan.plan[entryoffset + 5], stackptr);
-		for (int i = 0; i <= n2 - 1; i++) {
-			for (int j = 0; j <= n1 - 1; j++) {
-				offsa = aoffset + i * n1;
-				hk = (*a)[offsa + j];
-				hnk = (*a)[offsa + (n1 - j) % n1];
-				offs = 2 * (i * n1 + j);
-				tmpb[offs + 0] = -0.5 * (hnk - hk);
-				tmpb[offs + 1] = 0.5 * (hk + hnk);
-			}
-		}
-		ftbase_ffttwcalc(&(curplan.tmpbuf), 0, n1, n2);
-		for (int j = 0; j <= n1 - 1; j++)
-			(*a)[aoffset + j] = tmpb[2 * j + 0] + tmpb[2 * j + 1];
-		if (n2 % 2 == 0) {
-			offs = 2 * (n2 / 2) * n1;
-			offsa = aoffset + n2 / 2 * n1;
-			for (int j = 0; j <= n1 - 1; j++)
-				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs + 2 * j + 1];
-		}
-		for (int i = 1; i <= (n2 + 1) / 2 - 1; i++) {
-			offs = 2 * i * n1;
-			offs2 = 2 * (n2 - i) * n1;
-			offsa = aoffset + i * n1;
-			for (int j = 0; j <= n1 - 1; j++)
-				(*a)[offsa + j] = tmpb[offs + 2 * j + 1] + tmpb[offs2 + 2 * j + 0];
-			offsa = aoffset + (n2 - i) * n1;
-			for (int j = 0; j <= n1 - 1; j++)
-				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs2 + 2 * j + 1];
-		}
-		ftbase_internalreallintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n1 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n2, plan, curplan.plan[entryoffset + 6], stackptr);
-		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		if (n == 2) {
-			a0x = (*a)[aoffset + 0];
-			a0y = (*a)[aoffset + 1];
-			a1x = (*a)[aoffset + 2];
-			a1y = (*a)[aoffset + 3];
-			v0 = a0x + a1x;
-			v1 = a0y + a1y;
-			v2 = a0x - a1x;
-			v3 = a0y - a1y;
-			(*a)[aoffset + 0] = v0;
-			(*a)[aoffset + 1] = v1;
-			(*a)[aoffset + 2] = v2;
-			(*a)[aoffset + 3] = v3;
-			return;
-		}
-		if (n == 3) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			a0x = (*a)[aoffset + 0];
-			a0y = (*a)[aoffset + 1];
-			a1x = (*a)[aoffset + 2];
-			a1y = (*a)[aoffset + 3];
-			a2x = (*a)[aoffset + 4];
-			a2y = (*a)[aoffset + 5];
-			t1x = a1x + a2x;
-			t1y = a1y + a2y;
-			a0x = a0x + t1x;
-			a0y = a0y + t1y;
-			m1x = c1 * t1x;
-			m1y = c1 * t1y;
-			m2x = c2 * (a1y - a2y);
-			m2y = c2 * (a2x - a1x);
-			s1x = a0x + m1x;
-			s1y = a0y + m1y;
-			a1x = s1x + m2x;
-			a1y = s1y + m2y;
-			a2x = s1x - m2x;
-			a2y = s1y - m2y;
-			(*a)[aoffset + 0] = a0x;
-			(*a)[aoffset + 1] = a0y;
-			(*a)[aoffset + 2] = a1x;
-			(*a)[aoffset + 3] = a1y;
-			(*a)[aoffset + 4] = a2x;
-			(*a)[aoffset + 5] = a2y;
-			return;
-		}
-		if (n == 4) {
-			a0x = (*a)[aoffset + 0];
-			a0y = (*a)[aoffset + 1];
-			a1x = (*a)[aoffset + 2];
-			a1y = (*a)[aoffset + 3];
-			a2x = (*a)[aoffset + 4];
-			a2y = (*a)[aoffset + 5];
-			a3x = (*a)[aoffset + 6];
-			a3y = (*a)[aoffset + 7];
-			t1x = a0x + a2x;
-			t1y = a0y + a2y;
-			t2x = a1x + a3x;
-			t2y = a1y + a3y;
-			m2x = a0x - a2x;
-			m2y = a0y - a2y;
-			m3x = a1y - a3y;
-			m3y = a3x - a1x;
-			(*a)[aoffset + 0] = t1x + t2x;
-			(*a)[aoffset + 1] = t1y + t2y;
-			(*a)[aoffset + 4] = t1x - t2x;
-			(*a)[aoffset + 5] = t1y - t2y;
-			(*a)[aoffset + 2] = m2x + m3x;
-			(*a)[aoffset + 3] = m2y + m3y;
-			(*a)[aoffset + 6] = m2x - m3x;
-			(*a)[aoffset + 7] = m2y - m3y;
-			return;
-		}
-		if (n == 5) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			c3 = curplan.precomputed[offs + 2];
-			c4 = curplan.precomputed[offs + 3];
-			c5 = curplan.precomputed[offs + 4];
-			t1x = (*a)[aoffset + 2] + (*a)[aoffset + 8];
-			t1y = (*a)[aoffset + 3] + (*a)[aoffset + 9];
-			t2x = (*a)[aoffset + 4] + (*a)[aoffset + 6];
-			t2y = (*a)[aoffset + 5] + (*a)[aoffset + 7];
-			t3x = (*a)[aoffset + 2] - (*a)[aoffset + 8];
-			t3y = (*a)[aoffset + 3] - (*a)[aoffset + 9];
-			t4x = (*a)[aoffset + 6] - (*a)[aoffset + 4];
-			t4y = (*a)[aoffset + 7] - (*a)[aoffset + 5];
-			t5x = t1x + t2x;
-			t5y = t1y + t2y;
-			(*a)[aoffset + 0] = (*a)[aoffset + 0] + t5x;
-			(*a)[aoffset + 1] = (*a)[aoffset + 1] + t5y;
-			m1x = c1 * t5x;
-			m1y = c1 * t5y;
-			m2x = c2 * (t1x - t2x);
-			m2y = c2 * (t1y - t2y);
-			m3x = -c3 * (t3y + t4y);
-			m3y = c3 * (t3x + t4x);
-			m4x = -c4 * t4y;
-			m4y = c4 * t4x;
-			m5x = -c5 * t3y;
-			m5y = c5 * t3x;
-			s3x = m3x - m4x;
-			s3y = m3y - m4y;
-			s5x = m3x + m5x;
-			s5y = m3y + m5y;
-			s1x = (*a)[aoffset + 0] + m1x;
-			s1y = (*a)[aoffset + 1] + m1y;
-			s2x = s1x + m2x;
-			s2y = s1y + m2y;
-			s4x = s1x - m2x;
-			s4y = s1y - m2y;
-			(*a)[aoffset + 2] = s2x + s3x;
-			(*a)[aoffset + 3] = s2y + s3y;
-			(*a)[aoffset + 4] = s4x + s5x;
-			(*a)[aoffset + 5] = s4y + s5y;
-			(*a)[aoffset + 6] = s4x - s5x;
-			(*a)[aoffset + 7] = s4y - s5y;
-			(*a)[aoffset + 8] = s2x - s3x;
-			(*a)[aoffset + 9] = s2y - s3y;
-			return;
-		}
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		if (n == 2) {
-			a0x = (*a)[aoffset + 0];
-			a1x = (*a)[aoffset + 1];
-			(*a)[aoffset + 0] = a0x + a1x;
-			(*a)[aoffset + 1] = a0x - a1x;
-			return;
-		}
-		if (n == 3) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			a0x = (*a)[aoffset + 0];
-			a1x = (*a)[aoffset + 1];
-			a2x = (*a)[aoffset + 2];
-			t1x = a1x + a2x;
-			a0x = a0x + t1x;
-			m1x = c1 * t1x;
-			m2y = c2 * (a2x - a1x);
-			s1x = a0x + m1x;
-			(*a)[aoffset + 0] = a0x;
-			(*a)[aoffset + 1] = s1x - m2y;
-			(*a)[aoffset + 2] = s1x + m2y;
-			return;
-		}
-		if (n == 4) {
-			a0x = (*a)[aoffset + 0];
-			a1x = (*a)[aoffset + 1];
-			a2x = (*a)[aoffset + 2];
-			a3x = (*a)[aoffset + 3];
-			t1x = a0x + a2x;
-			t2x = a1x + a3x;
-			m2x = a0x - a2x;
-			m3y = a3x - a1x;
-			(*a)[aoffset + 0] = t1x + t2x;
-			(*a)[aoffset + 1] = m2x - m3y;
-			(*a)[aoffset + 2] = t1x - t2x;
-			(*a)[aoffset + 3] = m2x + m3y;
-			return;
-		}
-		if (n == 5) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			c3 = curplan.precomputed[offs + 2];
-			c4 = curplan.precomputed[offs + 3];
-			c5 = curplan.precomputed[offs + 4];
-			t1x = (*a)[aoffset + 1] + (*a)[aoffset + 4];
-			t2x = (*a)[aoffset + 2] + (*a)[aoffset + 3];
-			t3x = (*a)[aoffset + 1] - (*a)[aoffset + 4];
-			t4x = (*a)[aoffset + 3] - (*a)[aoffset + 2];
-			t5x = t1x + t2x;
-			v0 = (*a)[aoffset + 0] + t5x;
-			(*a)[aoffset + 0] = v0;
-			m2x = c2 * (t1x - t2x);
-			m3y = c3 * (t3x + t4x);
-			s3y = m3y - c4 * t4x;
-			s5y = m3y + c5 * t3x;
-			s1x = v0 + c1 * t5x;
-			s2x = s1x + m2x;
-			s4x = s1x - m2x;
-			(*a)[aoffset + 1] = s2x - s3y;
-			(*a)[aoffset + 2] = s4x - s5y;
-			(*a)[aoffset + 3] = s4x + s5y;
-			(*a)[aoffset + 4] = s2x + s3y;
-			return;
-		}
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
-		n = curplan.plan[entryoffset + 1];
-		m = curplan.plan[entryoffset + 4];
-		offs = curplan.plan[entryoffset + 7];
-		for (int i = stackptr + 2 * n; i <= stackptr + 2 * m - 1; i++)
-			curplan.stackbuf[i] = 0;
-		offsp = offs + 2 * m;
-		offsa = aoffset;
-		offsb = stackptr;
-		for (int i = 0; i < n; i++) {
-			bx = curplan.precomputed[offsp + 0];
-			by = curplan.precomputed[offsp + 1];
-			x = (*a)[offsa + 0];
-			y = (*a)[offsa + 1];
-			curplan.stackbuf[offsb + 0] = x * bx - y * (-by);
-			curplan.stackbuf[offsb + 1] = x * (-by) + y * bx;
-			offsp = offsp + 2;
-			offsa = offsa + 2;
-			offsb = offsb + 2;
-		}
-		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
-		offsb = stackptr;
-		offsp = offs;
-		for (int i = 0; i <= m - 1; i++) {
-			x = curplan.stackbuf[offsb + 0];
-			y = curplan.stackbuf[offsb + 1];
-			bx = curplan.precomputed[offsp + 0];
-			by = curplan.precomputed[offsp + 1];
-			curplan.stackbuf[offsb + 0] = x * bx - y * by;
-			curplan.stackbuf[offsb + 1] = -(x * by + y * bx);
-			offsb = offsb + 2;
-			offsp = offsp + 2;
-		}
-		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
-		offsb = stackptr;
-		offsp = offs + 2 * m;
-		offsa = aoffset;
-		for (int i = 0; i < n; i++) {
-			x = curplan.stackbuf[offsb + 0] / m;
-			y = -curplan.stackbuf[offsb + 1] / m;
-			bx = curplan.precomputed[offsp + 0];
-			by = curplan.precomputed[offsp + 1];
-			(*a)[offsa + 0] = x * bx - y * (-by);
-			(*a)[offsa + 1] = x * (-by) + y * bx;
-			offsp = offsp + 2;
-			offsa = offsa + 2;
-			offsb = offsb + 2;
-		}
-		return;
-	}
-}
-
-
-/*************************************************************************
-Twiddle factors calculation
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_double::ftbase_ffttwcalc(PIVector<double> * a, int aoffset, int n1, int n2) {
-	int n, idx, offs;
-	double x, y, twxm1, twy, twbasexm1, twbasey, twrowxm1, twrowy, tmpx, tmpy, v;
-	int ftbase_ftbaseupdatetw = 4;
-	n = n1 * n2;
-	v = -2 * M_PI / n;
-	twbasexm1 = -2 * sqr(sin(0.5 * v));
-	twbasey = sin(v);
-	twrowxm1 = 0;
-	twrowy = 0;
-	for (int i = 0, j = 0; i <= n2 - 1; i++) {
-		twxm1 = 0;
-		twy = 0;
-		for (j = 0; j <= n1 - 1; j++) {
-			idx = i * n1 + j;
-			offs = aoffset + 2 * idx;
-			x = (*a)[offs + 0];
-			y = (*a)[offs + 1];
-			tmpx = x * twxm1 - y * twy;
-			tmpy = x * twy + y * twxm1;
-			(*a)[offs + 0] = x + tmpx;
-			(*a)[offs + 1] = y + tmpy;
-			if (j < n1 - 1) {
-				if (j % ftbase_ftbaseupdatetw == 0) {
-					v = -2 * M_PI * i * (j + 1) / n;
-					twxm1 = -2 * sqr(sin(0.5 * v));
-					twy = sin(v);
-				} else {
-					tmpx = twrowxm1 + twxm1 * twrowxm1 - twy * twrowy;
-					tmpy = twrowy + twxm1 * twrowy + twy * twrowxm1;
-					twxm1 = twxm1 + tmpx;
-					twy = twy + tmpy;
-				}
-			}
-		}
-
-		if (i < n2 - 1) {
-			if (j % ftbase_ftbaseupdatetw == 0) {
-				v = -2 * M_PI * (i + 1) / n;
-				twrowxm1 = -2 * sqr(sin(0.5 * v));
-				twrowy = sin(v);
-			} else {
-				tmpx = twbasexm1 + twrowxm1 * twbasexm1 - twrowy * twbasey;
-				tmpy = twbasey + twrowxm1 * twbasey + twrowy * twbasexm1;
-				twrowxm1 = twrowxm1 + tmpx;
-				twrowy = twrowy + tmpy;
-			}
-		}
-	}
-}
-
-
-//=================================================================================================
-//*************************************************************************************************
-//---------------------FLOAT-----------------------FLOAT-------------------------------------------
-//*************************************************************************************************
-//=================================================================================================
-
-
-PIFFT_float::PIFFT_float() {
-}
-
-
-PIVector<complexf> * PIFFT_float::calcFFT(const PIVector<complexf> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1d(val, val.size());
-	return &result;
-}
-
-
-PIVector<complexf> * PIFFT_float::calcFFTinverse(const PIVector<complexf> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1dinv(val, val.size());
-	return &result;
-}
-
-
-PIVector<complexf> * PIFFT_float::calcHilbert(const PIVector<float> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1r(val, val.size());
-	for (uint i = 0; i < result.size() / 2; i++)             result[i] = result[i] * 2.f;
-	for (uint i = result.size() / 2; i < result.size(); i++) result[i] = 0;
-	fftc1dinv(result, result.size());
-	return &result;
-}
-
-
-PIVector<complexf> * PIFFT_float::calcFFT(const PIVector<float> & val) {
-	result.clear();
-	if (val.size_s() < 4) return &result;
-	fftc1r(val, val.size());
-	return &result;
-}
-
-
-PIVector<float> PIFFT_float::getAmplitude() const {
-	PIVector<float> ret;
-	ret.resize(result.size());
-	float tmp;
-	for (uint i = 0; i < result.size(); i++) {
-		tmp = sqrt(result[i].real() * result[i].real() + result[i].imag() * result[i].imag());
-		ret[i] = tmp;
-	}
-	return ret;
-}
-
-
-PIVector<float> PIFFT_float::getReal() const {
-	PIVector<float> ret;
-	ret.resize(result.size());
-	for (uint i = 0; i < result.size(); i++)
-		ret[i] = result[i].real();
-	return ret;
-}
-
-
-PIVector<float> PIFFT_float::getImag() const {
-	PIVector<float> ret;
-	ret.resize(result.size());
-	for (uint i = 0; i < result.size(); i++)
-		ret[i] = result[i].imag();
-	return ret;
-}
-
-
-void PIFFT_float::fftc1d(const PIVector<complexf> & a, uint n) {
-	createPlan(n);
-	uint i;
-	PIVector<float> buf;
-	buf.resize(2 * n);
-	for (i = 0; i < n; i++) {
-		buf[2 * i + 0] = a[i].real();
-		buf[2 * i + 1] = a[i].imag();
-	}
-	ftbaseexecuteplan(&buf, 0, n, &curplan);
-	result.resize(n);
-	for (i = 0; i < n; i++)
-		result[i] = complexf(buf[2 * i + 0], buf[2 * i + 1]);
-}
-
-
-void PIFFT_float::fftc1r(const PIVector<float> & a, uint n) {
-	uint i;
-	if (n % 2 == 0) {
-		PIVector<float> buf;
-		uint n2 = n / 2;
-		buf = a;
-		createPlan(n2);
-		ftbaseexecuteplan(&buf, 0, n2, &curplan);
-		result.resize(n);
-		uint idx;
-		complexf hn, hmnc, v;
-		for (i = 0; i <= n2; i++) {
-			idx = 2 * (i % n2);
-			hn = complexf(buf[idx + 0], buf[idx + 1]);
-			idx = 2 * ((n2 - i) % n2);
-			hmnc = complexf(buf[idx + 0], -buf[idx + 1]);
-			v = complexf(sin(M_PI * i / n2), cos(M_PI * i / n2));
-			result[i] = ((hn + hmnc) - (v * (hn - hmnc)));
-			result[i] *= 0.5;
-		}
-		for (i = n2 + 1; i < n; i++)
-			result[i] = conj(result[n - i]);
-	} else {
-		PIVector<complexf> cbuf;
-		cbuf.resize(n);
-		for (i = 0; i < n; i++)
-			cbuf[i] = complexf(a[i], 0.);
-		fftc1d(cbuf, n);
-	}
-}
-
-
-void PIFFT_float::fftc1dinv(const PIVector<complexf> & a, uint n) {
-	PIVector<complexf> cbuf;
-	cbuf.resize(n);
-	uint i;
-	for (i = 0; i < n; i++) {
-		cbuf[i] = conj(a[i]);
-	}
-	fftc1d(cbuf, n);
-	for (i = 0; i < n; i++) {
-		result[i] = conj(result[i] / (float)n);
-	}
-}
-
-
-void PIFFT_float::createPlan(uint n) {
-	curplan.plan.clear();
-	curplan.precomputed.clear();
-	curplan.stackbuf.clear();
-	curplan.tmpbuf.clear();
-	if (n < 2) return;
-	ftbasegeneratecomplexfftplan(n, &curplan);
-}
-
-
-void PIFFT_float::ftbasegeneratecomplexfftplan(uint n, ftplan * plan) {
-	int planarraysize;
-	int plansize;
-	int precomputedsize;
-	int tmpmemsize;
-	int stackmemsize;
-	ae_int_t stackptr;
-	planarraysize = 1;
-	plansize = 0;
-	precomputedsize = 0;
-	stackmemsize = 0;
-	stackptr = 0;
-	tmpmemsize = 2 * n;
-	curplan.plan.resize(planarraysize);
-	int ftbase_ftbasecffttask = 0;
-	ftbase_ftbasegenerateplanrec(n, ftbase_ftbasecffttask, plan, &plansize, &precomputedsize, &planarraysize, &tmpmemsize, &stackmemsize, stackptr);
-	if (stackptr != 0) {
-		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
-	}
-	curplan.stackbuf.resize(piMax<int>(stackmemsize, 1)); //ae_vector_set_length(&curplan.stackbuf, ae_maxint(stackmemsize, 1));
-	curplan.tmpbuf.resize(piMax<int>(tmpmemsize, 1)); //ae_vector_set_length(&(curplan.tmpbuf), ae_maxint(tmpmemsize, 1));
-	curplan.precomputed.resize(piMax<int>(precomputedsize, 1)); //ae_vector_set_length(&curplan.precomputed, ae_maxint(precomputedsize, 1));
-	stackptr = 0;
-	ftbase_ftbaseprecomputeplanrec(plan, 0, stackptr);
-	if (stackptr != 0) {
-		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
-	}
-}
-
-
-/*************************************************************************
-Recurrent subroutine for the FFTGeneratePlan:
-
-PARAMETERS:
-	N                   plan size
-	IsReal              whether input is real or not.
-						subroutine MUST NOT ignore this flag because real
-						inputs comes with non-initialized imaginary parts,
-						so ignoring this flag will result in corrupted output
-	HalfOut             whether full output or only half of it from 0 to
-						floor(N/2) is needed. This flag may be ignored if
-						doing so will simplify calculations
-	Plan                plan array
-	PlanSize            size of used part (in integers)
-	PrecomputedSize     size of precomputed array allocated yet
-	PlanArraySize       plan array size (actual)
-	TmpMemSize          temporary memory required size
-	BluesteinMemSize    temporary memory required size
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_float::ftbase_ftbasegenerateplanrec(
-int n,
-int tasktype,
-ftplan * plan,
-int * plansize,
-int * precomputedsize,
-int * planarraysize,
-int * tmpmemsize,
-int * stackmemsize,
-ae_int_t stackptr, int debugi) {
-	int k, m, n1, n2, esize, entryoffset;
-	int ftbase_ftbaseplanentrysize = 4;
-	int ftbase_ftbasecffttask = 0;
-	int ftbase_fftcooleytukeyplan = 0;
-	int ftbase_fftbluesteinplan = 1;
-	int ftbase_fftcodeletplan = 2;
-	int ftbase_fftrealcooleytukeyplan = 5;
-	int ftbase_fftemptyplan = 6;
-	if (*plansize + ftbase_ftbaseplanentrysize > (*planarraysize)) {
-		curplan.plan.resize(4 * (*planarraysize));
-		*planarraysize = 4 * (*planarraysize);
-	}
-	entryoffset = *plansize;
-	esize = ftbase_ftbaseplanentrysize;
-	*plansize = *plansize + esize;
-	if (n == 1) {
-		curplan.plan[entryoffset + 0] = esize;
-		curplan.plan[entryoffset + 1] = -1;
-		curplan.plan[entryoffset + 2] = -1;
-		curplan.plan[entryoffset + 3] = ftbase_fftemptyplan;
-		curplan.plan[entryoffset + 4] = -1;
-		curplan.plan[entryoffset + 5] = -1;
-		curplan.plan[entryoffset + 6] = -1;
-		curplan.plan[entryoffset + 7] = -1;
-		return;
-	}
-	ftbasefactorize(n, &n1, &n2);
-	if (n1 != 1) {
-		*tmpmemsize = piMax<int>(*tmpmemsize, 2 * n1 * n2);
-		curplan.plan[entryoffset + 0] = esize;
-		curplan.plan[entryoffset + 1] = n1;
-		curplan.plan[entryoffset + 2] = n2;
-		if (tasktype == ftbase_ftbasecffttask)
-			curplan.plan[entryoffset + 3] = ftbase_fftcooleytukeyplan;
-		else
-			curplan.plan[entryoffset + 3] = ftbase_fftrealcooleytukeyplan;
-		curplan.plan[entryoffset + 4] = 0;
-		curplan.plan[entryoffset + 5] = *plansize;
-		debugi++;
-		ftbase_ftbasegenerateplanrec(n1, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
-		curplan.plan[entryoffset + 6] = *plansize;
-		ftbase_ftbasegenerateplanrec(n2, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
-		curplan.plan[entryoffset + 7] = -1;
-		return;
-	} else {
-		if (n >= 2 && n <= 5) {
-			curplan.plan[entryoffset + 0] = esize;
-			curplan.plan[entryoffset + 1] = n1;
-			curplan.plan[entryoffset + 2] = n2;
-			curplan.plan[entryoffset + 3] = ftbase_fftcodeletplan;
-			curplan.plan[entryoffset + 4] = 0;
-			curplan.plan[entryoffset + 5] = -1;
-			curplan.plan[entryoffset + 6] = -1;
-			curplan.plan[entryoffset + 7] = *precomputedsize;
-			if (n == 3)
-				*precomputedsize = *precomputedsize + 2;
-			if (n == 5)
-				*precomputedsize = *precomputedsize + 5;
-			return;
-		} else {
-			k = 2 * n2 - 1;
-			m = ftbasefindsmooth(k);
-			*tmpmemsize = piMax<int>(*tmpmemsize, 2 * m);
-			curplan.plan[entryoffset + 0] = esize;
-			curplan.plan[entryoffset + 1] = n2;
-			curplan.plan[entryoffset + 2] = -1;
-			curplan.plan[entryoffset + 3] = ftbase_fftbluesteinplan;
-			curplan.plan[entryoffset + 4] = m;
-			curplan.plan[entryoffset + 5] = *plansize;
-			stackptr = stackptr + 2 * 2 * m;
-			*stackmemsize = piMax<int>(*stackmemsize, stackptr);
-			ftbase_ftbasegenerateplanrec(m, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr);
-			stackptr = stackptr - 2 * 2 * m;
-			curplan.plan[entryoffset + 6] = -1;
-			curplan.plan[entryoffset + 7] = *precomputedsize;
-			*precomputedsize = *precomputedsize + 2 * m + 2 * n;
-			return;
-		}
-	}
-}
-
-
-/*************************************************************************
-Recurrent subroutine for precomputing FFT plans
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_float::ftbase_ftbaseprecomputeplanrec(ftplan * plan,
-int entryoffset,
-ae_int_t stackptr) {
-	int n1, n2, n, m, offs;
-	float v, bx, by;
-	int ftbase_fftcooleytukeyplan = 0;
-	int ftbase_fftbluesteinplan = 1;
-	int ftbase_fftcodeletplan = 2;
-	int ftbase_fhtcooleytukeyplan = 3;
-	int ftbase_fhtcodeletplan = 4;
-	int ftbase_fftrealcooleytukeyplan = 5;
-	if ((curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan || curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) || curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
-		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
-		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 6], stackptr);
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan || curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		if (n == 3) {
-			offs = curplan.plan[entryoffset + 7];
-			curplan.precomputed[offs + 0] = cos(2 * M_PI / 3) - 1;
-			curplan.precomputed[offs + 1] = sin(2 * M_PI / 3);
-			return;
-		}
-		if (n == 5) {
-			offs = curplan.plan[entryoffset + 7];
-			v = 2 * M_PI / 5;
-			curplan.precomputed[offs + 0] = (cos(v) + cos(2 * v)) / 2 - 1;
-			curplan.precomputed[offs + 1] = (cos(v) - cos(2 * v)) / 2;
-			curplan.precomputed[offs + 2] = -sin(v);
-			curplan.precomputed[offs + 3] = -(sin(v) + sin(2 * v));
-			curplan.precomputed[offs + 4] = sin(v) - sin(2 * v);
-			return;
-		}
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
-		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
-		n = curplan.plan[entryoffset + 1];
-		m = curplan.plan[entryoffset + 4];
-		offs = curplan.plan[entryoffset + 7];
-		for (int i = 0; i <= 2 * m - 1; i++)
-			curplan.precomputed[offs + i] = 0;
-		for (int i = 0; i < n; i++) {
-			bx = cos(M_PI * sqr(i) / n);
-			by = sin(M_PI * sqr(i) / n);
-			curplan.precomputed[offs + 2 * i + 0] = bx;
-			curplan.precomputed[offs + 2 * i + 1] = by;
-			curplan.precomputed[offs + 2 * m + 2 * i + 0] = bx;
-			curplan.precomputed[offs + 2 * m + 2 * i + 1] = by;
-			if (i > 0) {
-				curplan.precomputed[offs + 2 * (m - i) + 0] = bx;
-				curplan.precomputed[offs + 2 * (m - i) + 1] = by;
-			}
-		}
-		ftbaseexecuteplanrec(&curplan.precomputed, offs, plan, curplan.plan[entryoffset + 5], stackptr);
-		return;
-	}
-}
-
-
-void PIFFT_float::ftbasefactorize(int n, int * n1, int * n2) {
-	*n1 = *n2 = 0;
-	int ftbase_ftbasecodeletrecommended = 5;
-	if ((*n1) * (*n2) != n) {
-		for (int j = ftbase_ftbasecodeletrecommended; j >= 2; j--) {
-			if (n % j == 0) {
-				*n1 = j;
-				*n2 = n / j;
-				break;
-			}
-		}
-	}
-	if ((*n1) * (*n2) != n) {
-		for (int j = ftbase_ftbasecodeletrecommended + 1; j <= n - 1; j++) {
-			if (n % j == 0) {
-				*n1 = j;
-				*n2 = n / j;
-				break;
-			}
-		}
-	}
-	if ((*n1) * (*n2) != n) {
-		*n1 = 1;
-		*n2 = n;
-	}
-	if ((*n2) == 1 && (*n1) != 1) {
-		*n2 = *n1;
-		*n1 = 1;
-	}
-}
-
-
-/*************************************************************************
-Is number smooth?
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_float::ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int * best) {
-	if (seed >= n) {
-		*best = piMini(*best, seed);
-		return;
-	}
-	if (leastfactor <= 2)
-		ftbase_ftbasefindsmoothrec(n, seed * 2, 2, best);
-	if (leastfactor <= 3)
-		ftbase_ftbasefindsmoothrec(n, seed * 3, 3, best);
-	if (leastfactor <= 5)
-		ftbase_ftbasefindsmoothrec(n, seed * 5, 5, best);
-}
-
-
-int PIFFT_float::ftbasefindsmooth(int n) {
-	int best, result;
-	best = 2;
-	while (best < n)
-		best = 2 * best;
-	ftbase_ftbasefindsmoothrec(n, 1, 2, &best);
-	result = best;
-	return result;
-}
-
-
-void PIFFT_float::ftbase_internalreallintranspose(PIVector<float> * a, int m, int n, int astart, PIVector<float> * buf) {
-	ftbase_fftirltrec(a, astart, n, buf, 0, m, m, n);
-	for (int i = 0; i < 2 * m * n; i++) (*a)[astart + i] = (*buf)[i];
-}
-
-
-void PIFFT_float::ftbase_fftirltrec(PIVector<float> * a, int astart, int astride, PIVector<float> * b, int bstart, int bstride, int m, int n) {
-	int idx1, idx2;
-	int m1, n1;
-	if (m == 0 || n == 0)
-		return;
-	if (piMaxi(m, n) <= 8) {
-		for (int i = 0; i <= m - 1; i++) {
-			idx1 = bstart + i;
-			idx2 = astart + i * astride;
-			for (int j = 0; j <= n - 1; j++) {
-				(*b)[idx1] = a->at(idx2);
-				idx1 = idx1 + bstride;
-				idx2 = idx2 + 1;
-			}
-		}
-		return;
-	}
-	if (n > m) {
-		n1 = n / 2;
-		if (n - n1 >= 8 && n1 % 8 != 0)
-			n1 = n1 + (8 - n1 % 8);
-		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m, n1);
-		ftbase_fftirltrec(a, astart + n1, astride, b, bstart + n1 * bstride, bstride, m, n - n1);
-	} else {
-		m1 = m / 2;
-		if (m - m1 >= 8 && m1 % 8 != 0)
-			m1 = m1 + (8 - m1 % 8);
-		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m1, n);
-		ftbase_fftirltrec(a, astart + m1 * astride, astride, b, bstart + m1, bstride, m - m1, n);
-	}
-}
-
-
-void PIFFT_float::ftbase_internalcomplexlintranspose(PIVector<float> * a, int m, int n, int astart, PIVector<float> * buf) {
-	ftbase_ffticltrec(a, astart, n, buf, 0, m, m, n);
-	for (int i = 0; i < 2 * m * n; i++)
-		(*a)[astart + i] = (*buf)[i];
-}
-
-
-void PIFFT_float::ftbase_ffticltrec(PIVector<float> * a, int astart, int astride, PIVector<float> * b, int bstart, int bstride, int m, int n) {
-	int idx1, idx2, m2, m1, n1;
-	if (m == 0 || n == 0)
-		return;
-	if (piMax<int>(m, n) <= 8) {
-		m2 = 2 * bstride;
-		for (int i = 0; i <= m - 1; i++) {
-			idx1 = bstart + 2 * i;
-			idx2 = astart + 2 * i * astride;
-			for (int j = 0; j <= n - 1; j++) {
-				(*b)[idx1 + 0] = a->at(idx2 + 0);
-				(*b)[idx1 + 1] = a->at(idx2 + 1);
-				idx1 = idx1 + m2;
-				idx2 = idx2 + 2;
-			}
-		}
-		return;
-	}
-	if (n > m) {
-		n1 = n / 2;
-		if (n - n1 >= 8 && n1 % 8 != 0)
-			n1 = n1 + (8 - n1 % 8);
-		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m, n1);
-		ftbase_ffticltrec(a, astart + 2 * n1, astride, b, bstart + 2 * n1 * bstride, bstride, m, n - n1);
-	} else {
-		m1 = m / 2;
-		if (m - m1 >= 8 && m1 % 8 != 0)
-			m1 = m1 + (8 - m1 % 8);
-		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m1, n);
-		ftbase_ffticltrec(a, astart + 2 * m1 * astride, astride, b, bstart + 2 * m1, bstride, m - m1, n);
-	}
-}
-
-
-void PIFFT_float::ftbaseexecuteplan(PIVector<float> * a, int aoffset, int n, ftplan * plan) {
-	ae_int_t stackptr;
-	stackptr = 0;
-	ftbaseexecuteplanrec(a, aoffset, plan, 0, stackptr);
-}
-
-
-/*************************************************************************
-Recurrent subroutine for the FTBaseExecutePlan
-
-Parameters:
-	A           FFT'ed array
-	AOffset     offset of the FFT'ed part (distance is measured in floats)
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_float::ftbaseexecuteplanrec(PIVector<float> * a, int aoffset, ftplan * plan, int entryoffset, ae_int_t stackptr) {
-	int n1, n2, n, m, offs, offs1, offs2, offsa, offsb, offsp;
-	float hk, hnk, x, y, bx, by, v0, v1, v2, v3;
-	float a0x, a0y, a1x, a1y, a2x, a2y, a3x, a3y;
-	float t1x, t1y, t2x, t2y, t3x, t3y, t4x, t4y, t5x, t5y;
-	float m1x, m1y, m2x, m2y, m3x, m3y, m4x, m4y, m5x, m5y;
-	float s1x, s1y, s2x, s2y, s3x, s3y, s4x, s4y, s5x, s5y;
-	float c1, c2, c3, c4, c5;
-	int ftbase_fftcooleytukeyplan = 0;
-	int ftbase_fftbluesteinplan = 1;
-	int ftbase_fftcodeletplan = 2;
-	int ftbase_fhtcooleytukeyplan = 3;
-	int ftbase_fhtcodeletplan = 4;
-	int ftbase_fftrealcooleytukeyplan = 5;
-	int ftbase_fftemptyplan = 6;
-	PIVector<float> & tmpb(curplan.tmpbuf);
-
-	if (curplan.plan[entryoffset + 3] == ftbase_fftemptyplan)
-		return;
-	if (curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n2 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
-		ftbase_ffttwcalc(a, aoffset, n1, n2);
-		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n1 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
-		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n1 / 2 - 1; i++) {
-			offs = aoffset + 2 * i * n2 * 2;
-			for (int k = 0; k <= n2 - 1; k++)
-				(*a)[offs + 2 * k + 1] = (*a)[offs + 2 * n2 + 2 * k + 0];
-			ftbaseexecuteplanrec(a, offs, plan, curplan.plan[entryoffset + 6], stackptr);
-			tmpb[0] = (*a)[offs + 0];
-			tmpb[1] = 0;
-			tmpb[2 * n2 + 0] = (*a)[offs + 1];
-			tmpb[2 * n2 + 1] = 0;
-			for (int k = 1; k <= n2 - 1; k++) {
-				offs1 = 2 * k;
-				offs2 = 2 * n2 + 2 * k;
-				hk = (*a)[offs + 2 * k + 0];
-				hnk = (*a)[offs + 2 * (n2 - k) + 0];
-				tmpb[offs1 + 0] = 0.5 * (hk + hnk);
-				tmpb[offs2 + 1] = -0.5 * (hk - hnk);
-				hk = (*a)[offs + 2 * k + 1];
-				hnk = (*a)[offs + 2 * (n2 - k) + 1];
-				tmpb[offs2 + 0] = 0.5 * (hk + hnk);
-				tmpb[offs1 + 1] = 0.5 * (hk - hnk);
-			}
-			for (int k = 0; k < 2 * n2 * 2; k++) (*a)[offs + k] = tmpb[k];
-		}
-		if (n1 % 2 != 0)
-			ftbaseexecuteplanrec(a, aoffset + (n1 - 1)*n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
-		ftbase_ffttwcalc(a, aoffset, n2, n1);
-		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n2 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
-		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n2 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n1, plan, curplan.plan[entryoffset + 5], stackptr);
-		for (int i = 0; i <= n2 - 1; i++) {
-			for (int j = 0; j <= n1 - 1; j++) {
-				offsa = aoffset + i * n1;
-				hk = (*a)[offsa + j];
-				hnk = (*a)[offsa + (n1 - j) % n1];
-				offs = 2 * (i * n1 + j);
-				tmpb[offs + 0] = -0.5 * (hnk - hk);
-				tmpb[offs + 1] = 0.5 * (hk + hnk);
-			}
-		}
-		ftbase_ffttwcalc(&(curplan.tmpbuf), 0, n1, n2);
-		for (int j = 0; j <= n1 - 1; j++)
-			(*a)[aoffset + j] = tmpb[2 * j + 0] + tmpb[2 * j + 1];
-		if (n2 % 2 == 0) {
-			offs = 2 * (n2 / 2) * n1;
-			offsa = aoffset + n2 / 2 * n1;
-			for (int j = 0; j <= n1 - 1; j++)
-				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs + 2 * j + 1];
-		}
-		for (int i = 1; i <= (n2 + 1) / 2 - 1; i++) {
-			offs = 2 * i * n1;
-			offs2 = 2 * (n2 - i) * n1;
-			offsa = aoffset + i * n1;
-			for (int j = 0; j <= n1 - 1; j++)
-				(*a)[offsa + j] = tmpb[offs + 2 * j + 1] + tmpb[offs2 + 2 * j + 0];
-			offsa = aoffset + (n2 - i) * n1;
-			for (int j = 0; j <= n1 - 1; j++)
-				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs2 + 2 * j + 1];
-		}
-		ftbase_internalreallintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
-		for (int i = 0; i <= n1 - 1; i++)
-			ftbaseexecuteplanrec(a, aoffset + i * n2, plan, curplan.plan[entryoffset + 6], stackptr);
-		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
-		return;
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		if (n == 2) {
-			a0x = (*a)[aoffset + 0];
-			a0y = (*a)[aoffset + 1];
-			a1x = (*a)[aoffset + 2];
-			a1y = (*a)[aoffset + 3];
-			v0 = a0x + a1x;
-			v1 = a0y + a1y;
-			v2 = a0x - a1x;
-			v3 = a0y - a1y;
-			(*a)[aoffset + 0] = v0;
-			(*a)[aoffset + 1] = v1;
-			(*a)[aoffset + 2] = v2;
-			(*a)[aoffset + 3] = v3;
-			return;
-		}
-		if (n == 3) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			a0x = (*a)[aoffset + 0];
-			a0y = (*a)[aoffset + 1];
-			a1x = (*a)[aoffset + 2];
-			a1y = (*a)[aoffset + 3];
-			a2x = (*a)[aoffset + 4];
-			a2y = (*a)[aoffset + 5];
-			t1x = a1x + a2x;
-			t1y = a1y + a2y;
-			a0x = a0x + t1x;
-			a0y = a0y + t1y;
-			m1x = c1 * t1x;
-			m1y = c1 * t1y;
-			m2x = c2 * (a1y - a2y);
-			m2y = c2 * (a2x - a1x);
-			s1x = a0x + m1x;
-			s1y = a0y + m1y;
-			a1x = s1x + m2x;
-			a1y = s1y + m2y;
-			a2x = s1x - m2x;
-			a2y = s1y - m2y;
-			(*a)[aoffset + 0] = a0x;
-			(*a)[aoffset + 1] = a0y;
-			(*a)[aoffset + 2] = a1x;
-			(*a)[aoffset + 3] = a1y;
-			(*a)[aoffset + 4] = a2x;
-			(*a)[aoffset + 5] = a2y;
-			return;
-		}
-		if (n == 4) {
-			a0x = (*a)[aoffset + 0];
-			a0y = (*a)[aoffset + 1];
-			a1x = (*a)[aoffset + 2];
-			a1y = (*a)[aoffset + 3];
-			a2x = (*a)[aoffset + 4];
-			a2y = (*a)[aoffset + 5];
-			a3x = (*a)[aoffset + 6];
-			a3y = (*a)[aoffset + 7];
-			t1x = a0x + a2x;
-			t1y = a0y + a2y;
-			t2x = a1x + a3x;
-			t2y = a1y + a3y;
-			m2x = a0x - a2x;
-			m2y = a0y - a2y;
-			m3x = a1y - a3y;
-			m3y = a3x - a1x;
-			(*a)[aoffset + 0] = t1x + t2x;
-			(*a)[aoffset + 1] = t1y + t2y;
-			(*a)[aoffset + 4] = t1x - t2x;
-			(*a)[aoffset + 5] = t1y - t2y;
-			(*a)[aoffset + 2] = m2x + m3x;
-			(*a)[aoffset + 3] = m2y + m3y;
-			(*a)[aoffset + 6] = m2x - m3x;
-			(*a)[aoffset + 7] = m2y - m3y;
-			return;
-		}
-		if (n == 5) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			c3 = curplan.precomputed[offs + 2];
-			c4 = curplan.precomputed[offs + 3];
-			c5 = curplan.precomputed[offs + 4];
-			t1x = (*a)[aoffset + 2] + (*a)[aoffset + 8];
-			t1y = (*a)[aoffset + 3] + (*a)[aoffset + 9];
-			t2x = (*a)[aoffset + 4] + (*a)[aoffset + 6];
-			t2y = (*a)[aoffset + 5] + (*a)[aoffset + 7];
-			t3x = (*a)[aoffset + 2] - (*a)[aoffset + 8];
-			t3y = (*a)[aoffset + 3] - (*a)[aoffset + 9];
-			t4x = (*a)[aoffset + 6] - (*a)[aoffset + 4];
-			t4y = (*a)[aoffset + 7] - (*a)[aoffset + 5];
-			t5x = t1x + t2x;
-			t5y = t1y + t2y;
-			(*a)[aoffset + 0] = (*a)[aoffset + 0] + t5x;
-			(*a)[aoffset + 1] = (*a)[aoffset + 1] + t5y;
-			m1x = c1 * t5x;
-			m1y = c1 * t5y;
-			m2x = c2 * (t1x - t2x);
-			m2y = c2 * (t1y - t2y);
-			m3x = -c3 * (t3y + t4y);
-			m3y = c3 * (t3x + t4x);
-			m4x = -c4 * t4y;
-			m4y = c4 * t4x;
-			m5x = -c5 * t3y;
-			m5y = c5 * t3x;
-			s3x = m3x - m4x;
-			s3y = m3y - m4y;
-			s5x = m3x + m5x;
-			s5y = m3y + m5y;
-			s1x = (*a)[aoffset + 0] + m1x;
-			s1y = (*a)[aoffset + 1] + m1y;
-			s2x = s1x + m2x;
-			s2y = s1y + m2y;
-			s4x = s1x - m2x;
-			s4y = s1y - m2y;
-			(*a)[aoffset + 2] = s2x + s3x;
-			(*a)[aoffset + 3] = s2y + s3y;
-			(*a)[aoffset + 4] = s4x + s5x;
-			(*a)[aoffset + 5] = s4y + s5y;
-			(*a)[aoffset + 6] = s4x - s5x;
-			(*a)[aoffset + 7] = s4y - s5y;
-			(*a)[aoffset + 8] = s2x - s3x;
-			(*a)[aoffset + 9] = s2y - s3y;
-			return;
-		}
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
-		n1 = curplan.plan[entryoffset + 1];
-		n2 = curplan.plan[entryoffset + 2];
-		n = n1 * n2;
-		if (n == 2) {
-			a0x = (*a)[aoffset + 0];
-			a1x = (*a)[aoffset + 1];
-			(*a)[aoffset + 0] = a0x + a1x;
-			(*a)[aoffset + 1] = a0x - a1x;
-			return;
-		}
-		if (n == 3) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			a0x = (*a)[aoffset + 0];
-			a1x = (*a)[aoffset + 1];
-			a2x = (*a)[aoffset + 2];
-			t1x = a1x + a2x;
-			a0x = a0x + t1x;
-			m1x = c1 * t1x;
-			m2y = c2 * (a2x - a1x);
-			s1x = a0x + m1x;
-			(*a)[aoffset + 0] = a0x;
-			(*a)[aoffset + 1] = s1x - m2y;
-			(*a)[aoffset + 2] = s1x + m2y;
-			return;
-		}
-		if (n == 4) {
-			a0x = (*a)[aoffset + 0];
-			a1x = (*a)[aoffset + 1];
-			a2x = (*a)[aoffset + 2];
-			a3x = (*a)[aoffset + 3];
-			t1x = a0x + a2x;
-			t2x = a1x + a3x;
-			m2x = a0x - a2x;
-			m3y = a3x - a1x;
-			(*a)[aoffset + 0] = t1x + t2x;
-			(*a)[aoffset + 1] = m2x - m3y;
-			(*a)[aoffset + 2] = t1x - t2x;
-			(*a)[aoffset + 3] = m2x + m3y;
-			return;
-		}
-		if (n == 5) {
-			offs = curplan.plan[entryoffset + 7];
-			c1 = curplan.precomputed[offs + 0];
-			c2 = curplan.precomputed[offs + 1];
-			c3 = curplan.precomputed[offs + 2];
-			c4 = curplan.precomputed[offs + 3];
-			c5 = curplan.precomputed[offs + 4];
-			t1x = (*a)[aoffset + 1] + (*a)[aoffset + 4];
-			t2x = (*a)[aoffset + 2] + (*a)[aoffset + 3];
-			t3x = (*a)[aoffset + 1] - (*a)[aoffset + 4];
-			t4x = (*a)[aoffset + 3] - (*a)[aoffset + 2];
-			t5x = t1x + t2x;
-			v0 = (*a)[aoffset + 0] + t5x;
-			(*a)[aoffset + 0] = v0;
-			m2x = c2 * (t1x - t2x);
-			m3y = c3 * (t3x + t4x);
-			s3y = m3y - c4 * t4x;
-			s5y = m3y + c5 * t3x;
-			s1x = v0 + c1 * t5x;
-			s2x = s1x + m2x;
-			s4x = s1x - m2x;
-			(*a)[aoffset + 1] = s2x - s3y;
-			(*a)[aoffset + 2] = s4x - s5y;
-			(*a)[aoffset + 3] = s4x + s5y;
-			(*a)[aoffset + 4] = s2x + s3y;
-			return;
-		}
-	}
-	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
-		n = curplan.plan[entryoffset + 1];
-		m = curplan.plan[entryoffset + 4];
-		offs = curplan.plan[entryoffset + 7];
-		for (int i = stackptr + 2 * n; i <= stackptr + 2 * m - 1; i++)
-			curplan.stackbuf[i] = 0;
-		offsp = offs + 2 * m;
-		offsa = aoffset;
-		offsb = stackptr;
-		for (int i = 0; i < n; i++) {
-			bx = curplan.precomputed[offsp + 0];
-			by = curplan.precomputed[offsp + 1];
-			x = (*a)[offsa + 0];
-			y = (*a)[offsa + 1];
-			curplan.stackbuf[offsb + 0] = x * bx - y * (-by);
-			curplan.stackbuf[offsb + 1] = x * (-by) + y * bx;
-			offsp = offsp + 2;
-			offsa = offsa + 2;
-			offsb = offsb + 2;
-		}
-		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
-		offsb = stackptr;
-		offsp = offs;
-		for (int i = 0; i <= m - 1; i++) {
-			x = curplan.stackbuf[offsb + 0];
-			y = curplan.stackbuf[offsb + 1];
-			bx = curplan.precomputed[offsp + 0];
-			by = curplan.precomputed[offsp + 1];
-			curplan.stackbuf[offsb + 0] = x * bx - y * by;
-			curplan.stackbuf[offsb + 1] = -(x * by + y * bx);
-			offsb = offsb + 2;
-			offsp = offsp + 2;
-		}
-		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
-		offsb = stackptr;
-		offsp = offs + 2 * m;
-		offsa = aoffset;
-		for (int i = 0; i < n; i++) {
-			x = curplan.stackbuf[offsb + 0] / m;
-			y = -curplan.stackbuf[offsb + 1] / m;
-			bx = curplan.precomputed[offsp + 0];
-			by = curplan.precomputed[offsp + 1];
-			(*a)[offsa + 0] = x * bx - y * (-by);
-			(*a)[offsa + 1] = x * (-by) + y * bx;
-			offsp = offsp + 2;
-			offsa = offsa + 2;
-			offsb = offsb + 2;
-		}
-		return;
-	}
-}
-
-
-/*************************************************************************
-Twiddle factors calculation
-
--- ALGLIB --
-	Copyright 01.05.2009 by Bochkanov Sergey
-*************************************************************************/
-void PIFFT_float::ftbase_ffttwcalc(PIVector<float> * a, int aoffset, int n1, int n2) {
-	int n, idx, offs;
-	float x, y, twxm1, twy, twbasexm1, twbasey, twrowxm1, twrowy, tmpx, tmpy, v;
-	int ftbase_ftbaseupdatetw = 4;
-	n = n1 * n2;
-	v = -2 * M_PI / n;
-	twbasexm1 = -2 * sqr(sin(0.5 * v));
-	twbasey = sin(v);
-	twrowxm1 = 0;
-	twrowy = 0;
-	for (int i = 0, j = 0; i <= n2 - 1; i++) {
-		twxm1 = 0;
-		twy = 0;
-		for (j = 0; j <= n1 - 1; j++) {
-			idx = i * n1 + j;
-			offs = aoffset + 2 * idx;
-			x = (*a)[offs + 0];
-			y = (*a)[offs + 1];
-			tmpx = x * twxm1 - y * twy;
-			tmpy = x * twy + y * twxm1;
-			(*a)[offs + 0] = x + tmpx;
-			(*a)[offs + 1] = y + tmpy;
-			if (j < n1 - 1) {
-				if (j % ftbase_ftbaseupdatetw == 0) {
-					v = -2 * M_PI * i * (j + 1) / n;
-					twxm1 = -2 * sqr(sin(0.5 * v));
-					twy = sin(v);
-				} else {
-					tmpx = twrowxm1 + twxm1 * twrowxm1 - twy * twrowy;
-					tmpy = twrowy + twxm1 * twrowy + twy * twrowxm1;
-					twxm1 = twxm1 + tmpx;
-					twy = twy + tmpy;
-				}
-			}
-		}
-
-		if (i < n2 - 1) {
-			if (j % ftbase_ftbaseupdatetw == 0) {
-				v = -2 * M_PI * (i + 1) / n;
-				twrowxm1 = -2 * sqr(sin(0.5 * v));
-				twrowy = sin(v);
-			} else {
-				tmpx = twbasexm1 + twrowxm1 * twbasexm1 - twrowy * twbasey;
-				tmpy = twbasey + twrowxm1 * twbasey + twrowy * twbasexm1;
-				twrowxm1 = twrowxm1 + tmpx;
-				twrowy = twrowy + tmpy;
-			}
-		}
-	}
-}
+/*
+	PIP - Platform Independent Primitives
+	Class for FFT, IFFT and Hilbert transformations
+	Andrey Bychkov work.a.b@yandex.ru, Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pifft.h"
+
+
+PIFFT_double::PIFFT_double() {
+}
+
+
+PIVector<complexd> * PIFFT_double::calcFFT(const PIVector<complexd> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1d(val, val.size());
+	return &result;
+}
+
+
+PIVector<complexd> * PIFFT_double::calcFFTinverse(const PIVector<complexd> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1dinv(val, val.size());
+	return &result;
+}
+
+
+PIVector<complexd> * PIFFT_double::calcHilbert(const PIVector<double> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1r(val, val.size());
+	for (uint i = 0; i < result.size() / 2; i++)             result[i] = result[i] * 2.;
+	for (uint i = result.size() / 2; i < result.size(); i++) result[i] = 0;
+	fftc1dinv(result, result.size());
+	return &result;
+}
+
+
+PIVector<complexd> * PIFFT_double::calcFFT(const PIVector<double> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1r(val, val.size());
+	return &result;
+}
+
+
+PIVector<double> PIFFT_double::getAmplitude() const {
+	PIVector<double> ret;
+	ret.resize(result.size());
+	double tmp;
+	for (uint i = 0; i < result.size(); i++) {
+		tmp = sqrt(result[i].real() * result[i].real() + result[i].imag() * result[i].imag());
+		ret[i] = tmp;
+	}
+	return ret;
+}
+
+
+PIVector<double> PIFFT_double::getReal() const {
+	PIVector<double> ret;
+	ret.resize(result.size());
+	for (uint i = 0; i < result.size(); i++)
+		ret[i] = result[i].real();
+	return ret;
+}
+
+
+PIVector<double> PIFFT_double::getImag() const {
+	PIVector<double> ret;
+	ret.resize(result.size());
+	for (uint i = 0; i < result.size(); i++)
+		ret[i] = result[i].imag();
+	return ret;
+}
+
+
+void PIFFT_double::fftc1d(const PIVector<complexd> & a, uint n) {
+	createPlan(n);
+	uint i;
+	PIVector<double> buf;
+	buf.resize(2 * n);
+	for (i = 0; i < n; i++) {
+		buf[2 * i + 0] = a[i].real();
+		buf[2 * i + 1] = a[i].imag();
+	}
+	ftbaseexecuteplan(&buf, 0, n, &curplan);
+	result.resize(n);
+	for (i = 0; i < n; i++)
+		result[i] = complexd(buf[2 * i + 0], buf[2 * i + 1]);
+}
+
+
+void PIFFT_double::fftc1r(const PIVector<double> & a, uint n) {
+	uint i;
+	if (n % 2 == 0) {
+		PIVector<double> buf;
+		uint n2 = n / 2;
+		buf = a;
+		createPlan(n2);
+		ftbaseexecuteplan(&buf, 0, n2, &curplan);
+		result.resize(n);
+		uint idx;
+		complexd hn, hmnc, v;
+		for (i = 0; i <= n2; i++) {
+			idx = 2 * (i % n2);
+			hn = complexd(buf[idx + 0], buf[idx + 1]);
+			idx = 2 * ((n2 - i) % n2);
+			hmnc = complexd(buf[idx + 0], -buf[idx + 1]);
+			v = complexd(sin(M_PI * i / n2), cos(M_PI * i / n2));
+			result[i] = ((hn + hmnc) - (v * (hn - hmnc)));
+			result[i] *= 0.5;
+		}
+		for (i = n2 + 1; i < n; i++)
+			result[i] = conj(result[n - i]);
+	} else {
+		PIVector<complexd> cbuf;
+		cbuf.resize(n);
+		for (i = 0; i < n; i++)
+			cbuf[i] = complexd(a[i], 0.);
+		fftc1d(cbuf, n);
+	}
+}
+
+
+void PIFFT_double::fftc1dinv(const PIVector<complexd> & a, uint n) {
+	PIVector<complexd> cbuf;
+	cbuf.resize(n);
+	uint i;
+	for (i = 0; i < n; i++) {
+		cbuf[i] = conj(a[i]);
+	}
+	fftc1d(cbuf, n);
+	for (i = 0; i < n; i++) {
+		result[i] = conj(result[i] / (double)n);
+	}
+}
+
+
+void PIFFT_double::createPlan(uint n) {
+	curplan.plan.clear();
+	curplan.precomputed.clear();
+	curplan.stackbuf.clear();
+	curplan.tmpbuf.clear();
+	if (n < 2) return;
+	ftbasegeneratecomplexfftplan(n, &curplan);
+}
+
+
+void PIFFT_double::ftbasegeneratecomplexfftplan(uint n, ftplan * plan) {
+	int planarraysize;
+	int plansize;
+	int precomputedsize;
+	int tmpmemsize;
+	int stackmemsize;
+	ae_int_t stackptr;
+	planarraysize = 1;
+	plansize = 0;
+	precomputedsize = 0;
+	stackmemsize = 0;
+	stackptr = 0;
+	tmpmemsize = 2 * n;
+	curplan.plan.resize(planarraysize);
+	int ftbase_ftbasecffttask = 0;
+	ftbase_ftbasegenerateplanrec(n, ftbase_ftbasecffttask, plan, &plansize, &precomputedsize, &planarraysize, &tmpmemsize, &stackmemsize, stackptr);
+	if (stackptr != 0) {
+		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
+	}
+	curplan.stackbuf.resize(piMax<int>(stackmemsize, 1)); //ae_vector_set_length(&curplan.stackbuf, ae_maxint(stackmemsize, 1));
+	curplan.tmpbuf.resize(piMax<int>(tmpmemsize, 1)); //ae_vector_set_length(&(curplan.tmpbuf), ae_maxint(tmpmemsize, 1));
+	curplan.precomputed.resize(piMax<int>(precomputedsize, 1)); //ae_vector_set_length(&curplan.precomputed, ae_maxint(precomputedsize, 1));
+	stackptr = 0;
+	ftbase_ftbaseprecomputeplanrec(plan, 0, stackptr);
+	if (stackptr != 0) {
+		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
+	}
+}
+
+
+/*************************************************************************
+Recurrent subroutine for the FFTGeneratePlan:
+
+PARAMETERS:
+	N                   plan size
+	IsReal              whether input is real or not.
+						subroutine MUST NOT ignore this flag because real
+						inputs comes with non-initialized imaginary parts,
+						so ignoring this flag will result in corrupted output
+	HalfOut             whether full output or only half of it from 0 to
+						floor(N/2) is needed. This flag may be ignored if
+						doing so will simplify calculations
+	Plan                plan array
+	PlanSize            size of used part (in integers)
+	PrecomputedSize     size of precomputed array allocated yet
+	PlanArraySize       plan array size (actual)
+	TmpMemSize          temporary memory required size
+	BluesteinMemSize    temporary memory required size
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_double::ftbase_ftbasegenerateplanrec(
+int n,
+int tasktype,
+ftplan * plan,
+int * plansize,
+int * precomputedsize,
+int * planarraysize,
+int * tmpmemsize,
+int * stackmemsize,
+ae_int_t stackptr, int debugi) {
+	int k, m, n1, n2, esize, entryoffset;
+	int ftbase_ftbaseplanentrysize = 8;
+	int ftbase_ftbasecffttask = 0;
+	int ftbase_fftcooleytukeyplan = 0;
+	int ftbase_fftbluesteinplan = 1;
+	int ftbase_fftcodeletplan = 2;
+	int ftbase_fftrealcooleytukeyplan = 5;
+	int ftbase_fftemptyplan = 6;
+	if (*plansize + ftbase_ftbaseplanentrysize > (*planarraysize)) {
+		curplan.plan.resize(8 * (*planarraysize));
+		*planarraysize = 8 * (*planarraysize);
+	}
+	entryoffset = *plansize;
+	esize = ftbase_ftbaseplanentrysize;
+	*plansize = *plansize + esize;
+	if (n == 1) {
+		curplan.plan[entryoffset + 0] = esize;
+		curplan.plan[entryoffset + 1] = -1;
+		curplan.plan[entryoffset + 2] = -1;
+		curplan.plan[entryoffset + 3] = ftbase_fftemptyplan;
+		curplan.plan[entryoffset + 4] = -1;
+		curplan.plan[entryoffset + 5] = -1;
+		curplan.plan[entryoffset + 6] = -1;
+		curplan.plan[entryoffset + 7] = -1;
+		return;
+	}
+	ftbasefactorize(n, &n1, &n2);
+	if (n1 != 1) {
+		*tmpmemsize = piMax<int>(*tmpmemsize, 2 * n1 * n2);
+		curplan.plan[entryoffset + 0] = esize;
+		curplan.plan[entryoffset + 1] = n1;
+		curplan.plan[entryoffset + 2] = n2;
+		if (tasktype == ftbase_ftbasecffttask)
+			curplan.plan[entryoffset + 3] = ftbase_fftcooleytukeyplan;
+		else
+			curplan.plan[entryoffset + 3] = ftbase_fftrealcooleytukeyplan;
+		curplan.plan[entryoffset + 4] = 0;
+		curplan.plan[entryoffset + 5] = *plansize;
+		debugi++;
+		ftbase_ftbasegenerateplanrec(n1, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
+		curplan.plan[entryoffset + 6] = *plansize;
+		ftbase_ftbasegenerateplanrec(n2, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
+		curplan.plan[entryoffset + 7] = -1;
+		return;
+	} else {
+		if (n >= 2 && n <= 5) {
+			curplan.plan[entryoffset + 0] = esize;
+			curplan.plan[entryoffset + 1] = n1;
+			curplan.plan[entryoffset + 2] = n2;
+			curplan.plan[entryoffset + 3] = ftbase_fftcodeletplan;
+			curplan.plan[entryoffset + 4] = 0;
+			curplan.plan[entryoffset + 5] = -1;
+			curplan.plan[entryoffset + 6] = -1;
+			curplan.plan[entryoffset + 7] = *precomputedsize;
+			if (n == 3)
+				*precomputedsize = *precomputedsize + 2;
+			if (n == 5)
+				*precomputedsize = *precomputedsize + 5;
+			return;
+		} else {
+			k = 2 * n2 - 1;
+			m = ftbasefindsmooth(k);
+			*tmpmemsize = piMax<int>(*tmpmemsize, 2 * m);
+			curplan.plan[entryoffset + 0] = esize;
+			curplan.plan[entryoffset + 1] = n2;
+			curplan.plan[entryoffset + 2] = -1;
+			curplan.plan[entryoffset + 3] = ftbase_fftbluesteinplan;
+			curplan.plan[entryoffset + 4] = m;
+			curplan.plan[entryoffset + 5] = *plansize;
+			stackptr = stackptr + 2 * 2 * m;
+			*stackmemsize = piMax<int>(*stackmemsize, stackptr);
+			ftbase_ftbasegenerateplanrec(m, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr);
+			stackptr = stackptr - 2 * 2 * m;
+			curplan.plan[entryoffset + 6] = -1;
+			curplan.plan[entryoffset + 7] = *precomputedsize;
+			*precomputedsize = *precomputedsize + 2 * m + 2 * n;
+			return;
+		}
+	}
+}
+
+
+/*************************************************************************
+Recurrent subroutine for precomputing FFT plans
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_double::ftbase_ftbaseprecomputeplanrec(ftplan * plan,
+int entryoffset,
+ae_int_t stackptr) {
+	int n1, n2, n, m, offs;
+	double v, bx, by;
+	int ftbase_fftcooleytukeyplan = 0;
+	int ftbase_fftbluesteinplan = 1;
+	int ftbase_fftcodeletplan = 2;
+	int ftbase_fhtcooleytukeyplan = 3;
+	int ftbase_fhtcodeletplan = 4;
+	int ftbase_fftrealcooleytukeyplan = 5;
+	if ((curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan || curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) || curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
+		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
+		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 6], stackptr);
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan || curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		if (n == 3) {
+			offs = curplan.plan[entryoffset + 7];
+			curplan.precomputed[offs + 0] = cos(2 * M_PI / 3) - 1;
+			curplan.precomputed[offs + 1] = sin(2 * M_PI / 3);
+			return;
+		}
+		if (n == 5) {
+			offs = curplan.plan[entryoffset + 7];
+			v = 2 * M_PI / 5;
+			curplan.precomputed[offs + 0] = (cos(v) + cos(2 * v)) / 2 - 1;
+			curplan.precomputed[offs + 1] = (cos(v) - cos(2 * v)) / 2;
+			curplan.precomputed[offs + 2] = -sin(v);
+			curplan.precomputed[offs + 3] = -(sin(v) + sin(2 * v));
+			curplan.precomputed[offs + 4] = sin(v) - sin(2 * v);
+			return;
+		}
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
+		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
+		n = curplan.plan[entryoffset + 1];
+		m = curplan.plan[entryoffset + 4];
+		offs = curplan.plan[entryoffset + 7];
+		for (int i = 0; i <= 2 * m - 1; i++)
+			curplan.precomputed[offs + i] = 0;
+		for (int i = 0; i < n; i++) {
+			bx = cos(M_PI * sqr(i) / n);
+			by = sin(M_PI * sqr(i) / n);
+			curplan.precomputed[offs + 2 * i + 0] = bx;
+			curplan.precomputed[offs + 2 * i + 1] = by;
+			curplan.precomputed[offs + 2 * m + 2 * i + 0] = bx;
+			curplan.precomputed[offs + 2 * m + 2 * i + 1] = by;
+			if (i > 0) {
+				curplan.precomputed[offs + 2 * (m - i) + 0] = bx;
+				curplan.precomputed[offs + 2 * (m - i) + 1] = by;
+			}
+		}
+		ftbaseexecuteplanrec(&curplan.precomputed, offs, plan, curplan.plan[entryoffset + 5], stackptr);
+		return;
+	}
+}
+
+
+void PIFFT_double::ftbasefactorize(int n, int * n1, int * n2) {
+	*n1 = *n2 = 0;
+	int ftbase_ftbasecodeletrecommended = 5;
+	if ((*n1) * (*n2) != n) {
+		for (int j = ftbase_ftbasecodeletrecommended; j >= 2; j--) {
+			if (n % j == 0) {
+				*n1 = j;
+				*n2 = n / j;
+				break;
+			}
+		}
+	}
+	if ((*n1) * (*n2) != n) {
+		for (int j = ftbase_ftbasecodeletrecommended + 1; j <= n - 1; j++) {
+			if (n % j == 0) {
+				*n1 = j;
+				*n2 = n / j;
+				break;
+			}
+		}
+	}
+	if ((*n1) * (*n2) != n) {
+		*n1 = 1;
+		*n2 = n;
+	}
+	if ((*n2) == 1 && (*n1) != 1) {
+		*n2 = *n1;
+		*n1 = 1;
+	}
+}
+
+
+/*************************************************************************
+Is number smooth?
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_double::ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int * best) {
+	if (seed >= n) {
+		*best = piMini(*best, seed);
+		return;
+	}
+	if (leastfactor <= 2)
+		ftbase_ftbasefindsmoothrec(n, seed * 2, 2, best);
+	if (leastfactor <= 3)
+		ftbase_ftbasefindsmoothrec(n, seed * 3, 3, best);
+	if (leastfactor <= 5)
+		ftbase_ftbasefindsmoothrec(n, seed * 5, 5, best);
+}
+
+
+int PIFFT_double::ftbasefindsmooth(int n) {
+	int best, result;
+	best = 2;
+	while (best < n)
+		best = 2 * best;
+	ftbase_ftbasefindsmoothrec(n, 1, 2, &best);
+	result = best;
+	return result;
+}
+
+
+void PIFFT_double::ftbase_internalreallintranspose(PIVector<double> * a, int m, int n, int astart, PIVector<double> * buf) {
+	ftbase_fftirltrec(a, astart, n, buf, 0, m, m, n);
+	for (int i = 0; i < 2 * m * n; i++) (*a)[astart + i] = (*buf)[i];
+}
+
+
+void PIFFT_double::ftbase_fftirltrec(PIVector<double> * a, int astart, int astride, PIVector<double> * b, int bstart, int bstride, int m, int n) {
+	int idx1, idx2;
+	int m1, n1;
+	if (m == 0 || n == 0)
+		return;
+	if (piMaxi(m, n) <= 8) {
+		for (int i = 0; i <= m - 1; i++) {
+			idx1 = bstart + i;
+			idx2 = astart + i * astride;
+			for (int j = 0; j <= n - 1; j++) {
+				(*b)[idx1] = a->at(idx2);
+				idx1 = idx1 + bstride;
+				idx2 = idx2 + 1;
+			}
+		}
+		return;
+	}
+	if (n > m) {
+		n1 = n / 2;
+		if (n - n1 >= 8 && n1 % 8 != 0)
+			n1 = n1 + (8 - n1 % 8);
+		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m, n1);
+		ftbase_fftirltrec(a, astart + n1, astride, b, bstart + n1 * bstride, bstride, m, n - n1);
+	} else {
+		m1 = m / 2;
+		if (m - m1 >= 8 && m1 % 8 != 0)
+			m1 = m1 + (8 - m1 % 8);
+		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m1, n);
+		ftbase_fftirltrec(a, astart + m1 * astride, astride, b, bstart + m1, bstride, m - m1, n);
+	}
+}
+
+
+void PIFFT_double::ftbase_internalcomplexlintranspose(PIVector<double> * a, int m, int n, int astart, PIVector<double> * buf) {
+	ftbase_ffticltrec(a, astart, n, buf, 0, m, m, n);
+	for (int i = 0; i < 2 * m * n; i++)
+		(*a)[astart + i] = (*buf)[i];
+}
+
+
+void PIFFT_double::ftbase_ffticltrec(PIVector<double> * a, int astart, int astride, PIVector<double> * b, int bstart, int bstride, int m, int n) {
+	int idx1, idx2, m2, m1, n1;
+	if (m == 0 || n == 0)
+		return;
+	if (piMax<int>(m, n) <= 8) {
+		m2 = 2 * bstride;
+		for (int i = 0; i <= m - 1; i++) {
+			idx1 = bstart + 2 * i;
+			idx2 = astart + 2 * i * astride;
+			for (int j = 0; j <= n - 1; j++) {
+				(*b)[idx1 + 0] = a->at(idx2 + 0);
+				(*b)[idx1 + 1] = a->at(idx2 + 1);
+				idx1 = idx1 + m2;
+				idx2 = idx2 + 2;
+			}
+		}
+		return;
+	}
+	if (n > m) {
+		n1 = n / 2;
+		if (n - n1 >= 8 && n1 % 8 != 0)
+			n1 = n1 + (8 - n1 % 8);
+		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m, n1);
+		ftbase_ffticltrec(a, astart + 2 * n1, astride, b, bstart + 2 * n1 * bstride, bstride, m, n - n1);
+	} else {
+		m1 = m / 2;
+		if (m - m1 >= 8 && m1 % 8 != 0)
+			m1 = m1 + (8 - m1 % 8);
+		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m1, n);
+		ftbase_ffticltrec(a, astart + 2 * m1 * astride, astride, b, bstart + 2 * m1, bstride, m - m1, n);
+	}
+}
+
+
+void PIFFT_double::ftbaseexecuteplan(PIVector<double> * a, int aoffset, int n, ftplan * plan) {
+	ae_int_t stackptr;
+	stackptr = 0;
+	ftbaseexecuteplanrec(a, aoffset, plan, 0, stackptr);
+}
+
+
+/*************************************************************************
+Recurrent subroutine for the FTBaseExecutePlan
+
+Parameters:
+	A           FFT'ed array
+	AOffset     offset of the FFT'ed part (distance is measured in doubles)
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_double::ftbaseexecuteplanrec(PIVector<double> * a, int aoffset, ftplan * plan, int entryoffset, ae_int_t stackptr) {
+	int n1, n2, n, m, offs, offs1, offs2, offsa, offsb, offsp;
+	double hk, hnk, x, y, bx, by, v0, v1, v2, v3;
+	double a0x, a0y, a1x, a1y, a2x, a2y, a3x, a3y;
+	double t1x, t1y, t2x, t2y, t3x, t3y, t4x, t4y, t5x, t5y;
+	double m1x, m1y, m2x, m2y, m3x, m3y, m4x, m4y, m5x, m5y;
+	double s1x, s1y, s2x, s2y, s3x, s3y, s4x, s4y, s5x, s5y;
+	double c1, c2, c3, c4, c5;
+	int ftbase_fftcooleytukeyplan = 0;
+	int ftbase_fftbluesteinplan = 1;
+	int ftbase_fftcodeletplan = 2;
+	int ftbase_fhtcooleytukeyplan = 3;
+	int ftbase_fhtcodeletplan = 4;
+	int ftbase_fftrealcooleytukeyplan = 5;
+	int ftbase_fftemptyplan = 6;
+	PIVector<double> & tmpb(curplan.tmpbuf);
+
+	if (curplan.plan[entryoffset + 3] == ftbase_fftemptyplan)
+		return;
+	if (curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n2 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
+		ftbase_ffttwcalc(a, aoffset, n1, n2);
+		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n1 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
+		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n1 / 2 - 1; i++) {
+			offs = aoffset + 2 * i * n2 * 2;
+			for (int k = 0; k <= n2 - 1; k++)
+				(*a)[offs + 2 * k + 1] = (*a)[offs + 2 * n2 + 2 * k + 0];
+			ftbaseexecuteplanrec(a, offs, plan, curplan.plan[entryoffset + 6], stackptr);
+			tmpb[0] = (*a)[offs + 0];
+			tmpb[1] = 0;
+			tmpb[2 * n2 + 0] = (*a)[offs + 1];
+			tmpb[2 * n2 + 1] = 0;
+			for (int k = 1; k <= n2 - 1; k++) {
+				offs1 = 2 * k;
+				offs2 = 2 * n2 + 2 * k;
+				hk = (*a)[offs + 2 * k + 0];
+				hnk = (*a)[offs + 2 * (n2 - k) + 0];
+				tmpb[offs1 + 0] = 0.5 * (hk + hnk);
+				tmpb[offs2 + 1] = -0.5 * (hk - hnk);
+				hk = (*a)[offs + 2 * k + 1];
+				hnk = (*a)[offs + 2 * (n2 - k) + 1];
+				tmpb[offs2 + 0] = 0.5 * (hk + hnk);
+				tmpb[offs1 + 1] = 0.5 * (hk - hnk);
+			}
+			for (int k = 0; k < 2 * n2 * 2; k++) (*a)[offs + k] = tmpb[k];
+		}
+		if (n1 % 2 != 0)
+			ftbaseexecuteplanrec(a, aoffset + (n1 - 1)*n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
+		ftbase_ffttwcalc(a, aoffset, n2, n1);
+		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n2 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
+		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n2 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n1, plan, curplan.plan[entryoffset + 5], stackptr);
+		for (int i = 0; i <= n2 - 1; i++) {
+			for (int j = 0; j <= n1 - 1; j++) {
+				offsa = aoffset + i * n1;
+				hk = (*a)[offsa + j];
+				hnk = (*a)[offsa + (n1 - j) % n1];
+				offs = 2 * (i * n1 + j);
+				tmpb[offs + 0] = -0.5 * (hnk - hk);
+				tmpb[offs + 1] = 0.5 * (hk + hnk);
+			}
+		}
+		ftbase_ffttwcalc(&(curplan.tmpbuf), 0, n1, n2);
+		for (int j = 0; j <= n1 - 1; j++)
+			(*a)[aoffset + j] = tmpb[2 * j + 0] + tmpb[2 * j + 1];
+		if (n2 % 2 == 0) {
+			offs = 2 * (n2 / 2) * n1;
+			offsa = aoffset + n2 / 2 * n1;
+			for (int j = 0; j <= n1 - 1; j++)
+				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs + 2 * j + 1];
+		}
+		for (int i = 1; i <= (n2 + 1) / 2 - 1; i++) {
+			offs = 2 * i * n1;
+			offs2 = 2 * (n2 - i) * n1;
+			offsa = aoffset + i * n1;
+			for (int j = 0; j <= n1 - 1; j++)
+				(*a)[offsa + j] = tmpb[offs + 2 * j + 1] + tmpb[offs2 + 2 * j + 0];
+			offsa = aoffset + (n2 - i) * n1;
+			for (int j = 0; j <= n1 - 1; j++)
+				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs2 + 2 * j + 1];
+		}
+		ftbase_internalreallintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n1 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n2, plan, curplan.plan[entryoffset + 6], stackptr);
+		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		if (n == 2) {
+			a0x = (*a)[aoffset + 0];
+			a0y = (*a)[aoffset + 1];
+			a1x = (*a)[aoffset + 2];
+			a1y = (*a)[aoffset + 3];
+			v0 = a0x + a1x;
+			v1 = a0y + a1y;
+			v2 = a0x - a1x;
+			v3 = a0y - a1y;
+			(*a)[aoffset + 0] = v0;
+			(*a)[aoffset + 1] = v1;
+			(*a)[aoffset + 2] = v2;
+			(*a)[aoffset + 3] = v3;
+			return;
+		}
+		if (n == 3) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			a0x = (*a)[aoffset + 0];
+			a0y = (*a)[aoffset + 1];
+			a1x = (*a)[aoffset + 2];
+			a1y = (*a)[aoffset + 3];
+			a2x = (*a)[aoffset + 4];
+			a2y = (*a)[aoffset + 5];
+			t1x = a1x + a2x;
+			t1y = a1y + a2y;
+			a0x = a0x + t1x;
+			a0y = a0y + t1y;
+			m1x = c1 * t1x;
+			m1y = c1 * t1y;
+			m2x = c2 * (a1y - a2y);
+			m2y = c2 * (a2x - a1x);
+			s1x = a0x + m1x;
+			s1y = a0y + m1y;
+			a1x = s1x + m2x;
+			a1y = s1y + m2y;
+			a2x = s1x - m2x;
+			a2y = s1y - m2y;
+			(*a)[aoffset + 0] = a0x;
+			(*a)[aoffset + 1] = a0y;
+			(*a)[aoffset + 2] = a1x;
+			(*a)[aoffset + 3] = a1y;
+			(*a)[aoffset + 4] = a2x;
+			(*a)[aoffset + 5] = a2y;
+			return;
+		}
+		if (n == 4) {
+			a0x = (*a)[aoffset + 0];
+			a0y = (*a)[aoffset + 1];
+			a1x = (*a)[aoffset + 2];
+			a1y = (*a)[aoffset + 3];
+			a2x = (*a)[aoffset + 4];
+			a2y = (*a)[aoffset + 5];
+			a3x = (*a)[aoffset + 6];
+			a3y = (*a)[aoffset + 7];
+			t1x = a0x + a2x;
+			t1y = a0y + a2y;
+			t2x = a1x + a3x;
+			t2y = a1y + a3y;
+			m2x = a0x - a2x;
+			m2y = a0y - a2y;
+			m3x = a1y - a3y;
+			m3y = a3x - a1x;
+			(*a)[aoffset + 0] = t1x + t2x;
+			(*a)[aoffset + 1] = t1y + t2y;
+			(*a)[aoffset + 4] = t1x - t2x;
+			(*a)[aoffset + 5] = t1y - t2y;
+			(*a)[aoffset + 2] = m2x + m3x;
+			(*a)[aoffset + 3] = m2y + m3y;
+			(*a)[aoffset + 6] = m2x - m3x;
+			(*a)[aoffset + 7] = m2y - m3y;
+			return;
+		}
+		if (n == 5) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			c3 = curplan.precomputed[offs + 2];
+			c4 = curplan.precomputed[offs + 3];
+			c5 = curplan.precomputed[offs + 4];
+			t1x = (*a)[aoffset + 2] + (*a)[aoffset + 8];
+			t1y = (*a)[aoffset + 3] + (*a)[aoffset + 9];
+			t2x = (*a)[aoffset + 4] + (*a)[aoffset + 6];
+			t2y = (*a)[aoffset + 5] + (*a)[aoffset + 7];
+			t3x = (*a)[aoffset + 2] - (*a)[aoffset + 8];
+			t3y = (*a)[aoffset + 3] - (*a)[aoffset + 9];
+			t4x = (*a)[aoffset + 6] - (*a)[aoffset + 4];
+			t4y = (*a)[aoffset + 7] - (*a)[aoffset + 5];
+			t5x = t1x + t2x;
+			t5y = t1y + t2y;
+			(*a)[aoffset + 0] = (*a)[aoffset + 0] + t5x;
+			(*a)[aoffset + 1] = (*a)[aoffset + 1] + t5y;
+			m1x = c1 * t5x;
+			m1y = c1 * t5y;
+			m2x = c2 * (t1x - t2x);
+			m2y = c2 * (t1y - t2y);
+			m3x = -c3 * (t3y + t4y);
+			m3y = c3 * (t3x + t4x);
+			m4x = -c4 * t4y;
+			m4y = c4 * t4x;
+			m5x = -c5 * t3y;
+			m5y = c5 * t3x;
+			s3x = m3x - m4x;
+			s3y = m3y - m4y;
+			s5x = m3x + m5x;
+			s5y = m3y + m5y;
+			s1x = (*a)[aoffset + 0] + m1x;
+			s1y = (*a)[aoffset + 1] + m1y;
+			s2x = s1x + m2x;
+			s2y = s1y + m2y;
+			s4x = s1x - m2x;
+			s4y = s1y - m2y;
+			(*a)[aoffset + 2] = s2x + s3x;
+			(*a)[aoffset + 3] = s2y + s3y;
+			(*a)[aoffset + 4] = s4x + s5x;
+			(*a)[aoffset + 5] = s4y + s5y;
+			(*a)[aoffset + 6] = s4x - s5x;
+			(*a)[aoffset + 7] = s4y - s5y;
+			(*a)[aoffset + 8] = s2x - s3x;
+			(*a)[aoffset + 9] = s2y - s3y;
+			return;
+		}
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		if (n == 2) {
+			a0x = (*a)[aoffset + 0];
+			a1x = (*a)[aoffset + 1];
+			(*a)[aoffset + 0] = a0x + a1x;
+			(*a)[aoffset + 1] = a0x - a1x;
+			return;
+		}
+		if (n == 3) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			a0x = (*a)[aoffset + 0];
+			a1x = (*a)[aoffset + 1];
+			a2x = (*a)[aoffset + 2];
+			t1x = a1x + a2x;
+			a0x = a0x + t1x;
+			m1x = c1 * t1x;
+			m2y = c2 * (a2x - a1x);
+			s1x = a0x + m1x;
+			(*a)[aoffset + 0] = a0x;
+			(*a)[aoffset + 1] = s1x - m2y;
+			(*a)[aoffset + 2] = s1x + m2y;
+			return;
+		}
+		if (n == 4) {
+			a0x = (*a)[aoffset + 0];
+			a1x = (*a)[aoffset + 1];
+			a2x = (*a)[aoffset + 2];
+			a3x = (*a)[aoffset + 3];
+			t1x = a0x + a2x;
+			t2x = a1x + a3x;
+			m2x = a0x - a2x;
+			m3y = a3x - a1x;
+			(*a)[aoffset + 0] = t1x + t2x;
+			(*a)[aoffset + 1] = m2x - m3y;
+			(*a)[aoffset + 2] = t1x - t2x;
+			(*a)[aoffset + 3] = m2x + m3y;
+			return;
+		}
+		if (n == 5) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			c3 = curplan.precomputed[offs + 2];
+			c4 = curplan.precomputed[offs + 3];
+			c5 = curplan.precomputed[offs + 4];
+			t1x = (*a)[aoffset + 1] + (*a)[aoffset + 4];
+			t2x = (*a)[aoffset + 2] + (*a)[aoffset + 3];
+			t3x = (*a)[aoffset + 1] - (*a)[aoffset + 4];
+			t4x = (*a)[aoffset + 3] - (*a)[aoffset + 2];
+			t5x = t1x + t2x;
+			v0 = (*a)[aoffset + 0] + t5x;
+			(*a)[aoffset + 0] = v0;
+			m2x = c2 * (t1x - t2x);
+			m3y = c3 * (t3x + t4x);
+			s3y = m3y - c4 * t4x;
+			s5y = m3y + c5 * t3x;
+			s1x = v0 + c1 * t5x;
+			s2x = s1x + m2x;
+			s4x = s1x - m2x;
+			(*a)[aoffset + 1] = s2x - s3y;
+			(*a)[aoffset + 2] = s4x - s5y;
+			(*a)[aoffset + 3] = s4x + s5y;
+			(*a)[aoffset + 4] = s2x + s3y;
+			return;
+		}
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
+		n = curplan.plan[entryoffset + 1];
+		m = curplan.plan[entryoffset + 4];
+		offs = curplan.plan[entryoffset + 7];
+		for (int i = stackptr + 2 * n; i <= stackptr + 2 * m - 1; i++)
+			curplan.stackbuf[i] = 0;
+		offsp = offs + 2 * m;
+		offsa = aoffset;
+		offsb = stackptr;
+		for (int i = 0; i < n; i++) {
+			bx = curplan.precomputed[offsp + 0];
+			by = curplan.precomputed[offsp + 1];
+			x = (*a)[offsa + 0];
+			y = (*a)[offsa + 1];
+			curplan.stackbuf[offsb + 0] = x * bx - y * (-by);
+			curplan.stackbuf[offsb + 1] = x * (-by) + y * bx;
+			offsp = offsp + 2;
+			offsa = offsa + 2;
+			offsb = offsb + 2;
+		}
+		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
+		offsb = stackptr;
+		offsp = offs;
+		for (int i = 0; i <= m - 1; i++) {
+			x = curplan.stackbuf[offsb + 0];
+			y = curplan.stackbuf[offsb + 1];
+			bx = curplan.precomputed[offsp + 0];
+			by = curplan.precomputed[offsp + 1];
+			curplan.stackbuf[offsb + 0] = x * bx - y * by;
+			curplan.stackbuf[offsb + 1] = -(x * by + y * bx);
+			offsb = offsb + 2;
+			offsp = offsp + 2;
+		}
+		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
+		offsb = stackptr;
+		offsp = offs + 2 * m;
+		offsa = aoffset;
+		for (int i = 0; i < n; i++) {
+			x = curplan.stackbuf[offsb + 0] / m;
+			y = -curplan.stackbuf[offsb + 1] / m;
+			bx = curplan.precomputed[offsp + 0];
+			by = curplan.precomputed[offsp + 1];
+			(*a)[offsa + 0] = x * bx - y * (-by);
+			(*a)[offsa + 1] = x * (-by) + y * bx;
+			offsp = offsp + 2;
+			offsa = offsa + 2;
+			offsb = offsb + 2;
+		}
+		return;
+	}
+}
+
+
+/*************************************************************************
+Twiddle factors calculation
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_double::ftbase_ffttwcalc(PIVector<double> * a, int aoffset, int n1, int n2) {
+	int n, idx, offs;
+	double x, y, twxm1, twy, twbasexm1, twbasey, twrowxm1, twrowy, tmpx, tmpy, v;
+	int ftbase_ftbaseupdatetw = 4;
+	n = n1 * n2;
+	v = -2 * M_PI / n;
+	twbasexm1 = -2 * sqr(sin(0.5 * v));
+	twbasey = sin(v);
+	twrowxm1 = 0;
+	twrowy = 0;
+	for (int i = 0, j = 0; i <= n2 - 1; i++) {
+		twxm1 = 0;
+		twy = 0;
+		for (j = 0; j <= n1 - 1; j++) {
+			idx = i * n1 + j;
+			offs = aoffset + 2 * idx;
+			x = (*a)[offs + 0];
+			y = (*a)[offs + 1];
+			tmpx = x * twxm1 - y * twy;
+			tmpy = x * twy + y * twxm1;
+			(*a)[offs + 0] = x + tmpx;
+			(*a)[offs + 1] = y + tmpy;
+			if (j < n1 - 1) {
+				if (j % ftbase_ftbaseupdatetw == 0) {
+					v = -2 * M_PI * i * (j + 1) / n;
+					twxm1 = -2 * sqr(sin(0.5 * v));
+					twy = sin(v);
+				} else {
+					tmpx = twrowxm1 + twxm1 * twrowxm1 - twy * twrowy;
+					tmpy = twrowy + twxm1 * twrowy + twy * twrowxm1;
+					twxm1 = twxm1 + tmpx;
+					twy = twy + tmpy;
+				}
+			}
+		}
+
+		if (i < n2 - 1) {
+			if (j % ftbase_ftbaseupdatetw == 0) {
+				v = -2 * M_PI * (i + 1) / n;
+				twrowxm1 = -2 * sqr(sin(0.5 * v));
+				twrowy = sin(v);
+			} else {
+				tmpx = twbasexm1 + twrowxm1 * twbasexm1 - twrowy * twbasey;
+				tmpy = twbasey + twrowxm1 * twbasey + twrowy * twbasexm1;
+				twrowxm1 = twrowxm1 + tmpx;
+				twrowy = twrowy + tmpy;
+			}
+		}
+	}
+}
+
+
+//=================================================================================================
+//*************************************************************************************************
+//---------------------FLOAT-----------------------FLOAT-------------------------------------------
+//*************************************************************************************************
+//=================================================================================================
+
+
+PIFFT_float::PIFFT_float() {
+}
+
+
+PIVector<complexf> * PIFFT_float::calcFFT(const PIVector<complexf> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1d(val, val.size());
+	return &result;
+}
+
+
+PIVector<complexf> * PIFFT_float::calcFFTinverse(const PIVector<complexf> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1dinv(val, val.size());
+	return &result;
+}
+
+
+PIVector<complexf> * PIFFT_float::calcHilbert(const PIVector<float> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1r(val, val.size());
+	for (uint i = 0; i < result.size() / 2; i++)             result[i] = result[i] * 2.f;
+	for (uint i = result.size() / 2; i < result.size(); i++) result[i] = 0;
+	fftc1dinv(result, result.size());
+	return &result;
+}
+
+
+PIVector<complexf> * PIFFT_float::calcFFT(const PIVector<float> & val) {
+	result.clear();
+	if (val.size_s() < 4) return &result;
+	fftc1r(val, val.size());
+	return &result;
+}
+
+
+PIVector<float> PIFFT_float::getAmplitude() const {
+	PIVector<float> ret;
+	ret.resize(result.size());
+	float tmp;
+	for (uint i = 0; i < result.size(); i++) {
+		tmp = sqrt(result[i].real() * result[i].real() + result[i].imag() * result[i].imag());
+		ret[i] = tmp;
+	}
+	return ret;
+}
+
+
+PIVector<float> PIFFT_float::getReal() const {
+	PIVector<float> ret;
+	ret.resize(result.size());
+	for (uint i = 0; i < result.size(); i++)
+		ret[i] = result[i].real();
+	return ret;
+}
+
+
+PIVector<float> PIFFT_float::getImag() const {
+	PIVector<float> ret;
+	ret.resize(result.size());
+	for (uint i = 0; i < result.size(); i++)
+		ret[i] = result[i].imag();
+	return ret;
+}
+
+
+void PIFFT_float::fftc1d(const PIVector<complexf> & a, uint n) {
+	createPlan(n);
+	uint i;
+	PIVector<float> buf;
+	buf.resize(2 * n);
+	for (i = 0; i < n; i++) {
+		buf[2 * i + 0] = a[i].real();
+		buf[2 * i + 1] = a[i].imag();
+	}
+	ftbaseexecuteplan(&buf, 0, n, &curplan);
+	result.resize(n);
+	for (i = 0; i < n; i++)
+		result[i] = complexf(buf[2 * i + 0], buf[2 * i + 1]);
+}
+
+
+void PIFFT_float::fftc1r(const PIVector<float> & a, uint n) {
+	uint i;
+	if (n % 2 == 0) {
+		PIVector<float> buf;
+		uint n2 = n / 2;
+		buf = a;
+		createPlan(n2);
+		ftbaseexecuteplan(&buf, 0, n2, &curplan);
+		result.resize(n);
+		uint idx;
+		complexf hn, hmnc, v;
+		for (i = 0; i <= n2; i++) {
+			idx = 2 * (i % n2);
+			hn = complexf(buf[idx + 0], buf[idx + 1]);
+			idx = 2 * ((n2 - i) % n2);
+			hmnc = complexf(buf[idx + 0], -buf[idx + 1]);
+			v = complexf(sin(M_PI * i / n2), cos(M_PI * i / n2));
+			result[i] = ((hn + hmnc) - (v * (hn - hmnc)));
+			result[i] *= 0.5;
+		}
+		for (i = n2 + 1; i < n; i++)
+			result[i] = conj(result[n - i]);
+	} else {
+		PIVector<complexf> cbuf;
+		cbuf.resize(n);
+		for (i = 0; i < n; i++)
+			cbuf[i] = complexf(a[i], 0.);
+		fftc1d(cbuf, n);
+	}
+}
+
+
+void PIFFT_float::fftc1dinv(const PIVector<complexf> & a, uint n) {
+	PIVector<complexf> cbuf;
+	cbuf.resize(n);
+	uint i;
+	for (i = 0; i < n; i++) {
+		cbuf[i] = conj(a[i]);
+	}
+	fftc1d(cbuf, n);
+	for (i = 0; i < n; i++) {
+		result[i] = conj(result[i] / (float)n);
+	}
+}
+
+
+void PIFFT_float::createPlan(uint n) {
+	curplan.plan.clear();
+	curplan.precomputed.clear();
+	curplan.stackbuf.clear();
+	curplan.tmpbuf.clear();
+	if (n < 2) return;
+	ftbasegeneratecomplexfftplan(n, &curplan);
+}
+
+
+void PIFFT_float::ftbasegeneratecomplexfftplan(uint n, ftplan * plan) {
+	int planarraysize;
+	int plansize;
+	int precomputedsize;
+	int tmpmemsize;
+	int stackmemsize;
+	ae_int_t stackptr;
+	planarraysize = 1;
+	plansize = 0;
+	precomputedsize = 0;
+	stackmemsize = 0;
+	stackptr = 0;
+	tmpmemsize = 2 * n;
+	curplan.plan.resize(planarraysize);
+	int ftbase_ftbasecffttask = 0;
+	ftbase_ftbasegenerateplanrec(n, ftbase_ftbasecffttask, plan, &plansize, &precomputedsize, &planarraysize, &tmpmemsize, &stackmemsize, stackptr);
+	if (stackptr != 0) {
+		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
+	}
+	curplan.stackbuf.resize(piMax<int>(stackmemsize, 1)); //ae_vector_set_length(&curplan.stackbuf, ae_maxint(stackmemsize, 1));
+	curplan.tmpbuf.resize(piMax<int>(tmpmemsize, 1)); //ae_vector_set_length(&(curplan.tmpbuf), ae_maxint(tmpmemsize, 1));
+	curplan.precomputed.resize(piMax<int>(precomputedsize, 1)); //ae_vector_set_length(&curplan.precomputed, ae_maxint(precomputedsize, 1));
+	stackptr = 0;
+	ftbase_ftbaseprecomputeplanrec(plan, 0, stackptr);
+	if (stackptr != 0) {
+		return;//ae_assert(stackptr==0, "Internal error in FTBaseGenerateComplexFFTPlan: stack ptr!");
+	}
+}
+
+
+/*************************************************************************
+Recurrent subroutine for the FFTGeneratePlan:
+
+PARAMETERS:
+	N                   plan size
+	IsReal              whether input is real or not.
+						subroutine MUST NOT ignore this flag because real
+						inputs comes with non-initialized imaginary parts,
+						so ignoring this flag will result in corrupted output
+	HalfOut             whether full output or only half of it from 0 to
+						floor(N/2) is needed. This flag may be ignored if
+						doing so will simplify calculations
+	Plan                plan array
+	PlanSize            size of used part (in integers)
+	PrecomputedSize     size of precomputed array allocated yet
+	PlanArraySize       plan array size (actual)
+	TmpMemSize          temporary memory required size
+	BluesteinMemSize    temporary memory required size
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_float::ftbase_ftbasegenerateplanrec(
+int n,
+int tasktype,
+ftplan * plan,
+int * plansize,
+int * precomputedsize,
+int * planarraysize,
+int * tmpmemsize,
+int * stackmemsize,
+ae_int_t stackptr, int debugi) {
+	int k, m, n1, n2, esize, entryoffset;
+	int ftbase_ftbaseplanentrysize = 4;
+	int ftbase_ftbasecffttask = 0;
+	int ftbase_fftcooleytukeyplan = 0;
+	int ftbase_fftbluesteinplan = 1;
+	int ftbase_fftcodeletplan = 2;
+	int ftbase_fftrealcooleytukeyplan = 5;
+	int ftbase_fftemptyplan = 6;
+	if (*plansize + ftbase_ftbaseplanentrysize > (*planarraysize)) {
+		curplan.plan.resize(4 * (*planarraysize));
+		*planarraysize = 4 * (*planarraysize);
+	}
+	entryoffset = *plansize;
+	esize = ftbase_ftbaseplanentrysize;
+	*plansize = *plansize + esize;
+	if (n == 1) {
+		curplan.plan[entryoffset + 0] = esize;
+		curplan.plan[entryoffset + 1] = -1;
+		curplan.plan[entryoffset + 2] = -1;
+		curplan.plan[entryoffset + 3] = ftbase_fftemptyplan;
+		curplan.plan[entryoffset + 4] = -1;
+		curplan.plan[entryoffset + 5] = -1;
+		curplan.plan[entryoffset + 6] = -1;
+		curplan.plan[entryoffset + 7] = -1;
+		return;
+	}
+	ftbasefactorize(n, &n1, &n2);
+	if (n1 != 1) {
+		*tmpmemsize = piMax<int>(*tmpmemsize, 2 * n1 * n2);
+		curplan.plan[entryoffset + 0] = esize;
+		curplan.plan[entryoffset + 1] = n1;
+		curplan.plan[entryoffset + 2] = n2;
+		if (tasktype == ftbase_ftbasecffttask)
+			curplan.plan[entryoffset + 3] = ftbase_fftcooleytukeyplan;
+		else
+			curplan.plan[entryoffset + 3] = ftbase_fftrealcooleytukeyplan;
+		curplan.plan[entryoffset + 4] = 0;
+		curplan.plan[entryoffset + 5] = *plansize;
+		debugi++;
+		ftbase_ftbasegenerateplanrec(n1, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
+		curplan.plan[entryoffset + 6] = *plansize;
+		ftbase_ftbasegenerateplanrec(n2, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr, debugi);
+		curplan.plan[entryoffset + 7] = -1;
+		return;
+	} else {
+		if (n >= 2 && n <= 5) {
+			curplan.plan[entryoffset + 0] = esize;
+			curplan.plan[entryoffset + 1] = n1;
+			curplan.plan[entryoffset + 2] = n2;
+			curplan.plan[entryoffset + 3] = ftbase_fftcodeletplan;
+			curplan.plan[entryoffset + 4] = 0;
+			curplan.plan[entryoffset + 5] = -1;
+			curplan.plan[entryoffset + 6] = -1;
+			curplan.plan[entryoffset + 7] = *precomputedsize;
+			if (n == 3)
+				*precomputedsize = *precomputedsize + 2;
+			if (n == 5)
+				*precomputedsize = *precomputedsize + 5;
+			return;
+		} else {
+			k = 2 * n2 - 1;
+			m = ftbasefindsmooth(k);
+			*tmpmemsize = piMax<int>(*tmpmemsize, 2 * m);
+			curplan.plan[entryoffset + 0] = esize;
+			curplan.plan[entryoffset + 1] = n2;
+			curplan.plan[entryoffset + 2] = -1;
+			curplan.plan[entryoffset + 3] = ftbase_fftbluesteinplan;
+			curplan.plan[entryoffset + 4] = m;
+			curplan.plan[entryoffset + 5] = *plansize;
+			stackptr = stackptr + 2 * 2 * m;
+			*stackmemsize = piMax<int>(*stackmemsize, stackptr);
+			ftbase_ftbasegenerateplanrec(m, ftbase_ftbasecffttask, plan, plansize, precomputedsize, planarraysize, tmpmemsize, stackmemsize, stackptr);
+			stackptr = stackptr - 2 * 2 * m;
+			curplan.plan[entryoffset + 6] = -1;
+			curplan.plan[entryoffset + 7] = *precomputedsize;
+			*precomputedsize = *precomputedsize + 2 * m + 2 * n;
+			return;
+		}
+	}
+}
+
+
+/*************************************************************************
+Recurrent subroutine for precomputing FFT plans
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_float::ftbase_ftbaseprecomputeplanrec(ftplan * plan,
+int entryoffset,
+ae_int_t stackptr) {
+	int n1, n2, n, m, offs;
+	float v, bx, by;
+	int ftbase_fftcooleytukeyplan = 0;
+	int ftbase_fftbluesteinplan = 1;
+	int ftbase_fftcodeletplan = 2;
+	int ftbase_fhtcooleytukeyplan = 3;
+	int ftbase_fhtcodeletplan = 4;
+	int ftbase_fftrealcooleytukeyplan = 5;
+	if ((curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan || curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) || curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
+		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
+		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 6], stackptr);
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan || curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		if (n == 3) {
+			offs = curplan.plan[entryoffset + 7];
+			curplan.precomputed[offs + 0] = cos(2 * M_PI / 3) - 1;
+			curplan.precomputed[offs + 1] = sin(2 * M_PI / 3);
+			return;
+		}
+		if (n == 5) {
+			offs = curplan.plan[entryoffset + 7];
+			v = 2 * M_PI / 5;
+			curplan.precomputed[offs + 0] = (cos(v) + cos(2 * v)) / 2 - 1;
+			curplan.precomputed[offs + 1] = (cos(v) - cos(2 * v)) / 2;
+			curplan.precomputed[offs + 2] = -sin(v);
+			curplan.precomputed[offs + 3] = -(sin(v) + sin(2 * v));
+			curplan.precomputed[offs + 4] = sin(v) - sin(2 * v);
+			return;
+		}
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
+		ftbase_ftbaseprecomputeplanrec(plan, curplan.plan[entryoffset + 5], stackptr);
+		n = curplan.plan[entryoffset + 1];
+		m = curplan.plan[entryoffset + 4];
+		offs = curplan.plan[entryoffset + 7];
+		for (int i = 0; i <= 2 * m - 1; i++)
+			curplan.precomputed[offs + i] = 0;
+		for (int i = 0; i < n; i++) {
+			bx = cos(M_PI * sqr(i) / n);
+			by = sin(M_PI * sqr(i) / n);
+			curplan.precomputed[offs + 2 * i + 0] = bx;
+			curplan.precomputed[offs + 2 * i + 1] = by;
+			curplan.precomputed[offs + 2 * m + 2 * i + 0] = bx;
+			curplan.precomputed[offs + 2 * m + 2 * i + 1] = by;
+			if (i > 0) {
+				curplan.precomputed[offs + 2 * (m - i) + 0] = bx;
+				curplan.precomputed[offs + 2 * (m - i) + 1] = by;
+			}
+		}
+		ftbaseexecuteplanrec(&curplan.precomputed, offs, plan, curplan.plan[entryoffset + 5], stackptr);
+		return;
+	}
+}
+
+
+void PIFFT_float::ftbasefactorize(int n, int * n1, int * n2) {
+	*n1 = *n2 = 0;
+	int ftbase_ftbasecodeletrecommended = 5;
+	if ((*n1) * (*n2) != n) {
+		for (int j = ftbase_ftbasecodeletrecommended; j >= 2; j--) {
+			if (n % j == 0) {
+				*n1 = j;
+				*n2 = n / j;
+				break;
+			}
+		}
+	}
+	if ((*n1) * (*n2) != n) {
+		for (int j = ftbase_ftbasecodeletrecommended + 1; j <= n - 1; j++) {
+			if (n % j == 0) {
+				*n1 = j;
+				*n2 = n / j;
+				break;
+			}
+		}
+	}
+	if ((*n1) * (*n2) != n) {
+		*n1 = 1;
+		*n2 = n;
+	}
+	if ((*n2) == 1 && (*n1) != 1) {
+		*n2 = *n1;
+		*n1 = 1;
+	}
+}
+
+
+/*************************************************************************
+Is number smooth?
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_float::ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int * best) {
+	if (seed >= n) {
+		*best = piMini(*best, seed);
+		return;
+	}
+	if (leastfactor <= 2)
+		ftbase_ftbasefindsmoothrec(n, seed * 2, 2, best);
+	if (leastfactor <= 3)
+		ftbase_ftbasefindsmoothrec(n, seed * 3, 3, best);
+	if (leastfactor <= 5)
+		ftbase_ftbasefindsmoothrec(n, seed * 5, 5, best);
+}
+
+
+int PIFFT_float::ftbasefindsmooth(int n) {
+	int best, result;
+	best = 2;
+	while (best < n)
+		best = 2 * best;
+	ftbase_ftbasefindsmoothrec(n, 1, 2, &best);
+	result = best;
+	return result;
+}
+
+
+void PIFFT_float::ftbase_internalreallintranspose(PIVector<float> * a, int m, int n, int astart, PIVector<float> * buf) {
+	ftbase_fftirltrec(a, astart, n, buf, 0, m, m, n);
+	for (int i = 0; i < 2 * m * n; i++) (*a)[astart + i] = (*buf)[i];
+}
+
+
+void PIFFT_float::ftbase_fftirltrec(PIVector<float> * a, int astart, int astride, PIVector<float> * b, int bstart, int bstride, int m, int n) {
+	int idx1, idx2;
+	int m1, n1;
+	if (m == 0 || n == 0)
+		return;
+	if (piMaxi(m, n) <= 8) {
+		for (int i = 0; i <= m - 1; i++) {
+			idx1 = bstart + i;
+			idx2 = astart + i * astride;
+			for (int j = 0; j <= n - 1; j++) {
+				(*b)[idx1] = a->at(idx2);
+				idx1 = idx1 + bstride;
+				idx2 = idx2 + 1;
+			}
+		}
+		return;
+	}
+	if (n > m) {
+		n1 = n / 2;
+		if (n - n1 >= 8 && n1 % 8 != 0)
+			n1 = n1 + (8 - n1 % 8);
+		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m, n1);
+		ftbase_fftirltrec(a, astart + n1, astride, b, bstart + n1 * bstride, bstride, m, n - n1);
+	} else {
+		m1 = m / 2;
+		if (m - m1 >= 8 && m1 % 8 != 0)
+			m1 = m1 + (8 - m1 % 8);
+		ftbase_fftirltrec(a, astart, astride, b, bstart, bstride, m1, n);
+		ftbase_fftirltrec(a, astart + m1 * astride, astride, b, bstart + m1, bstride, m - m1, n);
+	}
+}
+
+
+void PIFFT_float::ftbase_internalcomplexlintranspose(PIVector<float> * a, int m, int n, int astart, PIVector<float> * buf) {
+	ftbase_ffticltrec(a, astart, n, buf, 0, m, m, n);
+	for (int i = 0; i < 2 * m * n; i++)
+		(*a)[astart + i] = (*buf)[i];
+}
+
+
+void PIFFT_float::ftbase_ffticltrec(PIVector<float> * a, int astart, int astride, PIVector<float> * b, int bstart, int bstride, int m, int n) {
+	int idx1, idx2, m2, m1, n1;
+	if (m == 0 || n == 0)
+		return;
+	if (piMax<int>(m, n) <= 8) {
+		m2 = 2 * bstride;
+		for (int i = 0; i <= m - 1; i++) {
+			idx1 = bstart + 2 * i;
+			idx2 = astart + 2 * i * astride;
+			for (int j = 0; j <= n - 1; j++) {
+				(*b)[idx1 + 0] = a->at(idx2 + 0);
+				(*b)[idx1 + 1] = a->at(idx2 + 1);
+				idx1 = idx1 + m2;
+				idx2 = idx2 + 2;
+			}
+		}
+		return;
+	}
+	if (n > m) {
+		n1 = n / 2;
+		if (n - n1 >= 8 && n1 % 8 != 0)
+			n1 = n1 + (8 - n1 % 8);
+		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m, n1);
+		ftbase_ffticltrec(a, astart + 2 * n1, astride, b, bstart + 2 * n1 * bstride, bstride, m, n - n1);
+	} else {
+		m1 = m / 2;
+		if (m - m1 >= 8 && m1 % 8 != 0)
+			m1 = m1 + (8 - m1 % 8);
+		ftbase_ffticltrec(a, astart, astride, b, bstart, bstride, m1, n);
+		ftbase_ffticltrec(a, astart + 2 * m1 * astride, astride, b, bstart + 2 * m1, bstride, m - m1, n);
+	}
+}
+
+
+void PIFFT_float::ftbaseexecuteplan(PIVector<float> * a, int aoffset, int n, ftplan * plan) {
+	ae_int_t stackptr;
+	stackptr = 0;
+	ftbaseexecuteplanrec(a, aoffset, plan, 0, stackptr);
+}
+
+
+/*************************************************************************
+Recurrent subroutine for the FTBaseExecutePlan
+
+Parameters:
+	A           FFT'ed array
+	AOffset     offset of the FFT'ed part (distance is measured in floats)
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_float::ftbaseexecuteplanrec(PIVector<float> * a, int aoffset, ftplan * plan, int entryoffset, ae_int_t stackptr) {
+	int n1, n2, n, m, offs, offs1, offs2, offsa, offsb, offsp;
+	float hk, hnk, x, y, bx, by, v0, v1, v2, v3;
+	float a0x, a0y, a1x, a1y, a2x, a2y, a3x, a3y;
+	float t1x, t1y, t2x, t2y, t3x, t3y, t4x, t4y, t5x, t5y;
+	float m1x, m1y, m2x, m2y, m3x, m3y, m4x, m4y, m5x, m5y;
+	float s1x, s1y, s2x, s2y, s3x, s3y, s4x, s4y, s5x, s5y;
+	float c1, c2, c3, c4, c5;
+	int ftbase_fftcooleytukeyplan = 0;
+	int ftbase_fftbluesteinplan = 1;
+	int ftbase_fftcodeletplan = 2;
+	int ftbase_fhtcooleytukeyplan = 3;
+	int ftbase_fhtcodeletplan = 4;
+	int ftbase_fftrealcooleytukeyplan = 5;
+	int ftbase_fftemptyplan = 6;
+	PIVector<float> & tmpb(curplan.tmpbuf);
+
+	if (curplan.plan[entryoffset + 3] == ftbase_fftemptyplan)
+		return;
+	if (curplan.plan[entryoffset + 3] == ftbase_fftcooleytukeyplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n2 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
+		ftbase_ffttwcalc(a, aoffset, n1, n2);
+		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n1 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
+		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftrealcooleytukeyplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n1 / 2 - 1; i++) {
+			offs = aoffset + 2 * i * n2 * 2;
+			for (int k = 0; k <= n2 - 1; k++)
+				(*a)[offs + 2 * k + 1] = (*a)[offs + 2 * n2 + 2 * k + 0];
+			ftbaseexecuteplanrec(a, offs, plan, curplan.plan[entryoffset + 6], stackptr);
+			tmpb[0] = (*a)[offs + 0];
+			tmpb[1] = 0;
+			tmpb[2 * n2 + 0] = (*a)[offs + 1];
+			tmpb[2 * n2 + 1] = 0;
+			for (int k = 1; k <= n2 - 1; k++) {
+				offs1 = 2 * k;
+				offs2 = 2 * n2 + 2 * k;
+				hk = (*a)[offs + 2 * k + 0];
+				hnk = (*a)[offs + 2 * (n2 - k) + 0];
+				tmpb[offs1 + 0] = 0.5 * (hk + hnk);
+				tmpb[offs2 + 1] = -0.5 * (hk - hnk);
+				hk = (*a)[offs + 2 * k + 1];
+				hnk = (*a)[offs + 2 * (n2 - k) + 1];
+				tmpb[offs2 + 0] = 0.5 * (hk + hnk);
+				tmpb[offs1 + 1] = 0.5 * (hk - hnk);
+			}
+			for (int k = 0; k < 2 * n2 * 2; k++) (*a)[offs + k] = tmpb[k];
+		}
+		if (n1 % 2 != 0)
+			ftbaseexecuteplanrec(a, aoffset + (n1 - 1)*n2 * 2, plan, curplan.plan[entryoffset + 6], stackptr);
+		ftbase_ffttwcalc(a, aoffset, n2, n1);
+		ftbase_internalcomplexlintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n2 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n1 * 2, plan, curplan.plan[entryoffset + 5], stackptr);
+		ftbase_internalcomplexlintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fhtcooleytukeyplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n2 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n1, plan, curplan.plan[entryoffset + 5], stackptr);
+		for (int i = 0; i <= n2 - 1; i++) {
+			for (int j = 0; j <= n1 - 1; j++) {
+				offsa = aoffset + i * n1;
+				hk = (*a)[offsa + j];
+				hnk = (*a)[offsa + (n1 - j) % n1];
+				offs = 2 * (i * n1 + j);
+				tmpb[offs + 0] = -0.5 * (hnk - hk);
+				tmpb[offs + 1] = 0.5 * (hk + hnk);
+			}
+		}
+		ftbase_ffttwcalc(&(curplan.tmpbuf), 0, n1, n2);
+		for (int j = 0; j <= n1 - 1; j++)
+			(*a)[aoffset + j] = tmpb[2 * j + 0] + tmpb[2 * j + 1];
+		if (n2 % 2 == 0) {
+			offs = 2 * (n2 / 2) * n1;
+			offsa = aoffset + n2 / 2 * n1;
+			for (int j = 0; j <= n1 - 1; j++)
+				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs + 2 * j + 1];
+		}
+		for (int i = 1; i <= (n2 + 1) / 2 - 1; i++) {
+			offs = 2 * i * n1;
+			offs2 = 2 * (n2 - i) * n1;
+			offsa = aoffset + i * n1;
+			for (int j = 0; j <= n1 - 1; j++)
+				(*a)[offsa + j] = tmpb[offs + 2 * j + 1] + tmpb[offs2 + 2 * j + 0];
+			offsa = aoffset + (n2 - i) * n1;
+			for (int j = 0; j <= n1 - 1; j++)
+				(*a)[offsa + j] = tmpb[offs + 2 * j + 0] + tmpb[offs2 + 2 * j + 1];
+		}
+		ftbase_internalreallintranspose(a, n2, n1, aoffset, &(curplan.tmpbuf));
+		for (int i = 0; i <= n1 - 1; i++)
+			ftbaseexecuteplanrec(a, aoffset + i * n2, plan, curplan.plan[entryoffset + 6], stackptr);
+		ftbase_internalreallintranspose(a, n1, n2, aoffset, &(curplan.tmpbuf));
+		return;
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftcodeletplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		if (n == 2) {
+			a0x = (*a)[aoffset + 0];
+			a0y = (*a)[aoffset + 1];
+			a1x = (*a)[aoffset + 2];
+			a1y = (*a)[aoffset + 3];
+			v0 = a0x + a1x;
+			v1 = a0y + a1y;
+			v2 = a0x - a1x;
+			v3 = a0y - a1y;
+			(*a)[aoffset + 0] = v0;
+			(*a)[aoffset + 1] = v1;
+			(*a)[aoffset + 2] = v2;
+			(*a)[aoffset + 3] = v3;
+			return;
+		}
+		if (n == 3) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			a0x = (*a)[aoffset + 0];
+			a0y = (*a)[aoffset + 1];
+			a1x = (*a)[aoffset + 2];
+			a1y = (*a)[aoffset + 3];
+			a2x = (*a)[aoffset + 4];
+			a2y = (*a)[aoffset + 5];
+			t1x = a1x + a2x;
+			t1y = a1y + a2y;
+			a0x = a0x + t1x;
+			a0y = a0y + t1y;
+			m1x = c1 * t1x;
+			m1y = c1 * t1y;
+			m2x = c2 * (a1y - a2y);
+			m2y = c2 * (a2x - a1x);
+			s1x = a0x + m1x;
+			s1y = a0y + m1y;
+			a1x = s1x + m2x;
+			a1y = s1y + m2y;
+			a2x = s1x - m2x;
+			a2y = s1y - m2y;
+			(*a)[aoffset + 0] = a0x;
+			(*a)[aoffset + 1] = a0y;
+			(*a)[aoffset + 2] = a1x;
+			(*a)[aoffset + 3] = a1y;
+			(*a)[aoffset + 4] = a2x;
+			(*a)[aoffset + 5] = a2y;
+			return;
+		}
+		if (n == 4) {
+			a0x = (*a)[aoffset + 0];
+			a0y = (*a)[aoffset + 1];
+			a1x = (*a)[aoffset + 2];
+			a1y = (*a)[aoffset + 3];
+			a2x = (*a)[aoffset + 4];
+			a2y = (*a)[aoffset + 5];
+			a3x = (*a)[aoffset + 6];
+			a3y = (*a)[aoffset + 7];
+			t1x = a0x + a2x;
+			t1y = a0y + a2y;
+			t2x = a1x + a3x;
+			t2y = a1y + a3y;
+			m2x = a0x - a2x;
+			m2y = a0y - a2y;
+			m3x = a1y - a3y;
+			m3y = a3x - a1x;
+			(*a)[aoffset + 0] = t1x + t2x;
+			(*a)[aoffset + 1] = t1y + t2y;
+			(*a)[aoffset + 4] = t1x - t2x;
+			(*a)[aoffset + 5] = t1y - t2y;
+			(*a)[aoffset + 2] = m2x + m3x;
+			(*a)[aoffset + 3] = m2y + m3y;
+			(*a)[aoffset + 6] = m2x - m3x;
+			(*a)[aoffset + 7] = m2y - m3y;
+			return;
+		}
+		if (n == 5) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			c3 = curplan.precomputed[offs + 2];
+			c4 = curplan.precomputed[offs + 3];
+			c5 = curplan.precomputed[offs + 4];
+			t1x = (*a)[aoffset + 2] + (*a)[aoffset + 8];
+			t1y = (*a)[aoffset + 3] + (*a)[aoffset + 9];
+			t2x = (*a)[aoffset + 4] + (*a)[aoffset + 6];
+			t2y = (*a)[aoffset + 5] + (*a)[aoffset + 7];
+			t3x = (*a)[aoffset + 2] - (*a)[aoffset + 8];
+			t3y = (*a)[aoffset + 3] - (*a)[aoffset + 9];
+			t4x = (*a)[aoffset + 6] - (*a)[aoffset + 4];
+			t4y = (*a)[aoffset + 7] - (*a)[aoffset + 5];
+			t5x = t1x + t2x;
+			t5y = t1y + t2y;
+			(*a)[aoffset + 0] = (*a)[aoffset + 0] + t5x;
+			(*a)[aoffset + 1] = (*a)[aoffset + 1] + t5y;
+			m1x = c1 * t5x;
+			m1y = c1 * t5y;
+			m2x = c2 * (t1x - t2x);
+			m2y = c2 * (t1y - t2y);
+			m3x = -c3 * (t3y + t4y);
+			m3y = c3 * (t3x + t4x);
+			m4x = -c4 * t4y;
+			m4y = c4 * t4x;
+			m5x = -c5 * t3y;
+			m5y = c5 * t3x;
+			s3x = m3x - m4x;
+			s3y = m3y - m4y;
+			s5x = m3x + m5x;
+			s5y = m3y + m5y;
+			s1x = (*a)[aoffset + 0] + m1x;
+			s1y = (*a)[aoffset + 1] + m1y;
+			s2x = s1x + m2x;
+			s2y = s1y + m2y;
+			s4x = s1x - m2x;
+			s4y = s1y - m2y;
+			(*a)[aoffset + 2] = s2x + s3x;
+			(*a)[aoffset + 3] = s2y + s3y;
+			(*a)[aoffset + 4] = s4x + s5x;
+			(*a)[aoffset + 5] = s4y + s5y;
+			(*a)[aoffset + 6] = s4x - s5x;
+			(*a)[aoffset + 7] = s4y - s5y;
+			(*a)[aoffset + 8] = s2x - s3x;
+			(*a)[aoffset + 9] = s2y - s3y;
+			return;
+		}
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fhtcodeletplan) {
+		n1 = curplan.plan[entryoffset + 1];
+		n2 = curplan.plan[entryoffset + 2];
+		n = n1 * n2;
+		if (n == 2) {
+			a0x = (*a)[aoffset + 0];
+			a1x = (*a)[aoffset + 1];
+			(*a)[aoffset + 0] = a0x + a1x;
+			(*a)[aoffset + 1] = a0x - a1x;
+			return;
+		}
+		if (n == 3) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			a0x = (*a)[aoffset + 0];
+			a1x = (*a)[aoffset + 1];
+			a2x = (*a)[aoffset + 2];
+			t1x = a1x + a2x;
+			a0x = a0x + t1x;
+			m1x = c1 * t1x;
+			m2y = c2 * (a2x - a1x);
+			s1x = a0x + m1x;
+			(*a)[aoffset + 0] = a0x;
+			(*a)[aoffset + 1] = s1x - m2y;
+			(*a)[aoffset + 2] = s1x + m2y;
+			return;
+		}
+		if (n == 4) {
+			a0x = (*a)[aoffset + 0];
+			a1x = (*a)[aoffset + 1];
+			a2x = (*a)[aoffset + 2];
+			a3x = (*a)[aoffset + 3];
+			t1x = a0x + a2x;
+			t2x = a1x + a3x;
+			m2x = a0x - a2x;
+			m3y = a3x - a1x;
+			(*a)[aoffset + 0] = t1x + t2x;
+			(*a)[aoffset + 1] = m2x - m3y;
+			(*a)[aoffset + 2] = t1x - t2x;
+			(*a)[aoffset + 3] = m2x + m3y;
+			return;
+		}
+		if (n == 5) {
+			offs = curplan.plan[entryoffset + 7];
+			c1 = curplan.precomputed[offs + 0];
+			c2 = curplan.precomputed[offs + 1];
+			c3 = curplan.precomputed[offs + 2];
+			c4 = curplan.precomputed[offs + 3];
+			c5 = curplan.precomputed[offs + 4];
+			t1x = (*a)[aoffset + 1] + (*a)[aoffset + 4];
+			t2x = (*a)[aoffset + 2] + (*a)[aoffset + 3];
+			t3x = (*a)[aoffset + 1] - (*a)[aoffset + 4];
+			t4x = (*a)[aoffset + 3] - (*a)[aoffset + 2];
+			t5x = t1x + t2x;
+			v0 = (*a)[aoffset + 0] + t5x;
+			(*a)[aoffset + 0] = v0;
+			m2x = c2 * (t1x - t2x);
+			m3y = c3 * (t3x + t4x);
+			s3y = m3y - c4 * t4x;
+			s5y = m3y + c5 * t3x;
+			s1x = v0 + c1 * t5x;
+			s2x = s1x + m2x;
+			s4x = s1x - m2x;
+			(*a)[aoffset + 1] = s2x - s3y;
+			(*a)[aoffset + 2] = s4x - s5y;
+			(*a)[aoffset + 3] = s4x + s5y;
+			(*a)[aoffset + 4] = s2x + s3y;
+			return;
+		}
+	}
+	if (curplan.plan[entryoffset + 3] == ftbase_fftbluesteinplan) {
+		n = curplan.plan[entryoffset + 1];
+		m = curplan.plan[entryoffset + 4];
+		offs = curplan.plan[entryoffset + 7];
+		for (int i = stackptr + 2 * n; i <= stackptr + 2 * m - 1; i++)
+			curplan.stackbuf[i] = 0;
+		offsp = offs + 2 * m;
+		offsa = aoffset;
+		offsb = stackptr;
+		for (int i = 0; i < n; i++) {
+			bx = curplan.precomputed[offsp + 0];
+			by = curplan.precomputed[offsp + 1];
+			x = (*a)[offsa + 0];
+			y = (*a)[offsa + 1];
+			curplan.stackbuf[offsb + 0] = x * bx - y * (-by);
+			curplan.stackbuf[offsb + 1] = x * (-by) + y * bx;
+			offsp = offsp + 2;
+			offsa = offsa + 2;
+			offsb = offsb + 2;
+		}
+		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
+		offsb = stackptr;
+		offsp = offs;
+		for (int i = 0; i <= m - 1; i++) {
+			x = curplan.stackbuf[offsb + 0];
+			y = curplan.stackbuf[offsb + 1];
+			bx = curplan.precomputed[offsp + 0];
+			by = curplan.precomputed[offsp + 1];
+			curplan.stackbuf[offsb + 0] = x * bx - y * by;
+			curplan.stackbuf[offsb + 1] = -(x * by + y * bx);
+			offsb = offsb + 2;
+			offsp = offsp + 2;
+		}
+		ftbaseexecuteplanrec(&curplan.stackbuf, stackptr, plan, curplan.plan[entryoffset + 5], stackptr + 2 * 2 * m);
+		offsb = stackptr;
+		offsp = offs + 2 * m;
+		offsa = aoffset;
+		for (int i = 0; i < n; i++) {
+			x = curplan.stackbuf[offsb + 0] / m;
+			y = -curplan.stackbuf[offsb + 1] / m;
+			bx = curplan.precomputed[offsp + 0];
+			by = curplan.precomputed[offsp + 1];
+			(*a)[offsa + 0] = x * bx - y * (-by);
+			(*a)[offsa + 1] = x * (-by) + y * bx;
+			offsp = offsp + 2;
+			offsa = offsa + 2;
+			offsb = offsb + 2;
+		}
+		return;
+	}
+}
+
+
+/*************************************************************************
+Twiddle factors calculation
+
+-- ALGLIB --
+	Copyright 01.05.2009 by Bochkanov Sergey
+*************************************************************************/
+void PIFFT_float::ftbase_ffttwcalc(PIVector<float> * a, int aoffset, int n1, int n2) {
+	int n, idx, offs;
+	float x, y, twxm1, twy, twbasexm1, twbasey, twrowxm1, twrowy, tmpx, tmpy, v;
+	int ftbase_ftbaseupdatetw = 4;
+	n = n1 * n2;
+	v = -2 * M_PI / n;
+	twbasexm1 = -2 * sqr(sin(0.5 * v));
+	twbasey = sin(v);
+	twrowxm1 = 0;
+	twrowy = 0;
+	for (int i = 0, j = 0; i <= n2 - 1; i++) {
+		twxm1 = 0;
+		twy = 0;
+		for (j = 0; j <= n1 - 1; j++) {
+			idx = i * n1 + j;
+			offs = aoffset + 2 * idx;
+			x = (*a)[offs + 0];
+			y = (*a)[offs + 1];
+			tmpx = x * twxm1 - y * twy;
+			tmpy = x * twy + y * twxm1;
+			(*a)[offs + 0] = x + tmpx;
+			(*a)[offs + 1] = y + tmpy;
+			if (j < n1 - 1) {
+				if (j % ftbase_ftbaseupdatetw == 0) {
+					v = -2 * M_PI * i * (j + 1) / n;
+					twxm1 = -2 * sqr(sin(0.5 * v));
+					twy = sin(v);
+				} else {
+					tmpx = twrowxm1 + twxm1 * twrowxm1 - twy * twrowy;
+					tmpy = twrowy + twxm1 * twrowy + twy * twrowxm1;
+					twxm1 = twxm1 + tmpx;
+					twy = twy + tmpy;
+				}
+			}
+		}
+
+		if (i < n2 - 1) {
+			if (j % ftbase_ftbaseupdatetw == 0) {
+				v = -2 * M_PI * (i + 1) / n;
+				twrowxm1 = -2 * sqr(sin(0.5 * v));
+				twrowy = sin(v);
+			} else {
+				tmpx = twbasexm1 + twrowxm1 * twbasexm1 - twrowy * twbasey;
+				tmpy = twbasey + twrowxm1 * twbasey + twrowy * twbasexm1;
+				twrowxm1 = twrowxm1 + tmpx;
+				twrowy = twrowy + tmpy;
+			}
+		}
+	}
+}
diff --git a/src_main/math/pifft.h b/lib/main/math/pifft.h
similarity index 97%
rename from src_main/math/pifft.h
rename to lib/main/math/pifft.h
index 98004528..06250e32 100644
--- a/src_main/math/pifft.h
+++ b/lib/main/math/pifft.h
@@ -1,196 +1,196 @@
-/*! \file pifft.h
- * \brief Class for FFT, IFFT and Hilbert transformations
-*/
-/*
-	PIP - Platform Independent Primitives
-	Class for FFT, IFFT and Hilbert transformations
-	Andrey Bychkov work.a.b@yandex.ru, Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIFFT_H
-#define PIFFT_H
-
-#include "pimathcomplex.h"
-
-class PIP_EXPORT PIFFT_double
-{
-public:
-	PIFFT_double();
-	
-	PIVector<complexd> * calcFFT(const PIVector<complexd> &val);
-	PIVector<complexd> * calcFFT(const PIVector<double> &val);
-	PIVector<complexd> * calcFFTinverse(const PIVector<complexd> &val);
-	PIVector<complexd> * calcHilbert(const PIVector<double> &val);
-	PIVector<double> getAmplitude() const;
-	PIVector<double> getReal() const;
-	PIVector<double> getImag() const;
-	
-private:
-	PIVector<complexd> result;
-	typedef ptrdiff_t ae_int_t;
-
-	struct ftplan {
-		PIVector<int> plan;
-		PIVector<double> precomputed;
-		PIVector<double> tmpbuf;
-		PIVector<double> stackbuf;
-	};
-
-	ftplan curplan;
-
-	void fftc1d(const PIVector<complexd> &a, uint n);
-	void fftc1r(const PIVector<double> &a, uint n);
-	void fftc1dinv(const PIVector<complexd> &a, uint n);
-
-	void createPlan(uint n);
-	void ftbasegeneratecomplexfftplan(uint n, ftplan *plan);
-	void ftbase_ftbasegenerateplanrec(int n, int tasktype, ftplan *plan, int *plansize, int *precomputedsize, int *planarraysize, int *tmpmemsize, int *stackmemsize, ae_int_t stackptr, int debugi=0);
-	void ftbase_ftbaseprecomputeplanrec(ftplan *plan, int entryoffset, ae_int_t stackptr);
-	void ftbasefactorize(int n, int *n1, int *n2);
-	void ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int *best);
-	int ftbasefindsmooth(int n);
-	void ftbaseexecuteplan(PIVector<double> *a, int aoffset, int n, ftplan *plan);
-	void ftbaseexecuteplanrec(PIVector<double> *a, int aoffset, ftplan *plan, int entryoffset, ae_int_t stackptr);
-	void ftbase_internalcomplexlintranspose(PIVector<double> *a, int m, int n, int astart, PIVector<double> *buf);
-	void ftbase_ffticltrec(PIVector<double> *a, int astart, int astride, PIVector<double> *b, int bstart, int bstride, int m, int n);
-	void ftbase_internalreallintranspose(PIVector<double> *a, int m, int n, int astart, PIVector<double> *buf);
-	void ftbase_fftirltrec(PIVector<double> *a, int astart, int astride, PIVector<double> *b, int bstart, int bstride, int m, int n);
-	void ftbase_ffttwcalc(PIVector<double> *a, int aoffset, int n1, int n2);
-};
-
-class PIP_EXPORT PIFFT_float
-{
-public:
-	PIFFT_float();
-
-	PIVector<complexf> * calcFFT(const PIVector<complexf> &val);
-	PIVector<complexf> * calcFFT(const PIVector<float> &val);
-	PIVector<complexf> * calcFFTinverse(const PIVector<complexf> &val);
-	PIVector<complexf> * calcHilbert(const PIVector<float> &val);
-	PIVector<float> getAmplitude() const;
-	PIVector<float> getReal() const;
-	PIVector<float> getImag() const;
-
-private:
-	PIVector<complexf> result;
-	typedef ptrdiff_t ae_int_t;
-
-	struct ftplan {
-		PIVector<int> plan;
-		PIVector<float> precomputed;
-		PIVector<float> tmpbuf;
-		PIVector<float> stackbuf;
-	};
-
-	ftplan curplan;
-
-	void fftc1d(const PIVector<complexf> &a, uint n);
-	void fftc1r(const PIVector<float> &a, uint n);
-	void fftc1dinv(const PIVector<complexf> &a, uint n);
-
-	void createPlan(uint n);
-	void ftbasegeneratecomplexfftplan(uint n, ftplan *plan);
-	void ftbase_ftbasegenerateplanrec(int n, int tasktype, ftplan *plan, int *plansize, int *precomputedsize, int *planarraysize, int *tmpmemsize, int *stackmemsize, ae_int_t stackptr, int debugi=0);
-	void ftbase_ftbaseprecomputeplanrec(ftplan *plan, int entryoffset, ae_int_t stackptr);
-	void ftbasefactorize(int n, int *n1, int *n2);
-	void ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int *best);
-	int ftbasefindsmooth(int n);
-	void ftbaseexecuteplan(PIVector<float> *a, int aoffset, int n, ftplan *plan);
-	void ftbaseexecuteplanrec(PIVector<float> *a, int aoffset, ftplan *plan, int entryoffset, ae_int_t stackptr);
-	void ftbase_internalcomplexlintranspose(PIVector<float> *a, int m, int n, int astart, PIVector<float> *buf);
-	void ftbase_ffticltrec(PIVector<float> *a, int astart, int astride, PIVector<float> *b, int bstart, int bstride, int m, int n);
-	void ftbase_internalreallintranspose(PIVector<float> *a, int m, int n, int astart, PIVector<float> *buf);
-	void ftbase_fftirltrec(PIVector<float> *a, int astart, int astride, PIVector<float> *b, int bstart, int bstride, int m, int n);
-	void ftbase_ffttwcalc(PIVector<float> *a, int aoffset, int n1, int n2);
-};
-
-typedef PIFFT_double PIFFT;
-typedef PIFFT_double PIFFTd;
-typedef PIFFT_float PIFFTf;
-
-#ifndef CC_VC
-
-#define _PIFFTW_H(type) class _PIFFTW_P_##type##_ { \
-public: \
-	_PIFFTW_P_##type##_(); \
-	~_PIFFTW_P_##type##_(); \
-	const PIVector<complex<type> > & calcFFT(const PIVector<complex<type> > & in); \
-	const PIVector<complex<type> > & calcFFTR(const PIVector<type> & in); \
-	const PIVector<complex<type> > & calcFFTI(const PIVector<complex<type> > & in); \
-	void preparePlan(int size, int op); \
-	void * impl; \
-};
-_PIFFTW_H(float)
-_PIFFTW_H(double)
-_PIFFTW_H(ldouble)
-
-template <typename T>
-class PIP_EXPORT PIFFTW
-{
-public:
-	explicit PIFFTW() {p = 0; newP(p);}
-	~PIFFTW() {deleteP(p);}
-
-	inline const PIVector<complex<T> > & calcFFT(const PIVector<complex<T> > & in) {return PIVector<complex<T> >().resize(in.size());}
-	inline const PIVector<complex<T> > & calcFFT(const PIVector<T> & in) {return PIVector<complex<T> >().resize(in.size());}
-	inline const PIVector<complex<T> > & calcFFTinverse(const PIVector<complex<T> > & in) {return PIVector<complex<T> >().resize(in.size());}
-
-	enum FFT_Operation {foReal, foComplex, foInverse};
-
-	inline void preparePlan(int size, FFT_Operation op) {}
-
-private:
-	void operator =(const PIFFTW & );
-	PIFFTW(const PIFFTW &);
-	inline void newP(void *& _p) {}
-	inline void deleteP(void *& _p) {}
-
-	void * p;
-};
-
-
-template<> inline const PIVector<complex<float> > & PIFFTW<float>::calcFFT(const PIVector<complex<float> > & in) {return ((_PIFFTW_P_float_*)p)->calcFFT(in);}
-template<> inline const PIVector<complex<float> > & PIFFTW<float>::calcFFT(const PIVector<float> & in) {return ((_PIFFTW_P_float_*)p)->calcFFTR(in);}
-template<> inline const PIVector<complex<float> > & PIFFTW<float>::calcFFTinverse(const PIVector<complex<float> > & in) {return ((_PIFFTW_P_float_*)p)->calcFFTI(in);}
-template<> inline void PIFFTW<float>::preparePlan(int size, FFT_Operation op) {((_PIFFTW_P_float_*)p)->preparePlan(size, op);}
-template<> inline void PIFFTW<float>::newP(void *& _p) {_p = new _PIFFTW_P_float_();}
-template<> inline void PIFFTW<float>::deleteP(void *& _p) {if (_p) delete (_PIFFTW_P_float_*)_p; _p = 0;}
-
-typedef PIFFTW<float>   PIFFTWf;
-
-
-template<> inline const PIVector<complex<double> > & PIFFTW<double>::calcFFT(const PIVector<complex<double> > & in) {return ((_PIFFTW_P_double_*)p)->calcFFT(in);}
-template<> inline const PIVector<complex<double> > & PIFFTW<double>::calcFFT(const PIVector<double> & in) {return ((_PIFFTW_P_double_*)p)->calcFFTR(in);}
-template<> inline const PIVector<complex<double> > & PIFFTW<double>::calcFFTinverse(const PIVector<complex<double> > & in) {return ((_PIFFTW_P_double_*)p)->calcFFTI(in);}
-template<> inline void PIFFTW<double>::preparePlan(int size, FFT_Operation op) {((_PIFFTW_P_double_*)p)->preparePlan(size, op);}
-template<> inline void PIFFTW<double>::newP(void *& _p) {_p = new _PIFFTW_P_double_();}
-template<> inline void PIFFTW<double>::deleteP(void *& _p) {if (_p) delete (_PIFFTW_P_double_*)_p; _p = 0;}
-
-typedef PIFFTW<double>  PIFFTWd;
-
-
-template<> inline const PIVector<complex<ldouble> > & PIFFTW<ldouble>::calcFFT(const PIVector<complex<ldouble> > & in) {return ((_PIFFTW_P_ldouble_*)p)->calcFFT(in);}
-template<> inline const PIVector<complex<ldouble> > & PIFFTW<ldouble>::calcFFT(const PIVector<ldouble> & in) {return ((_PIFFTW_P_ldouble_*)p)->calcFFTR(in);}
-template<> inline const PIVector<complex<ldouble> > & PIFFTW<ldouble>::calcFFTinverse(const PIVector<complex<ldouble> > & in) {return ((_PIFFTW_P_ldouble_*)p)->calcFFTI(in);}
-template<> inline void PIFFTW<ldouble>::preparePlan(int size, FFT_Operation op) {((_PIFFTW_P_ldouble_*)p)->preparePlan(size, op);}
-template<> inline void PIFFTW<ldouble>::newP(void *& _p) {_p = new _PIFFTW_P_ldouble_();}
-template<> inline void PIFFTW<ldouble>::deleteP(void *& _p) {if (_p) delete (_PIFFTW_P_ldouble_*)_p; _p = 0;}
-
-typedef PIFFTW<ldouble> PIFFTWld;
-
-#endif
-
-#endif // PIFFT_H
+/*! \file pifft.h
+ * \brief Class for FFT, IFFT and Hilbert transformations
+*/
+/*
+	PIP - Platform Independent Primitives
+	Class for FFT, IFFT and Hilbert transformations
+	Andrey Bychkov work.a.b@yandex.ru, Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIFFT_H
+#define PIFFT_H
+
+#include "pimathcomplex.h"
+
+class PIP_EXPORT PIFFT_double
+{
+public:
+	PIFFT_double();
+	
+	PIVector<complexd> * calcFFT(const PIVector<complexd> &val);
+	PIVector<complexd> * calcFFT(const PIVector<double> &val);
+	PIVector<complexd> * calcFFTinverse(const PIVector<complexd> &val);
+	PIVector<complexd> * calcHilbert(const PIVector<double> &val);
+	PIVector<double> getAmplitude() const;
+	PIVector<double> getReal() const;
+	PIVector<double> getImag() const;
+	
+private:
+	PIVector<complexd> result;
+	typedef ptrdiff_t ae_int_t;
+
+	struct ftplan {
+		PIVector<int> plan;
+		PIVector<double> precomputed;
+		PIVector<double> tmpbuf;
+		PIVector<double> stackbuf;
+	};
+
+	ftplan curplan;
+
+	void fftc1d(const PIVector<complexd> &a, uint n);
+	void fftc1r(const PIVector<double> &a, uint n);
+	void fftc1dinv(const PIVector<complexd> &a, uint n);
+
+	void createPlan(uint n);
+	void ftbasegeneratecomplexfftplan(uint n, ftplan *plan);
+	void ftbase_ftbasegenerateplanrec(int n, int tasktype, ftplan *plan, int *plansize, int *precomputedsize, int *planarraysize, int *tmpmemsize, int *stackmemsize, ae_int_t stackptr, int debugi=0);
+	void ftbase_ftbaseprecomputeplanrec(ftplan *plan, int entryoffset, ae_int_t stackptr);
+	void ftbasefactorize(int n, int *n1, int *n2);
+	void ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int *best);
+	int ftbasefindsmooth(int n);
+	void ftbaseexecuteplan(PIVector<double> *a, int aoffset, int n, ftplan *plan);
+	void ftbaseexecuteplanrec(PIVector<double> *a, int aoffset, ftplan *plan, int entryoffset, ae_int_t stackptr);
+	void ftbase_internalcomplexlintranspose(PIVector<double> *a, int m, int n, int astart, PIVector<double> *buf);
+	void ftbase_ffticltrec(PIVector<double> *a, int astart, int astride, PIVector<double> *b, int bstart, int bstride, int m, int n);
+	void ftbase_internalreallintranspose(PIVector<double> *a, int m, int n, int astart, PIVector<double> *buf);
+	void ftbase_fftirltrec(PIVector<double> *a, int astart, int astride, PIVector<double> *b, int bstart, int bstride, int m, int n);
+	void ftbase_ffttwcalc(PIVector<double> *a, int aoffset, int n1, int n2);
+};
+
+class PIP_EXPORT PIFFT_float
+{
+public:
+	PIFFT_float();
+
+	PIVector<complexf> * calcFFT(const PIVector<complexf> &val);
+	PIVector<complexf> * calcFFT(const PIVector<float> &val);
+	PIVector<complexf> * calcFFTinverse(const PIVector<complexf> &val);
+	PIVector<complexf> * calcHilbert(const PIVector<float> &val);
+	PIVector<float> getAmplitude() const;
+	PIVector<float> getReal() const;
+	PIVector<float> getImag() const;
+
+private:
+	PIVector<complexf> result;
+	typedef ptrdiff_t ae_int_t;
+
+	struct ftplan {
+		PIVector<int> plan;
+		PIVector<float> precomputed;
+		PIVector<float> tmpbuf;
+		PIVector<float> stackbuf;
+	};
+
+	ftplan curplan;
+
+	void fftc1d(const PIVector<complexf> &a, uint n);
+	void fftc1r(const PIVector<float> &a, uint n);
+	void fftc1dinv(const PIVector<complexf> &a, uint n);
+
+	void createPlan(uint n);
+	void ftbasegeneratecomplexfftplan(uint n, ftplan *plan);
+	void ftbase_ftbasegenerateplanrec(int n, int tasktype, ftplan *plan, int *plansize, int *precomputedsize, int *planarraysize, int *tmpmemsize, int *stackmemsize, ae_int_t stackptr, int debugi=0);
+	void ftbase_ftbaseprecomputeplanrec(ftplan *plan, int entryoffset, ae_int_t stackptr);
+	void ftbasefactorize(int n, int *n1, int *n2);
+	void ftbase_ftbasefindsmoothrec(int n, int seed, int leastfactor, int *best);
+	int ftbasefindsmooth(int n);
+	void ftbaseexecuteplan(PIVector<float> *a, int aoffset, int n, ftplan *plan);
+	void ftbaseexecuteplanrec(PIVector<float> *a, int aoffset, ftplan *plan, int entryoffset, ae_int_t stackptr);
+	void ftbase_internalcomplexlintranspose(PIVector<float> *a, int m, int n, int astart, PIVector<float> *buf);
+	void ftbase_ffticltrec(PIVector<float> *a, int astart, int astride, PIVector<float> *b, int bstart, int bstride, int m, int n);
+	void ftbase_internalreallintranspose(PIVector<float> *a, int m, int n, int astart, PIVector<float> *buf);
+	void ftbase_fftirltrec(PIVector<float> *a, int astart, int astride, PIVector<float> *b, int bstart, int bstride, int m, int n);
+	void ftbase_ffttwcalc(PIVector<float> *a, int aoffset, int n1, int n2);
+};
+
+typedef PIFFT_double PIFFT;
+typedef PIFFT_double PIFFTd;
+typedef PIFFT_float PIFFTf;
+
+#ifndef CC_VC
+
+#define _PIFFTW_H(type) class _PIFFTW_P_##type##_ { \
+public: \
+	_PIFFTW_P_##type##_(); \
+	~_PIFFTW_P_##type##_(); \
+	const PIVector<complex<type> > & calcFFT(const PIVector<complex<type> > & in); \
+	const PIVector<complex<type> > & calcFFTR(const PIVector<type> & in); \
+	const PIVector<complex<type> > & calcFFTI(const PIVector<complex<type> > & in); \
+	void preparePlan(int size, int op); \
+	void * impl; \
+};
+_PIFFTW_H(float)
+_PIFFTW_H(double)
+_PIFFTW_H(ldouble)
+
+template <typename T>
+class PIP_EXPORT PIFFTW
+{
+public:
+	explicit PIFFTW() {p = 0; newP(p);}
+	~PIFFTW() {deleteP(p);}
+
+	inline const PIVector<complex<T> > & calcFFT(const PIVector<complex<T> > & in) {return PIVector<complex<T> >().resize(in.size());}
+	inline const PIVector<complex<T> > & calcFFT(const PIVector<T> & in) {return PIVector<complex<T> >().resize(in.size());}
+	inline const PIVector<complex<T> > & calcFFTinverse(const PIVector<complex<T> > & in) {return PIVector<complex<T> >().resize(in.size());}
+
+	enum FFT_Operation {foReal, foComplex, foInverse};
+
+	inline void preparePlan(int size, FFT_Operation op) {}
+
+private:
+	void operator =(const PIFFTW & );
+	PIFFTW(const PIFFTW &);
+	inline void newP(void *& _p) {}
+	inline void deleteP(void *& _p) {}
+
+	void * p;
+};
+
+
+template<> inline const PIVector<complex<float> > & PIFFTW<float>::calcFFT(const PIVector<complex<float> > & in) {return ((_PIFFTW_P_float_*)p)->calcFFT(in);}
+template<> inline const PIVector<complex<float> > & PIFFTW<float>::calcFFT(const PIVector<float> & in) {return ((_PIFFTW_P_float_*)p)->calcFFTR(in);}
+template<> inline const PIVector<complex<float> > & PIFFTW<float>::calcFFTinverse(const PIVector<complex<float> > & in) {return ((_PIFFTW_P_float_*)p)->calcFFTI(in);}
+template<> inline void PIFFTW<float>::preparePlan(int size, FFT_Operation op) {((_PIFFTW_P_float_*)p)->preparePlan(size, op);}
+template<> inline void PIFFTW<float>::newP(void *& _p) {_p = new _PIFFTW_P_float_();}
+template<> inline void PIFFTW<float>::deleteP(void *& _p) {if (_p) delete (_PIFFTW_P_float_*)_p; _p = 0;}
+
+typedef PIFFTW<float>   PIFFTWf;
+
+
+template<> inline const PIVector<complex<double> > & PIFFTW<double>::calcFFT(const PIVector<complex<double> > & in) {return ((_PIFFTW_P_double_*)p)->calcFFT(in);}
+template<> inline const PIVector<complex<double> > & PIFFTW<double>::calcFFT(const PIVector<double> & in) {return ((_PIFFTW_P_double_*)p)->calcFFTR(in);}
+template<> inline const PIVector<complex<double> > & PIFFTW<double>::calcFFTinverse(const PIVector<complex<double> > & in) {return ((_PIFFTW_P_double_*)p)->calcFFTI(in);}
+template<> inline void PIFFTW<double>::preparePlan(int size, FFT_Operation op) {((_PIFFTW_P_double_*)p)->preparePlan(size, op);}
+template<> inline void PIFFTW<double>::newP(void *& _p) {_p = new _PIFFTW_P_double_();}
+template<> inline void PIFFTW<double>::deleteP(void *& _p) {if (_p) delete (_PIFFTW_P_double_*)_p; _p = 0;}
+
+typedef PIFFTW<double>  PIFFTWd;
+
+
+template<> inline const PIVector<complex<ldouble> > & PIFFTW<ldouble>::calcFFT(const PIVector<complex<ldouble> > & in) {return ((_PIFFTW_P_ldouble_*)p)->calcFFT(in);}
+template<> inline const PIVector<complex<ldouble> > & PIFFTW<ldouble>::calcFFT(const PIVector<ldouble> & in) {return ((_PIFFTW_P_ldouble_*)p)->calcFFTR(in);}
+template<> inline const PIVector<complex<ldouble> > & PIFFTW<ldouble>::calcFFTinverse(const PIVector<complex<ldouble> > & in) {return ((_PIFFTW_P_ldouble_*)p)->calcFFTI(in);}
+template<> inline void PIFFTW<ldouble>::preparePlan(int size, FFT_Operation op) {((_PIFFTW_P_ldouble_*)p)->preparePlan(size, op);}
+template<> inline void PIFFTW<ldouble>::newP(void *& _p) {_p = new _PIFFTW_P_ldouble_();}
+template<> inline void PIFFTW<ldouble>::deleteP(void *& _p) {if (_p) delete (_PIFFTW_P_ldouble_*)_p; _p = 0;}
+
+typedef PIFFTW<ldouble> PIFFTWld;
+
+#endif
+
+#endif // PIFFT_H
diff --git a/src_main/math/pigeometry.h b/lib/main/math/pigeometry.h
similarity index 100%
rename from src_main/math/pigeometry.h
rename to lib/main/math/pigeometry.h
diff --git a/src_main/math/pimathbase.cpp b/lib/main/math/pimathbase.cpp
similarity index 96%
rename from src_main/math/pimathbase.cpp
rename to lib/main/math/pimathbase.cpp
index b65c6b7b..42fd4acb 100644
--- a/src_main/math/pimathbase.cpp
+++ b/lib/main/math/pimathbase.cpp
@@ -1,475 +1,475 @@
-/*
-	PIP - Platform Independent Primitives
-	Basic mathematical functions and defines
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pimathbase.h"
-#include "pitime.h"
-#include <stdlib.h>
-
-
-double piJ0(const double & v) {
-#ifndef PIP_MATH_J0
-	double x = v;
-	double xsq;
-	double nn;
-	double pzero;
-	double qzero;
-	double p1;
-	double q1;
-	double result;
-	if (x < 0) x = -x;
-	if (x > 8.) {
-		double xsq_;
-		double p2;
-		double q2;
-		double p3;
-		double q3;
-		xsq_ = 64. / (x * x);
-		p2 = 0.0;
-		p2 = 2485.271928957404011288128951 + xsq_ * p2;
-		p2 = 153982.6532623911470917825993 + xsq_ * p2;
-		p2 = 2016135.283049983642487182349 + xsq_ * p2;
-		p2 = 8413041.456550439208464315611 + xsq_ * p2;
-		p2 = 12332384.76817638145232406055 + xsq_ * p2;
-		p2 = 5393485.083869438325262122897 + xsq_ * p2;
-		q2 = 1.0;
-		q2 = 2615.700736920839685159081813 + xsq_ * q2;
-		q2 = 156001.7276940030940592769933 + xsq_ * q2;
-		q2 = 2025066.801570134013891035236 + xsq_ * q2;
-		q2 = 8426449.050629797331554404810 + xsq_ * q2;
-		q2 = 12338310.22786324960844856182 + xsq_ * q2;
-		q2 = 5393485.083869438325560444960 + xsq_ * q2;
-		p3 = -0.0;
-		p3 = -4.887199395841261531199129300  +xsq_ * p3;
-		p3 = -226.2630641933704113967255053  +xsq_ * p3;
-		p3 = -2365.956170779108192723612816  +xsq_ * p3;
-		p3 = -8239.066313485606568803548860  +xsq_ * p3;
-		p3 = -10381.41698748464093880530341  +xsq_ * p3;
-		p3 = -3984.617357595222463506790588  +xsq_ * p3;
-		q3 = 1.0;
-		q3 = 408.7714673983499223402830260 + xsq_ * q3;
-		q3 = 15704.89191515395519392882766 + xsq_ * q3;
-		q3 = 156021.3206679291652539287109 + xsq_ * q3;
-		q3 = 533291.3634216897168722255057 + xsq_ * q3;
-		q3 = 666745.4239319826986004038103 + xsq_ * q3;
-		q3 = 255015.5108860942382983170882 + xsq_ * q3;
-		pzero = p2 / q2;
-		qzero = 8. * p3 / q3 / x;
-		nn = x- M_PI / 4.;
-		result = sqrt(2. / M_PI / x) * (pzero * cos(nn) - qzero * sin(nn));
-		return result;
-	}
-	xsq = x * x;
-	p1 = 26857.86856980014981415848441;
-	p1 = -40504123.71833132706360663322 + xsq * p1;
-	p1 = 25071582855.36881945555156435 + xsq * p1;
-	p1 = -8085222034853.793871199468171 + xsq * p1;
-	p1 = 1434354939140344.111664316553 + xsq * p1;
-	p1 = -136762035308817138.6865416609 + xsq * p1;
-	p1 = 6382059341072356562.289432465 + xsq * p1;
-	p1 = -117915762910761053603.8440800 + xsq * p1;
-	p1 = 493378725179413356181.6813446 + xsq * p1;
-	q1 = 1.;
-	q1 = 1363.063652328970604442810507 + xsq * q1;
-	q1 = 1114636.098462985378182402543 + xsq * q1;
-	q1 = 669998767.2982239671814028660 + xsq * q1;
-	q1 = 312304311494.1213172572469442 + xsq * q1;
-	q1 = 112775673967979.8507056031594 + xsq * q1;
-	q1 = 30246356167094626.98627330784 + xsq * q1;
-	q1 = 5428918384092285160.200195092 + xsq * q1;
-	q1 = 493378725179413356211.3278438 + xsq * q1;
-	return p1 / q1;
-#else
-	return j0(v);
-#endif
-}
-
-
-double piJ1(const double & v) {
-#ifndef PIP_MATH_J1
-	double x = v;
-	double s;
-	double xsq;
-	double nn;
-	double pzero;
-	double qzero;
-	double p1;
-	double q1;
-	double result;
-	s = sign(x);
-	if (x < 0)
-		x = -x;
-	if (x > 8.) {
-		double xsq_;
-		double p2;
-		double q2;
-		double p3;
-		double q3;
-		xsq_ = 64.0 / (x * x);
-		p2 = -1611.616644324610116477412898;
-		p2 = -109824.0554345934672737413139 + xsq_ * p2;
-		p2 = -1523529.351181137383255105722 + xsq_ * p2;
-		p2 = -6603373.248364939109255245434 + xsq_ * p2;
-		p2 = -9942246.505077641195658377899 + xsq_ * p2;
-		p2 = -4435757.816794127857114720794 + xsq_ * p2;
-		q2 = 1.0;
-		q2 = -1455.009440190496182453565068 + xsq_ * q2;
-		q2 = -107263.8599110382011903063867 + xsq_ * q2;
-		q2 = -1511809.506634160881644546358 + xsq_ * q2;
-		q2 = -6585339.479723087072826915069 + xsq_ * q2;
-		q2 = -9934124.389934585658967556309 + xsq_ * q2;
-		q2 = -4435757.816794127856828016962 + xsq_ * q2;
-		p3 = 35.26513384663603218592175580;
-		p3 = 1706.375429020768002061283546 + xsq_ * p3;
-		p3 = 18494.26287322386679652009819 + xsq_ * p3;
-		p3 = 66178.83658127083517939992166 + xsq_ * p3;
-		p3 = 85145.16067533570196555001171 + xsq_ * p3;
-		p3 = 33220.91340985722351859704442 + xsq_ * p3;
-		q3 = 1.0;
-		q3 = 863.8367769604990967475517183 + xsq_ * q3;
-		q3 = 37890.22974577220264142952256 + xsq_ * q3;
-		q3 = 400294.4358226697511708610813 + xsq_ * q3;
-		q3 = 1419460.669603720892855755253 + xsq_ * q3;
-		q3 = 1819458.042243997298924553839 + xsq_ * q3;
-		q3 = 708712.8194102874357377502472 + xsq_ * q3;
-		pzero = p2 / q2;
-		qzero = 8 * p3 / q3 / x;
-		nn = x - 3 * M_PI / 4;
-		result = sqrt(2 / M_PI / x) * (pzero * cos(nn) - qzero * sin(nn));
-		if (s < 0)
-			result = -result;
-		return result;
-	}
-	xsq = sqr(x);
-	p1 = 2701.122710892323414856790990;
-	p1 = -4695753.530642995859767162166 + xsq * p1;
-	p1 = 3413234182.301700539091292655 + xsq * p1;
-	p1 = -1322983480332.126453125473247 + xsq * p1;
-	p1 = 290879526383477.5409737601689 + xsq * p1;
-	p1 = -35888175699101060.50743641413 + xsq * p1;
-	p1 = 2316433580634002297.931815435 + xsq * p1;
-	p1 = -66721065689249162980.20941484 + xsq * p1;
-	p1 = 581199354001606143928.050809 + xsq * p1;
-	q1 = 1.0;
-	q1 = 1606.931573481487801970916749 + xsq * q1;
-	q1 = 1501793.594998585505921097578 + xsq * q1;
-	q1 = 1013863514.358673989967045588 + xsq * q1;
-	q1 = 524371026216.7649715406728642 + xsq * q1;
-	q1 = 208166122130760.7351240184229 + xsq * q1;
-	q1 = 60920613989175217.46105196863 + xsq * q1;
-	q1 = 11857707121903209998.37113348 + xsq * q1;
-	q1 = 1162398708003212287858.529400 + xsq * q1;
-	result = s * x * p1 / q1;
-	return result;
-#else
-	return j1(v);
-#endif
-}
-
-
-double piJn(int n, const double & v) {
-#ifndef PIP_MATH_JN
-	double x = v;
-	double pkm2;
-	double pkm1;
-	double pk;
-	double xk;
-	double r;
-	double ans;
-	int k;
-	int sg;
-	double result;
-	if (n < 0) {
-		n = -n;
-		if (n % 2 == 0)
-			sg = 1;
-		else
-			sg = -1;
-	} else
-		sg = 1;
-	if (x < 0) {
-		if (n % 2 != 0)
-			sg = -sg;
-		x = -x;
-	}
-	if (n == 0) {
-		result = sg * piJ0(x);
-		return result;
-	}
-	if (n == 1) {
-		result = sg * piJ1(x);
-		return result;
-	}
-	if (n == 2) {
-		if (x == 0)
-			result = 0;
-		else
-			result = sg * (2.0 * piJ1(x) / x - piJ0(x));
-		return result;
-	}
-	if (x < 1E-16) {
-		result = 0;
-		return result;
-	}
-	k = 53;
-	pk = 2 * (n + k);
-	ans = pk;
-	xk = x * x;
-	do {
-		pk = pk - 2.0;
-		ans = pk - xk / ans;
-		k = k - 1;
-	} while (k != 0);
-	ans = x / ans;
-	pk = 1.0;
-	pkm1 = 1.0 / ans;
-	k = n - 1;
-	r = 2 * k;
-	do {
-		pkm2 = (pkm1 * r - pk * x) / x;
-		pk = pkm1;
-		pkm1 = pkm2;
-		r = r - 2.0;
-		k = k - 1;
-	} while (k != 0);
-	if (fabs(pk) > fabs(pkm1))
-		ans = piJ1(x) / pk;
-	else
-		ans = piJ0(x) / pkm1;
-	result = sg * ans;
-	return result;
-#else
-	return jn(n, v);
-#endif
-}
-
-
-double piY0(const double & v) {
-#ifndef PIP_MATH_Y0
-	double x = v;
-	double nn;
-	double xsq;
-	double pzero;
-	double qzero;
-	double p4;
-	double q4;
-	double result;
-	if (x > 8.) {
-		double xsq_;
-		double p2;
-		double q2;
-		double p3;
-		double q3;
-		xsq_ = 64.0 / (x * x);
-		p2 = 0.0;
-		p2 = 2485.271928957404011288128951 + xsq_ * p2;
-		p2 = 153982.6532623911470917825993 + xsq_ * p2;
-		p2 = 2016135.283049983642487182349 + xsq_ * p2;
-		p2 = 8413041.456550439208464315611 + xsq_ * p2;
-		p2 = 12332384.76817638145232406055 + xsq_ * p2;
-		p2 = 5393485.083869438325262122897 + xsq_ * p2;
-		q2 = 1.0;
-		q2 = 2615.700736920839685159081813 + xsq_ * q2;
-		q2 = 156001.7276940030940592769933 + xsq_ * q2;
-		q2 = 2025066.801570134013891035236 + xsq_ * q2;
-		q2 = 8426449.050629797331554404810 + xsq_ * q2;
-		q2 = 12338310.22786324960844856182 + xsq_ * q2;
-		q2 = 5393485.083869438325560444960 + xsq_ * q2;
-		p3 = -0.0;
-		p3 = -4.887199395841261531199129300 + xsq_ * p3;
-		p3 = -226.2630641933704113967255053 + xsq_ * p3;
-		p3 = -2365.956170779108192723612816 + xsq_ * p3;
-		p3 = -8239.066313485606568803548860 + xsq_ * p3;
-		p3 = -10381.41698748464093880530341 + xsq_ * p3;
-		p3 = -3984.617357595222463506790588 + xsq_ * p3;
-		q3 = 1.0;
-		q3 = 408.7714673983499223402830260 + xsq_ * q3;
-		q3 = 15704.89191515395519392882766 + xsq_ * q3;
-		q3 = 156021.3206679291652539287109 + xsq_ * q3;
-		q3 = 533291.3634216897168722255057 + xsq_ * q3;
-		q3 = 666745.4239319826986004038103 + xsq_ * q3;
-		q3 = 255015.5108860942382983170882 + xsq_ * q3;
-		pzero = p2 / q2;
-		qzero = 8 * p3 / q3 / x;
-		nn = x - M_PI / 4;
-		result = sqrt(2 / M_PI / x) * (pzero * sin(nn) + qzero * cos(nn));
-		return result;
-	}
-	xsq = sqr(x);
-	p4 = -41370.35497933148554125235152;
-	p4 = 59152134.65686889654273830069 + xsq * p4;
-	p4 = -34363712229.79040378171030138 + xsq * p4;
-	p4 = 10255208596863.94284509167421 + xsq * p4;
-	p4 = -1648605817185729.473122082537 + xsq * p4;
-	p4 = 137562431639934407.8571335453 + xsq * p4;
-	p4 = -5247065581112764941.297350814 + xsq * p4;
-	p4 = 65874732757195549259.99402049 + xsq * p4;
-	p4 = -27502866786291095837.01933175 + xsq * p4;
-	q4 = 1.0;
-	q4 = 1282.452772478993804176329391 + xsq * q4;
-	q4 = 1001702.641288906265666651753 + xsq * q4;
-	q4 = 579512264.0700729537480087915 + xsq * q4;
-	q4 = 261306575504.1081249568482092 + xsq * q4;
-	q4 = 91620380340751.85262489147968 + xsq * q4;
-	q4 = 23928830434997818.57439356652 + xsq * q4;
-	q4 = 4192417043410839973.904769661 + xsq * q4;
-	q4 = 372645883898616588198.9980 + xsq * q4;
-	result = p4 / q4 + 2 / M_PI * piJ0(x) * log(x);
-	return result;
-#else
-	return y0(v);
-#endif
-}
-
-
-double piY1(const double & v) {
-#ifndef PIP_MATH_Y1
-	double x = v;
-	double nn;
-	double xsq;
-	double pzero;
-	double qzero;
-	double p4;
-	double q4;
-	double result;
-	if (x > 8.) {
-		double xsq_;
-		double p2;
-		double q2;
-		double p3;
-		double q3;
-		xsq_ = 64.0 / (x * x);
-		p2 = -1611.616644324610116477412898;
-		p2 = -109824.0554345934672737413139 + xsq_ * p2;
-		p2 = -1523529.351181137383255105722 + xsq_ * p2;
-		p2 = -6603373.248364939109255245434 + xsq_ * p2;
-		p2 = -9942246.505077641195658377899 + xsq_ * p2;
-		p2 = -4435757.816794127857114720794 + xsq_ * p2;
-		q2 = 1.0;
-		q2 = -1455.009440190496182453565068 + xsq_ * q2;
-		q2 = -107263.8599110382011903063867 + xsq_ * q2;
-		q2 = -1511809.506634160881644546358 + xsq_ * q2;
-		q2 = -6585339.479723087072826915069 + xsq_ * q2;
-		q2 = -9934124.389934585658967556309 + xsq_ * q2;
-		q2 = -4435757.816794127856828016962 + xsq_ * q2;
-		p3 = 35.26513384663603218592175580;
-		p3 = 1706.375429020768002061283546 + xsq_ * p3;
-		p3 = 18494.26287322386679652009819 + xsq_ * p3;
-		p3 = 66178.83658127083517939992166 + xsq_ * p3;
-		p3 = 85145.16067533570196555001171 + xsq_ * p3;
-		p3 = 33220.91340985722351859704442 + xsq_ * p3;
-		q3 = 1.0;
-		q3 = 863.8367769604990967475517183 + xsq_ * q3;
-		q3 = 37890.22974577220264142952256 + xsq_ * q3;
-		q3 = 400294.4358226697511708610813 + xsq_ * q3;
-		q3 = 1419460.669603720892855755253 + xsq_ * q3;
-		q3 = 1819458.042243997298924553839 + xsq_ * q3;
-		q3 = 708712.8194102874357377502472 + xsq_ * q3;
-		pzero = p2 / q2;
-		qzero = 8 * p3 / q3 / x;
-		nn = x - 3 * M_PI / 4;
-		result = sqrt(2 / M_PI / x) * (pzero * sin(nn) + qzero * cos(nn));
-		return result;
-	}
-	xsq = sqr(x);
-	p4 = -2108847.540133123652824139923;
-	p4 = 3639488548.124002058278999428 + xsq * p4;
-	p4 = -2580681702194.450950541426399 + xsq * p4;
-	p4 = 956993023992168.3481121552788 + xsq * p4;
-	p4 = -196588746272214065.8820322248 + xsq * p4;
-	p4 = 21931073399177975921.11427556 + xsq * p4;
-	p4 = -1212297555414509577913.561535 + xsq * p4;
-	p4 = 26554738314348543268942.48968 + xsq * p4;
-	p4 = -99637534243069222259967.44354 + xsq * p4;
-	q4 = 1.0;
-	q4 = 1612.361029677000859332072312 + xsq * q4;
-	q4 = 1563282.754899580604737366452 + xsq * q4;
-	q4 = 1128686837.169442121732366891 + xsq * q4;
-	q4 = 646534088126.5275571961681500 + xsq * q4;
-	q4 = 297663212564727.6729292742282 + xsq * q4;
-	q4 = 108225825940881955.2553850180 + xsq * q4;
-	q4 = 29549879358971486742.90758119 + xsq * q4;
-	q4 = 5435310377188854170800.653097 + xsq * q4;
-	q4 = 508206736694124324531442.4152 + xsq * q4;
-	result = x * p4 / q4 + 2 / M_PI * (piJ1(x) * log(x) - 1 / x);
-	return result;
-#else
-	return y1(v);
-#endif
-}
-
-
-double piYn(int n, const double & v) {
-#ifndef PIP_MATH_YN
-	int i;
-	double x = v;
-	double a;
-	double b;
-	double tmp;
-	double s;
-	double result;
-	s = 1;
-	if (n < 0) {
-		n = -n;
-		if (n % 2 != 0)
-			s = -1;
-	}
-	if (n == 0) {
-		result = piY0(x);
-		return result;
-	}
-	if (n == 1) {
-		result = s * piY1(x);
-		return result;
-	}
-	a = piY0(x);
-	b = piY1(x);
-	for (i = 1; i <= n - 1; i++) {
-		tmp = b;
-		b = 2 * i / x * b - a;
-		a = tmp;
-	}
-	result = s * b;
-	return result;
-#else
-	return yn(n, v);
-#endif
-}
-
-
-double randomn(double dv, double sv) {
-	static bool agen = false;
-	double s = 2., v0 = 0., v1 = 0.;
-	if (agen) {
-		agen = false;
-		v1 = v1 * sqrt(-2 * log(s) / s);
-		return v1 * sv + dv;
-	}
-	while (s > 1. || s == 0.) {
-		v0 = randomd();
-		v1 = randomd();
-		s = v0*v0 + v1*v1;
-	}
-	v0 = v0 * sqrt(-2 * log(s) / s);
-	return v0 * sv + dv;
-}
-
-
-double randomd() {
-	return (double) randomi() / RAND_MAX * 2. - 1.;
-}
+/*
+	PIP - Platform Independent Primitives
+	Basic mathematical functions and defines
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pimathbase.h"
+#include "pitime.h"
+#include <stdlib.h>
+
+
+double piJ0(const double & v) {
+#ifndef PIP_MATH_J0
+	double x = v;
+	double xsq;
+	double nn;
+	double pzero;
+	double qzero;
+	double p1;
+	double q1;
+	double result;
+	if (x < 0) x = -x;
+	if (x > 8.) {
+		double xsq_;
+		double p2;
+		double q2;
+		double p3;
+		double q3;
+		xsq_ = 64. / (x * x);
+		p2 = 0.0;
+		p2 = 2485.271928957404011288128951 + xsq_ * p2;
+		p2 = 153982.6532623911470917825993 + xsq_ * p2;
+		p2 = 2016135.283049983642487182349 + xsq_ * p2;
+		p2 = 8413041.456550439208464315611 + xsq_ * p2;
+		p2 = 12332384.76817638145232406055 + xsq_ * p2;
+		p2 = 5393485.083869438325262122897 + xsq_ * p2;
+		q2 = 1.0;
+		q2 = 2615.700736920839685159081813 + xsq_ * q2;
+		q2 = 156001.7276940030940592769933 + xsq_ * q2;
+		q2 = 2025066.801570134013891035236 + xsq_ * q2;
+		q2 = 8426449.050629797331554404810 + xsq_ * q2;
+		q2 = 12338310.22786324960844856182 + xsq_ * q2;
+		q2 = 5393485.083869438325560444960 + xsq_ * q2;
+		p3 = -0.0;
+		p3 = -4.887199395841261531199129300  +xsq_ * p3;
+		p3 = -226.2630641933704113967255053  +xsq_ * p3;
+		p3 = -2365.956170779108192723612816  +xsq_ * p3;
+		p3 = -8239.066313485606568803548860  +xsq_ * p3;
+		p3 = -10381.41698748464093880530341  +xsq_ * p3;
+		p3 = -3984.617357595222463506790588  +xsq_ * p3;
+		q3 = 1.0;
+		q3 = 408.7714673983499223402830260 + xsq_ * q3;
+		q3 = 15704.89191515395519392882766 + xsq_ * q3;
+		q3 = 156021.3206679291652539287109 + xsq_ * q3;
+		q3 = 533291.3634216897168722255057 + xsq_ * q3;
+		q3 = 666745.4239319826986004038103 + xsq_ * q3;
+		q3 = 255015.5108860942382983170882 + xsq_ * q3;
+		pzero = p2 / q2;
+		qzero = 8. * p3 / q3 / x;
+		nn = x- M_PI / 4.;
+		result = sqrt(2. / M_PI / x) * (pzero * cos(nn) - qzero * sin(nn));
+		return result;
+	}
+	xsq = x * x;
+	p1 = 26857.86856980014981415848441;
+	p1 = -40504123.71833132706360663322 + xsq * p1;
+	p1 = 25071582855.36881945555156435 + xsq * p1;
+	p1 = -8085222034853.793871199468171 + xsq * p1;
+	p1 = 1434354939140344.111664316553 + xsq * p1;
+	p1 = -136762035308817138.6865416609 + xsq * p1;
+	p1 = 6382059341072356562.289432465 + xsq * p1;
+	p1 = -117915762910761053603.8440800 + xsq * p1;
+	p1 = 493378725179413356181.6813446 + xsq * p1;
+	q1 = 1.;
+	q1 = 1363.063652328970604442810507 + xsq * q1;
+	q1 = 1114636.098462985378182402543 + xsq * q1;
+	q1 = 669998767.2982239671814028660 + xsq * q1;
+	q1 = 312304311494.1213172572469442 + xsq * q1;
+	q1 = 112775673967979.8507056031594 + xsq * q1;
+	q1 = 30246356167094626.98627330784 + xsq * q1;
+	q1 = 5428918384092285160.200195092 + xsq * q1;
+	q1 = 493378725179413356211.3278438 + xsq * q1;
+	return p1 / q1;
+#else
+	return j0(v);
+#endif
+}
+
+
+double piJ1(const double & v) {
+#ifndef PIP_MATH_J1
+	double x = v;
+	double s;
+	double xsq;
+	double nn;
+	double pzero;
+	double qzero;
+	double p1;
+	double q1;
+	double result;
+	s = sign(x);
+	if (x < 0)
+		x = -x;
+	if (x > 8.) {
+		double xsq_;
+		double p2;
+		double q2;
+		double p3;
+		double q3;
+		xsq_ = 64.0 / (x * x);
+		p2 = -1611.616644324610116477412898;
+		p2 = -109824.0554345934672737413139 + xsq_ * p2;
+		p2 = -1523529.351181137383255105722 + xsq_ * p2;
+		p2 = -6603373.248364939109255245434 + xsq_ * p2;
+		p2 = -9942246.505077641195658377899 + xsq_ * p2;
+		p2 = -4435757.816794127857114720794 + xsq_ * p2;
+		q2 = 1.0;
+		q2 = -1455.009440190496182453565068 + xsq_ * q2;
+		q2 = -107263.8599110382011903063867 + xsq_ * q2;
+		q2 = -1511809.506634160881644546358 + xsq_ * q2;
+		q2 = -6585339.479723087072826915069 + xsq_ * q2;
+		q2 = -9934124.389934585658967556309 + xsq_ * q2;
+		q2 = -4435757.816794127856828016962 + xsq_ * q2;
+		p3 = 35.26513384663603218592175580;
+		p3 = 1706.375429020768002061283546 + xsq_ * p3;
+		p3 = 18494.26287322386679652009819 + xsq_ * p3;
+		p3 = 66178.83658127083517939992166 + xsq_ * p3;
+		p3 = 85145.16067533570196555001171 + xsq_ * p3;
+		p3 = 33220.91340985722351859704442 + xsq_ * p3;
+		q3 = 1.0;
+		q3 = 863.8367769604990967475517183 + xsq_ * q3;
+		q3 = 37890.22974577220264142952256 + xsq_ * q3;
+		q3 = 400294.4358226697511708610813 + xsq_ * q3;
+		q3 = 1419460.669603720892855755253 + xsq_ * q3;
+		q3 = 1819458.042243997298924553839 + xsq_ * q3;
+		q3 = 708712.8194102874357377502472 + xsq_ * q3;
+		pzero = p2 / q2;
+		qzero = 8 * p3 / q3 / x;
+		nn = x - 3 * M_PI / 4;
+		result = sqrt(2 / M_PI / x) * (pzero * cos(nn) - qzero * sin(nn));
+		if (s < 0)
+			result = -result;
+		return result;
+	}
+	xsq = sqr(x);
+	p1 = 2701.122710892323414856790990;
+	p1 = -4695753.530642995859767162166 + xsq * p1;
+	p1 = 3413234182.301700539091292655 + xsq * p1;
+	p1 = -1322983480332.126453125473247 + xsq * p1;
+	p1 = 290879526383477.5409737601689 + xsq * p1;
+	p1 = -35888175699101060.50743641413 + xsq * p1;
+	p1 = 2316433580634002297.931815435 + xsq * p1;
+	p1 = -66721065689249162980.20941484 + xsq * p1;
+	p1 = 581199354001606143928.050809 + xsq * p1;
+	q1 = 1.0;
+	q1 = 1606.931573481487801970916749 + xsq * q1;
+	q1 = 1501793.594998585505921097578 + xsq * q1;
+	q1 = 1013863514.358673989967045588 + xsq * q1;
+	q1 = 524371026216.7649715406728642 + xsq * q1;
+	q1 = 208166122130760.7351240184229 + xsq * q1;
+	q1 = 60920613989175217.46105196863 + xsq * q1;
+	q1 = 11857707121903209998.37113348 + xsq * q1;
+	q1 = 1162398708003212287858.529400 + xsq * q1;
+	result = s * x * p1 / q1;
+	return result;
+#else
+	return j1(v);
+#endif
+}
+
+
+double piJn(int n, const double & v) {
+#ifndef PIP_MATH_JN
+	double x = v;
+	double pkm2;
+	double pkm1;
+	double pk;
+	double xk;
+	double r;
+	double ans;
+	int k;
+	int sg;
+	double result;
+	if (n < 0) {
+		n = -n;
+		if (n % 2 == 0)
+			sg = 1;
+		else
+			sg = -1;
+	} else
+		sg = 1;
+	if (x < 0) {
+		if (n % 2 != 0)
+			sg = -sg;
+		x = -x;
+	}
+	if (n == 0) {
+		result = sg * piJ0(x);
+		return result;
+	}
+	if (n == 1) {
+		result = sg * piJ1(x);
+		return result;
+	}
+	if (n == 2) {
+		if (x == 0)
+			result = 0;
+		else
+			result = sg * (2.0 * piJ1(x) / x - piJ0(x));
+		return result;
+	}
+	if (x < 1E-16) {
+		result = 0;
+		return result;
+	}
+	k = 53;
+	pk = 2 * (n + k);
+	ans = pk;
+	xk = x * x;
+	do {
+		pk = pk - 2.0;
+		ans = pk - xk / ans;
+		k = k - 1;
+	} while (k != 0);
+	ans = x / ans;
+	pk = 1.0;
+	pkm1 = 1.0 / ans;
+	k = n - 1;
+	r = 2 * k;
+	do {
+		pkm2 = (pkm1 * r - pk * x) / x;
+		pk = pkm1;
+		pkm1 = pkm2;
+		r = r - 2.0;
+		k = k - 1;
+	} while (k != 0);
+	if (fabs(pk) > fabs(pkm1))
+		ans = piJ1(x) / pk;
+	else
+		ans = piJ0(x) / pkm1;
+	result = sg * ans;
+	return result;
+#else
+	return jn(n, v);
+#endif
+}
+
+
+double piY0(const double & v) {
+#ifndef PIP_MATH_Y0
+	double x = v;
+	double nn;
+	double xsq;
+	double pzero;
+	double qzero;
+	double p4;
+	double q4;
+	double result;
+	if (x > 8.) {
+		double xsq_;
+		double p2;
+		double q2;
+		double p3;
+		double q3;
+		xsq_ = 64.0 / (x * x);
+		p2 = 0.0;
+		p2 = 2485.271928957404011288128951 + xsq_ * p2;
+		p2 = 153982.6532623911470917825993 + xsq_ * p2;
+		p2 = 2016135.283049983642487182349 + xsq_ * p2;
+		p2 = 8413041.456550439208464315611 + xsq_ * p2;
+		p2 = 12332384.76817638145232406055 + xsq_ * p2;
+		p2 = 5393485.083869438325262122897 + xsq_ * p2;
+		q2 = 1.0;
+		q2 = 2615.700736920839685159081813 + xsq_ * q2;
+		q2 = 156001.7276940030940592769933 + xsq_ * q2;
+		q2 = 2025066.801570134013891035236 + xsq_ * q2;
+		q2 = 8426449.050629797331554404810 + xsq_ * q2;
+		q2 = 12338310.22786324960844856182 + xsq_ * q2;
+		q2 = 5393485.083869438325560444960 + xsq_ * q2;
+		p3 = -0.0;
+		p3 = -4.887199395841261531199129300 + xsq_ * p3;
+		p3 = -226.2630641933704113967255053 + xsq_ * p3;
+		p3 = -2365.956170779108192723612816 + xsq_ * p3;
+		p3 = -8239.066313485606568803548860 + xsq_ * p3;
+		p3 = -10381.41698748464093880530341 + xsq_ * p3;
+		p3 = -3984.617357595222463506790588 + xsq_ * p3;
+		q3 = 1.0;
+		q3 = 408.7714673983499223402830260 + xsq_ * q3;
+		q3 = 15704.89191515395519392882766 + xsq_ * q3;
+		q3 = 156021.3206679291652539287109 + xsq_ * q3;
+		q3 = 533291.3634216897168722255057 + xsq_ * q3;
+		q3 = 666745.4239319826986004038103 + xsq_ * q3;
+		q3 = 255015.5108860942382983170882 + xsq_ * q3;
+		pzero = p2 / q2;
+		qzero = 8 * p3 / q3 / x;
+		nn = x - M_PI / 4;
+		result = sqrt(2 / M_PI / x) * (pzero * sin(nn) + qzero * cos(nn));
+		return result;
+	}
+	xsq = sqr(x);
+	p4 = -41370.35497933148554125235152;
+	p4 = 59152134.65686889654273830069 + xsq * p4;
+	p4 = -34363712229.79040378171030138 + xsq * p4;
+	p4 = 10255208596863.94284509167421 + xsq * p4;
+	p4 = -1648605817185729.473122082537 + xsq * p4;
+	p4 = 137562431639934407.8571335453 + xsq * p4;
+	p4 = -5247065581112764941.297350814 + xsq * p4;
+	p4 = 65874732757195549259.99402049 + xsq * p4;
+	p4 = -27502866786291095837.01933175 + xsq * p4;
+	q4 = 1.0;
+	q4 = 1282.452772478993804176329391 + xsq * q4;
+	q4 = 1001702.641288906265666651753 + xsq * q4;
+	q4 = 579512264.0700729537480087915 + xsq * q4;
+	q4 = 261306575504.1081249568482092 + xsq * q4;
+	q4 = 91620380340751.85262489147968 + xsq * q4;
+	q4 = 23928830434997818.57439356652 + xsq * q4;
+	q4 = 4192417043410839973.904769661 + xsq * q4;
+	q4 = 372645883898616588198.9980 + xsq * q4;
+	result = p4 / q4 + 2 / M_PI * piJ0(x) * log(x);
+	return result;
+#else
+	return y0(v);
+#endif
+}
+
+
+double piY1(const double & v) {
+#ifndef PIP_MATH_Y1
+	double x = v;
+	double nn;
+	double xsq;
+	double pzero;
+	double qzero;
+	double p4;
+	double q4;
+	double result;
+	if (x > 8.) {
+		double xsq_;
+		double p2;
+		double q2;
+		double p3;
+		double q3;
+		xsq_ = 64.0 / (x * x);
+		p2 = -1611.616644324610116477412898;
+		p2 = -109824.0554345934672737413139 + xsq_ * p2;
+		p2 = -1523529.351181137383255105722 + xsq_ * p2;
+		p2 = -6603373.248364939109255245434 + xsq_ * p2;
+		p2 = -9942246.505077641195658377899 + xsq_ * p2;
+		p2 = -4435757.816794127857114720794 + xsq_ * p2;
+		q2 = 1.0;
+		q2 = -1455.009440190496182453565068 + xsq_ * q2;
+		q2 = -107263.8599110382011903063867 + xsq_ * q2;
+		q2 = -1511809.506634160881644546358 + xsq_ * q2;
+		q2 = -6585339.479723087072826915069 + xsq_ * q2;
+		q2 = -9934124.389934585658967556309 + xsq_ * q2;
+		q2 = -4435757.816794127856828016962 + xsq_ * q2;
+		p3 = 35.26513384663603218592175580;
+		p3 = 1706.375429020768002061283546 + xsq_ * p3;
+		p3 = 18494.26287322386679652009819 + xsq_ * p3;
+		p3 = 66178.83658127083517939992166 + xsq_ * p3;
+		p3 = 85145.16067533570196555001171 + xsq_ * p3;
+		p3 = 33220.91340985722351859704442 + xsq_ * p3;
+		q3 = 1.0;
+		q3 = 863.8367769604990967475517183 + xsq_ * q3;
+		q3 = 37890.22974577220264142952256 + xsq_ * q3;
+		q3 = 400294.4358226697511708610813 + xsq_ * q3;
+		q3 = 1419460.669603720892855755253 + xsq_ * q3;
+		q3 = 1819458.042243997298924553839 + xsq_ * q3;
+		q3 = 708712.8194102874357377502472 + xsq_ * q3;
+		pzero = p2 / q2;
+		qzero = 8 * p3 / q3 / x;
+		nn = x - 3 * M_PI / 4;
+		result = sqrt(2 / M_PI / x) * (pzero * sin(nn) + qzero * cos(nn));
+		return result;
+	}
+	xsq = sqr(x);
+	p4 = -2108847.540133123652824139923;
+	p4 = 3639488548.124002058278999428 + xsq * p4;
+	p4 = -2580681702194.450950541426399 + xsq * p4;
+	p4 = 956993023992168.3481121552788 + xsq * p4;
+	p4 = -196588746272214065.8820322248 + xsq * p4;
+	p4 = 21931073399177975921.11427556 + xsq * p4;
+	p4 = -1212297555414509577913.561535 + xsq * p4;
+	p4 = 26554738314348543268942.48968 + xsq * p4;
+	p4 = -99637534243069222259967.44354 + xsq * p4;
+	q4 = 1.0;
+	q4 = 1612.361029677000859332072312 + xsq * q4;
+	q4 = 1563282.754899580604737366452 + xsq * q4;
+	q4 = 1128686837.169442121732366891 + xsq * q4;
+	q4 = 646534088126.5275571961681500 + xsq * q4;
+	q4 = 297663212564727.6729292742282 + xsq * q4;
+	q4 = 108225825940881955.2553850180 + xsq * q4;
+	q4 = 29549879358971486742.90758119 + xsq * q4;
+	q4 = 5435310377188854170800.653097 + xsq * q4;
+	q4 = 508206736694124324531442.4152 + xsq * q4;
+	result = x * p4 / q4 + 2 / M_PI * (piJ1(x) * log(x) - 1 / x);
+	return result;
+#else
+	return y1(v);
+#endif
+}
+
+
+double piYn(int n, const double & v) {
+#ifndef PIP_MATH_YN
+	int i;
+	double x = v;
+	double a;
+	double b;
+	double tmp;
+	double s;
+	double result;
+	s = 1;
+	if (n < 0) {
+		n = -n;
+		if (n % 2 != 0)
+			s = -1;
+	}
+	if (n == 0) {
+		result = piY0(x);
+		return result;
+	}
+	if (n == 1) {
+		result = s * piY1(x);
+		return result;
+	}
+	a = piY0(x);
+	b = piY1(x);
+	for (i = 1; i <= n - 1; i++) {
+		tmp = b;
+		b = 2 * i / x * b - a;
+		a = tmp;
+	}
+	result = s * b;
+	return result;
+#else
+	return yn(n, v);
+#endif
+}
+
+
+double randomn(double dv, double sv) {
+	static bool agen = false;
+	double s = 2., v0 = 0., v1 = 0.;
+	if (agen) {
+		agen = false;
+		v1 = v1 * sqrt(-2 * log(s) / s);
+		return v1 * sv + dv;
+	}
+	while (s > 1. || s == 0.) {
+		v0 = randomd();
+		v1 = randomd();
+		s = v0*v0 + v1*v1;
+	}
+	v0 = v0 * sqrt(-2 * log(s) / s);
+	return v0 * sv + dv;
+}
+
+
+double randomd() {
+	return (double) randomi() / RAND_MAX * 2. - 1.;
+}
diff --git a/src_main/math/pimathbase.h b/lib/main/math/pimathbase.h
similarity index 96%
rename from src_main/math/pimathbase.h
rename to lib/main/math/pimathbase.h
index 317b43da..740514b7 100644
--- a/src_main/math/pimathbase.h
+++ b/lib/main/math/pimathbase.h
@@ -1,181 +1,181 @@
-/*! \file pimathbase.h
- * \brief Basic mathematical functions and defines
-*/
-/*
-	PIP - Platform Independent Primitives
-	Basic mathematical functions and defines
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIMATHBASE_H
-#define PIMATHBASE_H
-
-#include "piinit.h"
-#include "pivector.h"
-#include "pipair.h"
-#ifdef QNX
-#  undef PIP_MATH_J0
-#  undef PIP_MATH_J1
-#  undef PIP_MATH_JN
-#  undef PIP_MATH_Y0
-#  undef PIP_MATH_Y1
-#  undef PIP_MATH_YN
-#  include <math.h>
-#else
-#  include <cmath>
-#endif
-
-#ifndef M_LN2
-#  define M_LN2 0.69314718055994530942
-#endif
-#ifndef M_LN10
-#  define M_LN10 2.30258509299404568402
-#endif
-#ifndef M_SQRT2
-#  define M_SQRT2 1.41421356237309514547
-#endif
-#ifndef M_SQRT3
-#  define M_SQRT3 1.73205080756887719318
-#endif
-#ifndef M_1_SQRT2
-#  define M_1_SQRT2 0.70710678118654746172
-#endif
-#ifndef M_1_SQRT3
-#  define M_1_SQRT3 0.57735026918962584208
-#endif
-#ifndef M_PI
-#  define M_PI 3.141592653589793238462643383280
-#endif
-#ifndef M_2PI
-#  define M_2PI 6.283185307179586476925286766559
-#endif
-#ifndef M_PI_3
-#  define M_PI_3 1.04719755119659774615
-#endif
-#ifndef M_2PI_3
-#  define M_2PI_3 2.0943951023931954923
-#endif
-#ifndef M_180_PI
-#  define M_180_PI 57.2957795130823208768
-#endif
-#ifndef M_PI_180
-#  define M_PI_180 1.74532925199432957692e-2
-#endif
-#ifndef M_SQRT_PI
-#  define M_SQRT_PI 1.772453850905516027298167483341
-#endif
-#ifndef M_E
-#  define M_E 2.7182818284590452353602874713527
-#endif
-#ifndef M_LIGHT_SPEED
-#  define M_LIGHT_SPEED 2.99792458e+8
-#endif
-#ifndef M_RELATIVE_CONST
-#  define M_RELATIVE_CONST -4.442807633e-10;
-#endif
-#ifndef M_GRAVITY_CONST
-#  define M_GRAVITY_CONST 398600.4418e9;
-#endif
-
-
-
-const double deg2rad = M_PI_180;
-const double rad2deg = M_180_PI;
-
-inline int sign(const float & x) {return (x < 0.) ? -1 : (x > 0. ? 1 : 0);}
-inline int sign(const double & x) {return (x < 0.) ? -1 : (x > 0. ? 1 : 0);}
-inline int pow2(const int p) {return 1 << p;}
-inline int sqr(const int v) {return v * v;}
-inline float sqr(const float & v) {return v * v;}
-inline double sqr(const double & v) {return v * v;}
-inline double sinc(const double & v) {if (v == 0.) return 1.; double t = M_PI * v; return sin(t) / t;}
-
-double piJ0(const double & v);
-double piJ1(const double & v);
-double piJn(int n, const double & v);
-double piY0(const double & v);
-double piY1(const double & v);
-double piYn(int n, const double & v);
-inline double toDb(double val) {return 10. * log10(val);}
-inline double fromDb(double val) {return pow(10., val / 10.);}
-inline double toRad(double deg) {return deg * M_PI_180;}
-inline double toDeg(double rad) {return rad * M_180_PI;}
-
-// [-1 ; 1]
-double randomd();
-// [-1 ; 1] normal
-double randomn(double dv = 0., double sv = 1.);
-
-
-inline PIVector<double> abs(const PIVector<double> & v) {
-	PIVector<double> result;
-	result.resize(v.size());
-	for (uint i = 0; i < v.size(); i++)
-        result[i] = fabs(v[i]);
-	return result;
-}
-
-
-template <typename T>
-bool OLS_Linear(const PIVector<PIPair<T, T> > & input, T * out_a, T * out_b) {
-	if (input.size_s() < 2)
-		return false;
-	int n = input.size_s();
-	T a_t0 = T(), a_t1 = T(), a_t2 = T(), a_t3 = T(), a_t4 = T(), a = T(), b = T();
-	for (int i = 0; i < n; ++i) {
-		const PIPair<T, T> & cv(input[i]);
-		a_t0 += cv.first * cv.second;
-		a_t1 += cv.first;
-		a_t2 += cv.second;
-		a_t3 += cv.first * cv.first;
-	}
-	a_t4 = n * a_t3 - a_t1 * a_t1;
-	if (a_t4 != T())
-		a = (n * a_t0 - a_t1 * a_t2) / a_t4;
-	b = (a_t2 - a * a_t1) / n;
-	if (out_a != 0) *out_a = a;
-	if (out_b != 0) *out_b = b;
-	return true;
-}
-
-
-template <typename T>
-bool WLS_Linear(const PIVector<PIPair<T, T> > & input, const PIVector<T> & weights, T * out_a, T * out_b) {
-	if (input.size_s() < 2)
-		return false;
-	if (input.size_s() != weights.size_s())
-		return false;
-	int n = input.size_s();
-	T a_t0 = T(), a_t1 = T(), a_t2 = T(), a_t3 = T(), a_t4 = T(), a_n = T(), a = T(), b = T();
-	for (int i = 0; i < n; ++i) {
-		T cp = weights[i];
-		const PIPair<T, T> & cv(input[i]);
-		a_t0 += cv.first * cv.second * cp;
-		a_t1 += cv.first * cp;
-		a_t2 += cv.second * cp;
-		a_t3 += cv.first * cv.first * cp;
-		a_n += cp;
-	}
-	a_t4 = a_n * a_t3 - a_t1 * a_t1;
-	if (a_t4 != T())
-		a = (a_n * a_t0 - a_t1 * a_t2) / a_t4;
-	b = (a_t2 - a * a_t1) / a_n;
-	if (out_a != 0) *out_a = a;
-	if (out_b != 0) *out_b = b;
-	return true;
-}
-
-#endif // PIMATHBASE_H
+/*! \file pimathbase.h
+ * \brief Basic mathematical functions and defines
+*/
+/*
+	PIP - Platform Independent Primitives
+	Basic mathematical functions and defines
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIMATHBASE_H
+#define PIMATHBASE_H
+
+#include "piinit.h"
+#include "pivector.h"
+#include "pipair.h"
+#ifdef QNX
+#  undef PIP_MATH_J0
+#  undef PIP_MATH_J1
+#  undef PIP_MATH_JN
+#  undef PIP_MATH_Y0
+#  undef PIP_MATH_Y1
+#  undef PIP_MATH_YN
+#  include <math.h>
+#else
+#  include <cmath>
+#endif
+
+#ifndef M_LN2
+#  define M_LN2 0.69314718055994530942
+#endif
+#ifndef M_LN10
+#  define M_LN10 2.30258509299404568402
+#endif
+#ifndef M_SQRT2
+#  define M_SQRT2 1.41421356237309514547
+#endif
+#ifndef M_SQRT3
+#  define M_SQRT3 1.73205080756887719318
+#endif
+#ifndef M_1_SQRT2
+#  define M_1_SQRT2 0.70710678118654746172
+#endif
+#ifndef M_1_SQRT3
+#  define M_1_SQRT3 0.57735026918962584208
+#endif
+#ifndef M_PI
+#  define M_PI 3.141592653589793238462643383280
+#endif
+#ifndef M_2PI
+#  define M_2PI 6.283185307179586476925286766559
+#endif
+#ifndef M_PI_3
+#  define M_PI_3 1.04719755119659774615
+#endif
+#ifndef M_2PI_3
+#  define M_2PI_3 2.0943951023931954923
+#endif
+#ifndef M_180_PI
+#  define M_180_PI 57.2957795130823208768
+#endif
+#ifndef M_PI_180
+#  define M_PI_180 1.74532925199432957692e-2
+#endif
+#ifndef M_SQRT_PI
+#  define M_SQRT_PI 1.772453850905516027298167483341
+#endif
+#ifndef M_E
+#  define M_E 2.7182818284590452353602874713527
+#endif
+#ifndef M_LIGHT_SPEED
+#  define M_LIGHT_SPEED 2.99792458e+8
+#endif
+#ifndef M_RELATIVE_CONST
+#  define M_RELATIVE_CONST -4.442807633e-10;
+#endif
+#ifndef M_GRAVITY_CONST
+#  define M_GRAVITY_CONST 398600.4418e9;
+#endif
+
+
+
+const double deg2rad = M_PI_180;
+const double rad2deg = M_180_PI;
+
+inline int sign(const float & x) {return (x < 0.) ? -1 : (x > 0. ? 1 : 0);}
+inline int sign(const double & x) {return (x < 0.) ? -1 : (x > 0. ? 1 : 0);}
+inline int pow2(const int p) {return 1 << p;}
+inline int sqr(const int v) {return v * v;}
+inline float sqr(const float & v) {return v * v;}
+inline double sqr(const double & v) {return v * v;}
+inline double sinc(const double & v) {if (v == 0.) return 1.; double t = M_PI * v; return sin(t) / t;}
+
+double piJ0(const double & v);
+double piJ1(const double & v);
+double piJn(int n, const double & v);
+double piY0(const double & v);
+double piY1(const double & v);
+double piYn(int n, const double & v);
+inline double toDb(double val) {return 10. * log10(val);}
+inline double fromDb(double val) {return pow(10., val / 10.);}
+inline double toRad(double deg) {return deg * M_PI_180;}
+inline double toDeg(double rad) {return rad * M_180_PI;}
+
+// [-1 ; 1]
+double randomd();
+// [-1 ; 1] normal
+double randomn(double dv = 0., double sv = 1.);
+
+
+inline PIVector<double> abs(const PIVector<double> & v) {
+	PIVector<double> result;
+	result.resize(v.size());
+	for (uint i = 0; i < v.size(); i++)
+        result[i] = fabs(v[i]);
+	return result;
+}
+
+
+template <typename T>
+bool OLS_Linear(const PIVector<PIPair<T, T> > & input, T * out_a, T * out_b) {
+	if (input.size_s() < 2)
+		return false;
+	int n = input.size_s();
+	T a_t0 = T(), a_t1 = T(), a_t2 = T(), a_t3 = T(), a_t4 = T(), a = T(), b = T();
+	for (int i = 0; i < n; ++i) {
+		const PIPair<T, T> & cv(input[i]);
+		a_t0 += cv.first * cv.second;
+		a_t1 += cv.first;
+		a_t2 += cv.second;
+		a_t3 += cv.first * cv.first;
+	}
+	a_t4 = n * a_t3 - a_t1 * a_t1;
+	if (a_t4 != T())
+		a = (n * a_t0 - a_t1 * a_t2) / a_t4;
+	b = (a_t2 - a * a_t1) / n;
+	if (out_a != 0) *out_a = a;
+	if (out_b != 0) *out_b = b;
+	return true;
+}
+
+
+template <typename T>
+bool WLS_Linear(const PIVector<PIPair<T, T> > & input, const PIVector<T> & weights, T * out_a, T * out_b) {
+	if (input.size_s() < 2)
+		return false;
+	if (input.size_s() != weights.size_s())
+		return false;
+	int n = input.size_s();
+	T a_t0 = T(), a_t1 = T(), a_t2 = T(), a_t3 = T(), a_t4 = T(), a_n = T(), a = T(), b = T();
+	for (int i = 0; i < n; ++i) {
+		T cp = weights[i];
+		const PIPair<T, T> & cv(input[i]);
+		a_t0 += cv.first * cv.second * cp;
+		a_t1 += cv.first * cp;
+		a_t2 += cv.second * cp;
+		a_t3 += cv.first * cv.first * cp;
+		a_n += cp;
+	}
+	a_t4 = a_n * a_t3 - a_t1 * a_t1;
+	if (a_t4 != T())
+		a = (a_n * a_t0 - a_t1 * a_t2) / a_t4;
+	b = (a_t2 - a * a_t1) / a_n;
+	if (out_a != 0) *out_a = a;
+	if (out_b != 0) *out_b = b;
+	return true;
+}
+
+#endif // PIMATHBASE_H
diff --git a/src_main/math/pimathcomplex.h b/lib/main/math/pimathcomplex.h
similarity index 97%
rename from src_main/math/pimathcomplex.h
rename to lib/main/math/pimathcomplex.h
index ebedcdab..4c1ffe1b 100644
--- a/src_main/math/pimathcomplex.h
+++ b/lib/main/math/pimathcomplex.h
@@ -1,125 +1,125 @@
-/*! \file pimathcomplex.h
- * \brief PIP math complex
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIP math complex
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIMATHCOMPLEX_H
-#define PIMATHCOMPLEX_H
-
-#include <complex>
-#include "pimathbase.h"
-#include "pibytearray.h"
-#include "pivector2d.h"
-
-#define PIP_MATH_COMPLEX
-
-using std::complex;
-
-typedef complex<int> complexi;
-typedef complex<short> complexs;
-typedef complex<float> complexf;
-typedef complex<ldouble> complexld;
-#ifndef QPIEVALUATOR_COMPLEX
-typedef complex<double> complexd;
-
-const complexd complexd_i(0., 1.);
-const complexd complexd_0(0.);
-const complexd complexd_1(1.);
-#endif
-const complexld complexld_i(0., 1.);
-const complexld complexld_0(0.);
-const complexld complexld_1(1.);
-
-__PICONTAINERS_SIMPLE_TYPE__(complexi)
-__PICONTAINERS_SIMPLE_TYPE__(complexs)
-__PICONTAINERS_SIMPLE_TYPE__(complexf)
-__PICONTAINERS_SIMPLE_TYPE__(complexd)
-__PICONTAINERS_SIMPLE_TYPE__(complexld)
-__PIVECTOR2D_SIMPLE_TYPE__(complexi)
-__PIVECTOR2D_SIMPLE_TYPE__(complexs)
-__PIVECTOR2D_SIMPLE_TYPE__(complexf)
-__PIVECTOR2D_SIMPLE_TYPE__(complexd)
-__PIVECTOR2D_SIMPLE_TYPE__(complexld)
-__PIBYTEARRAY_SIMPLE_TYPE__(complexi)
-__PIBYTEARRAY_SIMPLE_TYPE__(complexs)
-__PIBYTEARRAY_SIMPLE_TYPE__(complexf)
-__PIBYTEARRAY_SIMPLE_TYPE__(complexd)
-__PIBYTEARRAY_SIMPLE_TYPE__(complexld)
-
-inline complexd sign(const complexd & x) {return complexd(sign(x.real()), sign(x.imag()));}
-
-inline complexd round(const complexd & c) {return complexd(piRound<double>(c.real()), piRound<double>(c.imag()));}
-inline complexd floor(const complexd & c) {return complexd(floor(c.real()), floor(c.imag()));}
-inline complexd ceil (const complexd & c) {return complexd(ceil(c.real()), ceil(c.imag()));}
-#ifdef PIP_CXX11_SUPPORT
-#  define acosc acos
-#  define asinc asin
-#  define atanc atan
-#else
-inline complexd atanc(const complexd & c) {return complexd(0., 0.5) * log((complexd_1 - complexd_i * c) / (complexd_1 + complexd_i * c));}
-inline complexd asinc(const complexd & c) {return -complexd_i * log(complexd_i * c + sqrt(complexd_1 - c * c));}
-inline complexd acosc(const complexd & c) {return -complexd_i * log(c + complexd_i * sqrt(complexd_1 - c * c));}
-#endif
-
-#ifdef CC_GCC
-#  if CC_GCC_VERSION <= 0x025F
-inline complexd tan(const complexd & c) {return sin(c) / cos(c);}
-inline complexd tanh(const complexd & c) {return sinh(c) / cosh(c);}
-inline complexd log2(const complexd & c) {return log(c) / M_LN2;}
-inline complexd log10(const complexd & c) {return log(c) / M_LN10;}
-#  endif
-#endif
-
-template<typename T>
-inline PICout operator <<(PICout s, const complex<T> & v) {s.space(); s.setControl(0, true); s << "(" << v.real() << "; " << v.imag() << ")"; s.restoreControl(); return s;}
-
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, complexf v) {float t; t = v.real(); s << t; t = v.imag(); s << t; return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, complexd v) {double t; t = v.real(); s << t; t = v.imag(); s << t; return s;}
-//! \relatesalso PIByteArray \brief Store operator
-inline PIByteArray & operator <<(PIByteArray & s, complexld v) {ldouble t; t = v.real(); s << t; t = v.imag(); s << t; return s;}
-
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, complexf & v) {float t0, t1; s >> t0; s >> t1; v = complexf(t0, t1); return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, complexd & v) {double t0, t1; s >> t0; s >> t1; v = complexd(t0, t1); return s;}
-//! \relatesalso PIByteArray \brief Restore operator
-inline PIByteArray & operator >>(PIByteArray & s, complexld & v) {ldouble t0, t1; s >> t0; s >> t1; v = complexld(t0, t1); return s;}
-
-
-inline PIVector<double> abs(const PIVector<complexd> & v) {
-	PIVector<double> result;
-	result.resize(v.size());
-	for (uint i = 0; i < v.size(); i++)
-		result[i] = abs(v[i]);
-	return result;
-}
-
-
-inline PIVector2D<double> abs(const PIVector2D<complexd> & v) {
-	PIVector2D<double> result(v.rows(), v.cols());
-	for (uint i = 0; i < v.rows(); i++)
-		for (uint j = 0; j < v.cols(); j++)
-			result[i][j] = abs(v.element(i,j));
-	return result;
-}
-
-#endif // PIMATHCOMPLEX_H
+/*! \file pimathcomplex.h
+ * \brief PIP math complex
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIP math complex
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIMATHCOMPLEX_H
+#define PIMATHCOMPLEX_H
+
+#include <complex>
+#include "pimathbase.h"
+#include "pibytearray.h"
+#include "pivector2d.h"
+
+#define PIP_MATH_COMPLEX
+
+using std::complex;
+
+typedef complex<int> complexi;
+typedef complex<short> complexs;
+typedef complex<float> complexf;
+typedef complex<ldouble> complexld;
+#ifndef QPIEVALUATOR_COMPLEX
+typedef complex<double> complexd;
+
+const complexd complexd_i(0., 1.);
+const complexd complexd_0(0.);
+const complexd complexd_1(1.);
+#endif
+const complexld complexld_i(0., 1.);
+const complexld complexld_0(0.);
+const complexld complexld_1(1.);
+
+__PICONTAINERS_SIMPLE_TYPE__(complexi)
+__PICONTAINERS_SIMPLE_TYPE__(complexs)
+__PICONTAINERS_SIMPLE_TYPE__(complexf)
+__PICONTAINERS_SIMPLE_TYPE__(complexd)
+__PICONTAINERS_SIMPLE_TYPE__(complexld)
+__PIVECTOR2D_SIMPLE_TYPE__(complexi)
+__PIVECTOR2D_SIMPLE_TYPE__(complexs)
+__PIVECTOR2D_SIMPLE_TYPE__(complexf)
+__PIVECTOR2D_SIMPLE_TYPE__(complexd)
+__PIVECTOR2D_SIMPLE_TYPE__(complexld)
+__PIBYTEARRAY_SIMPLE_TYPE__(complexi)
+__PIBYTEARRAY_SIMPLE_TYPE__(complexs)
+__PIBYTEARRAY_SIMPLE_TYPE__(complexf)
+__PIBYTEARRAY_SIMPLE_TYPE__(complexd)
+__PIBYTEARRAY_SIMPLE_TYPE__(complexld)
+
+inline complexd sign(const complexd & x) {return complexd(sign(x.real()), sign(x.imag()));}
+
+inline complexd round(const complexd & c) {return complexd(piRound<double>(c.real()), piRound<double>(c.imag()));}
+inline complexd floor(const complexd & c) {return complexd(floor(c.real()), floor(c.imag()));}
+inline complexd ceil (const complexd & c) {return complexd(ceil(c.real()), ceil(c.imag()));}
+#ifdef PIP_CXX11_SUPPORT
+#  define acosc acos
+#  define asinc asin
+#  define atanc atan
+#else
+inline complexd atanc(const complexd & c) {return complexd(0., 0.5) * log((complexd_1 - complexd_i * c) / (complexd_1 + complexd_i * c));}
+inline complexd asinc(const complexd & c) {return -complexd_i * log(complexd_i * c + sqrt(complexd_1 - c * c));}
+inline complexd acosc(const complexd & c) {return -complexd_i * log(c + complexd_i * sqrt(complexd_1 - c * c));}
+#endif
+
+#ifdef CC_GCC
+#  if CC_GCC_VERSION <= 0x025F
+inline complexd tan(const complexd & c) {return sin(c) / cos(c);}
+inline complexd tanh(const complexd & c) {return sinh(c) / cosh(c);}
+inline complexd log2(const complexd & c) {return log(c) / M_LN2;}
+inline complexd log10(const complexd & c) {return log(c) / M_LN10;}
+#  endif
+#endif
+
+template<typename T>
+inline PICout operator <<(PICout s, const complex<T> & v) {s.space(); s.setControl(0, true); s << "(" << v.real() << "; " << v.imag() << ")"; s.restoreControl(); return s;}
+
+//! \relatesalso PIByteArray \brief Store operator
+inline PIByteArray & operator <<(PIByteArray & s, complexf v) {float t; t = v.real(); s << t; t = v.imag(); s << t; return s;}
+//! \relatesalso PIByteArray \brief Store operator
+inline PIByteArray & operator <<(PIByteArray & s, complexd v) {double t; t = v.real(); s << t; t = v.imag(); s << t; return s;}
+//! \relatesalso PIByteArray \brief Store operator
+inline PIByteArray & operator <<(PIByteArray & s, complexld v) {ldouble t; t = v.real(); s << t; t = v.imag(); s << t; return s;}
+
+//! \relatesalso PIByteArray \brief Restore operator
+inline PIByteArray & operator >>(PIByteArray & s, complexf & v) {float t0, t1; s >> t0; s >> t1; v = complexf(t0, t1); return s;}
+//! \relatesalso PIByteArray \brief Restore operator
+inline PIByteArray & operator >>(PIByteArray & s, complexd & v) {double t0, t1; s >> t0; s >> t1; v = complexd(t0, t1); return s;}
+//! \relatesalso PIByteArray \brief Restore operator
+inline PIByteArray & operator >>(PIByteArray & s, complexld & v) {ldouble t0, t1; s >> t0; s >> t1; v = complexld(t0, t1); return s;}
+
+
+inline PIVector<double> abs(const PIVector<complexd> & v) {
+	PIVector<double> result;
+	result.resize(v.size());
+	for (uint i = 0; i < v.size(); i++)
+		result[i] = abs(v[i]);
+	return result;
+}
+
+
+inline PIVector2D<double> abs(const PIVector2D<complexd> & v) {
+	PIVector2D<double> result(v.rows(), v.cols());
+	for (uint i = 0; i < v.rows(); i++)
+		for (uint j = 0; j < v.cols(); j++)
+			result[i][j] = abs(v.element(i,j));
+	return result;
+}
+
+#endif // PIMATHCOMPLEX_H
diff --git a/src_main/math/pimathmatrix.h b/lib/main/math/pimathmatrix.h
similarity index 97%
rename from src_main/math/pimathmatrix.h
rename to lib/main/math/pimathmatrix.h
index 0ee2df58..07f27863 100644
--- a/src_main/math/pimathmatrix.h
+++ b/lib/main/math/pimathmatrix.h
@@ -1,574 +1,574 @@
-/*! \file pimathmatrix.h
- * \brief PIMathMatrix
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIMathMatrix
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIMATHMATRIX_H
-#define PIMATHMATRIX_H
-
-#include "pimathvector.h"
-#include "pimathcomplex.h"
-
-
-
-template<typename T>
-inline bool _PIMathMatrixNullCompare(const T v) {
-	return (piAbs(v) < T(1E-200));
-}
-
-template<>
-inline bool _PIMathMatrixNullCompare<complexf >(const complexf v) {
-	return (abs(v) < float(1E-200));
-}
-template<>
-inline bool _PIMathMatrixNullCompare<complexd >(const complexd v) {
-	return (abs(v) < double(1E-200));
-}
-
-
-/// Matrix templated
-
-#define PIMM_FOR(r, c) for (uint c = 0; c < Cols; ++c) { for (uint r = 0; r < Rows; ++r) {
-#define PIMM_FOR_WB(r, c) for (uint c = 0; c < Cols; ++c) for (uint r = 0; r < Rows; ++r) // without brakes
-#define PIMM_FOR_I(r, c) for (uint r = 0; r < Rows; ++r) { for (uint c = 0; c < Cols; ++c) {
-#define PIMM_FOR_I_WB(r, c) for (uint r = 0; r < Rows; ++r) for (uint c = 0; c < Cols; ++c) // without brakes
-#define PIMM_FOR_C(v) for (uint v = 0; v < Cols; ++v)
-#define PIMM_FOR_R(v) for (uint v = 0; v < Rows; ++v)
-
-#pragma pack(push, 1)
-template<uint Rows, uint Cols = Rows, typename Type = double>
-class PIP_EXPORT PIMathMatrixT {
-	typedef PIMathMatrixT<Rows, Cols, Type> _CMatrix;
-	typedef PIMathMatrixT<Cols, Rows, Type> _CMatrixI;
-	typedef PIMathVectorT<Rows, Type> _CMCol;
-	typedef PIMathVectorT<Cols, Type> _CMRow;
-public:
-	PIMathMatrixT() {resize(Rows, Cols);}
-	PIMathMatrixT(const PIVector<Type> & val) {resize(Rows, Cols); int i = 0; PIMM_FOR_I_WB(r, c) m[r][c] = val[i++];}
-
-	static _CMatrix identity() {_CMatrix tm = _CMatrix(); PIMM_FOR_WB(r, c) tm.m[r][c] = (c == r ? Type(1) : Type(0)); return tm;}
-	static _CMatrix filled(const Type & v) {_CMatrix tm; PIMM_FOR_WB(r, c) tm.m[r][c] = v; return tm;}
-	static _CMatrix rotation(double angle) {return _CMatrix();}
-	static _CMatrix rotationX(double angle) {return _CMatrix();}
-	static _CMatrix rotationY(double angle) {return _CMatrix();}
-	static _CMatrix rotationZ(double angle) {return _CMatrix();}
-	static _CMatrix scaleX(double factor) {return _CMatrix();}
-	static _CMatrix scaleY(double factor) {return _CMatrix();}
-	static _CMatrix scaleZ(double factor) {return _CMatrix();}
-
-	uint cols() const {return Cols;}
-	uint rows() const {return Rows;}
-	_CMCol col(uint index) {_CMCol tv; PIMM_FOR_R(i) tv[i] = m[i][index]; return tv;}
-	_CMRow row(uint index) {_CMRow tv; PIMM_FOR_C(i) tv[i] = m[index][i]; return tv;}
-	_CMatrix & setCol(uint index, const _CMCol & v) {PIMM_FOR_R(i) m[i][index] = v[i]; return *this;}
-	_CMatrix & setRow(uint index, const _CMRow & v) {PIMM_FOR_C(i) m[index][i] = v[i]; return *this;}
-	_CMatrix & swapRows(uint r0, uint r1) {Type t; PIMM_FOR_C(i) {t = m[r0][i]; m[r0][i] = m[r1][i]; m[r1][i] = t;} return *this;}
-	_CMatrix & swapCols(uint c0, uint c1) {Type t; PIMM_FOR_R(i) {t = m[i][c0]; m[i][c0] = m[i][c1]; m[i][c1] = t;} return *this;}
-	_CMatrix & fill(const Type & v) {PIMM_FOR_WB(r, c) m[r][c] = v; return *this;}
-	bool isSquare() const {return cols() == rows();}
-	bool isIdentity() const {PIMM_FOR_WB(r, c) if ((c == r) ? m[r][c] != Type(1) : m[r][c] != Type(0)) return false; return true;}
-	bool isNull() const {PIMM_FOR_WB(r, c) if (m[r][c] != Type(0)) return false; return true;}
-
-	Type & at(uint row, uint col) {return m[row][col];}
-	Type at(uint row, uint col) const {return m[row][col];}
-	Type * operator [](uint row) {return m[row];}
-	const Type * operator [](uint row) const {return m[row];}
-	_CMatrix & operator =(const _CMatrix & sm) {memcpy(m, sm.m, sizeof(Type) * Cols * Rows); return *this;}
-	bool operator ==(const _CMatrix & sm) const {PIMM_FOR_WB(r, c) if (m[r][c] != sm.m[r][c]) return false; return true;}
-	bool operator !=(const _CMatrix & sm) const {return !(*this == sm);}
-	void operator +=(const _CMatrix & sm) {PIMM_FOR_WB(r, c) m[r][c] += sm.m[r][c];}
-	void operator -=(const _CMatrix & sm) {PIMM_FOR_WB(r, c) m[r][c] -= sm.m[r][c];}
-	void operator *=(const Type & v) {PIMM_FOR_WB(r, c) m[r][c] *= v;}
-	void operator /=(const Type & v) {PIMM_FOR_WB(r, c) m[r][c] /= v;}
-	_CMatrix operator -() const {_CMatrix tm; PIMM_FOR_WB(r, c) tm.m[r][c] = -m[r][c]; return tm;}
-	_CMatrix operator +(const _CMatrix & sm) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] += sm.m[r][c]; return tm;}
-	_CMatrix operator -(const _CMatrix & sm) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] -= sm.m[r][c]; return tm;}
-	_CMatrix operator *(const Type & v) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] *= v; return tm;}
-	_CMatrix operator /(const Type & v) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] /= v; return tm;}
-	
-	Type determinant(bool * ok = 0) const {
-		_CMatrix m(*this);
-		bool k;
-		Type ret = Type(0);
-		m.toUpperTriangular(&k);
-		if (ok) *ok = k;
-		if (!k) return ret;
-		ret = Type(1);
-		for (uint c = 0; c < Cols; ++c)
-			for (uint r = 0; r < Rows; ++r)
-				if (r == c)
-					ret *= m[r][c];
-		return ret;
-	}
-
-	_CMatrix & toUpperTriangular(bool * ok = 0) {
-		if (Cols != Rows) {
-			if (ok != 0) *ok = false;
-			return *this;
-		}
-		_CMatrix smat(*this);
-		bool ndet;
-		uint crow;
-		Type mul;
-		for (uint i = 0; i < Cols; ++i) {
-			ndet = true;
-			for (uint j = 0; j < Rows; ++j) if (smat.m[i][j] != 0) ndet = false;
-			if (ndet) {
-				if (ok != 0) *ok = false;
-				return *this;
-			}
-		}
-		for (uint i = 0; i < Cols; ++i) {
-			crow = i;
-			while (smat.m[i][i] == Type(0))
-				smat.swapRows(i, ++crow);
-			for (uint j = i + 1; j < Rows; ++j) {
-				mul = smat.m[i][j] / smat.m[i][i];
-				for (uint k = i; k < Cols; ++k) smat.m[k][j] -= mul * smat.m[k][i];
-			}
-			if (i < Cols - 1) {
-				if (fabs(smat.m[i+1][i+1]) < Type(1E-200)) {
-					if (ok != 0) *ok = false;
-					return *this;
-				}
-			}
-		}
-		if (ok != 0) *ok = true;
-		memcpy(m, smat.m, sizeof(Type) * Cols * Rows);
-		return *this;
-	}
-
-	_CMatrix & invert(bool * ok = 0) {
-		if (Cols != Rows) {
-			if (ok != 0) *ok = false;
-			return *this;
-		}
-		_CMatrix mtmp = _CMatrix::identity(), smat(*this);
-		bool ndet;
-		uint crow;
-		Type mul, iddiv;
-		for (uint i = 0; i < Cols; ++i) {
-			ndet = true;
-			for (uint j = 0; j < Rows; ++j) if (smat.m[i][j] != 0) ndet = false;
-			if (ndet) {
-				if (ok != 0) *ok = false;
-				return *this;
-			}
-		}
-		for (uint i = 0; i < Cols; ++i) {
-			crow = i;
-			while (smat.m[i][i] == Type(0)) {
-				++crow;
-				smat.swapRows(i, crow);
-				mtmp.swapRows(i, crow);
-			}
-			for (uint j = i + 1; j < Rows; ++j) {
-				mul = smat.m[i][j] / smat.m[i][i];
-				for (uint k = i; k < Cols; ++k) smat.m[k][j] -= mul * smat.m[k][i];
-				for (uint k = 0; k < Cols; ++k) mtmp.m[k][j] -= mul * mtmp.m[k][i];
-			}
-			if (i < Cols - 1) {
-				if (fabs(smat.m[i+1][i+1]) < Type(1E-200)) {
-					if (ok != 0) *ok = false;
-					return *this;
-				}
-			}
-			iddiv = smat.m[i][i];
-			for (uint j = i; j < Cols; ++j) smat.m[j][i] /= iddiv;
-			for (uint j = 0; j < Cols; ++j) mtmp.m[j][i] /= iddiv;
-		}
-		for (uint i = Cols - 1; i > 0; --i) {
-			for (uint j = 0; j < i; ++j) {
-				mul = smat.m[i][j];
-				smat.m[i][j] -= mul;
-				for (uint k = 0; k < Cols; ++k) mtmp.m[k][j] -= mtmp.m[k][i] * mul;
-			}
-		}
-		if (ok != 0) *ok = true;
-		memcpy(m, mtmp.m, sizeof(Type) * Cols * Rows);
-		return *this;
-	}
-	_CMatrix inverted(bool * ok = 0) const {_CMatrix tm(*this); tm.invert(ok); return tm;}
-	_CMatrixI transposed() const {_CMatrixI tm; PIMM_FOR_WB(r, c) tm[c][r] = m[r][c]; return tm;}
-
-private:
-	void resize(uint rows_, uint cols_, const Type & new_value = Type()) {r_ = rows_; c_ = cols_; PIMM_FOR_WB(r, c) m[r][c] = new_value;}
-	int c_, r_;
-	Type m[Rows][Cols];
-
-};
-#pragma pack(pop)
-
-
-template<> inline PIMathMatrixT<2u, 2u> PIMathMatrixT<2u, 2u>::rotation(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<2u, 2u> tm; tm[0][0] = tm[1][1] = c; tm[0][1] = -s; tm[1][0] = s; return tm;}
-template<> inline PIMathMatrixT<2u, 2u> PIMathMatrixT<2u, 2u>::scaleX(double factor) {PIMathMatrixT<2u, 2u> tm; tm[0][0] = factor; tm[1][1] = 1.; return tm;}
-template<> inline PIMathMatrixT<2u, 2u> PIMathMatrixT<2u, 2u>::scaleY(double factor) {PIMathMatrixT<2u, 2u> tm; tm[0][0] = 1.; tm[1][1] = factor; return tm;}
-
-template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::rotationX(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<3u, 3u> tm; tm[0][0] = 1.; tm[1][1] = tm[2][2] = c; tm[2][1] = s; tm[1][2] = -s; return tm;}
-template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::rotationY(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<3u, 3u> tm; tm[1][1] = 1.; tm[0][0] = tm[2][2] = c; tm[2][0] = -s; tm[0][2] = s; return tm;}
-template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::rotationZ(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<3u, 3u> tm; tm[2][2] = 1.; tm[0][0] = tm[1][1] = c; tm[1][0] = s; tm[0][1] = -s; return tm;}
-template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::scaleX(double factor) {PIMathMatrixT<3u, 3u> tm; tm[1][1] = tm[2][2] = 1.; tm[0][0] = factor; return tm;}
-template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::scaleY(double factor) {PIMathMatrixT<3u, 3u> tm; tm[0][0] = tm[2][2] = 1.; tm[1][1] = factor; return tm;}
-template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::scaleZ(double factor) {PIMathMatrixT<3u, 3u> tm; tm[0][0] = tm[1][1] = 1.; tm[2][2] = factor; return tm;}
-
-#ifdef PIP_STD_IOSTREAM
-template<uint Rows, uint Cols, typename Type>
-inline std::ostream & operator <<(std::ostream & s, const PIMathMatrixT<Rows, Cols, Type> & m) {s << "{"; PIMM_FOR_I(r, c) s << m[r][c]; if (c < Cols - 1 || r < Rows - 1) s << ", ";} if (r < Rows - 1) s << std::endl << " ";} s << "}"; return s;}
-#endif
-
-template<uint Rows, uint Cols, typename Type>
-inline PICout operator <<(PICout s, const PIMathMatrixT<Rows, Cols, Type> & m) {s << "{"; PIMM_FOR_I(r, c) s << m[r][c]; if (c < Cols - 1 || r < Rows - 1) s << ", ";} if (r < Rows - 1) s << PICoutManipulators::NewLine << " ";} s << "}"; return s;}
-
-/// Multiply matrices {Rows0 x CR} on {CR x Cols1}, result is {Rows0 x Cols1}
-template<uint CR, uint Rows0, uint Cols1, typename Type>
-inline PIMathMatrixT<Rows0, Cols1, Type> operator *(const PIMathMatrixT<Rows0, CR, Type> & fm,
-													const PIMathMatrixT<CR, Cols1, Type> & sm) {
-	PIMathMatrixT<Rows0, Cols1, Type> tm;
-	Type t;
-	for (uint j = 0; j < Rows0; ++j) {
-		for (uint i = 0; i < Cols1; ++i) {
-			t = Type(0);
-			for (uint k = 0; k < CR; ++k)
-				t += fm[j][k] * sm[k][i];
-			tm[j][i] = t;
-		}
-	}
-	return tm;
-}
-
-/// Multiply matrix {Rows x Cols} on vector {Cols}, result is vector {Rows}
-template<uint Cols, uint Rows, typename Type>
-inline PIMathVectorT<Rows, Type> operator *(const PIMathMatrixT<Rows, Cols, Type> & fm,
-											const PIMathVectorT<Cols, Type> & sv) {
-	PIMathVectorT<Rows, Type> tv;
-	Type t;
-	for (uint j = 0; j < Rows; ++j) {
-		t = Type(0);
-		for (uint i = 0; i < Cols; ++i)
-			t += fm[j][i] * sv[i];
-		tv[j] = t;
-	}
-	return tv;
-}
-
-/// Multiply vector {Rows} on matrix {Rows x Cols}, result is vector {Cols}
-template<uint Cols, uint Rows, typename Type>
-inline PIMathVectorT<Cols, Type> operator *(const PIMathVectorT<Rows, Type> & sv,
-											const PIMathMatrixT<Rows, Cols, Type> & fm) {
-	PIMathVectorT<Cols, Type> tv;
-	Type t;
-	for (uint j = 0; j < Cols; ++j) {
-		t = Type(0);
-		for (uint i = 0; i < Rows; ++i)
-			t += fm[i][j] * sv[i];
-		tv[j] = t;
-	}
-	return tv;
-}
-
-/// Multiply value(T) on matrix {Rows x Cols}, result is vector {Rows}
-template<uint Cols, uint Rows, typename Type>
-inline PIMathMatrixT<Rows, Cols, Type> operator *(const Type & x, const PIMathMatrixT<Rows, Cols, Type> & v) {
-	return v * x;
-}
-
-
-typedef PIMathMatrixT<2u, 2u, int> PIMathMatrixT22i;
-typedef PIMathMatrixT<3u, 3u, int> PIMathMatrixT33i;
-typedef PIMathMatrixT<4u, 4u, int> PIMathMatrixT44i;
-typedef PIMathMatrixT<2u, 2u, double> PIMathMatrixT22d;
-typedef PIMathMatrixT<3u, 3u, double> PIMathMatrixT33d;
-typedef PIMathMatrixT<4u, 4u, double> PIMathMatrixT44d;
-
-
-template<typename Type>
-class PIMathMatrix;
-
-#undef PIMM_FOR
-#undef PIMM_FOR_WB
-#undef PIMM_FOR_I
-#undef PIMM_FOR_I_WB
-#undef PIMM_FOR_C
-#undef PIMM_FOR_R
-
-
-
-
-
-/// Matrix
-
-#define PIMM_FOR(c, r) for (uint c = 0; c < _V2D::cols_; ++c) for (uint r = 0; r < _V2D::rows_; ++r)
-#define PIMM_FOR_I(c, r) for (uint r = 0; r < _V2D::rows_; ++r) for (uint c = 0; c < _V2D::cols_; ++c)
-#define PIMM_FOR_A(v) for (uint v = 0; v < _V2D::mat.size(); ++v)
-#define PIMM_FOR_C(v) for (uint v = 0; v < _V2D::cols_; ++v)
-#define PIMM_FOR_R(v) for (uint v = 0; v < _V2D::rows_; ++v)
-
-template<typename Type>
-class PIP_EXPORT PIMathMatrix : public PIVector2D<Type> {
-	typedef PIVector2D<Type>   _V2D;
-	typedef PIMathMatrix<Type> _CMatrix;
-	typedef PIMathVector<Type> _CMCol;
-public:
-	PIMathMatrix(const uint cols = 0, const uint rows = 0, const Type & f = Type()) {_V2D::resize(rows, cols, f);}
-	PIMathMatrix(const uint cols, const uint rows, const PIVector<Type> & val) {_V2D::resize(rows, cols); int i=0; PIMM_FOR_I(c, r) _V2D::element(r, c) = val[i++];}
-	PIMathMatrix(const PIVector<PIVector<Type> > & val) {if(!val.isEmpty()) {_V2D::resize(val.size(), val[0].size()); PIMM_FOR_I(c, r) _V2D::element(r, c) = val[r][c];}}
-	PIMathMatrix(const PIVector2D<Type> & val) {if(!val.isEmpty()) {_V2D::resize(val.rows(), val.cols()); PIMM_FOR_I(c, r) _V2D::element(r, c) = val.element(r, c);}}
-
-	static _CMatrix identity(const uint cols, const uint rows) {_CMatrix tm(cols, rows); for (uint r = 0; r < rows; ++r) for (uint c = 0; c < cols; ++c)  tm.element(r, c) = (c == r ? Type(1) : Type(0)); return tm;}
-	static _CMatrix matrixRow(const PIMathVector<Type> & val) {return _CMatrix(val.size(), 1, val.toVector());}
-	static _CMatrix matrixCol(const PIMathVector<Type> & val) {return _CMatrix(1, val.size(), val.toVector());}
-
-	_CMatrix & setCol(uint index, const _CMCol & v) {PIMM_FOR_R(i) _V2D::element(i, index) = v[i]; return *this;}
-	_CMatrix & setRow(uint index, const _CMCol & v) {PIMM_FOR_C(i) _V2D::element(index, i) = v[i]; return *this;}
-	_CMatrix & swapCols(uint r0, uint r1) {PIMM_FOR_C(i) {piSwap(_V2D::element(i, r0), _V2D::element(i, r1));} return *this;}
-	_CMatrix & swapRows(uint c0, uint c1) {PIMM_FOR_R(i) {piSwap(_V2D::element(c0, i), _V2D::element(c1, i));} return *this;}
-	_CMatrix & fill(const Type & v) {PIMM_FOR_A(i) _V2D::mat[i] = v; return *this;}
-	bool isSquare() const {return _V2D::cols_ == _V2D::rows_;}
-	bool isIdentity() const {PIMM_FOR(c, r) if ((c == r) ? _V2D::element(r, c) != Type(1) : _V2D::element(r, c) != Type(0)) return false; return true;}
-	bool isNull() const {PIMM_FOR_A(i) if (_V2D::mat[i] != Type(0)) return false; return true;}
-	bool isValid() const {return !PIVector2D<Type>::isEmpty();}
-
-	_CMatrix & operator =(const PIVector<PIVector<Type> > & v) {*this = _CMatrix(v); return *this;}
-	bool operator ==(const _CMatrix & sm) const {PIMM_FOR_A(i) if (_V2D::mat[i] != sm.mat[i]) return false; return true;}
-	bool operator !=(const _CMatrix & sm) const {return !(*this == sm);}
-	void operator +=(const _CMatrix & sm) {PIMM_FOR_A(i) _V2D::mat[i] += sm.mat[i];}
-	void operator -=(const _CMatrix & sm) {PIMM_FOR_A(i) _V2D::mat[i] -= sm.mat[i];}
-	void operator *=(const Type & v) {PIMM_FOR_A(i) _V2D::mat[i] *= v;}
-	void operator /=(const Type & v) {PIMM_FOR_A(i) _V2D::mat[i] /= v;}
-	_CMatrix operator -() const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] = -_V2D::mat[i]; return tm;}
-	_CMatrix operator +(const _CMatrix & sm) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] += sm.mat[i]; return tm;}
-	_CMatrix operator -(const _CMatrix & sm) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] -= sm.mat[i]; return tm;}
-	_CMatrix operator *(const Type & v) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] *= v; return tm;}
-	_CMatrix operator /(const Type & v) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] /= v; return tm;}
-
-	Type determinant(bool * ok = 0) const {
-		_CMatrix m(*this);
-		bool k;
-		Type ret = Type(0);
-		m.toUpperTriangular(&k);
-		if (ok) *ok = k;
-		if (!k) return ret;
-		ret = Type(1);
-		for (uint c = 0; c < _V2D::cols_; ++c)
-			for (uint r = 0; r < _V2D::rows_; ++r)
-				if (r == c)
-					ret *= m.element(r, c);
-		return ret;
-	}
-
-	Type trace(bool * ok = 0) const {
-		Type ret = Type(0);
-		if (!isSquare()) {
-			if (ok != 0) *ok = false;
-			return ret;
-		}
-		for (uint i = 0; i < _V2D::cols_; ++i) {
-			ret += _V2D::element(i, i);
-		}
-		if (ok != 0) *ok = true;
-		return ret;
-	}
-
-	_CMatrix & toUpperTriangular(bool * ok = 0) {
-		if (!isSquare()) {
-			if (ok != 0) *ok = false;
-			return *this;
-		}
-		_CMatrix smat(*this);
-		bool ndet;
-		uint crow;
-		Type mul;
-		for (uint i = 0; i < _V2D::cols_; ++i) {
-			ndet = true;
-			for (uint j = 0; j < _V2D::rows_; ++j) if (smat.element(i, j) != 0) ndet = false;
-			if (ndet) {
-				if (ok != 0) *ok = false;
-				return *this;
-			}
-		}
-		for (uint i = 0; i < _V2D::cols_; ++i) {
-			crow = i;
-			while (smat.element(i, i) == Type(0))
-				smat.swapRows(i, ++crow);
-			for (uint j = i + 1; j < _V2D::rows_; ++j) {
-				mul = smat.element(i, j) / smat.element(i, i);
-				for (uint k = i; k < _V2D::cols_; ++k) smat.element(k, j) -= mul * smat.element(k, i);
-			}
-			if (i < _V2D::cols_ - 1) {
-				if (_PIMathMatrixNullCompare(smat.element(i+1, i+1))) {
-					if (ok != 0) *ok = false;
-					return *this;
-				}
-			}
-		}
-		if (ok != 0) *ok = true;
-		_V2D::mat.swap(smat.mat);
-		return *this;
-	}
-
-	_CMatrix & invert(bool * ok = 0, _CMCol * sv = 0) {
-		if (!isSquare()) {
-			if (ok != 0) *ok = false;
-			return *this;
-		}
-		_CMatrix mtmp = _CMatrix::identity(_V2D::cols_, _V2D::rows_), smat(*this);
-		bool ndet;
-		uint crow;
-		Type mul, iddiv;
-		for (uint i = 0; i < _V2D::cols_; ++i) {
-			ndet = true;
-			for (uint j = 0; j < _V2D::rows_; ++j) if (smat.element(i, j) != Type(0)) ndet = false;
-			if (ndet) {
-				if (ok != 0) *ok = false;
-				return *this;
-			}
-		}
-		for (uint i = 0; i < _V2D::cols_; ++i) {
-			crow = i;
-			while (smat.element(i, i) == Type(0)) {
-				++crow;
-				smat.swapRows(i, crow);
-				mtmp.swapRows(i, crow);
-				if (sv != 0) sv->swap(i, crow);
-			}
-			for (uint j = i + 1; j < _V2D::rows_; ++j) {
-				mul = smat.element(i, j) / smat.element(i, i);
-				for (uint k = i; k < _V2D::cols_; ++k) smat.element(k, j) -= mul * smat.element(k, i);
-				for (uint k = 0; k < _V2D::cols_; ++k) mtmp.element(k, j) -= mul * mtmp.element(k, i);
-				if (sv != 0) (*sv)[j] -= mul * (*sv)[i];
-			}
-			if (i < _V2D::cols_ - 1) {
-				if (_PIMathMatrixNullCompare(smat.element(i+1, i+1))) {
-					if (ok != 0) *ok = false;
-					return *this;
-				}
-			}
-			iddiv = smat.element(i, i);
-			for (uint j = i; j < _V2D::cols_; ++j) smat.element(j, i) /= iddiv;
-			for (uint j = 0; j < _V2D::cols_; ++j) mtmp.element(j, i) /= iddiv;
-			if (sv != 0) (*sv)[i] /= iddiv;
-		}
-		for (uint i = _V2D::cols_ - 1; i > 0; --i) {
-			for (uint j = 0; j < i; ++j) {
-				mul = smat.element(i, j);
-				smat.element(i, j) -= mul;
-				for (uint k = 0; k < _V2D::cols_; ++k) mtmp.element(k, j) -= mul * mtmp.element(k, i);
-				if (sv != 0) (*sv)[j] -= mul * (*sv)[i];
-			}
-		}
-		if (ok != 0) *ok = true;
-		PIVector2D<Type>::swap(mtmp);
-		return *this;
-	}
-	_CMatrix inverted(bool * ok = 0) const {_CMatrix tm(*this); tm.invert(ok); return tm;}
-	_CMatrix transposed() const {_CMatrix tm(_V2D::rows_, _V2D::cols_); PIMM_FOR(c, r) tm.element(c, r) = _V2D::element(r, c); return tm;}
-};
-
-
-#ifdef PIP_STD_IOSTREAM
-template<typename Type>
-inline std::ostream & operator <<(std::ostream & s, const PIMathMatrix<Type> & m) {s << "{"; for (uint r = 0; r < m.rows(); ++r) { for (uint c = 0; c < m.cols(); ++c) { s << m.element(r, c); if (c < m.cols() - 1 || r < m.rows() - 1) s << ", ";} if (r < m.rows() - 1) s << std::endl << " ";} s << "}"; return s;}
-#endif
-
-template<typename Type>
-inline PICout operator <<(PICout s, const PIMathMatrix<Type> & m) {s << "Matrix{"; for (uint r = 0; r < m.rows(); ++r) { for (uint c = 0; c < m.cols(); ++c) { s << m.element(r, c); if (c < m.cols() - 1 || r < m.rows() - 1) s << ", ";} if (r < m.rows() - 1) s << PICoutManipulators::NewLine << " ";} s << "}"; return s;}
-
-template<typename Type>
-inline PIByteArray & operator <<(PIByteArray & s, const PIMathMatrix<Type> & v) {s << (const PIVector2D<Type> &)v; return s;}
-template<typename Type>
-inline PIByteArray & operator >>(PIByteArray & s, PIMathMatrix<Type> & v) {s >> (PIVector2D<Type> &)v; return s;}
-
-
-/// Multiply matrices {CR x Rows0} on {Cols1 x CR}, result is {Cols1 x Rows0}
-template<typename Type>
-inline PIMathMatrix<Type> operator *(const PIMathMatrix<Type> & fm,
-									const PIMathMatrix<Type> & sm) {
-	uint cr = fm.cols(), rows0 = fm.rows(), cols1 = sm.cols();
-	PIMathMatrix<Type> tm(cols1, rows0);
-	if (fm.cols() != sm.rows()) return tm;
-	Type t;
-	for (uint j = 0; j < rows0; ++j) {
-		for (uint i = 0; i < cols1; ++i) {
-			t = Type(0);
-			for (uint k = 0; k < cr; ++k)
-				t += fm.element(j, k) * sm.element(k, i);
-			tm.element(j, i) = t;
-		}
-	}
-	return tm;
-}
-
-/// Multiply matrix {Cols x Rows} on vector {Cols}, result is vector {Rows}
-template<typename Type>
-inline PIMathVector<Type> operator *(const PIMathMatrix<Type> & fm,
-									const PIMathVector<Type> & sv) {
-	uint c = fm.cols(), r = fm.rows();
-	PIMathVector<Type> tv(r);
-	if (c != sv.size()) return tv;
-	Type t;
-	for (uint j = 0; j < r; ++j) {
-		t = Type(0);
-		for (uint i = 0; i < c; ++i)
-			t += fm.element(j, i) * sv[i];
-		tv[j] = t;
-	}
-	return tv;
-}
-
-
-/// Multiply vector {Rows} on matrix {Rows x Cols}, result is vector {Cols}
-template<typename Type>
-inline PIMathVector<Type> operator *(const PIMathVector<Type> & sv,
-									  const PIMathMatrix<Type> & fm) {
-	uint c = fm.cols(), r = fm.rows();
-	PIMathVector<Type> tv(c);
-	Type t;
-	for (uint j = 0; j < c; ++j) {
-		t = Type(0);
-		for (uint i = 0; i < r; ++i)
-			t += fm.element(i, j) * sv[i];
-		tv[j] = t;
-	}
-	return tv;
-}
-
-/// Multiply value(T) on matrix {Rows x Cols}, result is vector {Rows}
-template<typename Type>
-inline PIMathMatrix<Type> operator *(const Type & x, const PIMathMatrix<Type> & v) {
-	return v * x;
-}
-
-typedef PIMathMatrix<int> PIMathMatrixi;
-typedef PIMathMatrix<double> PIMathMatrixd;
-
-template<typename T>
-PIMathMatrix<complex<T> > hermitian(const PIMathMatrix<complex<T> > & m) {
-	PIMathMatrix<complex<T> > ret(m);
-	for (uint r = 0; r < ret.rows(); ++r) for (uint c = 0; c < ret.cols(); ++c) ret.element(r, c).imag(-(ret.element(r, c).imag()));
-	return ret.transposed();
-}
-
-#undef PIMM_FOR
-#undef PIMM_FOR_I
-#undef PIMM_FOR_A
-#undef PIMM_FOR_C
-#undef PIMM_FOR_R
-
-#endif // PIMATHMATRIX_H
+/*! \file pimathmatrix.h
+ * \brief PIMathMatrix
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIMathMatrix
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIMATHMATRIX_H
+#define PIMATHMATRIX_H
+
+#include "pimathvector.h"
+#include "pimathcomplex.h"
+
+
+
+template<typename T>
+inline bool _PIMathMatrixNullCompare(const T v) {
+	return (piAbs(v) < T(1E-200));
+}
+
+template<>
+inline bool _PIMathMatrixNullCompare<complexf >(const complexf v) {
+	return (abs(v) < float(1E-200));
+}
+template<>
+inline bool _PIMathMatrixNullCompare<complexd >(const complexd v) {
+	return (abs(v) < double(1E-200));
+}
+
+
+/// Matrix templated
+
+#define PIMM_FOR(r, c) for (uint c = 0; c < Cols; ++c) { for (uint r = 0; r < Rows; ++r) {
+#define PIMM_FOR_WB(r, c) for (uint c = 0; c < Cols; ++c) for (uint r = 0; r < Rows; ++r) // without brakes
+#define PIMM_FOR_I(r, c) for (uint r = 0; r < Rows; ++r) { for (uint c = 0; c < Cols; ++c) {
+#define PIMM_FOR_I_WB(r, c) for (uint r = 0; r < Rows; ++r) for (uint c = 0; c < Cols; ++c) // without brakes
+#define PIMM_FOR_C(v) for (uint v = 0; v < Cols; ++v)
+#define PIMM_FOR_R(v) for (uint v = 0; v < Rows; ++v)
+
+#pragma pack(push, 1)
+template<uint Rows, uint Cols = Rows, typename Type = double>
+class PIP_EXPORT PIMathMatrixT {
+	typedef PIMathMatrixT<Rows, Cols, Type> _CMatrix;
+	typedef PIMathMatrixT<Cols, Rows, Type> _CMatrixI;
+	typedef PIMathVectorT<Rows, Type> _CMCol;
+	typedef PIMathVectorT<Cols, Type> _CMRow;
+public:
+	PIMathMatrixT() {resize(Rows, Cols);}
+	PIMathMatrixT(const PIVector<Type> & val) {resize(Rows, Cols); int i = 0; PIMM_FOR_I_WB(r, c) m[r][c] = val[i++];}
+
+	static _CMatrix identity() {_CMatrix tm = _CMatrix(); PIMM_FOR_WB(r, c) tm.m[r][c] = (c == r ? Type(1) : Type(0)); return tm;}
+	static _CMatrix filled(const Type & v) {_CMatrix tm; PIMM_FOR_WB(r, c) tm.m[r][c] = v; return tm;}
+	static _CMatrix rotation(double angle) {return _CMatrix();}
+	static _CMatrix rotationX(double angle) {return _CMatrix();}
+	static _CMatrix rotationY(double angle) {return _CMatrix();}
+	static _CMatrix rotationZ(double angle) {return _CMatrix();}
+	static _CMatrix scaleX(double factor) {return _CMatrix();}
+	static _CMatrix scaleY(double factor) {return _CMatrix();}
+	static _CMatrix scaleZ(double factor) {return _CMatrix();}
+
+	uint cols() const {return Cols;}
+	uint rows() const {return Rows;}
+	_CMCol col(uint index) {_CMCol tv; PIMM_FOR_R(i) tv[i] = m[i][index]; return tv;}
+	_CMRow row(uint index) {_CMRow tv; PIMM_FOR_C(i) tv[i] = m[index][i]; return tv;}
+	_CMatrix & setCol(uint index, const _CMCol & v) {PIMM_FOR_R(i) m[i][index] = v[i]; return *this;}
+	_CMatrix & setRow(uint index, const _CMRow & v) {PIMM_FOR_C(i) m[index][i] = v[i]; return *this;}
+	_CMatrix & swapRows(uint r0, uint r1) {Type t; PIMM_FOR_C(i) {t = m[r0][i]; m[r0][i] = m[r1][i]; m[r1][i] = t;} return *this;}
+	_CMatrix & swapCols(uint c0, uint c1) {Type t; PIMM_FOR_R(i) {t = m[i][c0]; m[i][c0] = m[i][c1]; m[i][c1] = t;} return *this;}
+	_CMatrix & fill(const Type & v) {PIMM_FOR_WB(r, c) m[r][c] = v; return *this;}
+	bool isSquare() const {return cols() == rows();}
+	bool isIdentity() const {PIMM_FOR_WB(r, c) if ((c == r) ? m[r][c] != Type(1) : m[r][c] != Type(0)) return false; return true;}
+	bool isNull() const {PIMM_FOR_WB(r, c) if (m[r][c] != Type(0)) return false; return true;}
+
+	Type & at(uint row, uint col) {return m[row][col];}
+	Type at(uint row, uint col) const {return m[row][col];}
+	Type * operator [](uint row) {return m[row];}
+	const Type * operator [](uint row) const {return m[row];}
+	_CMatrix & operator =(const _CMatrix & sm) {memcpy(m, sm.m, sizeof(Type) * Cols * Rows); return *this;}
+	bool operator ==(const _CMatrix & sm) const {PIMM_FOR_WB(r, c) if (m[r][c] != sm.m[r][c]) return false; return true;}
+	bool operator !=(const _CMatrix & sm) const {return !(*this == sm);}
+	void operator +=(const _CMatrix & sm) {PIMM_FOR_WB(r, c) m[r][c] += sm.m[r][c];}
+	void operator -=(const _CMatrix & sm) {PIMM_FOR_WB(r, c) m[r][c] -= sm.m[r][c];}
+	void operator *=(const Type & v) {PIMM_FOR_WB(r, c) m[r][c] *= v;}
+	void operator /=(const Type & v) {PIMM_FOR_WB(r, c) m[r][c] /= v;}
+	_CMatrix operator -() const {_CMatrix tm; PIMM_FOR_WB(r, c) tm.m[r][c] = -m[r][c]; return tm;}
+	_CMatrix operator +(const _CMatrix & sm) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] += sm.m[r][c]; return tm;}
+	_CMatrix operator -(const _CMatrix & sm) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] -= sm.m[r][c]; return tm;}
+	_CMatrix operator *(const Type & v) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] *= v; return tm;}
+	_CMatrix operator /(const Type & v) const {_CMatrix tm = _CMatrix(*this); PIMM_FOR_WB(r, c) tm.m[r][c] /= v; return tm;}
+	
+	Type determinant(bool * ok = 0) const {
+		_CMatrix m(*this);
+		bool k;
+		Type ret = Type(0);
+		m.toUpperTriangular(&k);
+		if (ok) *ok = k;
+		if (!k) return ret;
+		ret = Type(1);
+		for (uint c = 0; c < Cols; ++c)
+			for (uint r = 0; r < Rows; ++r)
+				if (r == c)
+					ret *= m[r][c];
+		return ret;
+	}
+
+	_CMatrix & toUpperTriangular(bool * ok = 0) {
+		if (Cols != Rows) {
+			if (ok != 0) *ok = false;
+			return *this;
+		}
+		_CMatrix smat(*this);
+		bool ndet;
+		uint crow;
+		Type mul;
+		for (uint i = 0; i < Cols; ++i) {
+			ndet = true;
+			for (uint j = 0; j < Rows; ++j) if (smat.m[i][j] != 0) ndet = false;
+			if (ndet) {
+				if (ok != 0) *ok = false;
+				return *this;
+			}
+		}
+		for (uint i = 0; i < Cols; ++i) {
+			crow = i;
+			while (smat.m[i][i] == Type(0))
+				smat.swapRows(i, ++crow);
+			for (uint j = i + 1; j < Rows; ++j) {
+				mul = smat.m[i][j] / smat.m[i][i];
+				for (uint k = i; k < Cols; ++k) smat.m[k][j] -= mul * smat.m[k][i];
+			}
+			if (i < Cols - 1) {
+				if (fabs(smat.m[i+1][i+1]) < Type(1E-200)) {
+					if (ok != 0) *ok = false;
+					return *this;
+				}
+			}
+		}
+		if (ok != 0) *ok = true;
+		memcpy(m, smat.m, sizeof(Type) * Cols * Rows);
+		return *this;
+	}
+
+	_CMatrix & invert(bool * ok = 0) {
+		if (Cols != Rows) {
+			if (ok != 0) *ok = false;
+			return *this;
+		}
+		_CMatrix mtmp = _CMatrix::identity(), smat(*this);
+		bool ndet;
+		uint crow;
+		Type mul, iddiv;
+		for (uint i = 0; i < Cols; ++i) {
+			ndet = true;
+			for (uint j = 0; j < Rows; ++j) if (smat.m[i][j] != 0) ndet = false;
+			if (ndet) {
+				if (ok != 0) *ok = false;
+				return *this;
+			}
+		}
+		for (uint i = 0; i < Cols; ++i) {
+			crow = i;
+			while (smat.m[i][i] == Type(0)) {
+				++crow;
+				smat.swapRows(i, crow);
+				mtmp.swapRows(i, crow);
+			}
+			for (uint j = i + 1; j < Rows; ++j) {
+				mul = smat.m[i][j] / smat.m[i][i];
+				for (uint k = i; k < Cols; ++k) smat.m[k][j] -= mul * smat.m[k][i];
+				for (uint k = 0; k < Cols; ++k) mtmp.m[k][j] -= mul * mtmp.m[k][i];
+			}
+			if (i < Cols - 1) {
+				if (fabs(smat.m[i+1][i+1]) < Type(1E-200)) {
+					if (ok != 0) *ok = false;
+					return *this;
+				}
+			}
+			iddiv = smat.m[i][i];
+			for (uint j = i; j < Cols; ++j) smat.m[j][i] /= iddiv;
+			for (uint j = 0; j < Cols; ++j) mtmp.m[j][i] /= iddiv;
+		}
+		for (uint i = Cols - 1; i > 0; --i) {
+			for (uint j = 0; j < i; ++j) {
+				mul = smat.m[i][j];
+				smat.m[i][j] -= mul;
+				for (uint k = 0; k < Cols; ++k) mtmp.m[k][j] -= mtmp.m[k][i] * mul;
+			}
+		}
+		if (ok != 0) *ok = true;
+		memcpy(m, mtmp.m, sizeof(Type) * Cols * Rows);
+		return *this;
+	}
+	_CMatrix inverted(bool * ok = 0) const {_CMatrix tm(*this); tm.invert(ok); return tm;}
+	_CMatrixI transposed() const {_CMatrixI tm; PIMM_FOR_WB(r, c) tm[c][r] = m[r][c]; return tm;}
+
+private:
+	void resize(uint rows_, uint cols_, const Type & new_value = Type()) {r_ = rows_; c_ = cols_; PIMM_FOR_WB(r, c) m[r][c] = new_value;}
+	int c_, r_;
+	Type m[Rows][Cols];
+
+};
+#pragma pack(pop)
+
+
+template<> inline PIMathMatrixT<2u, 2u> PIMathMatrixT<2u, 2u>::rotation(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<2u, 2u> tm; tm[0][0] = tm[1][1] = c; tm[0][1] = -s; tm[1][0] = s; return tm;}
+template<> inline PIMathMatrixT<2u, 2u> PIMathMatrixT<2u, 2u>::scaleX(double factor) {PIMathMatrixT<2u, 2u> tm; tm[0][0] = factor; tm[1][1] = 1.; return tm;}
+template<> inline PIMathMatrixT<2u, 2u> PIMathMatrixT<2u, 2u>::scaleY(double factor) {PIMathMatrixT<2u, 2u> tm; tm[0][0] = 1.; tm[1][1] = factor; return tm;}
+
+template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::rotationX(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<3u, 3u> tm; tm[0][0] = 1.; tm[1][1] = tm[2][2] = c; tm[2][1] = s; tm[1][2] = -s; return tm;}
+template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::rotationY(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<3u, 3u> tm; tm[1][1] = 1.; tm[0][0] = tm[2][2] = c; tm[2][0] = -s; tm[0][2] = s; return tm;}
+template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::rotationZ(double angle) {double c = cos(angle), s = sin(angle); PIMathMatrixT<3u, 3u> tm; tm[2][2] = 1.; tm[0][0] = tm[1][1] = c; tm[1][0] = s; tm[0][1] = -s; return tm;}
+template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::scaleX(double factor) {PIMathMatrixT<3u, 3u> tm; tm[1][1] = tm[2][2] = 1.; tm[0][0] = factor; return tm;}
+template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::scaleY(double factor) {PIMathMatrixT<3u, 3u> tm; tm[0][0] = tm[2][2] = 1.; tm[1][1] = factor; return tm;}
+template<> inline PIMathMatrixT<3u, 3u> PIMathMatrixT<3u, 3u>::scaleZ(double factor) {PIMathMatrixT<3u, 3u> tm; tm[0][0] = tm[1][1] = 1.; tm[2][2] = factor; return tm;}
+
+#ifdef PIP_STD_IOSTREAM
+template<uint Rows, uint Cols, typename Type>
+inline std::ostream & operator <<(std::ostream & s, const PIMathMatrixT<Rows, Cols, Type> & m) {s << "{"; PIMM_FOR_I(r, c) s << m[r][c]; if (c < Cols - 1 || r < Rows - 1) s << ", ";} if (r < Rows - 1) s << std::endl << " ";} s << "}"; return s;}
+#endif
+
+template<uint Rows, uint Cols, typename Type>
+inline PICout operator <<(PICout s, const PIMathMatrixT<Rows, Cols, Type> & m) {s << "{"; PIMM_FOR_I(r, c) s << m[r][c]; if (c < Cols - 1 || r < Rows - 1) s << ", ";} if (r < Rows - 1) s << PICoutManipulators::NewLine << " ";} s << "}"; return s;}
+
+/// Multiply matrices {Rows0 x CR} on {CR x Cols1}, result is {Rows0 x Cols1}
+template<uint CR, uint Rows0, uint Cols1, typename Type>
+inline PIMathMatrixT<Rows0, Cols1, Type> operator *(const PIMathMatrixT<Rows0, CR, Type> & fm,
+													const PIMathMatrixT<CR, Cols1, Type> & sm) {
+	PIMathMatrixT<Rows0, Cols1, Type> tm;
+	Type t;
+	for (uint j = 0; j < Rows0; ++j) {
+		for (uint i = 0; i < Cols1; ++i) {
+			t = Type(0);
+			for (uint k = 0; k < CR; ++k)
+				t += fm[j][k] * sm[k][i];
+			tm[j][i] = t;
+		}
+	}
+	return tm;
+}
+
+/// Multiply matrix {Rows x Cols} on vector {Cols}, result is vector {Rows}
+template<uint Cols, uint Rows, typename Type>
+inline PIMathVectorT<Rows, Type> operator *(const PIMathMatrixT<Rows, Cols, Type> & fm,
+											const PIMathVectorT<Cols, Type> & sv) {
+	PIMathVectorT<Rows, Type> tv;
+	Type t;
+	for (uint j = 0; j < Rows; ++j) {
+		t = Type(0);
+		for (uint i = 0; i < Cols; ++i)
+			t += fm[j][i] * sv[i];
+		tv[j] = t;
+	}
+	return tv;
+}
+
+/// Multiply vector {Rows} on matrix {Rows x Cols}, result is vector {Cols}
+template<uint Cols, uint Rows, typename Type>
+inline PIMathVectorT<Cols, Type> operator *(const PIMathVectorT<Rows, Type> & sv,
+											const PIMathMatrixT<Rows, Cols, Type> & fm) {
+	PIMathVectorT<Cols, Type> tv;
+	Type t;
+	for (uint j = 0; j < Cols; ++j) {
+		t = Type(0);
+		for (uint i = 0; i < Rows; ++i)
+			t += fm[i][j] * sv[i];
+		tv[j] = t;
+	}
+	return tv;
+}
+
+/// Multiply value(T) on matrix {Rows x Cols}, result is vector {Rows}
+template<uint Cols, uint Rows, typename Type>
+inline PIMathMatrixT<Rows, Cols, Type> operator *(const Type & x, const PIMathMatrixT<Rows, Cols, Type> & v) {
+	return v * x;
+}
+
+
+typedef PIMathMatrixT<2u, 2u, int> PIMathMatrixT22i;
+typedef PIMathMatrixT<3u, 3u, int> PIMathMatrixT33i;
+typedef PIMathMatrixT<4u, 4u, int> PIMathMatrixT44i;
+typedef PIMathMatrixT<2u, 2u, double> PIMathMatrixT22d;
+typedef PIMathMatrixT<3u, 3u, double> PIMathMatrixT33d;
+typedef PIMathMatrixT<4u, 4u, double> PIMathMatrixT44d;
+
+
+template<typename Type>
+class PIMathMatrix;
+
+#undef PIMM_FOR
+#undef PIMM_FOR_WB
+#undef PIMM_FOR_I
+#undef PIMM_FOR_I_WB
+#undef PIMM_FOR_C
+#undef PIMM_FOR_R
+
+
+
+
+
+/// Matrix
+
+#define PIMM_FOR(c, r) for (uint c = 0; c < _V2D::cols_; ++c) for (uint r = 0; r < _V2D::rows_; ++r)
+#define PIMM_FOR_I(c, r) for (uint r = 0; r < _V2D::rows_; ++r) for (uint c = 0; c < _V2D::cols_; ++c)
+#define PIMM_FOR_A(v) for (uint v = 0; v < _V2D::mat.size(); ++v)
+#define PIMM_FOR_C(v) for (uint v = 0; v < _V2D::cols_; ++v)
+#define PIMM_FOR_R(v) for (uint v = 0; v < _V2D::rows_; ++v)
+
+template<typename Type>
+class PIP_EXPORT PIMathMatrix : public PIVector2D<Type> {
+	typedef PIVector2D<Type>   _V2D;
+	typedef PIMathMatrix<Type> _CMatrix;
+	typedef PIMathVector<Type> _CMCol;
+public:
+	PIMathMatrix(const uint cols = 0, const uint rows = 0, const Type & f = Type()) {_V2D::resize(rows, cols, f);}
+	PIMathMatrix(const uint cols, const uint rows, const PIVector<Type> & val) {_V2D::resize(rows, cols); int i=0; PIMM_FOR_I(c, r) _V2D::element(r, c) = val[i++];}
+	PIMathMatrix(const PIVector<PIVector<Type> > & val) {if(!val.isEmpty()) {_V2D::resize(val.size(), val[0].size()); PIMM_FOR_I(c, r) _V2D::element(r, c) = val[r][c];}}
+	PIMathMatrix(const PIVector2D<Type> & val) {if(!val.isEmpty()) {_V2D::resize(val.rows(), val.cols()); PIMM_FOR_I(c, r) _V2D::element(r, c) = val.element(r, c);}}
+
+	static _CMatrix identity(const uint cols, const uint rows) {_CMatrix tm(cols, rows); for (uint r = 0; r < rows; ++r) for (uint c = 0; c < cols; ++c)  tm.element(r, c) = (c == r ? Type(1) : Type(0)); return tm;}
+	static _CMatrix matrixRow(const PIMathVector<Type> & val) {return _CMatrix(val.size(), 1, val.toVector());}
+	static _CMatrix matrixCol(const PIMathVector<Type> & val) {return _CMatrix(1, val.size(), val.toVector());}
+
+	_CMatrix & setCol(uint index, const _CMCol & v) {PIMM_FOR_R(i) _V2D::element(i, index) = v[i]; return *this;}
+	_CMatrix & setRow(uint index, const _CMCol & v) {PIMM_FOR_C(i) _V2D::element(index, i) = v[i]; return *this;}
+	_CMatrix & swapCols(uint r0, uint r1) {PIMM_FOR_C(i) {piSwap(_V2D::element(i, r0), _V2D::element(i, r1));} return *this;}
+	_CMatrix & swapRows(uint c0, uint c1) {PIMM_FOR_R(i) {piSwap(_V2D::element(c0, i), _V2D::element(c1, i));} return *this;}
+	_CMatrix & fill(const Type & v) {PIMM_FOR_A(i) _V2D::mat[i] = v; return *this;}
+	bool isSquare() const {return _V2D::cols_ == _V2D::rows_;}
+	bool isIdentity() const {PIMM_FOR(c, r) if ((c == r) ? _V2D::element(r, c) != Type(1) : _V2D::element(r, c) != Type(0)) return false; return true;}
+	bool isNull() const {PIMM_FOR_A(i) if (_V2D::mat[i] != Type(0)) return false; return true;}
+	bool isValid() const {return !PIVector2D<Type>::isEmpty();}
+
+	_CMatrix & operator =(const PIVector<PIVector<Type> > & v) {*this = _CMatrix(v); return *this;}
+	bool operator ==(const _CMatrix & sm) const {PIMM_FOR_A(i) if (_V2D::mat[i] != sm.mat[i]) return false; return true;}
+	bool operator !=(const _CMatrix & sm) const {return !(*this == sm);}
+	void operator +=(const _CMatrix & sm) {PIMM_FOR_A(i) _V2D::mat[i] += sm.mat[i];}
+	void operator -=(const _CMatrix & sm) {PIMM_FOR_A(i) _V2D::mat[i] -= sm.mat[i];}
+	void operator *=(const Type & v) {PIMM_FOR_A(i) _V2D::mat[i] *= v;}
+	void operator /=(const Type & v) {PIMM_FOR_A(i) _V2D::mat[i] /= v;}
+	_CMatrix operator -() const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] = -_V2D::mat[i]; return tm;}
+	_CMatrix operator +(const _CMatrix & sm) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] += sm.mat[i]; return tm;}
+	_CMatrix operator -(const _CMatrix & sm) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] -= sm.mat[i]; return tm;}
+	_CMatrix operator *(const Type & v) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] *= v; return tm;}
+	_CMatrix operator /(const Type & v) const {_CMatrix tm(*this); PIMM_FOR_A(i) tm.mat[i] /= v; return tm;}
+
+	Type determinant(bool * ok = 0) const {
+		_CMatrix m(*this);
+		bool k;
+		Type ret = Type(0);
+		m.toUpperTriangular(&k);
+		if (ok) *ok = k;
+		if (!k) return ret;
+		ret = Type(1);
+		for (uint c = 0; c < _V2D::cols_; ++c)
+			for (uint r = 0; r < _V2D::rows_; ++r)
+				if (r == c)
+					ret *= m.element(r, c);
+		return ret;
+	}
+
+	Type trace(bool * ok = 0) const {
+		Type ret = Type(0);
+		if (!isSquare()) {
+			if (ok != 0) *ok = false;
+			return ret;
+		}
+		for (uint i = 0; i < _V2D::cols_; ++i) {
+			ret += _V2D::element(i, i);
+		}
+		if (ok != 0) *ok = true;
+		return ret;
+	}
+
+	_CMatrix & toUpperTriangular(bool * ok = 0) {
+		if (!isSquare()) {
+			if (ok != 0) *ok = false;
+			return *this;
+		}
+		_CMatrix smat(*this);
+		bool ndet;
+		uint crow;
+		Type mul;
+		for (uint i = 0; i < _V2D::cols_; ++i) {
+			ndet = true;
+			for (uint j = 0; j < _V2D::rows_; ++j) if (smat.element(i, j) != 0) ndet = false;
+			if (ndet) {
+				if (ok != 0) *ok = false;
+				return *this;
+			}
+		}
+		for (uint i = 0; i < _V2D::cols_; ++i) {
+			crow = i;
+			while (smat.element(i, i) == Type(0))
+				smat.swapRows(i, ++crow);
+			for (uint j = i + 1; j < _V2D::rows_; ++j) {
+				mul = smat.element(i, j) / smat.element(i, i);
+				for (uint k = i; k < _V2D::cols_; ++k) smat.element(k, j) -= mul * smat.element(k, i);
+			}
+			if (i < _V2D::cols_ - 1) {
+				if (_PIMathMatrixNullCompare(smat.element(i+1, i+1))) {
+					if (ok != 0) *ok = false;
+					return *this;
+				}
+			}
+		}
+		if (ok != 0) *ok = true;
+		_V2D::mat.swap(smat.mat);
+		return *this;
+	}
+
+	_CMatrix & invert(bool * ok = 0, _CMCol * sv = 0) {
+		if (!isSquare()) {
+			if (ok != 0) *ok = false;
+			return *this;
+		}
+		_CMatrix mtmp = _CMatrix::identity(_V2D::cols_, _V2D::rows_), smat(*this);
+		bool ndet;
+		uint crow;
+		Type mul, iddiv;
+		for (uint i = 0; i < _V2D::cols_; ++i) {
+			ndet = true;
+			for (uint j = 0; j < _V2D::rows_; ++j) if (smat.element(i, j) != Type(0)) ndet = false;
+			if (ndet) {
+				if (ok != 0) *ok = false;
+				return *this;
+			}
+		}
+		for (uint i = 0; i < _V2D::cols_; ++i) {
+			crow = i;
+			while (smat.element(i, i) == Type(0)) {
+				++crow;
+				smat.swapRows(i, crow);
+				mtmp.swapRows(i, crow);
+				if (sv != 0) sv->swap(i, crow);
+			}
+			for (uint j = i + 1; j < _V2D::rows_; ++j) {
+				mul = smat.element(i, j) / smat.element(i, i);
+				for (uint k = i; k < _V2D::cols_; ++k) smat.element(k, j) -= mul * smat.element(k, i);
+				for (uint k = 0; k < _V2D::cols_; ++k) mtmp.element(k, j) -= mul * mtmp.element(k, i);
+				if (sv != 0) (*sv)[j] -= mul * (*sv)[i];
+			}
+			if (i < _V2D::cols_ - 1) {
+				if (_PIMathMatrixNullCompare(smat.element(i+1, i+1))) {
+					if (ok != 0) *ok = false;
+					return *this;
+				}
+			}
+			iddiv = smat.element(i, i);
+			for (uint j = i; j < _V2D::cols_; ++j) smat.element(j, i) /= iddiv;
+			for (uint j = 0; j < _V2D::cols_; ++j) mtmp.element(j, i) /= iddiv;
+			if (sv != 0) (*sv)[i] /= iddiv;
+		}
+		for (uint i = _V2D::cols_ - 1; i > 0; --i) {
+			for (uint j = 0; j < i; ++j) {
+				mul = smat.element(i, j);
+				smat.element(i, j) -= mul;
+				for (uint k = 0; k < _V2D::cols_; ++k) mtmp.element(k, j) -= mul * mtmp.element(k, i);
+				if (sv != 0) (*sv)[j] -= mul * (*sv)[i];
+			}
+		}
+		if (ok != 0) *ok = true;
+		PIVector2D<Type>::swap(mtmp);
+		return *this;
+	}
+	_CMatrix inverted(bool * ok = 0) const {_CMatrix tm(*this); tm.invert(ok); return tm;}
+	_CMatrix transposed() const {_CMatrix tm(_V2D::rows_, _V2D::cols_); PIMM_FOR(c, r) tm.element(c, r) = _V2D::element(r, c); return tm;}
+};
+
+
+#ifdef PIP_STD_IOSTREAM
+template<typename Type>
+inline std::ostream & operator <<(std::ostream & s, const PIMathMatrix<Type> & m) {s << "{"; for (uint r = 0; r < m.rows(); ++r) { for (uint c = 0; c < m.cols(); ++c) { s << m.element(r, c); if (c < m.cols() - 1 || r < m.rows() - 1) s << ", ";} if (r < m.rows() - 1) s << std::endl << " ";} s << "}"; return s;}
+#endif
+
+template<typename Type>
+inline PICout operator <<(PICout s, const PIMathMatrix<Type> & m) {s << "Matrix{"; for (uint r = 0; r < m.rows(); ++r) { for (uint c = 0; c < m.cols(); ++c) { s << m.element(r, c); if (c < m.cols() - 1 || r < m.rows() - 1) s << ", ";} if (r < m.rows() - 1) s << PICoutManipulators::NewLine << " ";} s << "}"; return s;}
+
+template<typename Type>
+inline PIByteArray & operator <<(PIByteArray & s, const PIMathMatrix<Type> & v) {s << (const PIVector2D<Type> &)v; return s;}
+template<typename Type>
+inline PIByteArray & operator >>(PIByteArray & s, PIMathMatrix<Type> & v) {s >> (PIVector2D<Type> &)v; return s;}
+
+
+/// Multiply matrices {CR x Rows0} on {Cols1 x CR}, result is {Cols1 x Rows0}
+template<typename Type>
+inline PIMathMatrix<Type> operator *(const PIMathMatrix<Type> & fm,
+									const PIMathMatrix<Type> & sm) {
+	uint cr = fm.cols(), rows0 = fm.rows(), cols1 = sm.cols();
+	PIMathMatrix<Type> tm(cols1, rows0);
+	if (fm.cols() != sm.rows()) return tm;
+	Type t;
+	for (uint j = 0; j < rows0; ++j) {
+		for (uint i = 0; i < cols1; ++i) {
+			t = Type(0);
+			for (uint k = 0; k < cr; ++k)
+				t += fm.element(j, k) * sm.element(k, i);
+			tm.element(j, i) = t;
+		}
+	}
+	return tm;
+}
+
+/// Multiply matrix {Cols x Rows} on vector {Cols}, result is vector {Rows}
+template<typename Type>
+inline PIMathVector<Type> operator *(const PIMathMatrix<Type> & fm,
+									const PIMathVector<Type> & sv) {
+	uint c = fm.cols(), r = fm.rows();
+	PIMathVector<Type> tv(r);
+	if (c != sv.size()) return tv;
+	Type t;
+	for (uint j = 0; j < r; ++j) {
+		t = Type(0);
+		for (uint i = 0; i < c; ++i)
+			t += fm.element(j, i) * sv[i];
+		tv[j] = t;
+	}
+	return tv;
+}
+
+
+/// Multiply vector {Rows} on matrix {Rows x Cols}, result is vector {Cols}
+template<typename Type>
+inline PIMathVector<Type> operator *(const PIMathVector<Type> & sv,
+									  const PIMathMatrix<Type> & fm) {
+	uint c = fm.cols(), r = fm.rows();
+	PIMathVector<Type> tv(c);
+	Type t;
+	for (uint j = 0; j < c; ++j) {
+		t = Type(0);
+		for (uint i = 0; i < r; ++i)
+			t += fm.element(i, j) * sv[i];
+		tv[j] = t;
+	}
+	return tv;
+}
+
+/// Multiply value(T) on matrix {Rows x Cols}, result is vector {Rows}
+template<typename Type>
+inline PIMathMatrix<Type> operator *(const Type & x, const PIMathMatrix<Type> & v) {
+	return v * x;
+}
+
+typedef PIMathMatrix<int> PIMathMatrixi;
+typedef PIMathMatrix<double> PIMathMatrixd;
+
+template<typename T>
+PIMathMatrix<complex<T> > hermitian(const PIMathMatrix<complex<T> > & m) {
+	PIMathMatrix<complex<T> > ret(m);
+	for (uint r = 0; r < ret.rows(); ++r) for (uint c = 0; c < ret.cols(); ++c) ret.element(r, c).imag(-(ret.element(r, c).imag()));
+	return ret.transposed();
+}
+
+#undef PIMM_FOR
+#undef PIMM_FOR_I
+#undef PIMM_FOR_A
+#undef PIMM_FOR_C
+#undef PIMM_FOR_R
+
+#endif // PIMATHMATRIX_H
diff --git a/src_main/math/pimathmodule.h b/lib/main/math/pimathmodule.h
similarity index 100%
rename from src_main/math/pimathmodule.h
rename to lib/main/math/pimathmodule.h
diff --git a/src_main/math/pimathsolver.cpp b/lib/main/math/pimathsolver.cpp
similarity index 96%
rename from src_main/math/pimathsolver.cpp
rename to lib/main/math/pimathsolver.cpp
index b1f12a5c..02fdec7f 100644
--- a/src_main/math/pimathsolver.cpp
+++ b/lib/main/math/pimathsolver.cpp
@@ -1,242 +1,242 @@
-/*
-	PIP - Platform Independent Primitives
-	PIMathSolver
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "pimathsolver.h"
-
-const char PIMathSolver::methods_desc[] = "b{Methods:}\
-\n  -1 - Global settings\
-\n  01 - Eyler 1\
-\n  02 - Eyler 2\
-\n  14 - Runge-Kutta 4\
-\n  23 - Adams-Bashfort-Moulton 3\
-\n  24 - Adams-Bashfort-Moulton 4\
-\n  32 - Polynomial Approximation 2\
-\n  33 - Polynomial Approximation 3\
-\n  34 - Polynomial Approximation 4\
-\n  35 - Polynomial Approximation 5";
-
-PIMathSolver::Method PIMathSolver::method_global = PIMathSolver::Eyler_2;
-
-
-void PIMathSolver::solve(double u, double h) {
-	switch (method) {
-	case Global:
-		switch (method_global) {
-		case Eyler_1: solveEyler1(u, h); break;
-		case Eyler_2: solveEyler2(u, h); break;
-		case RungeKutta_4: solveRK4(u, h); break;
-		case AdamsBashfortMoulton_2: solveABM2(u, h); break;
-		case AdamsBashfortMoulton_3: solveABM3(u, h); break;
-		case AdamsBashfortMoulton_4: default: solveABM4(u, h); break;
-		case PolynomialApproximation_2: solvePA2(u, h); break;
-		case PolynomialApproximation_3: solvePA3(u, h); break;
-		case PolynomialApproximation_4: solvePA4(u, h); break;
-		case PolynomialApproximation_5: solvePA5(u, h); break;
-		}
-		break;
-	case Eyler_1: solveEyler1(u, h); break;
-	case Eyler_2: solveEyler2(u, h); break;
-	case RungeKutta_4: solveRK4(u, h); break;
-	case AdamsBashfortMoulton_2: solveABM2(u, h); break;
-	case AdamsBashfortMoulton_3: solveABM3(u, h); break;
-	case AdamsBashfortMoulton_4: default: solveABM4(u, h); break;
-	case PolynomialApproximation_2: solvePA2(u, h); break;
-	case PolynomialApproximation_3: solvePA3(u, h); break;
-	case PolynomialApproximation_4: solvePA4(u, h); break;
-	case PolynomialApproximation_5: solvePA5(u, h); break;
-	}
-	step++;
-}
-
-
-void PIMathSolver::fromTF(const TransferFunction & TF) {
-	if (TF.vector_An.size() >= TF.vector_Bm.size())
-		size = TF.vector_An.size()-1;
-	else {
-		piCout << "PIMathSolver error: {A} should be greater than {B}";
-		return;
-	}
-	if (size == 0) return;
-
-	step = 0;
-	times.fill(0.);
-	A.resize(size, size);
-	d.resize(size + 1); d.fill(0.);
-	a1.resize(size + 1); a1.fill(0.);
-	b1.resize(size + 1); b1.fill(0.);
-	X.resize(size); X.fill(0.);
-	F.resize(5);
-	for (uint i = 0; i < 5; ++i)
-		F[i].resize(size), F[i].fill(0.);
-	k1.resize(size); k1.fill(0.);
-	k2.resize(size); k2.fill(0.);
-	k3.resize(size); k3.fill(0.);
-	k4.resize(size); k4.fill(0.);
-	xx.resize(size); xx.fill(0.);
-	XX.resize(size); XX.fill(0.);
-	for (uint i = 0; i < size + 1; ++i)
-		a1[size - i] = TF.vector_An[i];
-	for (uint i = 0; i < TF.vector_Bm.size(); ++i)
-		b1[size - i] = TF.vector_Bm[i];
-	double a0 = a1[0];
-	a1 /= a0;
-	b1 /= a0;
-
-	d[0] = b1[0];
-	for (uint i = 1; i < size + 1; ++i) {
-		sum = 0.;
-		for (uint m = 0; m < i; ++m)
-			sum += a1[i - m] * d[m];
-		d[i] = b1[i] - sum;
-	}
-
-	for (uint i = 0; i < size - 1; ++i)
-		for (uint j = 0; j < size; ++j)
-				A[j][i] = (j == i + 1);
-	for (uint i = 0; i < size; ++i)
-		A[i][size - 1] = -a1[size - i];
-	for (uint i = 0; i < size; ++i)
-		d[i] = d[i + 1];
-}
-
-
-void PIMathSolver::solveEyler1(double u, double h) {
-	F[0] = A * X + d * u;
-	X += F[0] * h;
-	moveF();
-}
-
-
-void PIMathSolver::solveEyler2(double u, double h) {
-	F[0] = A * X + d * u;
-	X += (F[0] + F[1]) * h / 2.;
-	moveF();
-}
-
-
-void PIMathSolver::solveRK4(double u, double h) {
-	td = X[0] - F[0][0];
-	k1 = A * X + d * u; xx = k1 * h / 2.; XX = X + xx;
-	k2 = A * (XX + k1 * h / 2.) + d * (u + td/3.); xx = k2 * h / 2.; XX += xx;
-	k3 = A * (XX + k2 * h / 2.) + d * (u + td*2./3.); xx = k3 * h; XX += xx;
-	k4 = A * (XX + k3 * h) + d * (u + td);
-	//cout << k1 << k2 << k3 << k4 << endl;
-	X += (k1 + k2 * 2. + k3 * 2. + k4) * h / 6.;
-	F[0] = X;
-}
-
-
-void PIMathSolver::solveABM2(double u, double h) {
-	F[0] = A * X + d * u;
-	XX = X + (F[0] * 3. - F[1]) * (h / 2.);
-	F[1] = A * XX + d * u;
-	X += (F[1] + F[0]) * (h / 2.);
-	moveF();
-}
-
-
-void PIMathSolver::solveABM3(double u, double h) {
-	F[0] = A * X + d * u;
-	XX = X + (F[0] * 23. - F[1] * 16. + F[2] * 5.) * (h / 12.);
-	F[2] = A * XX + d * u;
-	X += (F[2] * 5. + F[0] * 8. - F[1]) * (h / 12.);
-	moveF();
-}
-
-
-void PIMathSolver::solveABM4(double u, double h) {
-	F[0] = A * X + d * u;
-	XX = X + (F[0] * 55. - F[1] * 59. + F[2] * 37. - F[3] * 9.) * (h / 24.);
-	F[3] = A * XX + d * u;
-	X += (F[3] * 9. + F[0] * 19. - F[1] * 5. + F[2]) * (h / 24.);
-	moveF();
-}
-
-
-void PIMathSolver::solvePA(double u, double h, uint deg) {
-	F[0] = A * X + d * u;
-	M.resize(deg, deg);
-	Y.resize(deg);
-	pY.resize(deg);
-
-	for (uint k = 0; k < size; ++k) {
-		for (uint i = 0; i < deg; ++i) {
-			td = 1.;
-			ct = times[i];
-			for (uint j = 0; j < deg; ++j) {
-				M[j][i] = td;
-				td *= ct;
-			}
-		}
-		for (uint i = 0; i < deg; ++i)
-			Y[i] = F[i][k];
-		/// find polynom
-		//if (step == 1) cout << M << endl << Y << endl;
-		M.invert(&ok, &Y);
-		//if (step == 1) cout << Y << endl;
-		if (!ok) {
-			solveEyler2(u, h);
-			break;
-		}
-		// calc last piece
-		x0 = 0.;
-		td = 1.;
-		t = times[0];
-		for (uint i = 0; i < deg; ++i) {
-			x0 += Y[i] * td / (i + 1.);
-			td *= t;
-		}
-		x0 *= t;
-
-		x1 = 0.;
-		td = 1.;
-		t = times[1];
-		for (uint i = 0; i < deg; ++i) {
-			x1 += Y[i] * td / (i + 1.);
-			td *= t;
-		}
-		x1 *= t;
-		lp = x0 - x1;
-
-		if (deg > 2) {
-			// calc prev piece
-			x0 = 0.;
-			td = 1.;
-			dh = times[1] - times[2];
-			if (dh != 0. && step > 1) {
-				t = times[2];
-				for (uint i = 0; i < deg; ++i) {
-					x0 += Y[i] * td / (i + 1.);
-					td *= t;
-				}
-				x0 *= t;
-				ct = x1 - x0;
-				// calc correction
-				ct -= pY[k];
-			}
-			// calc final
-			X[k] += lp - ct;
-			pY[k] = lp;
-		} else {
-			X[k] += lp;
-			pY[k] = lp;
-		}
-	}
-	moveF();
-}
+/*
+	PIP - Platform Independent Primitives
+	PIMathSolver
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pimathsolver.h"
+
+const char PIMathSolver::methods_desc[] = "b{Methods:}\
+\n  -1 - Global settings\
+\n  01 - Eyler 1\
+\n  02 - Eyler 2\
+\n  14 - Runge-Kutta 4\
+\n  23 - Adams-Bashfort-Moulton 3\
+\n  24 - Adams-Bashfort-Moulton 4\
+\n  32 - Polynomial Approximation 2\
+\n  33 - Polynomial Approximation 3\
+\n  34 - Polynomial Approximation 4\
+\n  35 - Polynomial Approximation 5";
+
+PIMathSolver::Method PIMathSolver::method_global = PIMathSolver::Eyler_2;
+
+
+void PIMathSolver::solve(double u, double h) {
+	switch (method) {
+	case Global:
+		switch (method_global) {
+		case Eyler_1: solveEyler1(u, h); break;
+		case Eyler_2: solveEyler2(u, h); break;
+		case RungeKutta_4: solveRK4(u, h); break;
+		case AdamsBashfortMoulton_2: solveABM2(u, h); break;
+		case AdamsBashfortMoulton_3: solveABM3(u, h); break;
+		case AdamsBashfortMoulton_4: default: solveABM4(u, h); break;
+		case PolynomialApproximation_2: solvePA2(u, h); break;
+		case PolynomialApproximation_3: solvePA3(u, h); break;
+		case PolynomialApproximation_4: solvePA4(u, h); break;
+		case PolynomialApproximation_5: solvePA5(u, h); break;
+		}
+		break;
+	case Eyler_1: solveEyler1(u, h); break;
+	case Eyler_2: solveEyler2(u, h); break;
+	case RungeKutta_4: solveRK4(u, h); break;
+	case AdamsBashfortMoulton_2: solveABM2(u, h); break;
+	case AdamsBashfortMoulton_3: solveABM3(u, h); break;
+	case AdamsBashfortMoulton_4: default: solveABM4(u, h); break;
+	case PolynomialApproximation_2: solvePA2(u, h); break;
+	case PolynomialApproximation_3: solvePA3(u, h); break;
+	case PolynomialApproximation_4: solvePA4(u, h); break;
+	case PolynomialApproximation_5: solvePA5(u, h); break;
+	}
+	step++;
+}
+
+
+void PIMathSolver::fromTF(const TransferFunction & TF) {
+	if (TF.vector_An.size() >= TF.vector_Bm.size())
+		size = TF.vector_An.size()-1;
+	else {
+		piCout << "PIMathSolver error: {A} should be greater than {B}";
+		return;
+	}
+	if (size == 0) return;
+
+	step = 0;
+	times.fill(0.);
+	A.resize(size, size);
+	d.resize(size + 1); d.fill(0.);
+	a1.resize(size + 1); a1.fill(0.);
+	b1.resize(size + 1); b1.fill(0.);
+	X.resize(size); X.fill(0.);
+	F.resize(5);
+	for (uint i = 0; i < 5; ++i)
+		F[i].resize(size), F[i].fill(0.);
+	k1.resize(size); k1.fill(0.);
+	k2.resize(size); k2.fill(0.);
+	k3.resize(size); k3.fill(0.);
+	k4.resize(size); k4.fill(0.);
+	xx.resize(size); xx.fill(0.);
+	XX.resize(size); XX.fill(0.);
+	for (uint i = 0; i < size + 1; ++i)
+		a1[size - i] = TF.vector_An[i];
+	for (uint i = 0; i < TF.vector_Bm.size(); ++i)
+		b1[size - i] = TF.vector_Bm[i];
+	double a0 = a1[0];
+	a1 /= a0;
+	b1 /= a0;
+
+	d[0] = b1[0];
+	for (uint i = 1; i < size + 1; ++i) {
+		sum = 0.;
+		for (uint m = 0; m < i; ++m)
+			sum += a1[i - m] * d[m];
+		d[i] = b1[i] - sum;
+	}
+
+	for (uint i = 0; i < size - 1; ++i)
+		for (uint j = 0; j < size; ++j)
+				A[j][i] = (j == i + 1);
+	for (uint i = 0; i < size; ++i)
+		A[i][size - 1] = -a1[size - i];
+	for (uint i = 0; i < size; ++i)
+		d[i] = d[i + 1];
+}
+
+
+void PIMathSolver::solveEyler1(double u, double h) {
+	F[0] = A * X + d * u;
+	X += F[0] * h;
+	moveF();
+}
+
+
+void PIMathSolver::solveEyler2(double u, double h) {
+	F[0] = A * X + d * u;
+	X += (F[0] + F[1]) * h / 2.;
+	moveF();
+}
+
+
+void PIMathSolver::solveRK4(double u, double h) {
+	td = X[0] - F[0][0];
+	k1 = A * X + d * u; xx = k1 * h / 2.; XX = X + xx;
+	k2 = A * (XX + k1 * h / 2.) + d * (u + td/3.); xx = k2 * h / 2.; XX += xx;
+	k3 = A * (XX + k2 * h / 2.) + d * (u + td*2./3.); xx = k3 * h; XX += xx;
+	k4 = A * (XX + k3 * h) + d * (u + td);
+	//cout << k1 << k2 << k3 << k4 << endl;
+	X += (k1 + k2 * 2. + k3 * 2. + k4) * h / 6.;
+	F[0] = X;
+}
+
+
+void PIMathSolver::solveABM2(double u, double h) {
+	F[0] = A * X + d * u;
+	XX = X + (F[0] * 3. - F[1]) * (h / 2.);
+	F[1] = A * XX + d * u;
+	X += (F[1] + F[0]) * (h / 2.);
+	moveF();
+}
+
+
+void PIMathSolver::solveABM3(double u, double h) {
+	F[0] = A * X + d * u;
+	XX = X + (F[0] * 23. - F[1] * 16. + F[2] * 5.) * (h / 12.);
+	F[2] = A * XX + d * u;
+	X += (F[2] * 5. + F[0] * 8. - F[1]) * (h / 12.);
+	moveF();
+}
+
+
+void PIMathSolver::solveABM4(double u, double h) {
+	F[0] = A * X + d * u;
+	XX = X + (F[0] * 55. - F[1] * 59. + F[2] * 37. - F[3] * 9.) * (h / 24.);
+	F[3] = A * XX + d * u;
+	X += (F[3] * 9. + F[0] * 19. - F[1] * 5. + F[2]) * (h / 24.);
+	moveF();
+}
+
+
+void PIMathSolver::solvePA(double u, double h, uint deg) {
+	F[0] = A * X + d * u;
+	M.resize(deg, deg);
+	Y.resize(deg);
+	pY.resize(deg);
+
+	for (uint k = 0; k < size; ++k) {
+		for (uint i = 0; i < deg; ++i) {
+			td = 1.;
+			ct = times[i];
+			for (uint j = 0; j < deg; ++j) {
+				M[j][i] = td;
+				td *= ct;
+			}
+		}
+		for (uint i = 0; i < deg; ++i)
+			Y[i] = F[i][k];
+		/// find polynom
+		//if (step == 1) cout << M << endl << Y << endl;
+		M.invert(&ok, &Y);
+		//if (step == 1) cout << Y << endl;
+		if (!ok) {
+			solveEyler2(u, h);
+			break;
+		}
+		// calc last piece
+		x0 = 0.;
+		td = 1.;
+		t = times[0];
+		for (uint i = 0; i < deg; ++i) {
+			x0 += Y[i] * td / (i + 1.);
+			td *= t;
+		}
+		x0 *= t;
+
+		x1 = 0.;
+		td = 1.;
+		t = times[1];
+		for (uint i = 0; i < deg; ++i) {
+			x1 += Y[i] * td / (i + 1.);
+			td *= t;
+		}
+		x1 *= t;
+		lp = x0 - x1;
+
+		if (deg > 2) {
+			// calc prev piece
+			x0 = 0.;
+			td = 1.;
+			dh = times[1] - times[2];
+			if (dh != 0. && step > 1) {
+				t = times[2];
+				for (uint i = 0; i < deg; ++i) {
+					x0 += Y[i] * td / (i + 1.);
+					td *= t;
+				}
+				x0 *= t;
+				ct = x1 - x0;
+				// calc correction
+				ct -= pY[k];
+			}
+			// calc final
+			X[k] += lp - ct;
+			pY[k] = lp;
+		} else {
+			X[k] += lp;
+			pY[k] = lp;
+		}
+	}
+	moveF();
+}
diff --git a/src_main/math/pimathsolver.h b/lib/main/math/pimathsolver.h
similarity index 96%
rename from src_main/math/pimathsolver.h
rename to lib/main/math/pimathsolver.h
index eeaa0b72..23bbd249 100644
--- a/src_main/math/pimathsolver.h
+++ b/lib/main/math/pimathsolver.h
@@ -1,89 +1,89 @@
-/*! \file pimathsolver.h
- * \brief PIMathSolver
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIMathSolver
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIMATHSOLVER_H
-#define PIMATHSOLVER_H
-
-#include "pimathmatrix.h"
-
-/// Differential evaluations
-
-struct TransferFunction {
-	PIVector<double> vector_Bm, vector_An;
-};
-
-class PIP_EXPORT PIMathSolver
-{
-public:
-	enum Method {Global = -1,
-				Eyler_1 = 01,
-				Eyler_2 = 02,
-				EylerKoshi = 03,
-				RungeKutta_4 = 14,
-				AdamsBashfortMoulton_2 = 22,
-				AdamsBashfortMoulton_3 = 23,
-				AdamsBashfortMoulton_4 = 24,
-				PolynomialApproximation_2 = 32,
-				PolynomialApproximation_3 = 33,
-				PolynomialApproximation_4 = 34,
-				PolynomialApproximation_5 = 35
-				};
-
-	PIMathSolver() {times.resize(4); step = 0;}
-
-	void solve(double u, double h);
-	void fromTF(const TransferFunction & TF);
-	void setMethod(Method m) {method = m;}
-	void setTime(double time) {times.pop_back(); times.push_front(time);}
-
-	void solveEyler1(double u, double h);
-	void solveEyler2(double u, double h);
-	void solveRK4(double u, double h);
-	void solveABM2(double u, double h);
-	void solveABM3(double u, double h);
-	void solveABM4(double u, double h);
-	void solvePA(double u, double h, uint deg);
-	void solvePA2(double u, double h) {if (step > 0) solvePA(u, h, 2); else solveEyler1(u, h);}
-	void solvePA3(double u, double h) {if (step > 1) solvePA(u, h, 3); else solvePA2(u, h);}
-	void solvePA4(double u, double h) {if (step > 2) solvePA(u, h, 4); else solvePA3(u, h);}
-	void solvePA5(double u, double h) {if (step > 3) solvePA(u, h, 5); else solvePA4(u, h);}
-
-	PIMathVectord X;
-	static Method method_global;
-	static const char methods_desc[];
-
-private:
-	void moveF() {for (uint i = F.size() - 1; i > 0; --i) F[i] = F[i - 1];}
-
-	PIMathMatrixd A, M;
-	PIMathVectord d, a1, b1;
-	PIMathVectord k1, k2, k3, k4, xx;
-	PIMathVectord XX, Y, pY;
-	PIVector<PIMathVectord> F;
-	PIVector<double> times;
-	uint size, step;
-	Method method;
-	double sum, td, ct, lp, dh, t, x1, x0;
-	bool ok;
-};
-
-#endif // PIMATHSOLVER_H
+/*! \file pimathsolver.h
+ * \brief PIMathSolver
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIMathSolver
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIMATHSOLVER_H
+#define PIMATHSOLVER_H
+
+#include "pimathmatrix.h"
+
+/// Differential evaluations
+
+struct TransferFunction {
+	PIVector<double> vector_Bm, vector_An;
+};
+
+class PIP_EXPORT PIMathSolver
+{
+public:
+	enum Method {Global = -1,
+				Eyler_1 = 01,
+				Eyler_2 = 02,
+				EylerKoshi = 03,
+				RungeKutta_4 = 14,
+				AdamsBashfortMoulton_2 = 22,
+				AdamsBashfortMoulton_3 = 23,
+				AdamsBashfortMoulton_4 = 24,
+				PolynomialApproximation_2 = 32,
+				PolynomialApproximation_3 = 33,
+				PolynomialApproximation_4 = 34,
+				PolynomialApproximation_5 = 35
+				};
+
+	PIMathSolver() {times.resize(4); step = 0;}
+
+	void solve(double u, double h);
+	void fromTF(const TransferFunction & TF);
+	void setMethod(Method m) {method = m;}
+	void setTime(double time) {times.pop_back(); times.push_front(time);}
+
+	void solveEyler1(double u, double h);
+	void solveEyler2(double u, double h);
+	void solveRK4(double u, double h);
+	void solveABM2(double u, double h);
+	void solveABM3(double u, double h);
+	void solveABM4(double u, double h);
+	void solvePA(double u, double h, uint deg);
+	void solvePA2(double u, double h) {if (step > 0) solvePA(u, h, 2); else solveEyler1(u, h);}
+	void solvePA3(double u, double h) {if (step > 1) solvePA(u, h, 3); else solvePA2(u, h);}
+	void solvePA4(double u, double h) {if (step > 2) solvePA(u, h, 4); else solvePA3(u, h);}
+	void solvePA5(double u, double h) {if (step > 3) solvePA(u, h, 5); else solvePA4(u, h);}
+
+	PIMathVectord X;
+	static Method method_global;
+	static const char methods_desc[];
+
+private:
+	void moveF() {for (uint i = F.size() - 1; i > 0; --i) F[i] = F[i - 1];}
+
+	PIMathMatrixd A, M;
+	PIMathVectord d, a1, b1;
+	PIMathVectord k1, k2, k3, k4, xx;
+	PIMathVectord XX, Y, pY;
+	PIVector<PIMathVectord> F;
+	PIVector<double> times;
+	uint size, step;
+	Method method;
+	double sum, td, ct, lp, dh, t, x1, x0;
+	bool ok;
+};
+
+#endif // PIMATHSOLVER_H
diff --git a/src_main/math/pimathvector.h b/lib/main/math/pimathvector.h
similarity index 98%
rename from src_main/math/pimathvector.h
rename to lib/main/math/pimathvector.h
index 6149c213..ef7d834e 100644
--- a/src_main/math/pimathvector.h
+++ b/lib/main/math/pimathvector.h
@@ -1,252 +1,252 @@
-/*! \file pimathvector.h
- * \brief PIMathVector
-*/
-/*
-	PIP - Platform Independent Primitives
-	PIMathVector
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIMATHVECTOR_H
-#define PIMATHVECTOR_H
-
-#include "pimathbase.h"
-
-template<uint Cols, uint Rows, typename Type>
-class PIMathMatrixT;
-
-
-/// Vector templated
-
-#define PIMV_FOR(v, s) for (uint v = s; v < Size; ++v)
-
-template<uint Size, typename Type = double>
-class PIP_EXPORT PIMathVectorT {
-	typedef PIMathVectorT<Size, Type> _CVector;
-public:
-	PIMathVectorT() {resize();}
-	PIMathVectorT(const PIVector<Type> & val) {resize(); PIMV_FOR(i, 0) c[i] = val[i];}
-	PIMathVectorT(const _CVector & st, const _CVector & fn) {resize(); set(st, fn);}
-
-	uint size() const {return Size;}
-	_CVector & fill(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
-	_CVector & set(const _CVector & st, const _CVector & fn) {PIMV_FOR(i, 0) c[i] = fn[i] - st[i]; return *this;}
-	_CVector & move(const Type & v) {PIMV_FOR(i, 0) c[i] += v; return *this;}
-	_CVector & move(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i]; return *this;}
-	Type lengthSqr() const {Type tv(0); PIMV_FOR(i, 0) tv += (c[i] * c[i]); return tv;}
-	Type length() const {return sqrt(lengthSqr());}
-	Type manhattanLength() const {Type tv(0); PIMV_FOR(i, 0) tv += fabs(c[i]); return tv;}
-	Type angleCos(const _CVector & v) const {Type tv = v.length() * length(); return (tv == Type(0) ? Type(0) : ((*this) ^ v) / tv);}
-	Type angleSin(const _CVector & v) const {Type tv = angleCos(v); return sqrt(Type(1) - tv * tv);}
-	Type angleRad(const _CVector & v) const {return acos(angleCos(v));}
-	Type angleDeg(const _CVector & v) const {return toDeg(acos(angleCos(v)));}
-	Type angleElevation(const _CVector & v) const {_CVector z = v - *this; double c = z.angleCos(*this); return 90.0 - acos(c) * rad2deg;}
-	_CVector projection(const _CVector & v) {Type tv = v.length(); return (tv == Type(0) ? _CVector() : v * (((*this) ^ v) / tv));}
-	_CVector & normalize() {Type tv = length(); if (tv == Type(1)) return *this; if (piAbs<Type>(tv) <= Type(1E-100)) {fill(Type(0)); return *this;} PIMV_FOR(i, 0) c[i] /= tv; return *this;}
-	_CVector normalized() {_CVector tv(*this); tv.normalize(); return tv;}
-	_CVector cross(const _CVector & v) {return (*this) * v;}
-	Type dot(const _CVector & v) const {return (*this) ^ v;}
-	bool isNull() const {PIMV_FOR(i, 0) if (c[i] != Type(0)) return false; return true;}
-	bool isOrtho(const _CVector & v) const {return ((*this) ^ v) == Type(0);}
-
-	Type & at(uint index) {return c[index];}
-	Type at(uint index) const {return c[index];}
-	Type & operator [](uint index) {return c[index];}
-	Type operator [](uint index) const {return c[index];}
-	_CVector & operator =(const _CVector & v) {memcpy(c, v.c, sizeof(Type) * Size); return *this;}
-	_CVector & operator =(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
-	bool operator ==(const _CVector & v) const {PIMV_FOR(i, 0) if (c[i] != v[i]) return false; return true;}
-	bool operator !=(const _CVector & v) const {return !(*this == c);}
-	void operator +=(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i];}
-	void operator -=(const _CVector & v) {PIMV_FOR(i, 0) c[i] -= v[i];}
-	void operator *=(const Type & v) {PIMV_FOR(i, 0) c[i] *= v;}
-	void operator *=(const _CVector & v) {PIMV_FOR(i, 0) c[i] *= v[i];}
-	void operator /=(const Type & v) {PIMV_FOR(i, 0) c[i] /= v;}
-	void operator /=(const _CVector & v) {PIMV_FOR(i, 0) c[i] /= v[i];}
-	_CVector operator -() const {_CVector tv; PIMV_FOR(i, 0) tv[i] = -c[i]; return tv;}
-	_CVector operator +(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] += v[i]; return tv;}
-	_CVector operator -(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] -= v[i]; return tv;}
-	_CVector operator *(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v; return tv;}
-	_CVector operator /(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] /= v; return tv;}
-	_CVector operator /(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] /= v[i]; return tv;}
-	_CVector operator *(const _CVector & v) const {if (Size != 3) return _CVector(); _CVector tv; tv.fill(Type(1)); tv[0] = c[1]*v[2] - v[1]*c[2]; tv[1] = v[0]*c[2] - c[0]*v[2]; tv[2] = c[0]*v[1] - v[0]*c[1]; return tv;}
-	_CVector operator &(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v[i]; return tv;}
-	Type operator ^(const _CVector & v) const {Type tv(0); PIMV_FOR(i, 0) tv += c[i] * v[i]; return tv;}
-	
-	PIMathMatrixT<1, Size, Type> transposed() const {
-		PIMathMatrixT<1, Size, Type> ret;
-		PIMV_FOR(i, 0) ret[0][i] = c[i];
-		return ret;
-	}
-
-	Type distToLine(const _CVector & lp0, const _CVector & lp1) {
-		_CVector a(lp0, lp1), b(lp0, *this), c(lp1, *this);
-		Type f = fabs(a[0]*b[1] - a[1]*b[0]) / a.length();
-		return f;}
-
-	template<uint Size1, typename Type1> /// vector {Size, Type} to vector {Size1, Type1}
-	PIMathVectorT<Size1, Type1> turnTo() const {PIMathVectorT<Size1, Type1> tv; uint sz = piMin<uint>(Size, Size1); for (uint i = 0; i < sz; ++i) tv[i] = c[i]; return tv;}
-
-	static _CVector filled(const Type & v) {_CVector vv; PIMV_FOR(i, 0) vv[i] = v; return vv;}
-
-private:
-	void resize(const Type & new_value = Type()) {for (uint i = 0; i < Size; ++i) c[i] = new_value;}
-	
-	Type c[Size];
-
-};
-
-template<uint Size, typename Type>
-inline PIMathVectorT<Size, Type> operator *(const Type & x, const PIMathVectorT<Size, Type> & v) {
-	return v * x;
-}
-
-template<uint Size, typename Type>
-inline PICout operator <<(PICout s, const PIMathVectorT<Size, Type> & v) {s << "{"; PIMV_FOR(i, 0) {s << v[i]; if (i < Size - 1) s << ", ";} s << "}"; return s;}
-template<uint Size, typename Type>
-inline bool operator ||(const PIMathVectorT<Size, Type> & f, const PIMathVectorT<Size, Type> & s) {return (f * s).isNull();}
-template<uint Size, typename Type>
-inline PIMathVectorT<Size, Type> sqrt(const PIMathVectorT<Size, Type> & v) {PIMathVectorT<Size, Type> ret; PIMV_FOR(i, 0) {ret[i] = sqrt(v[i]);} return ret;}
-template<uint Size, typename Type>
-inline PIMathVectorT<Size, Type> sqr(const PIMathVectorT<Size, Type> & v) {PIMathVectorT<Size, Type> ret; PIMV_FOR(i, 0) {ret[i] = sqr(v[i]);} return ret;}
-
-template<uint Size, typename Type>
-inline PIByteArray & operator <<(PIByteArray & s, const PIMathVectorT<Size, Type> & v) {for (uint i = 0; i < Size; ++i) s << v[i]; return s;}
-template<uint Size, typename Type>
-inline PIByteArray & operator >>(PIByteArray & s, PIMathVectorT<Size, Type> & v) {for (uint i = 0; i < Size; ++i) s >> v[i]; return s;}
-
-template<typename T>
-inline PIMathVectorT<2u, T> createVectorT2(T x, T y) {return PIMathVectorT<2u, T>(PIVector<T>() << x << y);}
-template<typename T>
-inline PIMathVectorT<3u, T> createVectorT3(T x, T y, T z) {return PIMathVectorT<3u, T>(PIVector<T>() << x << y << z);}
-template<typename T>
-inline PIMathVectorT<4u, T> createVectorT4(T x, T y, T z, T w) {return PIMathVectorT<4u, T>(PIVector<T>() << x << y << z << w);}
-
-typedef PIMathVectorT<2u, int> PIMathVectorT2i;
-typedef PIMathVectorT<3u, int> PIMathVectorT3i;
-typedef PIMathVectorT<4u, int> PIMathVectorT4i;
-typedef PIMathVectorT<2u, double> PIMathVectorT2d;
-typedef PIMathVectorT<3u, double> PIMathVectorT3d;
-typedef PIMathVectorT<4u, double> PIMathVectorT4d;
-#define createVectorT2i createVectorT2<int>
-#define createVectorT3i createVectorT3<int>
-#define createVectorT4i createVectorT4<int>
-#define createVectorT2f createVectorT2<float>
-#define createVectorT3f createVectorT3<float>
-#define createVectorT4f createVectorT4<float>
-#define createVectorT2d createVectorT2<double>
-#define createVectorT3d createVectorT3<double>
-#define createVectorT4d createVectorT4<double>
-
-#undef PIMV_FOR
-
-/// Vector
-
-#define PIMV_FOR(v, s) for (uint v = s; v < c.size(); ++v)
-
-template<typename Type>
-class PIP_EXPORT PIMathVector {
-	typedef PIMathVector<Type> _CVector;
-	template<typename TypeOp> friend PIByteArray & operator <<(PIByteArray & s, const PIMathVector<TypeOp> & v);
-	template<typename TypeOp> friend PIByteArray & operator >>(PIByteArray & s, PIMathVector<TypeOp> & v);
-public:
-	PIMathVector(const uint size = 0) {c.resize(size);}
-	PIMathVector(const PIVector<Type> & val) {c.resize(val.size()); PIMV_FOR(i, 0) c[i] = val[i];}
-	PIMathVector(const _CVector & st, const _CVector & fn) {c.resize(st.size()); PIMV_FOR(i, 0) c[i] = fn[i] - st[i];}
-
-	uint size() const {return c.size();}
-	_CVector & resize(uint size, const Type & new_value = Type()) {c.resize(size, new_value); return *this;}
-	_CVector resized(uint size, const Type & new_value = Type()) {_CVector tv = _CVector(*this); tv.resize(size, new_value); return tv;}
-	_CVector & fill(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
-	_CVector & move(const Type & v) {PIMV_FOR(i, 0) c[i] += v; return *this;}
-	_CVector & move(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i]; return *this;}
-	_CVector & swap(uint fe, uint se) {piSwap<Type>(c[fe], c[se]); return *this;}
-	Type lengthSqr() const {Type tv(0); PIMV_FOR(i, 0) tv += (c[i] * c[i]); return tv;}
-	Type length() const {return sqrt(lengthSqr());}
-	Type manhattanLength() const {Type tv(0); PIMV_FOR(i, 0) tv += fabs(c[i]); return tv;}
-	Type angleCos(const _CVector & v) const {Type tv = v.length() * length(); return (tv == Type(0) ? Type(0) : ((*this) ^ v) / tv);}
-	Type angleSin(const _CVector & v) const {Type tv = angleCos(v); return sqrt(Type(1) - tv * tv);}
-	Type angleRad(const _CVector & v) const {return acos(angleCos(v));}
-	Type angleDeg(const _CVector & v) const {return toDeg(acos(angleCos(v)));}
-	_CVector projection(const _CVector & v) {Type tv = v.length(); return (tv == Type(0) ? _CVector() : v * (((*this) ^ v) / tv));}
-	_CVector & normalize() {Type tv = length(); if (tv == Type(1)) return *this; if (piAbs<Type>(tv) <= Type(1E-100)) {fill(Type(0)); return *this;} PIMV_FOR(i, 0) c[i] /= tv; return *this;}
-	_CVector normalized() {_CVector tv(*this); tv.normalize(); return tv;}
-	bool isNull() const {PIMV_FOR(i, 0) if (c[i] != Type(0)) return false; return true;}
-	bool isValid() const {return !c.isEmpty();}
-
-	bool isOrtho(const _CVector & v) const {return ((*this) ^ v) == Type(0);}
-
-	Type & at(uint index) {return c[index];}
-	Type at(uint index) const {return c[index];}
-	Type & operator [](uint index) {return c[index];}
-	Type operator [](uint index) const {return c[index];}
-	_CVector & operator =(const _CVector & v) {c = v.c; return *this;}
-	_CVector & operator =(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
-	bool operator ==(const _CVector & v) const {PIMV_FOR(i, 0) if (c[i] != v[i]) return false; return true;}
-	bool operator !=(const _CVector & v) const {return !(*this == c);}
-	void operator +=(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i];}
-	void operator -=(const _CVector & v) {PIMV_FOR(i, 0) c[i] -= v[i];}
-	void operator *=(const Type & v) {PIMV_FOR(i, 0) c[i] *= v;}
-	void operator *=(const _CVector & v) {PIMV_FOR(i, 0) c[i] *= v[i];}
-	void operator /=(const Type & v) {PIMV_FOR(i, 0) c[i] /= v;}
-	void operator /=(const _CVector & v) {PIMV_FOR(i, 0) c[i] /= v[i];}
-	_CVector operator -() const {_CVector tv; PIMV_FOR(i, 0) tv[i] = -c[i]; return tv;}
-	_CVector operator +(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] += v[i]; return tv;}
-	_CVector operator -(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] -= v[i]; return tv;}
-	_CVector operator *(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v; return tv;}
-	_CVector operator /(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] /= v; return tv;}
-	_CVector operator *(const _CVector & v) const {if (c.size() < 3) return _CVector(); _CVector tv; tv.fill(Type(1)); tv[0] = c[1]*v[2] - v[1]*c[2]; tv[1] = v[0]*c[2] - c[0]*v[2]; tv[2] = c[0]*v[1] - v[0]*c[1]; return tv;}
-	_CVector operator &(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v[i]; return tv;}
-	Type operator ^(const _CVector & v) const {Type tv(0); PIMV_FOR(i, 0) tv += c[i] * v[i]; return tv;}
-
-	Type distToLine(const _CVector & lp0, const _CVector & lp1) {
-		_CVector a(lp0, lp1), b(lp0, *this), c(lp1, *this);
-		Type f = fabs(a[0]*b[1] - a[1]*b[0]) / a.length();
-		return f;
-	}
-
-	template<typename Type1>
-	PIMathVector turnTo(uint size) const {PIMathVector<Type1> tv; uint sz = piMin<uint>(c.size(), size); for (uint i = 0; i < sz; ++i) tv[i] = c[i]; return tv;}
-	PIVector<Type> toVector() const {return c;}
-
-	inline Type * data() {return c.data();}
-	inline const Type * data() const {return c.data();}
-
-private:
-	PIVector<Type> c;
-
-};
-
-#undef PIMV_FOR
-
-#ifdef PIP_STD_IOSTREAM
-template<typename Type>
-inline std::ostream & operator <<(std::ostream & s, const PIMathVector<Type> & v) {s << "{"; for (uint i = 0; i < v.size(); ++i) {s << v[i]; if (i < v.size() - 1) s << ", ";} s << "}"; return s;}
-#endif
-
-template<typename Type>
-inline PICout operator <<(PICout s, const PIMathVector<Type> & v) {s << "Vector{"; for (uint i = 0; i < v.size(); ++i) {s << v[i]; if (i < v.size() - 1) s << ", ";} s << "}"; return s;}
-
-template<typename Type>
-inline PIByteArray & operator <<(PIByteArray & s, const PIMathVector<Type> & v) {s << v.c; return s;}
-template<typename Type>
-inline PIByteArray & operator >>(PIByteArray & s, PIMathVector<Type> & v) {s >> v.c; return s;}
-
-
-typedef PIMathVector<int> PIMathVectori;
-typedef PIMathVector<double> PIMathVectord;
-
-#endif // PIMATHVECTOR_H
+/*! \file pimathvector.h
+ * \brief PIMathVector
+*/
+/*
+	PIP - Platform Independent Primitives
+	PIMathVector
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIMATHVECTOR_H
+#define PIMATHVECTOR_H
+
+#include "pimathbase.h"
+
+template<uint Cols, uint Rows, typename Type>
+class PIMathMatrixT;
+
+
+/// Vector templated
+
+#define PIMV_FOR(v, s) for (uint v = s; v < Size; ++v)
+
+template<uint Size, typename Type = double>
+class PIP_EXPORT PIMathVectorT {
+	typedef PIMathVectorT<Size, Type> _CVector;
+public:
+	PIMathVectorT() {resize();}
+	PIMathVectorT(const PIVector<Type> & val) {resize(); PIMV_FOR(i, 0) c[i] = val[i];}
+	PIMathVectorT(const _CVector & st, const _CVector & fn) {resize(); set(st, fn);}
+
+	uint size() const {return Size;}
+	_CVector & fill(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
+	_CVector & set(const _CVector & st, const _CVector & fn) {PIMV_FOR(i, 0) c[i] = fn[i] - st[i]; return *this;}
+	_CVector & move(const Type & v) {PIMV_FOR(i, 0) c[i] += v; return *this;}
+	_CVector & move(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i]; return *this;}
+	Type lengthSqr() const {Type tv(0); PIMV_FOR(i, 0) tv += (c[i] * c[i]); return tv;}
+	Type length() const {return sqrt(lengthSqr());}
+	Type manhattanLength() const {Type tv(0); PIMV_FOR(i, 0) tv += fabs(c[i]); return tv;}
+	Type angleCos(const _CVector & v) const {Type tv = v.length() * length(); return (tv == Type(0) ? Type(0) : ((*this) ^ v) / tv);}
+	Type angleSin(const _CVector & v) const {Type tv = angleCos(v); return sqrt(Type(1) - tv * tv);}
+	Type angleRad(const _CVector & v) const {return acos(angleCos(v));}
+	Type angleDeg(const _CVector & v) const {return toDeg(acos(angleCos(v)));}
+	Type angleElevation(const _CVector & v) const {_CVector z = v - *this; double c = z.angleCos(*this); return 90.0 - acos(c) * rad2deg;}
+	_CVector projection(const _CVector & v) {Type tv = v.length(); return (tv == Type(0) ? _CVector() : v * (((*this) ^ v) / tv));}
+	_CVector & normalize() {Type tv = length(); if (tv == Type(1)) return *this; if (piAbs<Type>(tv) <= Type(1E-100)) {fill(Type(0)); return *this;} PIMV_FOR(i, 0) c[i] /= tv; return *this;}
+	_CVector normalized() {_CVector tv(*this); tv.normalize(); return tv;}
+	_CVector cross(const _CVector & v) {return (*this) * v;}
+	Type dot(const _CVector & v) const {return (*this) ^ v;}
+	bool isNull() const {PIMV_FOR(i, 0) if (c[i] != Type(0)) return false; return true;}
+	bool isOrtho(const _CVector & v) const {return ((*this) ^ v) == Type(0);}
+
+	Type & at(uint index) {return c[index];}
+	Type at(uint index) const {return c[index];}
+	Type & operator [](uint index) {return c[index];}
+	Type operator [](uint index) const {return c[index];}
+	_CVector & operator =(const _CVector & v) {memcpy(c, v.c, sizeof(Type) * Size); return *this;}
+	_CVector & operator =(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
+	bool operator ==(const _CVector & v) const {PIMV_FOR(i, 0) if (c[i] != v[i]) return false; return true;}
+	bool operator !=(const _CVector & v) const {return !(*this == c);}
+	void operator +=(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i];}
+	void operator -=(const _CVector & v) {PIMV_FOR(i, 0) c[i] -= v[i];}
+	void operator *=(const Type & v) {PIMV_FOR(i, 0) c[i] *= v;}
+	void operator *=(const _CVector & v) {PIMV_FOR(i, 0) c[i] *= v[i];}
+	void operator /=(const Type & v) {PIMV_FOR(i, 0) c[i] /= v;}
+	void operator /=(const _CVector & v) {PIMV_FOR(i, 0) c[i] /= v[i];}
+	_CVector operator -() const {_CVector tv; PIMV_FOR(i, 0) tv[i] = -c[i]; return tv;}
+	_CVector operator +(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] += v[i]; return tv;}
+	_CVector operator -(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] -= v[i]; return tv;}
+	_CVector operator *(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v; return tv;}
+	_CVector operator /(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] /= v; return tv;}
+	_CVector operator /(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] /= v[i]; return tv;}
+	_CVector operator *(const _CVector & v) const {if (Size != 3) return _CVector(); _CVector tv; tv.fill(Type(1)); tv[0] = c[1]*v[2] - v[1]*c[2]; tv[1] = v[0]*c[2] - c[0]*v[2]; tv[2] = c[0]*v[1] - v[0]*c[1]; return tv;}
+	_CVector operator &(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v[i]; return tv;}
+	Type operator ^(const _CVector & v) const {Type tv(0); PIMV_FOR(i, 0) tv += c[i] * v[i]; return tv;}
+	
+	PIMathMatrixT<1, Size, Type> transposed() const {
+		PIMathMatrixT<1, Size, Type> ret;
+		PIMV_FOR(i, 0) ret[0][i] = c[i];
+		return ret;
+	}
+
+	Type distToLine(const _CVector & lp0, const _CVector & lp1) {
+		_CVector a(lp0, lp1), b(lp0, *this), c(lp1, *this);
+		Type f = fabs(a[0]*b[1] - a[1]*b[0]) / a.length();
+		return f;}
+
+	template<uint Size1, typename Type1> /// vector {Size, Type} to vector {Size1, Type1}
+	PIMathVectorT<Size1, Type1> turnTo() const {PIMathVectorT<Size1, Type1> tv; uint sz = piMin<uint>(Size, Size1); for (uint i = 0; i < sz; ++i) tv[i] = c[i]; return tv;}
+
+	static _CVector filled(const Type & v) {_CVector vv; PIMV_FOR(i, 0) vv[i] = v; return vv;}
+
+private:
+	void resize(const Type & new_value = Type()) {for (uint i = 0; i < Size; ++i) c[i] = new_value;}
+	
+	Type c[Size];
+
+};
+
+template<uint Size, typename Type>
+inline PIMathVectorT<Size, Type> operator *(const Type & x, const PIMathVectorT<Size, Type> & v) {
+	return v * x;
+}
+
+template<uint Size, typename Type>
+inline PICout operator <<(PICout s, const PIMathVectorT<Size, Type> & v) {s << "{"; PIMV_FOR(i, 0) {s << v[i]; if (i < Size - 1) s << ", ";} s << "}"; return s;}
+template<uint Size, typename Type>
+inline bool operator ||(const PIMathVectorT<Size, Type> & f, const PIMathVectorT<Size, Type> & s) {return (f * s).isNull();}
+template<uint Size, typename Type>
+inline PIMathVectorT<Size, Type> sqrt(const PIMathVectorT<Size, Type> & v) {PIMathVectorT<Size, Type> ret; PIMV_FOR(i, 0) {ret[i] = sqrt(v[i]);} return ret;}
+template<uint Size, typename Type>
+inline PIMathVectorT<Size, Type> sqr(const PIMathVectorT<Size, Type> & v) {PIMathVectorT<Size, Type> ret; PIMV_FOR(i, 0) {ret[i] = sqr(v[i]);} return ret;}
+
+template<uint Size, typename Type>
+inline PIByteArray & operator <<(PIByteArray & s, const PIMathVectorT<Size, Type> & v) {for (uint i = 0; i < Size; ++i) s << v[i]; return s;}
+template<uint Size, typename Type>
+inline PIByteArray & operator >>(PIByteArray & s, PIMathVectorT<Size, Type> & v) {for (uint i = 0; i < Size; ++i) s >> v[i]; return s;}
+
+template<typename T>
+inline PIMathVectorT<2u, T> createVectorT2(T x, T y) {return PIMathVectorT<2u, T>(PIVector<T>() << x << y);}
+template<typename T>
+inline PIMathVectorT<3u, T> createVectorT3(T x, T y, T z) {return PIMathVectorT<3u, T>(PIVector<T>() << x << y << z);}
+template<typename T>
+inline PIMathVectorT<4u, T> createVectorT4(T x, T y, T z, T w) {return PIMathVectorT<4u, T>(PIVector<T>() << x << y << z << w);}
+
+typedef PIMathVectorT<2u, int> PIMathVectorT2i;
+typedef PIMathVectorT<3u, int> PIMathVectorT3i;
+typedef PIMathVectorT<4u, int> PIMathVectorT4i;
+typedef PIMathVectorT<2u, double> PIMathVectorT2d;
+typedef PIMathVectorT<3u, double> PIMathVectorT3d;
+typedef PIMathVectorT<4u, double> PIMathVectorT4d;
+#define createVectorT2i createVectorT2<int>
+#define createVectorT3i createVectorT3<int>
+#define createVectorT4i createVectorT4<int>
+#define createVectorT2f createVectorT2<float>
+#define createVectorT3f createVectorT3<float>
+#define createVectorT4f createVectorT4<float>
+#define createVectorT2d createVectorT2<double>
+#define createVectorT3d createVectorT3<double>
+#define createVectorT4d createVectorT4<double>
+
+#undef PIMV_FOR
+
+/// Vector
+
+#define PIMV_FOR(v, s) for (uint v = s; v < c.size(); ++v)
+
+template<typename Type>
+class PIP_EXPORT PIMathVector {
+	typedef PIMathVector<Type> _CVector;
+	template<typename TypeOp> friend PIByteArray & operator <<(PIByteArray & s, const PIMathVector<TypeOp> & v);
+	template<typename TypeOp> friend PIByteArray & operator >>(PIByteArray & s, PIMathVector<TypeOp> & v);
+public:
+	PIMathVector(const uint size = 0) {c.resize(size);}
+	PIMathVector(const PIVector<Type> & val) {c.resize(val.size()); PIMV_FOR(i, 0) c[i] = val[i];}
+	PIMathVector(const _CVector & st, const _CVector & fn) {c.resize(st.size()); PIMV_FOR(i, 0) c[i] = fn[i] - st[i];}
+
+	uint size() const {return c.size();}
+	_CVector & resize(uint size, const Type & new_value = Type()) {c.resize(size, new_value); return *this;}
+	_CVector resized(uint size, const Type & new_value = Type()) {_CVector tv = _CVector(*this); tv.resize(size, new_value); return tv;}
+	_CVector & fill(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
+	_CVector & move(const Type & v) {PIMV_FOR(i, 0) c[i] += v; return *this;}
+	_CVector & move(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i]; return *this;}
+	_CVector & swap(uint fe, uint se) {piSwap<Type>(c[fe], c[se]); return *this;}
+	Type lengthSqr() const {Type tv(0); PIMV_FOR(i, 0) tv += (c[i] * c[i]); return tv;}
+	Type length() const {return sqrt(lengthSqr());}
+	Type manhattanLength() const {Type tv(0); PIMV_FOR(i, 0) tv += fabs(c[i]); return tv;}
+	Type angleCos(const _CVector & v) const {Type tv = v.length() * length(); return (tv == Type(0) ? Type(0) : ((*this) ^ v) / tv);}
+	Type angleSin(const _CVector & v) const {Type tv = angleCos(v); return sqrt(Type(1) - tv * tv);}
+	Type angleRad(const _CVector & v) const {return acos(angleCos(v));}
+	Type angleDeg(const _CVector & v) const {return toDeg(acos(angleCos(v)));}
+	_CVector projection(const _CVector & v) {Type tv = v.length(); return (tv == Type(0) ? _CVector() : v * (((*this) ^ v) / tv));}
+	_CVector & normalize() {Type tv = length(); if (tv == Type(1)) return *this; if (piAbs<Type>(tv) <= Type(1E-100)) {fill(Type(0)); return *this;} PIMV_FOR(i, 0) c[i] /= tv; return *this;}
+	_CVector normalized() {_CVector tv(*this); tv.normalize(); return tv;}
+	bool isNull() const {PIMV_FOR(i, 0) if (c[i] != Type(0)) return false; return true;}
+	bool isValid() const {return !c.isEmpty();}
+
+	bool isOrtho(const _CVector & v) const {return ((*this) ^ v) == Type(0);}
+
+	Type & at(uint index) {return c[index];}
+	Type at(uint index) const {return c[index];}
+	Type & operator [](uint index) {return c[index];}
+	Type operator [](uint index) const {return c[index];}
+	_CVector & operator =(const _CVector & v) {c = v.c; return *this;}
+	_CVector & operator =(const Type & v) {PIMV_FOR(i, 0) c[i] = v; return *this;}
+	bool operator ==(const _CVector & v) const {PIMV_FOR(i, 0) if (c[i] != v[i]) return false; return true;}
+	bool operator !=(const _CVector & v) const {return !(*this == c);}
+	void operator +=(const _CVector & v) {PIMV_FOR(i, 0) c[i] += v[i];}
+	void operator -=(const _CVector & v) {PIMV_FOR(i, 0) c[i] -= v[i];}
+	void operator *=(const Type & v) {PIMV_FOR(i, 0) c[i] *= v;}
+	void operator *=(const _CVector & v) {PIMV_FOR(i, 0) c[i] *= v[i];}
+	void operator /=(const Type & v) {PIMV_FOR(i, 0) c[i] /= v;}
+	void operator /=(const _CVector & v) {PIMV_FOR(i, 0) c[i] /= v[i];}
+	_CVector operator -() const {_CVector tv; PIMV_FOR(i, 0) tv[i] = -c[i]; return tv;}
+	_CVector operator +(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] += v[i]; return tv;}
+	_CVector operator -(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] -= v[i]; return tv;}
+	_CVector operator *(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v; return tv;}
+	_CVector operator /(const Type & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] /= v; return tv;}
+	_CVector operator *(const _CVector & v) const {if (c.size() < 3) return _CVector(); _CVector tv; tv.fill(Type(1)); tv[0] = c[1]*v[2] - v[1]*c[2]; tv[1] = v[0]*c[2] - c[0]*v[2]; tv[2] = c[0]*v[1] - v[0]*c[1]; return tv;}
+	_CVector operator &(const _CVector & v) const {_CVector tv = _CVector(*this); PIMV_FOR(i, 0) tv[i] *= v[i]; return tv;}
+	Type operator ^(const _CVector & v) const {Type tv(0); PIMV_FOR(i, 0) tv += c[i] * v[i]; return tv;}
+
+	Type distToLine(const _CVector & lp0, const _CVector & lp1) {
+		_CVector a(lp0, lp1), b(lp0, *this), c(lp1, *this);
+		Type f = fabs(a[0]*b[1] - a[1]*b[0]) / a.length();
+		return f;
+	}
+
+	template<typename Type1>
+	PIMathVector turnTo(uint size) const {PIMathVector<Type1> tv; uint sz = piMin<uint>(c.size(), size); for (uint i = 0; i < sz; ++i) tv[i] = c[i]; return tv;}
+	PIVector<Type> toVector() const {return c;}
+
+	inline Type * data() {return c.data();}
+	inline const Type * data() const {return c.data();}
+
+private:
+	PIVector<Type> c;
+
+};
+
+#undef PIMV_FOR
+
+#ifdef PIP_STD_IOSTREAM
+template<typename Type>
+inline std::ostream & operator <<(std::ostream & s, const PIMathVector<Type> & v) {s << "{"; for (uint i = 0; i < v.size(); ++i) {s << v[i]; if (i < v.size() - 1) s << ", ";} s << "}"; return s;}
+#endif
+
+template<typename Type>
+inline PICout operator <<(PICout s, const PIMathVector<Type> & v) {s << "Vector{"; for (uint i = 0; i < v.size(); ++i) {s << v[i]; if (i < v.size() - 1) s << ", ";} s << "}"; return s;}
+
+template<typename Type>
+inline PIByteArray & operator <<(PIByteArray & s, const PIMathVector<Type> & v) {s << v.c; return s;}
+template<typename Type>
+inline PIByteArray & operator >>(PIByteArray & s, PIMathVector<Type> & v) {s >> v.c; return s;}
+
+
+typedef PIMathVector<int> PIMathVectori;
+typedef PIMathVector<double> PIMathVectord;
+
+#endif // PIMATHVECTOR_H
diff --git a/src_main/math/piquaternion.cpp b/lib/main/math/piquaternion.cpp
similarity index 100%
rename from src_main/math/piquaternion.cpp
rename to lib/main/math/piquaternion.cpp
diff --git a/src_main/math/piquaternion.h b/lib/main/math/piquaternion.h
similarity index 100%
rename from src_main/math/piquaternion.h
rename to lib/main/math/piquaternion.h
diff --git a/src_main/math/pistatistic.h b/lib/main/math/pistatistic.h
similarity index 96%
rename from src_main/math/pistatistic.h
rename to lib/main/math/pistatistic.h
index 6ad0a45d..f5f66f30 100644
--- a/src_main/math/pistatistic.h
+++ b/lib/main/math/pistatistic.h
@@ -1,85 +1,85 @@
-/*! \file pistatistic.h
- * \brief Class for calculating math statistic in values array
-*/
-/*
-	PIP - Platform Independent Primitives
-	Class for calculacing math statistic in values array
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PISTATISTIC_H
-#define PISTATISTIC_H
-
-#include "pimathbase.h"
-
-template <typename T>
-class PIP_EXPORT PIStatistic {
-public:
-	PIStatistic() {mean = variance = skewness = kurtosis = T();}
-	
-	static T calculateMean(const PIVector<T> & val) {
-		T ret = T();
-		int n = val.size();
-		if (n < 1)
-			return ret;
-		for (int i = 0; i < n; i++)
-			ret += val[i];
-		return ret / n;
-	}
-	bool calculate(const PIVector<T> & val, const T & given_mean) {
-		T v = T(), v1 = T(), v2 = T(), stddev = T(), var = T();
-		int i, n = val.size();
-		if (n < 2)
-			return false;
-		mean = given_mean;
-		variance = skewness = kurtosis = T();
-		// Variance (using corrected two-pass algorithm)
-		for (i = 0; i < n; i++)
-			v1 += sqr(val[i] - mean);
-		for (i = 0; i < n; i++)
-			v2 += val[i] - mean;
-		v2 = sqr(v2) / n;
-		variance = v1 / n;
-		var = (v1 / n - v2) / (n - 1);
-		if (var < T())
-			var = T();
-		stddev = sqrt(var);
-		// Skewness and kurtosis
-		if (stddev != T()) {
-			for (i = 0; i < n; i++) {
-				v = (val[i] - mean) / stddev;
-				v2 = sqr(v);
-				skewness = skewness + v2 * v;
-				kurtosis = kurtosis + sqr(v2);
-			}
-			skewness /= n;
-			kurtosis = kurtosis / n - 3.;
-		}
-		return true;
-	}
-	bool calculate(const PIVector<T> & val) {return calculate(val, calculateMean(val));}
-	
-	T mean;
-	T variance;
-	T skewness;
-	T kurtosis;
-};
-
-typedef PIStatistic<int> PIStatistici;
-typedef PIStatistic<float> PIStatisticf;
-typedef PIStatistic<double> PIStatisticd;
-
-#endif // PISTATISTIC_H
+/*! \file pistatistic.h
+ * \brief Class for calculating math statistic in values array
+*/
+/*
+	PIP - Platform Independent Primitives
+	Class for calculacing math statistic in values array
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PISTATISTIC_H
+#define PISTATISTIC_H
+
+#include "pimathbase.h"
+
+template <typename T>
+class PIP_EXPORT PIStatistic {
+public:
+	PIStatistic() {mean = variance = skewness = kurtosis = T();}
+	
+	static T calculateMean(const PIVector<T> & val) {
+		T ret = T();
+		int n = val.size();
+		if (n < 1)
+			return ret;
+		for (int i = 0; i < n; i++)
+			ret += val[i];
+		return ret / n;
+	}
+	bool calculate(const PIVector<T> & val, const T & given_mean) {
+		T v = T(), v1 = T(), v2 = T(), stddev = T(), var = T();
+		int i, n = val.size();
+		if (n < 2)
+			return false;
+		mean = given_mean;
+		variance = skewness = kurtosis = T();
+		// Variance (using corrected two-pass algorithm)
+		for (i = 0; i < n; i++)
+			v1 += sqr(val[i] - mean);
+		for (i = 0; i < n; i++)
+			v2 += val[i] - mean;
+		v2 = sqr(v2) / n;
+		variance = v1 / n;
+		var = (v1 / n - v2) / (n - 1);
+		if (var < T())
+			var = T();
+		stddev = sqrt(var);
+		// Skewness and kurtosis
+		if (stddev != T()) {
+			for (i = 0; i < n; i++) {
+				v = (val[i] - mean) / stddev;
+				v2 = sqr(v);
+				skewness = skewness + v2 * v;
+				kurtosis = kurtosis + sqr(v2);
+			}
+			skewness /= n;
+			kurtosis = kurtosis / n - 3.;
+		}
+		return true;
+	}
+	bool calculate(const PIVector<T> & val) {return calculate(val, calculateMean(val));}
+	
+	T mean;
+	T variance;
+	T skewness;
+	T kurtosis;
+};
+
+typedef PIStatistic<int> PIStatistici;
+typedef PIStatistic<float> PIStatisticf;
+typedef PIStatistic<double> PIStatisticd;
+
+#endif // PISTATISTIC_H
diff --git a/src_main/opencl/piopencl.h b/lib/main/opencl/piopencl.h
similarity index 95%
rename from src_main/opencl/piopencl.h
rename to lib/main/opencl/piopencl.h
index 1436e8cc..ac00f160 100644
--- a/src_main/opencl/piopencl.h
+++ b/lib/main/opencl/piopencl.h
@@ -1,194 +1,194 @@
-/*
-	PIP - Platform Independent Primitives
-	OpenCL wrappers
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIOPENCL_H
-#define PIOPENCL_H
-
-#include "pivariant.h"
-
-
-class PIOpenCL {
-public:
-
-	struct KernelArg;
-	struct Device;
-	struct Platform;
-	class Context;
-	class Program;
-	class Kernel;
-
-	typedef PIVector<Device> DeviceList;
-
-	enum AddressQualifier {
-		AddressGlobal,
-		AddressLocal,
-		AddressConstant,
-		AddressPrivate,
-	};
-
-	enum AccessQualifier {
-		AccessReadOnly,
-		AccessWriteOnly,
-		AccessReadWrite,
-		AccessNone,
-	};
-
-	enum TypeQualifier {
-		TypeConst,
-		TypeRestrict,
-		TypeVolatile,
-		TypeNone,
-	};
-
-	enum ArgType {
-		Char = 1,
-		UChar,
-		Short,
-		UShort,
-		Int,
-		UInt,
-		Long,
-		ULong,
-		Float,
-		Double,
-	};
-
-	struct KernelArg {
-		KernelArg();
-		AddressQualifier address_qualifier;
-		AccessQualifier access_qualifier;
-		TypeQualifier type_qualifier;
-		PIString arg_name;
-		PIString type_name;
-		PIString base_type_name;
-		bool is_pointer;
-		ArgType arg_type;
-		int dims;
-	private:
-		friend class Kernel;
-		void init(void * _k, uint index);
-	};
-
-	struct Device {
-		Device() {id = platform_id = 0; max_compute_units = max_clock_frequency = 0; max_memory_size = 0;}
-		bool isValid() const {return id != 0;}
-		PIString displayText() const {return name.trimmed() + " (" + device_version.trimmed() + ")";}
-		void * id;
-		void * platform_id;
-		PIString name;
-		PIString vendor;
-		PIString device_version;
-		PIString driver_version;
-		int max_compute_units;
-		int max_clock_frequency;
-		ullong max_memory_size;
-	};
-
-	struct Platform {
-		Platform() {id = 0;}
-		bool isValid() const {return id != 0;}
-		PIString displayText() const {return name.trimmed() + " (" + version.trimmed() + ", " + profile.trimmed() + ")";}
-		void * id;
-		PIString name;
-		PIString vendor;
-		PIString profile;
-		PIString version;
-		PIStringList extensions;
-		PIVector<Device> devices;
-	};
-
-	class Context {
-		friend class Program;
-	public:
-		~Context();
-		static Context * create(const DeviceList & dl);
-		static Context * create(const Device & d) {return create(DeviceList() << d);}
-		Program * createProgram(const PIString & source, PIString * error = 0);
-	private:
-		Context();
-		void zero();
-		void deletePrograms();
-		PIVector<Program * > programs_;
-		PRIVATE_DECLARATION
-	};
-
-	class Program {
-		friend class Context;
-		friend class Kernel;
-	public:
-		~Program();
-		const PIString & sourceCode() const {return source_;}
-		const Kernel * kernel(int index = 0) const {return kernels_[index];}
-		const PIVector<Kernel * > & kernels() const {return kernels_;}
-	private:
-		Program();
-		void zero();
-		bool initKernels(PIVector<void*> kerns);
-		Context * context_;
-		PIString source_;
-		PIVector<Kernel * > kernels_;
-		PRIVATE_DECLARATION
-	};
-
-	class Kernel {
-		friend class Program;
-	public:
-		const PIString & name() const {return name_;}
-		const PIVector<KernelArg> & args() const {return args_;}
-		template <typename T> bool setArgValue(int index, const T & value) {return setArgValueV(index, PIVariant::fromValue(value));}
-		template <typename T> bool setArgValue(const PIString & arg, const T & value) {return setArgValue(argIndex(arg), value);}
-	private:
-		Kernel();
-		~Kernel();
-		void zero();
-		bool init();
-		bool setArgValueV(int index, const PIVariant & value);
-		int argIndex(const PIString & an) const;
-		KernelArg argByName(const PIString & an) const;
-		Context * context_;
-		Program * program_;
-		PIString name_;
-		PIVector<KernelArg> args_;
-		PRIVATE_DECLARATION
-	};
-
-	static void init();
-	static const PIVector<Platform> & platforms();
-	static const PIVector<Device> devices();
-	static Device deviceByID(void * id);
-	static PIString prepareProgram(const PIString & prog);
-
-private:
-	static PIString prog_header;
-	PIOpenCL() {;}
-	class Initializer {
-	public:
-		Initializer();
-		static Initializer * instance();
-		void init();
-		PIVector<Platform> platforms_;
-		bool inited_;
-	};
-};
-
-
-PICout operator <<(PICout s, const PIOpenCL::KernelArg & v);
-
-
-#endif // PIOPENCL_H
+/*
+	PIP - Platform Independent Primitives
+	OpenCL wrappers
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIOPENCL_H
+#define PIOPENCL_H
+
+#include "pivariant.h"
+
+
+class PIOpenCL {
+public:
+
+	struct KernelArg;
+	struct Device;
+	struct Platform;
+	class Context;
+	class Program;
+	class Kernel;
+
+	typedef PIVector<Device> DeviceList;
+
+	enum AddressQualifier {
+		AddressGlobal,
+		AddressLocal,
+		AddressConstant,
+		AddressPrivate,
+	};
+
+	enum AccessQualifier {
+		AccessReadOnly,
+		AccessWriteOnly,
+		AccessReadWrite,
+		AccessNone,
+	};
+
+	enum TypeQualifier {
+		TypeConst,
+		TypeRestrict,
+		TypeVolatile,
+		TypeNone,
+	};
+
+	enum ArgType {
+		Char = 1,
+		UChar,
+		Short,
+		UShort,
+		Int,
+		UInt,
+		Long,
+		ULong,
+		Float,
+		Double,
+	};
+
+	struct KernelArg {
+		KernelArg();
+		AddressQualifier address_qualifier;
+		AccessQualifier access_qualifier;
+		TypeQualifier type_qualifier;
+		PIString arg_name;
+		PIString type_name;
+		PIString base_type_name;
+		bool is_pointer;
+		ArgType arg_type;
+		int dims;
+	private:
+		friend class Kernel;
+		void init(void * _k, uint index);
+	};
+
+	struct Device {
+		Device() {id = platform_id = 0; max_compute_units = max_clock_frequency = 0; max_memory_size = 0;}
+		bool isValid() const {return id != 0;}
+		PIString displayText() const {return name.trimmed() + " (" + device_version.trimmed() + ")";}
+		void * id;
+		void * platform_id;
+		PIString name;
+		PIString vendor;
+		PIString device_version;
+		PIString driver_version;
+		int max_compute_units;
+		int max_clock_frequency;
+		ullong max_memory_size;
+	};
+
+	struct Platform {
+		Platform() {id = 0;}
+		bool isValid() const {return id != 0;}
+		PIString displayText() const {return name.trimmed() + " (" + version.trimmed() + ", " + profile.trimmed() + ")";}
+		void * id;
+		PIString name;
+		PIString vendor;
+		PIString profile;
+		PIString version;
+		PIStringList extensions;
+		PIVector<Device> devices;
+	};
+
+	class Context {
+		friend class Program;
+	public:
+		~Context();
+		static Context * create(const DeviceList & dl);
+		static Context * create(const Device & d) {return create(DeviceList() << d);}
+		Program * createProgram(const PIString & source, PIString * error = 0);
+	private:
+		Context();
+		void zero();
+		void deletePrograms();
+		PIVector<Program * > programs_;
+		PRIVATE_DECLARATION
+	};
+
+	class Program {
+		friend class Context;
+		friend class Kernel;
+	public:
+		~Program();
+		const PIString & sourceCode() const {return source_;}
+		const Kernel * kernel(int index = 0) const {return kernels_[index];}
+		const PIVector<Kernel * > & kernels() const {return kernels_;}
+	private:
+		Program();
+		void zero();
+		bool initKernels(PIVector<void*> kerns);
+		Context * context_;
+		PIString source_;
+		PIVector<Kernel * > kernels_;
+		PRIVATE_DECLARATION
+	};
+
+	class Kernel {
+		friend class Program;
+	public:
+		const PIString & name() const {return name_;}
+		const PIVector<KernelArg> & args() const {return args_;}
+		template <typename T> bool setArgValue(int index, const T & value) {return setArgValueV(index, PIVariant::fromValue(value));}
+		template <typename T> bool setArgValue(const PIString & arg, const T & value) {return setArgValue(argIndex(arg), value);}
+	private:
+		Kernel();
+		~Kernel();
+		void zero();
+		bool init();
+		bool setArgValueV(int index, const PIVariant & value);
+		int argIndex(const PIString & an) const;
+		KernelArg argByName(const PIString & an) const;
+		Context * context_;
+		Program * program_;
+		PIString name_;
+		PIVector<KernelArg> args_;
+		PRIVATE_DECLARATION
+	};
+
+	static void init();
+	static const PIVector<Platform> & platforms();
+	static const PIVector<Device> devices();
+	static Device deviceByID(void * id);
+	static PIString prepareProgram(const PIString & prog);
+
+private:
+	static PIString prog_header;
+	PIOpenCL() {;}
+	class Initializer {
+	public:
+		Initializer();
+		static Initializer * instance();
+		void init();
+		PIVector<Platform> platforms_;
+		bool inited_;
+	};
+};
+
+
+PICout operator <<(PICout s, const PIOpenCL::KernelArg & v);
+
+
+#endif // PIOPENCL_H
diff --git a/src_main/pip.h b/lib/main/pip.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/pip.h
rename to lib/main/pip.h
diff --git a/src_main/piplatform.h b/lib/main/piplatform.h
similarity index 100%
rename from src_main/piplatform.h
rename to lib/main/piplatform.h
diff --git a/src_main/resources/piresources.cpp b/lib/main/resources/piresources.cpp
similarity index 97%
rename from src_main/resources/piresources.cpp
rename to lib/main/resources/piresources.cpp
index 726634bb..e3a691d6 100644
--- a/src_main/resources/piresources.cpp
+++ b/lib/main/resources/piresources.cpp
@@ -1,51 +1,51 @@
-/*
-	PIP - Platform Independent Primitives
-	Resources subsystem
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piresources.h"
-#include "piresourcesstorage.h"
-
-
-PIResources::PIResources() {
-}
-
-
-PIByteArray PIResources::get(const PIString & section, const PIString & name) {
-	return PIResourcesStorage::instance()->get(section, name);
-}
-
-
-PIByteArray PIResources::get(const PIString & name) {
-	return PIResourcesStorage::instance()->get(name);
-}
-
-
-void PIResources::dump() {
-	PIMap<PIString, PIResourcesStorage::Section * > & sm(PIResourcesStorage::instance()->sections);
-	PIMap<PIString, PIResourcesStorage::Section * >::iterator si;
-	for (si = sm.begin(); si != sm.end(); ++si) {
-		piCout << "Section [" << si.key() << "]";
-		if (!si.value()) continue;
-		PIMap<PIString, PIByteArray * >::iterator fi;
-		for (fi = si.value()->entries.begin(); fi != si.value()->entries.end(); ++fi) {
-			PIString s = fi.key() + ": ";
-			s << (fi.value() ? fi.value()->size_s() : 0) << " b";
-			piCout << "   " << s;
-		}
-	}
-}
+/*
+	PIP - Platform Independent Primitives
+	Resources subsystem
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piresources.h"
+#include "piresourcesstorage.h"
+
+
+PIResources::PIResources() {
+}
+
+
+PIByteArray PIResources::get(const PIString & section, const PIString & name) {
+	return PIResourcesStorage::instance()->get(section, name);
+}
+
+
+PIByteArray PIResources::get(const PIString & name) {
+	return PIResourcesStorage::instance()->get(name);
+}
+
+
+void PIResources::dump() {
+	PIMap<PIString, PIResourcesStorage::Section * > & sm(PIResourcesStorage::instance()->sections);
+	PIMap<PIString, PIResourcesStorage::Section * >::iterator si;
+	for (si = sm.begin(); si != sm.end(); ++si) {
+		piCout << "Section [" << si.key() << "]";
+		if (!si.value()) continue;
+		PIMap<PIString, PIByteArray * >::iterator fi;
+		for (fi = si.value()->entries.begin(); fi != si.value()->entries.end(); ++fi) {
+			PIString s = fi.key() + ": ";
+			s << (fi.value() ? fi.value()->size_s() : 0) << " b";
+			piCout << "   " << s;
+		}
+	}
+}
diff --git a/src_main/resources/piresources.h b/lib/main/resources/piresources.h
similarity index 96%
rename from src_main/resources/piresources.h
rename to lib/main/resources/piresources.h
index a677e875..6fca0431 100644
--- a/src_main/resources/piresources.h
+++ b/lib/main/resources/piresources.h
@@ -1,44 +1,44 @@
-/*! \file piresources.h
- * \brief Resources subsystem
-*/
-/*
-	PIP - Platform Independent Primitives
-	Resources subsystem
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIRESOURCES_H
-#define PIRESOURCES_H
-
-#include "pistring.h"
-
-#define INIT_RESOURCE(name) {extern void _pirc_##name##_init_(); _pirc_##name##_init_();}
-
-class PIP_EXPORT PIResources {
-public:
-
-	//!
-	static PIByteArray get(const PIString & section, const PIString & name);
-	static PIByteArray get(const PIString & name);
-
-	static void dump();
-
-private:
-	PIResources();
-
-};
-
-#endif // PIRESOURCES_H
+/*! \file piresources.h
+ * \brief Resources subsystem
+*/
+/*
+	PIP - Platform Independent Primitives
+	Resources subsystem
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIRESOURCES_H
+#define PIRESOURCES_H
+
+#include "pistring.h"
+
+#define INIT_RESOURCE(name) {extern void _pirc_##name##_init_(); _pirc_##name##_init_();}
+
+class PIP_EXPORT PIResources {
+public:
+
+	//!
+	static PIByteArray get(const PIString & section, const PIString & name);
+	static PIByteArray get(const PIString & name);
+
+	static void dump();
+
+private:
+	PIResources();
+
+};
+
+#endif // PIRESOURCES_H
diff --git a/src_main/resources/piresourcesstorage.cpp b/lib/main/resources/piresourcesstorage.cpp
similarity index 96%
rename from src_main/resources/piresourcesstorage.cpp
rename to lib/main/resources/piresourcesstorage.cpp
index 9b8dbc01..b08dba70 100644
--- a/src_main/resources/piresourcesstorage.cpp
+++ b/lib/main/resources/piresourcesstorage.cpp
@@ -1,170 +1,170 @@
-/*
-	PIP - Platform Independent Primitives
-	Resources subsystem
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piresourcesstorage.h"
-#include "pichunkstream.h"
-#include "piset.h"
-
-
-PIResourcesStorage::Section::Section() {
-}
-
-
-PIResourcesStorage::Section::~Section() {
-}
-
-
-void PIResourcesStorage::Section::add(const PIResourcesStorage::Section & s) {
-	PIMap<PIString, PIByteArray * >::const_iterator i;
-	for (i = s.entries.begin(); i != s.entries.end(); ++i) {
-		if (!i.value()) continue;
-		if (entries.value(i.key(), 0)) continue;
-		entries[i.key()] = i.value();
-	}
-}
-
-
-void PIResourcesStorage::Section::purge() {
-	PIVector<PIByteArray * > bav = entries.values();
-	PISet<PIByteArray * > bas;
-	piForeach (PIByteArray * i, bav) {
-		if (i)
-			bas << i;
-	}
-	bav = bas.toVector();
-	piForeach (PIByteArray * i, bav)
-		delete i;
-	entries.clear();
-}
-
-
-PIResourcesStorage::PIResourcesStorage() {
-
-}
-
-
-PIResourcesStorage::~PIResourcesStorage() {
-	clear();
-}
-
-
-void PIResourcesStorage::registerSection(const PIString & section_name, const PIResourcesStorage::Section & data) {
-	Section * s = sections.value(section_name, 0);
-	if (!s) {
-		s = new Section();
-		sections[section_name] = s;
-	}
-	s->add(data);
-}
-
-
-void PIResourcesStorage::registerSection(const uchar * rc_data, const uchar * rc_desc, int rc_desc_size) {
-	//piCout << "registerSection" << this;
-	PIByteArray dba(rc_desc, rc_desc_size);
-	PIVector<PIResourcesStorage::__RCEntry> el;
-	dba >> el;
-	PIMap<PIString, PIVector<PIResourcesStorage::__RCEntry> > ebs;
-	piForeachC (PIResourcesStorage::__RCEntry & e, el) {
-		ebs[e.section] << e;
-	}
-	PIMap<PIString, PIVector<PIResourcesStorage::__RCEntry> >::iterator it;
-	for (it = ebs.begin(); it != ebs.end(); ++it) {
-		PIResourcesStorage::Section s;
-		PIVector<PIResourcesStorage::__RCEntry> & itv(it.value());
-		piForeachC (PIResourcesStorage::__RCEntry & e, itv) {
-			//piCout << "add" << e.name << e.alias << PIString::readableSize(e.size);
-			PIByteArray * eba = new PIByteArray(&(rc_data[e.offset]), e.size);
-			s.entries[e.name] = eba;
-			if (!e.alias.isEmpty() && e.alias != e.name)
-				s.entries[e.alias] = eba;
-		}
-		registerSection(it.key(), s);
-	}
-}
-
-
-PIResourcesStorage::Section * PIResourcesStorage::section(const PIString & section_name) const {
-	return sections.value(section_name, 0);
-}
-
-
-PIByteArray PIResourcesStorage::get(const PIString & section_name, const PIString & entry_name) const {
-	Section * s = sections.value(section_name, 0);
-	if (!s) return PIByteArray();
-	PIByteArray * ba = s->entries.value(entry_name, 0);
-	if (!ba) return PIByteArray();
-	return *ba;
-}
-
-
-PIByteArray PIResourcesStorage::get(const PIString & entry_name) const {
-	PIMap<PIString, Section * >::const_iterator i;
-	for (i = sections.begin(); i != sections.end(); ++i) {
-		if (!i.value()) continue;
-		PIByteArray * ba = i.value()->entries.value(entry_name, 0);
-		if (!ba) continue;
-		return *ba;
-	}
-	return PIByteArray();
-}
-
-
-void PIResourcesStorage::clear() {
-	//piCout << "PIResourcesStorage clear";
-	PIVector<Section * > sv = sections.values();
-	piForeach (Section * i, sv) {
-		if (i)
-			i->purge();
-	}
-	sections.clear();
-}
-
-
-PIResourcesStorage * PIResourcesStorage::instance() {
-	static PIResourcesStorage * ret = new PIResourcesStorage();
-	return ret;
-}
-
-
-PIByteArray & operator <<(PIByteArray & b, const PIResourcesStorage::__RCEntry & v) {
-	PIChunkStream cs;
-	cs << cs.chunk(1, v.section) << cs.chunk(2, v.name) << cs.chunk(3, v.file)
-	   << cs.chunk(4, v.size) << cs.chunk(5, v.offset) << cs.chunk(6, v.flags)
-	   << cs.chunk(7, v.alias);
-	b << cs.data();
-	return b;
-}
-
-
-PIByteArray & operator >>(PIByteArray & b, PIResourcesStorage::__RCEntry & v) {
-	PIByteArray ba; b >> ba;
-	PIChunkStream cs(ba);
-	while (!cs.atEnd()) {
-		switch (cs.read()) {
-		case 1: cs.get(v.section); break;
-		case 2: cs.get(v.name); break;
-		case 3: cs.get(v.file); break;
-		case 4: cs.get(v.size); break;
-		case 5: cs.get(v.offset); break;
-		case 6: cs.get(v.flags); break;
-		case 7: cs.get(v.alias); break;
-		}
-	}
-	return b;
-}
+/*
+	PIP - Platform Independent Primitives
+	Resources subsystem
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piresourcesstorage.h"
+#include "pichunkstream.h"
+#include "piset.h"
+
+
+PIResourcesStorage::Section::Section() {
+}
+
+
+PIResourcesStorage::Section::~Section() {
+}
+
+
+void PIResourcesStorage::Section::add(const PIResourcesStorage::Section & s) {
+	PIMap<PIString, PIByteArray * >::const_iterator i;
+	for (i = s.entries.begin(); i != s.entries.end(); ++i) {
+		if (!i.value()) continue;
+		if (entries.value(i.key(), 0)) continue;
+		entries[i.key()] = i.value();
+	}
+}
+
+
+void PIResourcesStorage::Section::purge() {
+	PIVector<PIByteArray * > bav = entries.values();
+	PISet<PIByteArray * > bas;
+	piForeach (PIByteArray * i, bav) {
+		if (i)
+			bas << i;
+	}
+	bav = bas.toVector();
+	piForeach (PIByteArray * i, bav)
+		delete i;
+	entries.clear();
+}
+
+
+PIResourcesStorage::PIResourcesStorage() {
+
+}
+
+
+PIResourcesStorage::~PIResourcesStorage() {
+	clear();
+}
+
+
+void PIResourcesStorage::registerSection(const PIString & section_name, const PIResourcesStorage::Section & data) {
+	Section * s = sections.value(section_name, 0);
+	if (!s) {
+		s = new Section();
+		sections[section_name] = s;
+	}
+	s->add(data);
+}
+
+
+void PIResourcesStorage::registerSection(const uchar * rc_data, const uchar * rc_desc, int rc_desc_size) {
+	//piCout << "registerSection" << this;
+	PIByteArray dba(rc_desc, rc_desc_size);
+	PIVector<PIResourcesStorage::__RCEntry> el;
+	dba >> el;
+	PIMap<PIString, PIVector<PIResourcesStorage::__RCEntry> > ebs;
+	piForeachC (PIResourcesStorage::__RCEntry & e, el) {
+		ebs[e.section] << e;
+	}
+	PIMap<PIString, PIVector<PIResourcesStorage::__RCEntry> >::iterator it;
+	for (it = ebs.begin(); it != ebs.end(); ++it) {
+		PIResourcesStorage::Section s;
+		PIVector<PIResourcesStorage::__RCEntry> & itv(it.value());
+		piForeachC (PIResourcesStorage::__RCEntry & e, itv) {
+			//piCout << "add" << e.name << e.alias << PIString::readableSize(e.size);
+			PIByteArray * eba = new PIByteArray(&(rc_data[e.offset]), e.size);
+			s.entries[e.name] = eba;
+			if (!e.alias.isEmpty() && e.alias != e.name)
+				s.entries[e.alias] = eba;
+		}
+		registerSection(it.key(), s);
+	}
+}
+
+
+PIResourcesStorage::Section * PIResourcesStorage::section(const PIString & section_name) const {
+	return sections.value(section_name, 0);
+}
+
+
+PIByteArray PIResourcesStorage::get(const PIString & section_name, const PIString & entry_name) const {
+	Section * s = sections.value(section_name, 0);
+	if (!s) return PIByteArray();
+	PIByteArray * ba = s->entries.value(entry_name, 0);
+	if (!ba) return PIByteArray();
+	return *ba;
+}
+
+
+PIByteArray PIResourcesStorage::get(const PIString & entry_name) const {
+	PIMap<PIString, Section * >::const_iterator i;
+	for (i = sections.begin(); i != sections.end(); ++i) {
+		if (!i.value()) continue;
+		PIByteArray * ba = i.value()->entries.value(entry_name, 0);
+		if (!ba) continue;
+		return *ba;
+	}
+	return PIByteArray();
+}
+
+
+void PIResourcesStorage::clear() {
+	//piCout << "PIResourcesStorage clear";
+	PIVector<Section * > sv = sections.values();
+	piForeach (Section * i, sv) {
+		if (i)
+			i->purge();
+	}
+	sections.clear();
+}
+
+
+PIResourcesStorage * PIResourcesStorage::instance() {
+	static PIResourcesStorage * ret = new PIResourcesStorage();
+	return ret;
+}
+
+
+PIByteArray & operator <<(PIByteArray & b, const PIResourcesStorage::__RCEntry & v) {
+	PIChunkStream cs;
+	cs << cs.chunk(1, v.section) << cs.chunk(2, v.name) << cs.chunk(3, v.file)
+	   << cs.chunk(4, v.size) << cs.chunk(5, v.offset) << cs.chunk(6, v.flags)
+	   << cs.chunk(7, v.alias);
+	b << cs.data();
+	return b;
+}
+
+
+PIByteArray & operator >>(PIByteArray & b, PIResourcesStorage::__RCEntry & v) {
+	PIByteArray ba; b >> ba;
+	PIChunkStream cs(ba);
+	while (!cs.atEnd()) {
+		switch (cs.read()) {
+		case 1: cs.get(v.section); break;
+		case 2: cs.get(v.name); break;
+		case 3: cs.get(v.file); break;
+		case 4: cs.get(v.size); break;
+		case 5: cs.get(v.offset); break;
+		case 6: cs.get(v.flags); break;
+		case 7: cs.get(v.alias); break;
+		}
+	}
+	return b;
+}
diff --git a/src_main/resources/piresourcesstorage.h b/lib/main/resources/piresourcesstorage.h
similarity index 96%
rename from src_main/resources/piresourcesstorage.h
rename to lib/main/resources/piresourcesstorage.h
index 8c81b8be..3f67aac2 100644
--- a/src_main/resources/piresourcesstorage.h
+++ b/lib/main/resources/piresourcesstorage.h
@@ -1,82 +1,82 @@
-/*
-	PIP - Platform Independent Primitives
-	Resources subsystem
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIRESOURCES_P_H
-#define PIRESOURCES_P_H
-
-#include "pistring.h"
-#include "pimap.h"
-
-class PIResources;
-
-class PIP_EXPORT PIResourcesStorage {
-	friend class PIResources;
-public:
-
-	static PIResourcesStorage * instance();
-
-	struct PIP_EXPORT Section {
-		Section();
-		~Section();
-		void add(const Section & s);
-		void purge();
-		PIMap<PIString, PIByteArray * > entries;
-	};
-
-	struct PIP_EXPORT __RCEntry {
-		__RCEntry(const PIString & s = PIString(), const PIString & n = PIString(), const PIString & a = PIString(),
-				  const PIString & f = PIString(), llong o = 0, llong si = 0, int fl = 0) {
-			section = s;
-			name = n;
-			alias = a;
-			file = f;
-			offset = o;
-			size = si;
-			flags = fl;
-		}
-		PIString section;
-		PIString name;
-		PIString alias;
-		PIString file;
-		llong offset;
-		llong size;
-		int flags;
-	};
-
-	void registerSection(const PIString & section_name, const Section & data);
-	void registerSection(const uchar * rc_data, const uchar * rc_desc, int rc_desc_size);
-	Section * section(const PIString & section_name) const;
-	PIByteArray get(const PIString & section_name, const PIString & entry_name) const;
-	PIByteArray get(const PIString & entry_name) const;
-
-	void clear();
-
-private:
-	PIResourcesStorage();
-	~PIResourcesStorage();
-
-	PIMap<PIString, Section * > sections;
-};
-
-
-PIP_EXPORT PIByteArray & operator <<(PIByteArray & b, const PIResourcesStorage::__RCEntry & v);
-PIP_EXPORT PIByteArray & operator >>(PIByteArray & b,       PIResourcesStorage::__RCEntry & v);
-
-
-#endif // PIRESOURCES_H
+/*
+	PIP - Platform Independent Primitives
+	Resources subsystem
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIRESOURCES_P_H
+#define PIRESOURCES_P_H
+
+#include "pistring.h"
+#include "pimap.h"
+
+class PIResources;
+
+class PIP_EXPORT PIResourcesStorage {
+	friend class PIResources;
+public:
+
+	static PIResourcesStorage * instance();
+
+	struct PIP_EXPORT Section {
+		Section();
+		~Section();
+		void add(const Section & s);
+		void purge();
+		PIMap<PIString, PIByteArray * > entries;
+	};
+
+	struct PIP_EXPORT __RCEntry {
+		__RCEntry(const PIString & s = PIString(), const PIString & n = PIString(), const PIString & a = PIString(),
+				  const PIString & f = PIString(), llong o = 0, llong si = 0, int fl = 0) {
+			section = s;
+			name = n;
+			alias = a;
+			file = f;
+			offset = o;
+			size = si;
+			flags = fl;
+		}
+		PIString section;
+		PIString name;
+		PIString alias;
+		PIString file;
+		llong offset;
+		llong size;
+		int flags;
+	};
+
+	void registerSection(const PIString & section_name, const Section & data);
+	void registerSection(const uchar * rc_data, const uchar * rc_desc, int rc_desc_size);
+	Section * section(const PIString & section_name) const;
+	PIByteArray get(const PIString & section_name, const PIString & entry_name) const;
+	PIByteArray get(const PIString & entry_name) const;
+
+	void clear();
+
+private:
+	PIResourcesStorage();
+	~PIResourcesStorage();
+
+	PIMap<PIString, Section * > sections;
+};
+
+
+PIP_EXPORT PIByteArray & operator <<(PIByteArray & b, const PIResourcesStorage::__RCEntry & v);
+PIP_EXPORT PIByteArray & operator >>(PIByteArray & b,       PIResourcesStorage::__RCEntry & v);
+
+
+#endif // PIRESOURCES_H
diff --git a/src_main/system/picodec.cpp b/lib/main/system/picodec.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/picodec.cpp
rename to lib/main/system/picodec.cpp
diff --git a/src_main/system/picodec.h b/lib/main/system/picodec.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/picodec.h
rename to lib/main/system/picodec.h
diff --git a/src_main/system/pilibrary.cpp b/lib/main/system/pilibrary.cpp
similarity index 100%
rename from src_main/system/pilibrary.cpp
rename to lib/main/system/pilibrary.cpp
diff --git a/src_main/system/pilibrary.h b/lib/main/system/pilibrary.h
similarity index 100%
rename from src_main/system/pilibrary.h
rename to lib/main/system/pilibrary.h
diff --git a/src_main/system/piprocess.cpp b/lib/main/system/piprocess.cpp
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/system/piprocess.cpp
rename to lib/main/system/piprocess.cpp
index 50b2a7f0..05e2d9cd
--- a/src_main/system/piprocess.cpp
+++ b/lib/main/system/piprocess.cpp
@@ -1,294 +1,294 @@
-/*
-	PIP - Platform Independent Primitives
-	Process
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIP_FREERTOS
-
-#include "piincludes_p.h"
-#include "piprocess.h"
-#ifndef WINDOWS
-#  include <sys/wait.h>
-#  include <csignal>
-#endif
-#ifdef MAC_OS
-#  include <crt_externs.h>
-#endif
-PRIVATE_DEFINITION_START(PIProcess)
-#ifdef WINDOWS
-	STARTUPINFOA si;
-	PROCESS_INFORMATION pi;
-#else
-	pid_t pid;
-#endif
-	FILE * tf_in, * tf_out, * tf_err;
-PRIVATE_DEFINITION_END(PIProcess)
-
-
-PIProcess::PIProcess(): PIThread() {
-	exit_code = -1;
-#ifdef WINDOWS
-	PRIVATE->pi.dwProcessId = 0;
-#else
-	PRIVATE->pid = 0;
-#endif
-	is_exec = false;
-	g_in = g_out = g_err = false;
-	t_in = t_out = t_err = false;
-	PRIVATE->tf_in = PRIVATE->tf_out = PRIVATE->tf_err = 0;
-	env = PIProcess::currentEnvironment();
-}
-
-
-PIProcess::~PIProcess() {
-	if (t_in)  f_in.remove();
-	if (t_out) f_out.remove();
-	if (t_err) f_err.remove();
-}
-
-
-void PIProcess::exec_() {
-	is_exec = false;
-	startOnce();
-	//cout << "exec wait" << endl;
-	while (!is_exec)
-		msleep(PIP_MIN_MSLEEP);
-	//cout << "exec end" << endl;
-}
-
-
-void PIProcess::startProc(bool detached) {
-	//cout << "run" << endl;
-	PIString str;
-	/// arguments convertion
-#ifdef WINDOWS
-	int as = 0;
-	piForeachC (PIString & i, args)
-		as += i.lengthAscii() + 3;
-	char * a = new char[as];
-	memset(a, ' ', as - 1);
-	as = 0;
-	for (int i = 0; i < args.size_s(); ++i) {
-		str = args[i];
-		a[as] = '"';
-		memcpy(&(a[as + 1]), str.data(), str.lengthAscii());
-		a[as + str.lengthAscii() + 1] = '"';
-		as += str.lengthAscii() + 3;
-	}
-	a[as - 1] = 0;
-	//piCout << a;
-#else
-	//piCout << "#" << args;
-	char * a[args.size_s() + 1];
-	for (int i = 0; i < args.size_s(); ++i) {
-		str = args[i];
-		//piCout << i << str << str.size() << str.lengthAscii() << str.lengthAscii() << str.lengthAscii();
-		a[i] = new char[str.lengthAscii() + 1];
-		memcpy(a[i], str.data(), str.lengthAscii());
-		a[i][str.lengthAscii()] = 0;
-	}
-	a[args.size_s()] = 0;
-#endif
-	/// environment convertion
-	char ** e = new char*[env.size_s() + 1];
-	for (int i = 0; i < env.size_s(); ++i) {
-		str = env[i];
-		e[i] = new char[str.lengthAscii() + 1];
-		memcpy(e[i], str.data(), str.lengthAscii());
-		e[i][str.lengthAscii()] = 0;
-		//cout << e[i] << endl;
-	}
-	e[env.size_s()] = 0;
-	/// files for stdin/out/err
-	t_in = t_out = t_err = false;
-	if (f_in.path().isEmpty()) {
-		f_in.openTemporary(PIIODevice::ReadWrite);
-		t_in = true;
-	}
-	if (f_out.path().isEmpty()) {
-		f_out.openTemporary(PIIODevice::ReadWrite);
-		t_out = true;
-	}
-	if (f_err.path().isEmpty()) {
-		f_err.openTemporary(PIIODevice::ReadWrite);
-		t_err = true;
-	}
-
-	str = args.front();
-	is_exec = true;
-	if (!detached) execStarted(str);
-#ifndef WINDOWS
-	int pid_ = fork();
-	if (!detached) PRIVATE->pid = pid_;
-	if (pid_ == 0) {
-#endif
-		PRIVATE->tf_in = PRIVATE->tf_out = PRIVATE->tf_err = 0;
-		//cout << "exec " << tf_in << ", " << tf_out << ", " << tf_err << endl;
-		//cout << f_out.path() << endl;
-		if (g_in)  PRIVATE->tf_in = freopen(f_in.path().data(), "r", stdin);
-		if (g_out) PRIVATE->tf_out = freopen(f_out.path().data(), "w", stdout);
-		if (g_err) PRIVATE->tf_err = freopen(f_err.path().data(), "w", stderr);
-#ifndef WINDOWS
-		if (!wd.isEmpty())
-			if (!chdir(wd.data()))
-				piCoutObj << "Error while set working directory";
-#endif
-#ifdef WINDOWS
-	GetStartupInfoA(&(PRIVATE->si));
-	memset(&(PRIVATE->pi), 0, sizeof(PRIVATE->pi));
-	if(CreateProcessA(0,   // No module name (use command line)
-		a,         // Command line
-		0,         // Process handle not inheritable
-		0,         // Thread handle not inheritable
-		false,     // Set handle inheritance to FALSE
-		detached ? DETACHED_PROCESS/*CREATE_NEW_CONSOLE*/ : 0, // Creation flags
-		0,//e,         // Use environment
-		wd.isEmpty() ? 0 : wd.data(), // Use working directory
-		&(PRIVATE->si),       // Pointer to STARTUPINFO structure
-		&(PRIVATE->pi)))      // Pointer to PROCESS_INFORMATION structure
-	{
-		if (!detached) WaitForSingleObject(PRIVATE->pi.hProcess, INFINITE);
-		CloseHandle(PRIVATE->pi.hThread);
-		CloseHandle(PRIVATE->pi.hProcess);
-	} else
-		piCoutObj << "\"CreateProcess\" error, " << errorString();
-#else
-
-		//cout << "exec " << tf_in << ", " << tf_out << ", " << tf_err << endl;
-		if (execve(str.data(), a, e) < 0)
-			piCoutObj << "\"execve" << str << args << "\" error :" << errorString();
-	} else {
-		msleep(PIP_MIN_MSLEEP);
-		//cout << "wait" << endl;
-		if (!detached) {
-			wait(&exit_code);
-			pid_ = 0;
-			if (!detached) PRIVATE->pid = pid_;
-			//cout << "wait done" << endl;
-		}
-	}
-#endif
-	if (!detached) execFinished(str, exit_code);
-	is_exec = false;
-	for (int i = 0; i < env.size_s(); ++i)
-		delete e[i];
-	delete[] e;
-#ifdef WINDOWS
-	delete a;
-#else
-	for (int i = 0; i < args.size_s(); ++i)
-		delete a[i];
-#endif
-}
-
-
-void PIProcess::terminate() {
-#ifdef WINDOWS
-	if (is_exec)
-		if (!TerminateProcess(PRIVATE->pi.hProcess, 0))
-			return;
-	PRIVATE->pi.dwProcessId = 0;
-#else
-	if (is_exec)
-		kill(PRIVATE->pid, SIGKILL);
-	PRIVATE->pid = 0;
-#endif
-}
-
-
-void PIProcess::execIndependent(const PIString & program, const PIStringList & args_) {
-	PIProcess p;
-	p.args << program << args_;
-	p.startProc(true);
-}
-
-
-int PIProcess::pID() const {
-#ifdef WINDOWS
-	return PRIVATE->pi.dwProcessId;
-#else
-	return PRIVATE->pid;
-#endif
-}
-
-
-int PIProcess::currentPID() {
-#ifdef WINDOWS
-	return GetCurrentProcessId();
-#else
-	return getpid();
-#endif
-}
-
-
-PIStringList PIProcess::currentEnvironment() {
-	PIStringList l;
-	int i = 0;
-	while (environ[i] != 0) {
-		l << environ[i];
-		++i;
-	}
-	return l;
-}
-
-
-void PIProcess::run() {
-	startProc(false);
-}
-
-
-void PIProcess::removeEnvironmentVariable(const PIString & variable) {
-	PIString s;
-	for (int i = 0; i < env.size_s(); ++i) {
-		s = env[i];
-		if (s.left(s.find("=")).trimmed() == variable) {
-			env.remove(i);
-			--i;
-		}
-	}
-}
-
-
-void PIProcess::setEnvironmentVariable(const PIString & variable, const PIString & value) {
-	PIString s, v;
-	for (int i = 0; i < env.size_s(); ++i) {
-		s = env[i];
-		v = s.left(s.find("=")).trimmed();
-		if (v == variable) {
-			env[i] = v + "=" + value;
-			return;
-		}
-	}
-	env << variable + "=" + value;
-}
-
-
-PIString PIProcess::getEnvironmentVariable(const PIString & variable) {
-	PIStringList env_ = currentEnvironment();
-	PIString s, v;
-	for (int i = 0; i < env_.size_s(); ++i) {
-		s = env_[i];
-		v = s.left(s.find("=")).trimmed();
-		if (v == variable) {
-			return s.right(s.size() - 1 - s.find("=")).trimmed();
-		}
-	}
-	return PIString();
-}
-
-#endif // PIP_FREERTOS
-
+/*
+	PIP - Platform Independent Primitives
+	Process
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIP_FREERTOS
+
+#include "piincludes_p.h"
+#include "piprocess.h"
+#ifndef WINDOWS
+#  include <sys/wait.h>
+#  include <csignal>
+#endif
+#ifdef MAC_OS
+#  include <crt_externs.h>
+#endif
+PRIVATE_DEFINITION_START(PIProcess)
+#ifdef WINDOWS
+	STARTUPINFOA si;
+	PROCESS_INFORMATION pi;
+#else
+	pid_t pid;
+#endif
+	FILE * tf_in, * tf_out, * tf_err;
+PRIVATE_DEFINITION_END(PIProcess)
+
+
+PIProcess::PIProcess(): PIThread() {
+	exit_code = -1;
+#ifdef WINDOWS
+	PRIVATE->pi.dwProcessId = 0;
+#else
+	PRIVATE->pid = 0;
+#endif
+	is_exec = false;
+	g_in = g_out = g_err = false;
+	t_in = t_out = t_err = false;
+	PRIVATE->tf_in = PRIVATE->tf_out = PRIVATE->tf_err = 0;
+	env = PIProcess::currentEnvironment();
+}
+
+
+PIProcess::~PIProcess() {
+	if (t_in)  f_in.remove();
+	if (t_out) f_out.remove();
+	if (t_err) f_err.remove();
+}
+
+
+void PIProcess::exec_() {
+	is_exec = false;
+	startOnce();
+	//cout << "exec wait" << endl;
+	while (!is_exec)
+		msleep(PIP_MIN_MSLEEP);
+	//cout << "exec end" << endl;
+}
+
+
+void PIProcess::startProc(bool detached) {
+	//cout << "run" << endl;
+	PIString str;
+	/// arguments convertion
+#ifdef WINDOWS
+	int as = 0;
+	piForeachC (PIString & i, args)
+		as += i.lengthAscii() + 3;
+	char * a = new char[as];
+	memset(a, ' ', as - 1);
+	as = 0;
+	for (int i = 0; i < args.size_s(); ++i) {
+		str = args[i];
+		a[as] = '"';
+		memcpy(&(a[as + 1]), str.data(), str.lengthAscii());
+		a[as + str.lengthAscii() + 1] = '"';
+		as += str.lengthAscii() + 3;
+	}
+	a[as - 1] = 0;
+	//piCout << a;
+#else
+	//piCout << "#" << args;
+	char * a[args.size_s() + 1];
+	for (int i = 0; i < args.size_s(); ++i) {
+		str = args[i];
+		//piCout << i << str << str.size() << str.lengthAscii() << str.lengthAscii() << str.lengthAscii();
+		a[i] = new char[str.lengthAscii() + 1];
+		memcpy(a[i], str.data(), str.lengthAscii());
+		a[i][str.lengthAscii()] = 0;
+	}
+	a[args.size_s()] = 0;
+#endif
+	/// environment convertion
+	char ** e = new char*[env.size_s() + 1];
+	for (int i = 0; i < env.size_s(); ++i) {
+		str = env[i];
+		e[i] = new char[str.lengthAscii() + 1];
+		memcpy(e[i], str.data(), str.lengthAscii());
+		e[i][str.lengthAscii()] = 0;
+		//cout << e[i] << endl;
+	}
+	e[env.size_s()] = 0;
+	/// files for stdin/out/err
+	t_in = t_out = t_err = false;
+	if (f_in.path().isEmpty()) {
+		f_in.openTemporary(PIIODevice::ReadWrite);
+		t_in = true;
+	}
+	if (f_out.path().isEmpty()) {
+		f_out.openTemporary(PIIODevice::ReadWrite);
+		t_out = true;
+	}
+	if (f_err.path().isEmpty()) {
+		f_err.openTemporary(PIIODevice::ReadWrite);
+		t_err = true;
+	}
+
+	str = args.front();
+	is_exec = true;
+	if (!detached) execStarted(str);
+#ifndef WINDOWS
+	int pid_ = fork();
+	if (!detached) PRIVATE->pid = pid_;
+	if (pid_ == 0) {
+#endif
+		PRIVATE->tf_in = PRIVATE->tf_out = PRIVATE->tf_err = 0;
+		//cout << "exec " << tf_in << ", " << tf_out << ", " << tf_err << endl;
+		//cout << f_out.path() << endl;
+		if (g_in)  PRIVATE->tf_in = freopen(f_in.path().data(), "r", stdin);
+		if (g_out) PRIVATE->tf_out = freopen(f_out.path().data(), "w", stdout);
+		if (g_err) PRIVATE->tf_err = freopen(f_err.path().data(), "w", stderr);
+#ifndef WINDOWS
+		if (!wd.isEmpty())
+			if (!chdir(wd.data()))
+				piCoutObj << "Error while set working directory";
+#endif
+#ifdef WINDOWS
+	GetStartupInfoA(&(PRIVATE->si));
+	memset(&(PRIVATE->pi), 0, sizeof(PRIVATE->pi));
+	if(CreateProcessA(0,   // No module name (use command line)
+		a,         // Command line
+		0,         // Process handle not inheritable
+		0,         // Thread handle not inheritable
+		false,     // Set handle inheritance to FALSE
+		detached ? DETACHED_PROCESS/*CREATE_NEW_CONSOLE*/ : 0, // Creation flags
+		0,//e,         // Use environment
+		wd.isEmpty() ? 0 : wd.data(), // Use working directory
+		&(PRIVATE->si),       // Pointer to STARTUPINFO structure
+		&(PRIVATE->pi)))      // Pointer to PROCESS_INFORMATION structure
+	{
+		if (!detached) WaitForSingleObject(PRIVATE->pi.hProcess, INFINITE);
+		CloseHandle(PRIVATE->pi.hThread);
+		CloseHandle(PRIVATE->pi.hProcess);
+	} else
+		piCoutObj << "\"CreateProcess\" error, " << errorString();
+#else
+
+		//cout << "exec " << tf_in << ", " << tf_out << ", " << tf_err << endl;
+		if (execve(str.data(), a, e) < 0)
+			piCoutObj << "\"execve" << str << args << "\" error :" << errorString();
+	} else {
+		msleep(PIP_MIN_MSLEEP);
+		//cout << "wait" << endl;
+		if (!detached) {
+			wait(&exit_code);
+			pid_ = 0;
+			if (!detached) PRIVATE->pid = pid_;
+			//cout << "wait done" << endl;
+		}
+	}
+#endif
+	if (!detached) execFinished(str, exit_code);
+	is_exec = false;
+	for (int i = 0; i < env.size_s(); ++i)
+		delete e[i];
+	delete[] e;
+#ifdef WINDOWS
+	delete a;
+#else
+	for (int i = 0; i < args.size_s(); ++i)
+		delete a[i];
+#endif
+}
+
+
+void PIProcess::terminate() {
+#ifdef WINDOWS
+	if (is_exec)
+		if (!TerminateProcess(PRIVATE->pi.hProcess, 0))
+			return;
+	PRIVATE->pi.dwProcessId = 0;
+#else
+	if (is_exec)
+		kill(PRIVATE->pid, SIGKILL);
+	PRIVATE->pid = 0;
+#endif
+}
+
+
+void PIProcess::execIndependent(const PIString & program, const PIStringList & args_) {
+	PIProcess p;
+	p.args << program << args_;
+	p.startProc(true);
+}
+
+
+int PIProcess::pID() const {
+#ifdef WINDOWS
+	return PRIVATE->pi.dwProcessId;
+#else
+	return PRIVATE->pid;
+#endif
+}
+
+
+int PIProcess::currentPID() {
+#ifdef WINDOWS
+	return GetCurrentProcessId();
+#else
+	return getpid();
+#endif
+}
+
+
+PIStringList PIProcess::currentEnvironment() {
+	PIStringList l;
+	int i = 0;
+	while (environ[i] != 0) {
+		l << environ[i];
+		++i;
+	}
+	return l;
+}
+
+
+void PIProcess::run() {
+	startProc(false);
+}
+
+
+void PIProcess::removeEnvironmentVariable(const PIString & variable) {
+	PIString s;
+	for (int i = 0; i < env.size_s(); ++i) {
+		s = env[i];
+		if (s.left(s.find("=")).trimmed() == variable) {
+			env.remove(i);
+			--i;
+		}
+	}
+}
+
+
+void PIProcess::setEnvironmentVariable(const PIString & variable, const PIString & value) {
+	PIString s, v;
+	for (int i = 0; i < env.size_s(); ++i) {
+		s = env[i];
+		v = s.left(s.find("=")).trimmed();
+		if (v == variable) {
+			env[i] = v + "=" + value;
+			return;
+		}
+	}
+	env << variable + "=" + value;
+}
+
+
+PIString PIProcess::getEnvironmentVariable(const PIString & variable) {
+	PIStringList env_ = currentEnvironment();
+	PIString s, v;
+	for (int i = 0; i < env_.size_s(); ++i) {
+		s = env_[i];
+		v = s.left(s.find("=")).trimmed();
+		if (v == variable) {
+			return s.right(s.size() - 1 - s.find("=")).trimmed();
+		}
+	}
+	return PIString();
+}
+
+#endif // PIP_FREERTOS
+
diff --git a/src_main/system/piprocess.h b/lib/main/system/piprocess.h
old mode 100755
new mode 100644
similarity index 97%
rename from src_main/system/piprocess.h
rename to lib/main/system/piprocess.h
index a2afadae..74f48cc6
--- a/src_main/system/piprocess.h
+++ b/lib/main/system/piprocess.h
@@ -1,108 +1,108 @@
-/*! \file piprocess.h
-* \brief Process
-*/
-/*
-	PIP - Platform Independent Primitives
-	Process
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIPROCESS_H
-#define PIPROCESS_H
-
-#ifndef PIP_FREERTOS
-
-#include "pithread.h"
-#include "pifile.h"
-
-/// events:
-/// execStarted(PIString program)
-/// execFinished(PIString program, int exit_code)
-///
-/// handlers:
-/// bool exec(const PIString & program)
-/// bool exec(const PIString & program, const PIString & arg1)
-/// bool exec(const PIString & program, const PIString & arg1, const PIString & arg2)
-/// bool exec(const PIString & program, const PIString & arg1, const PIString & arg2, const PIString & arg3)
-/// bool exec(const PIString & program, const PIStringList & args)
-/// void terminate()
-/// bool waitForFinish(int timeout_msecs = 60000)
-class PIP_EXPORT PIProcess: public PIThread
-{
-	PIOBJECT_SUBCLASS(PIProcess, PIThread)
-public:
-	PIProcess();
-	virtual ~PIProcess();
-
-	int exitCode() const {return exit_code;}
-	int pID() const;
-
-	void setGrabInput(bool yes) {g_in = yes;}
-	void setGrabOutput(bool yes) {g_out = yes;}
-	void setGrabError(bool yes) {g_err = yes;}
-	void setInputFile(const PIString & path) {f_in.setPath(path);}
-	void setOutputFile(const PIString & path) {f_out.setPath(path);}
-	void setErrorFile(const PIString & path) {f_err.setPath(path);}
-	void unsetInputFile() {f_in.setPath("");}
-	void unsetOutputFile() {f_out.setPath("");}
-	void unsetErrorFile() {f_err.setPath("");}
-	PIString workingDirectory() const {return wd;}
-	void setWorkingDirectory(const PIString & path) {wd = path;}
-	void resetWorkingDirectory() {wd.clear();}
-	PIByteArray readOutput() {f_out.open(PIIODevice::ReadOnly); return f_out.readAll();}
-	PIByteArray readError() {f_err.open(PIIODevice::ReadOnly); return f_err.readAll();}
-
-	PIStringList environment() {return env;}
-	void clearEnvironment() {env.clear();}
-	void removeEnvironmentVariable(const PIString & variable);
-	void setEnvironmentVariable(const PIString & variable, const PIString & value);
-
-	EVENT_HANDLER1(void, exec, const PIString & , program) {args.clear(); args << program; exec_();}
-	void exec(const PIString & program, const PIString & arg) {args.clear(); args << program << arg; exec_();}
-	EVENT_HANDLER2(void, exec, const PIString & , program, const PIStringList & , args_) {args.clear(); args << program << args_; exec_();}
-	EVENT_HANDLER(void, terminate);
-	EVENT_HANDLER(bool, waitForFinish) {return waitForFinish(60000);}
-	EVENT_HANDLER1(bool, waitForFinish, int, timeout_msecs) {return PIThread::waitForFinish(timeout_msecs);}
-
-	EVENT1(execStarted, PIString, program)
-	EVENT2(execFinished, PIString, program, int, exit_code)
-
-	static void execIndependent(const PIString & program) {execIndependent(program, PIStringList());}
-	static void execIndependent(const PIString & program, const PIString & arg) {execIndependent(program, PIStringList() << arg);}
-	static void execIndependent(const PIString & program, const PIStringList & args_);
-
-	static PIStringList currentEnvironment();
-	static int currentPID();
-	static PIString getEnvironmentVariable(const PIString & variable);
-
-private:
-	virtual void run();
-	void exec_();
-	void startProc(bool detached);
-
-	PRIVATE_DECLARATION
-	PIStringList args, env;
-	PIString wd;
-	PIByteArray out;
-	PIFile f_in, f_out, f_err;
-	bool g_in, g_out, g_err, t_in, t_out, t_err;
-	int exit_code;
-	bool is_exec;
-
-};
-
-#endif // PIP_FREERTOS
-#endif // PIPROCESS_H
+/*! \file piprocess.h
+* \brief Process
+*/
+/*
+	PIP - Platform Independent Primitives
+	Process
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIPROCESS_H
+#define PIPROCESS_H
+
+#ifndef PIP_FREERTOS
+
+#include "pithread.h"
+#include "pifile.h"
+
+/// events:
+/// execStarted(PIString program)
+/// execFinished(PIString program, int exit_code)
+///
+/// handlers:
+/// bool exec(const PIString & program)
+/// bool exec(const PIString & program, const PIString & arg1)
+/// bool exec(const PIString & program, const PIString & arg1, const PIString & arg2)
+/// bool exec(const PIString & program, const PIString & arg1, const PIString & arg2, const PIString & arg3)
+/// bool exec(const PIString & program, const PIStringList & args)
+/// void terminate()
+/// bool waitForFinish(int timeout_msecs = 60000)
+class PIP_EXPORT PIProcess: public PIThread
+{
+	PIOBJECT_SUBCLASS(PIProcess, PIThread)
+public:
+	PIProcess();
+	virtual ~PIProcess();
+
+	int exitCode() const {return exit_code;}
+	int pID() const;
+
+	void setGrabInput(bool yes) {g_in = yes;}
+	void setGrabOutput(bool yes) {g_out = yes;}
+	void setGrabError(bool yes) {g_err = yes;}
+	void setInputFile(const PIString & path) {f_in.setPath(path);}
+	void setOutputFile(const PIString & path) {f_out.setPath(path);}
+	void setErrorFile(const PIString & path) {f_err.setPath(path);}
+	void unsetInputFile() {f_in.setPath("");}
+	void unsetOutputFile() {f_out.setPath("");}
+	void unsetErrorFile() {f_err.setPath("");}
+	PIString workingDirectory() const {return wd;}
+	void setWorkingDirectory(const PIString & path) {wd = path;}
+	void resetWorkingDirectory() {wd.clear();}
+	PIByteArray readOutput() {f_out.open(PIIODevice::ReadOnly); return f_out.readAll();}
+	PIByteArray readError() {f_err.open(PIIODevice::ReadOnly); return f_err.readAll();}
+
+	PIStringList environment() {return env;}
+	void clearEnvironment() {env.clear();}
+	void removeEnvironmentVariable(const PIString & variable);
+	void setEnvironmentVariable(const PIString & variable, const PIString & value);
+
+	EVENT_HANDLER1(void, exec, const PIString & , program) {args.clear(); args << program; exec_();}
+	void exec(const PIString & program, const PIString & arg) {args.clear(); args << program << arg; exec_();}
+	EVENT_HANDLER2(void, exec, const PIString & , program, const PIStringList & , args_) {args.clear(); args << program << args_; exec_();}
+	EVENT_HANDLER(void, terminate);
+	EVENT_HANDLER(bool, waitForFinish) {return waitForFinish(60000);}
+	EVENT_HANDLER1(bool, waitForFinish, int, timeout_msecs) {return PIThread::waitForFinish(timeout_msecs);}
+
+	EVENT1(execStarted, PIString, program)
+	EVENT2(execFinished, PIString, program, int, exit_code)
+
+	static void execIndependent(const PIString & program) {execIndependent(program, PIStringList());}
+	static void execIndependent(const PIString & program, const PIString & arg) {execIndependent(program, PIStringList() << arg);}
+	static void execIndependent(const PIString & program, const PIStringList & args_);
+
+	static PIStringList currentEnvironment();
+	static int currentPID();
+	static PIString getEnvironmentVariable(const PIString & variable);
+
+private:
+	virtual void run();
+	void exec_();
+	void startProc(bool detached);
+
+	PRIVATE_DECLARATION
+	PIStringList args, env;
+	PIString wd;
+	PIByteArray out;
+	PIFile f_in, f_out, f_err;
+	bool g_in, g_out, g_err, t_in, t_out, t_err;
+	int exit_code;
+	bool is_exec;
+
+};
+
+#endif // PIP_FREERTOS
+#endif // PIPROCESS_H
diff --git a/src_main/system/pisignals.cpp b/lib/main/system/pisignals.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/pisignals.cpp
rename to lib/main/system/pisignals.cpp
diff --git a/src_main/system/pisignals.h b/lib/main/system/pisignals.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/pisignals.h
rename to lib/main/system/pisignals.h
diff --git a/src_main/system/pisingleapplication.cpp b/lib/main/system/pisingleapplication.cpp
similarity index 100%
rename from src_main/system/pisingleapplication.cpp
rename to lib/main/system/pisingleapplication.cpp
diff --git a/src_main/system/pisingleapplication.h b/lib/main/system/pisingleapplication.h
similarity index 100%
rename from src_main/system/pisingleapplication.h
rename to lib/main/system/pisingleapplication.h
diff --git a/src_main/system/pisysteminfo.cpp b/lib/main/system/pisysteminfo.cpp
similarity index 100%
rename from src_main/system/pisysteminfo.cpp
rename to lib/main/system/pisysteminfo.cpp
diff --git a/src_main/system/pisysteminfo.h b/lib/main/system/pisysteminfo.h
similarity index 100%
rename from src_main/system/pisysteminfo.h
rename to lib/main/system/pisysteminfo.h
diff --git a/src_main/system/pisystemmodule.h b/lib/main/system/pisystemmodule.h
similarity index 100%
rename from src_main/system/pisystemmodule.h
rename to lib/main/system/pisystemmodule.h
diff --git a/src_main/system/pisystemmonitor.cpp b/lib/main/system/pisystemmonitor.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/pisystemmonitor.cpp
rename to lib/main/system/pisystemmonitor.cpp
diff --git a/src_main/system/pisystemmonitor.h b/lib/main/system/pisystemmonitor.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/pisystemmonitor.h
rename to lib/main/system/pisystemmonitor.h
diff --git a/src_main/system/pisystemtests.cpp b/lib/main/system/pisystemtests.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/pisystemtests.cpp
rename to lib/main/system/pisystemtests.cpp
diff --git a/src_main/system/pisystemtests.h b/lib/main/system/pisystemtests.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/system/pisystemtests.h
rename to lib/main/system/pisystemtests.h
diff --git a/src_main/thread/pigrabberbase.h b/lib/main/thread/pigrabberbase.h
similarity index 95%
rename from src_main/thread/pigrabberbase.h
rename to lib/main/thread/pigrabberbase.h
index d0d30acb..3ba007fe 100644
--- a/src_main/thread/pigrabberbase.h
+++ b/lib/main/thread/pigrabberbase.h
@@ -1,196 +1,196 @@
-/*! \file pigrabberbase.h
- * \brief Abstract class for create grabbers
-*/
-/*
-	PIP - Platform Independent Primitives
-	Abstract class for create grabbers
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIGRABBERBASE_H
-#define PIGRABBERBASE_H
-
-#include "pithread.h"
-#include "pidiagnostics.h"
-
-
-template<typename T = PIByteArray>
-class PIP_EXPORT PIGrabberBase: public PIThread
-{
-	PIOBJECT_SUBCLASS(PIGrabberBase, PIThread)
-public:
-	PIGrabberBase() {
-		is_opened = false;
-		is_recording = false;
-	}
-	virtual ~PIGrabberBase() {
-		stopGrabber(false);
-	}
-	virtual bool isOpened() const {return is_opened;}
-	virtual bool isRecording() const {return is_recording;}
-	virtual void startRecord(const PIString & filename) {
-		if (!isOpened()) return;
-		if (isRecording()) return;
-		rec_mutex.lock();
-		startRecordInternal(filename);
-		is_recording = true;
-		rec_mutex.unlock();
-	}
-	virtual void stopRecord() {
-		if (!isOpened()) return;
-		if (!isRecording()) return;
-		rec_mutex.lock();
-		is_recording = false;
-		stopRecordInternal();
-		rec_mutex.unlock();
-	}
-	T last() const {
-		T ret;
-		last_mutex.lock();
-		ret = last_;
-		last_mutex.unlock();
-		return ret;
-	}
-	bool isEmpty() {
-		bool ret;
-		que_mutex.lock();
-		ret = que.isEmpty();
-		que_mutex.unlock();
-		return ret;
-	}
-	int queSize() {
-		int ret;
-		que_mutex.lock();
-		ret = que.size();
-		que_mutex.unlock();
-		return ret;
-	}
-	T dequeue() {
-		T ret;
-//		piCoutObj << "start";
-		que_mutex.lock();
-		if (!que.isEmpty()) {
-//			piCoutObj << "dequeue";
-			ret = que.dequeue();
-		}
-//		piCoutObj << "end";
-		que_mutex.unlock();
-		return ret;
-	}
-	void stopGrabber(bool wait_forever = true) {
-		if (isRunning()) {
-			stop();
-			if (wait_forever) waitForFinish();
-			else {
-				if (!waitForFinish(100)) terminate();
-				stopRecord();
-				close();
-			}
-		}
-	}
-	bool open() {
-		bool ret = openInternal();
-		if (!is_opened && ret)
-			opened();
-		is_opened = ret;
-		return ret;
-	}
-	void close() {
-		bool em = is_opened;
-		closeInternal();
-		last_ = T();
-		if (em)
-			closed();
-		is_opened = false;
-	}
-	const PIDiagnostics & diag() const {return diag_;}
-	void clear() {
-		que_mutex.lock();
-		que.clear();
-		que_mutex.unlock();
-	}
-	void restart() {
-		clear();
-		close();
-	}
-
-	EVENT(dataReady)
-	EVENT(opened)
-	EVENT(closed)
-
-protected:
-	virtual void init() {}
-	virtual bool openInternal() = 0;
-	virtual void closeInternal() = 0;
-	virtual int get(T & val) = 0;
-	virtual void record(const T & val) {}
-	virtual void startRecordInternal(const PIString & filename) {}
-	virtual void stopRecordInternal() {}
-
-	bool is_opened, is_recording;
-	mutable PIMutex rec_mutex;
-
-private:
-	void begin() {
-		init();
-	}
-	void run() {
-		if (!isOpened()) {
-			open();
-			diag_.reset();
-			if (!is_opened)
-				piMSleep(200);
-		}
-		if (isOpened()) {
-			T c;
-			int ret = get(c);
-			if (ret < 0) {
-				close();
-				return;
-			}
-			if (ret > 0) {
-				piMSleep(PIP_MIN_MSLEEP);
-				return;
-			}
-			diag_.received(1);
-			que_mutex.lock();
-			que.enqueue(c);
-			que_mutex.unlock();
-			if (isRecording()) {
-				rec_mutex.lock();
-				record(c);
-				rec_mutex.unlock();
-				diag_.sended(1);
-			}
-			last_mutex.lock();
-			last_ = c;
-			last_mutex.unlock();
-			dataReady();
-		}
-	}
-
-	void end() {
-		stopRecord();
-		close();
-	}
-
-	T last_;
-	PIQueue<T> que;
-	PIDiagnostics diag_;
-	mutable PIMutex que_mutex, last_mutex;
-};
-
-#endif // PIGRABBERBASE_H
+/*! \file pigrabberbase.h
+ * \brief Abstract class for create grabbers
+*/
+/*
+	PIP - Platform Independent Primitives
+	Abstract class for create grabbers
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIGRABBERBASE_H
+#define PIGRABBERBASE_H
+
+#include "pithread.h"
+#include "pidiagnostics.h"
+
+
+template<typename T = PIByteArray>
+class PIP_EXPORT PIGrabberBase: public PIThread
+{
+	PIOBJECT_SUBCLASS(PIGrabberBase, PIThread)
+public:
+	PIGrabberBase() {
+		is_opened = false;
+		is_recording = false;
+	}
+	virtual ~PIGrabberBase() {
+		stopGrabber(false);
+	}
+	virtual bool isOpened() const {return is_opened;}
+	virtual bool isRecording() const {return is_recording;}
+	virtual void startRecord(const PIString & filename) {
+		if (!isOpened()) return;
+		if (isRecording()) return;
+		rec_mutex.lock();
+		startRecordInternal(filename);
+		is_recording = true;
+		rec_mutex.unlock();
+	}
+	virtual void stopRecord() {
+		if (!isOpened()) return;
+		if (!isRecording()) return;
+		rec_mutex.lock();
+		is_recording = false;
+		stopRecordInternal();
+		rec_mutex.unlock();
+	}
+	T last() const {
+		T ret;
+		last_mutex.lock();
+		ret = last_;
+		last_mutex.unlock();
+		return ret;
+	}
+	bool isEmpty() {
+		bool ret;
+		que_mutex.lock();
+		ret = que.isEmpty();
+		que_mutex.unlock();
+		return ret;
+	}
+	int queSize() {
+		int ret;
+		que_mutex.lock();
+		ret = que.size();
+		que_mutex.unlock();
+		return ret;
+	}
+	T dequeue() {
+		T ret;
+//		piCoutObj << "start";
+		que_mutex.lock();
+		if (!que.isEmpty()) {
+//			piCoutObj << "dequeue";
+			ret = que.dequeue();
+		}
+//		piCoutObj << "end";
+		que_mutex.unlock();
+		return ret;
+	}
+	void stopGrabber(bool wait_forever = true) {
+		if (isRunning()) {
+			stop();
+			if (wait_forever) waitForFinish();
+			else {
+				if (!waitForFinish(100)) terminate();
+				stopRecord();
+				close();
+			}
+		}
+	}
+	bool open() {
+		bool ret = openInternal();
+		if (!is_opened && ret)
+			opened();
+		is_opened = ret;
+		return ret;
+	}
+	void close() {
+		bool em = is_opened;
+		closeInternal();
+		last_ = T();
+		if (em)
+			closed();
+		is_opened = false;
+	}
+	const PIDiagnostics & diag() const {return diag_;}
+	void clear() {
+		que_mutex.lock();
+		que.clear();
+		que_mutex.unlock();
+	}
+	void restart() {
+		clear();
+		close();
+	}
+
+	EVENT(dataReady)
+	EVENT(opened)
+	EVENT(closed)
+
+protected:
+	virtual void init() {}
+	virtual bool openInternal() = 0;
+	virtual void closeInternal() = 0;
+	virtual int get(T & val) = 0;
+	virtual void record(const T & val) {}
+	virtual void startRecordInternal(const PIString & filename) {}
+	virtual void stopRecordInternal() {}
+
+	bool is_opened, is_recording;
+	mutable PIMutex rec_mutex;
+
+private:
+	void begin() {
+		init();
+	}
+	void run() {
+		if (!isOpened()) {
+			open();
+			diag_.reset();
+			if (!is_opened)
+				piMSleep(200);
+		}
+		if (isOpened()) {
+			T c;
+			int ret = get(c);
+			if (ret < 0) {
+				close();
+				return;
+			}
+			if (ret > 0) {
+				piMSleep(PIP_MIN_MSLEEP);
+				return;
+			}
+			diag_.received(1);
+			que_mutex.lock();
+			que.enqueue(c);
+			que_mutex.unlock();
+			if (isRecording()) {
+				rec_mutex.lock();
+				record(c);
+				rec_mutex.unlock();
+				diag_.sended(1);
+			}
+			last_mutex.lock();
+			last_ = c;
+			last_mutex.unlock();
+			dataReady();
+		}
+	}
+
+	void end() {
+		stopRecord();
+		close();
+	}
+
+	T last_;
+	PIQueue<T> que;
+	PIDiagnostics diag_;
+	mutable PIMutex que_mutex, last_mutex;
+};
+
+#endif // PIGRABBERBASE_H
diff --git a/src_main/thread/pimutex.cpp b/lib/main/thread/pimutex.cpp
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/thread/pimutex.cpp
rename to lib/main/thread/pimutex.cpp
index b1bafc43..efdf9918
--- a/src_main/thread/pimutex.cpp
+++ b/lib/main/thread/pimutex.cpp
@@ -1,143 +1,143 @@
-/*
-	PIP - Platform Independent Primitives
-	Mutex
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/** \class PIMutex
- * \brief Mutex
- * \details 
- * \section PIMutex_sec0 Synopsis
- * %PIMutex provides synchronization blocks between several threads.
- * Using mutex guarantees execution of some code only one of threads.
- * Mutex contains logic state and functions to change it: \a lock(),
- * \a unlock() and \a tryLock().
- * 
- * \section PIMutex_sec1 Usage
- * Block of code that should to be executed only one thread simultaniously
- * should to be started with \a lock() and ended with \a unlock().
- * \snippet pimutex.cpp main
- * "mutex" in this example is one for all threads.
- * 
- * */
-
-#include "pimutex.h"
-#include "piincludes_p.h"
-#ifdef BLACKBERRY
-#  include <pthread.h>
-#endif
-
-
-PRIVATE_DEFINITION_START(PIMutex)
-#ifdef WINDOWS
-	HANDLE
-#else
-	pthread_mutex_t
-#endif
-		mutex;
-PRIVATE_DEFINITION_END(PIMutex)
-
-
-PIMutex::PIMutex(): inited_(false) {
-	//printf("new Mutex %p\n", this);
-#ifdef WINDOWS
-	PRIVATE->mutex = 0;
-#endif
-	init();
-}
-
-
-PIMutex::~PIMutex() {
-	//printf("del Mutex %p\n", this);
-	destroy();
-}
-
-
-void PIMutex::lock() {
-#ifdef WINDOWS
-//	std::cout << (ullong)PRIVATE->mutex << "locking..." << std::endl;
-//	DWORD wr =
-			WaitForSingleObject(PRIVATE->mutex, INFINITE);
-//	std::cout << (ullong)PRIVATE->mutex << " lock wr=" << wr << std::endl;
-#else
-	pthread_mutex_lock(&(PRIVATE->mutex));
-#endif
-	locked = true;
-}
-
-
-void PIMutex::unlock() {
-#ifdef WINDOWS
-//	BOOL wr =
-//			ReleaseMutex(PRIVATE->mutex);
-			SetEvent(PRIVATE->mutex);
-//	std::cout << (ullong)PRIVATE->mutex << " unlock wr=" << wr << std::endl;
-#else
-	pthread_mutex_unlock(&(PRIVATE->mutex));
-#endif
-	locked = false;
-}
-
-
-bool PIMutex::tryLock() {
-	bool ret =
-#ifdef WINDOWS
-			(WaitForSingleObject(PRIVATE->mutex, 0) == WAIT_OBJECT_0);
-#else
-			(pthread_mutex_trylock(&(PRIVATE->mutex)) == 0);
-#endif
-	locked = true;
-	return ret;
-}
-
-
-bool PIMutex::isLocked() const {
-//	std::cout << "test " << (ullong)PRIVATE->mutex << std::endl;
-	return locked;
-}
-
-
-void PIMutex::init() {
-	if (inited_) destroy();
-#ifdef WINDOWS
-	PRIVATE->mutex = CreateEvent(NULL, FALSE, TRUE, NULL);
-//	std::cout << "create " << (ullong)PRIVATE->mutex << std::endl;
-#else
-	pthread_mutexattr_t attr;
-	memset(&attr, 0, sizeof(attr));
-	pthread_mutexattr_init(&attr);
-	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
-	memset(&(PRIVATE->mutex), 0, sizeof(PRIVATE->mutex));
-	pthread_mutex_init(&(PRIVATE->mutex), &attr);
-	pthread_mutexattr_destroy(&attr);
-#endif
-	locked = false;
-	inited_ = true;
-}
-
-
-void PIMutex::destroy() {
-	if (inited_) {
-#ifdef WINDOWS
-//		std::cout << "destroy " << (ullong)PRIVATE->mutex << std::endl;
-		if (PRIVATE->mutex) CloseHandle(PRIVATE->mutex);
-		PRIVATE->mutex = 0;
-#else
-		pthread_mutex_destroy(&(PRIVATE->mutex));
-#endif
-	}
-	locked = inited_ = false;
-}
+/*
+	PIP - Platform Independent Primitives
+	Mutex
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/** \class PIMutex
+ * \brief Mutex
+ * \details 
+ * \section PIMutex_sec0 Synopsis
+ * %PIMutex provides synchronization blocks between several threads.
+ * Using mutex guarantees execution of some code only one of threads.
+ * Mutex contains logic state and functions to change it: \a lock(),
+ * \a unlock() and \a tryLock().
+ * 
+ * \section PIMutex_sec1 Usage
+ * Block of code that should to be executed only one thread simultaniously
+ * should to be started with \a lock() and ended with \a unlock().
+ * \snippet pimutex.cpp main
+ * "mutex" in this example is one for all threads.
+ * 
+ * */
+
+#include "pimutex.h"
+#include "piincludes_p.h"
+#ifdef BLACKBERRY
+#  include <pthread.h>
+#endif
+
+
+PRIVATE_DEFINITION_START(PIMutex)
+#ifdef WINDOWS
+	HANDLE
+#else
+	pthread_mutex_t
+#endif
+		mutex;
+PRIVATE_DEFINITION_END(PIMutex)
+
+
+PIMutex::PIMutex(): inited_(false) {
+	//printf("new Mutex %p\n", this);
+#ifdef WINDOWS
+	PRIVATE->mutex = 0;
+#endif
+	init();
+}
+
+
+PIMutex::~PIMutex() {
+	//printf("del Mutex %p\n", this);
+	destroy();
+}
+
+
+void PIMutex::lock() {
+#ifdef WINDOWS
+//	std::cout << (ullong)PRIVATE->mutex << "locking..." << std::endl;
+//	DWORD wr =
+			WaitForSingleObject(PRIVATE->mutex, INFINITE);
+//	std::cout << (ullong)PRIVATE->mutex << " lock wr=" << wr << std::endl;
+#else
+	pthread_mutex_lock(&(PRIVATE->mutex));
+#endif
+	locked = true;
+}
+
+
+void PIMutex::unlock() {
+#ifdef WINDOWS
+//	BOOL wr =
+//			ReleaseMutex(PRIVATE->mutex);
+			SetEvent(PRIVATE->mutex);
+//	std::cout << (ullong)PRIVATE->mutex << " unlock wr=" << wr << std::endl;
+#else
+	pthread_mutex_unlock(&(PRIVATE->mutex));
+#endif
+	locked = false;
+}
+
+
+bool PIMutex::tryLock() {
+	bool ret =
+#ifdef WINDOWS
+			(WaitForSingleObject(PRIVATE->mutex, 0) == WAIT_OBJECT_0);
+#else
+			(pthread_mutex_trylock(&(PRIVATE->mutex)) == 0);
+#endif
+	locked = true;
+	return ret;
+}
+
+
+bool PIMutex::isLocked() const {
+//	std::cout << "test " << (ullong)PRIVATE->mutex << std::endl;
+	return locked;
+}
+
+
+void PIMutex::init() {
+	if (inited_) destroy();
+#ifdef WINDOWS
+	PRIVATE->mutex = CreateEvent(NULL, FALSE, TRUE, NULL);
+//	std::cout << "create " << (ullong)PRIVATE->mutex << std::endl;
+#else
+	pthread_mutexattr_t attr;
+	memset(&attr, 0, sizeof(attr));
+	pthread_mutexattr_init(&attr);
+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
+	memset(&(PRIVATE->mutex), 0, sizeof(PRIVATE->mutex));
+	pthread_mutex_init(&(PRIVATE->mutex), &attr);
+	pthread_mutexattr_destroy(&attr);
+#endif
+	locked = false;
+	inited_ = true;
+}
+
+
+void PIMutex::destroy() {
+	if (inited_) {
+#ifdef WINDOWS
+//		std::cout << "destroy " << (ullong)PRIVATE->mutex << std::endl;
+		if (PRIVATE->mutex) CloseHandle(PRIVATE->mutex);
+		PRIVATE->mutex = 0;
+#else
+		pthread_mutex_destroy(&(PRIVATE->mutex));
+#endif
+	}
+	locked = inited_ = false;
+}
diff --git a/src_main/thread/pimutex.h b/lib/main/thread/pimutex.h
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/thread/pimutex.h
rename to lib/main/thread/pimutex.h
index 6bd8f5a1..ac4277e5
--- a/src_main/thread/pimutex.h
+++ b/lib/main/thread/pimutex.h
@@ -1,77 +1,77 @@
-/*! \file pimutex.h
- * \brief Mutex
-*/
-/*
-	PIP - Platform Independent Primitives
-	Mutex
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIMUTEX_H
-#define PIMUTEX_H
-
-#include "piinit.h"
-
-class PIP_EXPORT PIMutex
-{
-public:
-	//! Constructs unlocked mutex
-	explicit PIMutex();
-	
-	//! Destroy mutex
-	~PIMutex();
-
-
-	//! \brief Lock mutex
-	//! \details If mutex is unlocked it set to locked state and returns immediate.
-	//! If mutex is already locked function blocks until mutex will be unlocked
-	void lock();
-	
-	//! \brief Unlock mutex
-	//! \details In any case this function returns immediate
-	void unlock();
-	
-	//! \brief Try to lock mutex
-	//! \details If mutex is unlocked it set to locked state and returns "true" immediate.
-	//! If mutex is already locked function returns immediate an returns "false"
-	bool tryLock();
-	
-	//! Returns if mutex is locked
-	bool isLocked() const;
-	
-private:
-	NO_COPY_CLASS(PIMutex)
-
-	void init();
-	void destroy();
-	bool inited_;
-	bool locked;
-	PRIVATE_DECLARATION
-};
-
-
-class PIP_EXPORT PIMutexLocker
-{
-public:
-	PIMutexLocker(PIMutex * m, bool condition = true): mutex(m), cond(condition) {if (cond) mutex->lock();}
-	PIMutexLocker(PIMutex & m, bool condition = true): mutex(&m), cond(condition) {if (cond) mutex->lock();}
-	~PIMutexLocker() {if (cond) mutex->unlock();}
-private:
-	PIMutex * mutex;
-	volatile bool cond;
-};
-
-#endif // PIMUTEX_H
+/*! \file pimutex.h
+ * \brief Mutex
+*/
+/*
+	PIP - Platform Independent Primitives
+	Mutex
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIMUTEX_H
+#define PIMUTEX_H
+
+#include "piinit.h"
+
+class PIP_EXPORT PIMutex
+{
+public:
+	//! Constructs unlocked mutex
+	explicit PIMutex();
+	
+	//! Destroy mutex
+	~PIMutex();
+
+
+	//! \brief Lock mutex
+	//! \details If mutex is unlocked it set to locked state and returns immediate.
+	//! If mutex is already locked function blocks until mutex will be unlocked
+	void lock();
+	
+	//! \brief Unlock mutex
+	//! \details In any case this function returns immediate
+	void unlock();
+	
+	//! \brief Try to lock mutex
+	//! \details If mutex is unlocked it set to locked state and returns "true" immediate.
+	//! If mutex is already locked function returns immediate an returns "false"
+	bool tryLock();
+	
+	//! Returns if mutex is locked
+	bool isLocked() const;
+	
+private:
+	NO_COPY_CLASS(PIMutex)
+
+	void init();
+	void destroy();
+	bool inited_;
+	bool locked;
+	PRIVATE_DECLARATION
+};
+
+
+class PIP_EXPORT PIMutexLocker
+{
+public:
+	PIMutexLocker(PIMutex * m, bool condition = true): mutex(m), cond(condition) {if (cond) mutex->lock();}
+	PIMutexLocker(PIMutex & m, bool condition = true): mutex(&m), cond(condition) {if (cond) mutex->lock();}
+	~PIMutexLocker() {if (cond) mutex->unlock();}
+private:
+	PIMutex * mutex;
+	volatile bool cond;
+};
+
+#endif // PIMUTEX_H
diff --git a/src_main/thread/pipipelinethread.h b/lib/main/thread/pipipelinethread.h
similarity index 95%
rename from src_main/thread/pipipelinethread.h
rename to lib/main/thread/pipipelinethread.h
index 830d56e5..db3ecc7c 100644
--- a/src_main/thread/pipipelinethread.h
+++ b/lib/main/thread/pipipelinethread.h
@@ -1,168 +1,168 @@
-/*! \file pipipelinethread.h
- * \brief Class for create multihread pipeline
-*/
-/*
-	PIP - Platform Independent Primitives
-	Class for create multihread pipeline
-	Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIPIPELINETHREAD_H
-#define PIPIPELINETHREAD_H
-
-#include "pithread.h"
-#include "piqueue.h"
-
-template <typename Tin, typename Tout>
-class PIPipelineThread : public PIThread
-{
-	PIOBJECT_SUBCLASS(PIPipelineThread, PIThread)
-public:
-	PIPipelineThread() {
-		cnt = 0;
-		max_size = 0;
-		wait_next_pipe = false;
-		next_overload = false;
-	}
-	~PIPipelineThread() {
-		stop();
-		if (!waitForFinish(1000)) {
-			piCoutObj << "terminating self thread";
-			terminate();
-		}
-	}
-	template <typename T>
-	void connectTo(PIPipelineThread<Tout, T> * next) {
-		CONNECT2(void, Tout, bool *, this, calculated, next, enqueue)
-	}
-	EVENT2(calculated, const Tout &, v, bool *, overload)
-	void enqueue(const Tin &v) {enqueue(v, 0);}
-	EVENT_HANDLER2(void, enqueue, const Tin &, v, bool *, overload) {
-		mutex.lock();
-		//piCoutObj << "enque" << overload;
-		if (max_size == 0 || in.size() < max_size) {
-			in.enqueue(v);
-			if (overload) *overload = false;
-		} else {
-			if (overload) *overload = true;
-		}
-		mutex.unlock();
-	}
-	const ullong * counterPtr() const {return &cnt;}
-	ullong counter() const {return cnt;}
-	bool isEmpty() {
-		bool ret;
-		mutex.lock();
-		ret = in.isEmpty();
-		mutex.unlock();
-		return ret;
-	}
-	int queSize() {
-		int ret;
-		mutex.lock();
-		ret = in.size();
-		mutex.unlock();
-		return ret;
-	}
-	void clear() {
-		mutex.lock();
-		in.clear();
-		next_overload = false;
-		mutex.unlock();
-	}
-	void stopCalc(int wait_delay = 100) {
-		if (isRunning()) {
-			stop();
-			if (!waitForFinish(wait_delay)) {
-				mutex_l.unlock();
-				mutex.unlock();
-				terminate();
-			}
-		}
-	}
-	Tout getLast() {
-		Tout ret;
-		mutex_l.lock();
-		ret = last;
-		mutex_l.unlock();
-		return ret;
-	}
-
-	uint maxQueSize() {
-		uint ret;
-		mutex.lock();
-		ret = max_size;
-		mutex.unlock();
-		return ret;
-	}
-
-	void setMaxQueSize(uint count) {
-		mutex.lock();
-		max_size = count;
-		if (max_size > 0 && in.size() > max_size) in.resize(max_size);
-		mutex.unlock();
-	}
-
-	bool isWaitNextPipe() {return wait_next_pipe;}
-	void setWaitNextPipe(bool wait) {wait_next_pipe = wait;}
-
-protected:
-	virtual Tout calc(Tin &v, bool &ok) = 0;
-
-	uint max_size;
-
-private:
-	void begin() {cnt = 0;}
-	void run() {
-		//piCoutObj << "run ...";
-		mutex.lock();
-		if (in.isEmpty()) {
-			mutex.unlock();
-			piMSleep(10);
-			//piCoutObj << "run in empty";
-			return;
-		}
-		if (next_overload && wait_next_pipe) {
-			mutex.unlock();
-			//piCoutObj << "wait" << &next_overload;
-			calculated(last, &next_overload);
-			piMSleep(10);
-		} else {
-			Tin t = in.dequeue();
-			mutex.unlock();
-			bool ok = true;
-			Tout r = calc(t, ok);
-			if (ok) {
-				mutex_l.lock();
-				last = r;
-				mutex_l.unlock();
-				cnt++;
-				//piCoutObj << "calc ok" << &next_overload;
-				calculated(r, &next_overload);
-			}
-		}
-		//piCoutObj << "run ok";
-	}
-	PIMutex mutex;
-	PIMutex mutex_l;
-	bool wait_next_pipe;
-	bool next_overload;
-	ullong cnt;
-	PIQueue<Tin> in;
-	Tout last;
-};
-
-#endif // PIPIPELINETHREAD_H
+/*! \file pipipelinethread.h
+ * \brief Class for create multihread pipeline
+*/
+/*
+	PIP - Platform Independent Primitives
+	Class for create multihread pipeline
+	Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIPIPELINETHREAD_H
+#define PIPIPELINETHREAD_H
+
+#include "pithread.h"
+#include "piqueue.h"
+
+template <typename Tin, typename Tout>
+class PIPipelineThread : public PIThread
+{
+	PIOBJECT_SUBCLASS(PIPipelineThread, PIThread)
+public:
+	PIPipelineThread() {
+		cnt = 0;
+		max_size = 0;
+		wait_next_pipe = false;
+		next_overload = false;
+	}
+	~PIPipelineThread() {
+		stop();
+		if (!waitForFinish(1000)) {
+			piCoutObj << "terminating self thread";
+			terminate();
+		}
+	}
+	template <typename T>
+	void connectTo(PIPipelineThread<Tout, T> * next) {
+		CONNECT2(void, Tout, bool *, this, calculated, next, enqueue)
+	}
+	EVENT2(calculated, const Tout &, v, bool *, overload)
+	void enqueue(const Tin &v) {enqueue(v, 0);}
+	EVENT_HANDLER2(void, enqueue, const Tin &, v, bool *, overload) {
+		mutex.lock();
+		//piCoutObj << "enque" << overload;
+		if (max_size == 0 || in.size() < max_size) {
+			in.enqueue(v);
+			if (overload) *overload = false;
+		} else {
+			if (overload) *overload = true;
+		}
+		mutex.unlock();
+	}
+	const ullong * counterPtr() const {return &cnt;}
+	ullong counter() const {return cnt;}
+	bool isEmpty() {
+		bool ret;
+		mutex.lock();
+		ret = in.isEmpty();
+		mutex.unlock();
+		return ret;
+	}
+	int queSize() {
+		int ret;
+		mutex.lock();
+		ret = in.size();
+		mutex.unlock();
+		return ret;
+	}
+	void clear() {
+		mutex.lock();
+		in.clear();
+		next_overload = false;
+		mutex.unlock();
+	}
+	void stopCalc(int wait_delay = 100) {
+		if (isRunning()) {
+			stop();
+			if (!waitForFinish(wait_delay)) {
+				mutex_l.unlock();
+				mutex.unlock();
+				terminate();
+			}
+		}
+	}
+	Tout getLast() {
+		Tout ret;
+		mutex_l.lock();
+		ret = last;
+		mutex_l.unlock();
+		return ret;
+	}
+
+	uint maxQueSize() {
+		uint ret;
+		mutex.lock();
+		ret = max_size;
+		mutex.unlock();
+		return ret;
+	}
+
+	void setMaxQueSize(uint count) {
+		mutex.lock();
+		max_size = count;
+		if (max_size > 0 && in.size() > max_size) in.resize(max_size);
+		mutex.unlock();
+	}
+
+	bool isWaitNextPipe() {return wait_next_pipe;}
+	void setWaitNextPipe(bool wait) {wait_next_pipe = wait;}
+
+protected:
+	virtual Tout calc(Tin &v, bool &ok) = 0;
+
+	uint max_size;
+
+private:
+	void begin() {cnt = 0;}
+	void run() {
+		//piCoutObj << "run ...";
+		mutex.lock();
+		if (in.isEmpty()) {
+			mutex.unlock();
+			piMSleep(10);
+			//piCoutObj << "run in empty";
+			return;
+		}
+		if (next_overload && wait_next_pipe) {
+			mutex.unlock();
+			//piCoutObj << "wait" << &next_overload;
+			calculated(last, &next_overload);
+			piMSleep(10);
+		} else {
+			Tin t = in.dequeue();
+			mutex.unlock();
+			bool ok = true;
+			Tout r = calc(t, ok);
+			if (ok) {
+				mutex_l.lock();
+				last = r;
+				mutex_l.unlock();
+				cnt++;
+				//piCoutObj << "calc ok" << &next_overload;
+				calculated(r, &next_overload);
+			}
+		}
+		//piCoutObj << "run ok";
+	}
+	PIMutex mutex;
+	PIMutex mutex_l;
+	bool wait_next_pipe;
+	bool next_overload;
+	ullong cnt;
+	PIQueue<Tin> in;
+	Tout last;
+};
+
+#endif // PIPIPELINETHREAD_H
diff --git a/src_main/thread/pithread.cpp b/lib/main/thread/pithread.cpp
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/thread/pithread.cpp
rename to lib/main/thread/pithread.cpp
index 53daed8f..9fdd98eb
--- a/src_main/thread/pithread.cpp
+++ b/lib/main/thread/pithread.cpp
@@ -1,577 +1,577 @@
-/*
-	PIP - Platform Independent Primitives
-	Thread
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "piincludes_p.h"
-#include "pithread.h"
-#include "pisystemtests.h"
-#include "piintrospection_threads.h"
-#include <signal.h>
-#ifdef WINDOWS
-#  define __THREAD_FUNC_RET__ uint __stdcall
-#else
-#  define __THREAD_FUNC_RET__ void*
-#endif
-#if defined(LINUX)
-#  include <sys/syscall.h>
-#  define gettid() syscall(SYS_gettid)
-#endif
-#if defined(MAC_OS) || defined(BLACKBERRY) || defined(FREERTOS)
-#  include <pthread.h>
-#endif
-__THREAD_FUNC_RET__ thread_function(void * t) {((PIThread*)t)->__thread_func__(); return 0;}
-__THREAD_FUNC_RET__ thread_function_once(void * t) {((PIThread*)t)->__thread_func_once__(); return 0;}
-
-#define REGISTER_THREAD(t) __PIThreadCollection::instance()->registerThread(t)
-#define UNREGISTER_THREAD(t) __PIThreadCollection::instance()->unregisterThread(t)
-
-
-/*! \class PIThread
- * \brief Thread class
- * \details This class allow you exec your code in separate thread.
- * 
- * \section PIThread_sec0 Synopsis
- * Multithreading allow you to write program which will be executed
- * in several threads simultaneously. This trend allow you to use all 
- * cores of modern processors, but there are many dangers.
- * 
- * This class provide virtual functions \a begin(), \a run() and \a end(),
- * which describes start, execution and finish work of some process.
- * These functions executes in \b separate thread. When you execute
- * \a start(), %PIThread create separate system thread and sequentially
- * executes function \a begin(), \a run() and \a end(). You can
- * reimplement each function and write your own code to execute.
- * Scheme of functions executing:
-\code{.cpp}
-begin();
-event started();
-while (isRunning()) {
-    run();
-    ThreadFunc();
-    msleep(timer_delay);
-}
-event stopped();
-end();
-\endcode
- * Unlike from directly using "pthread" or some similar you doesn`t need
- * to write your own main thread cycle and sleep at every cycle end.
- * %PIThread make it for you, and your job is to set sleep value from
- * contructor or when starting thread, and reimplement \a begin(), \a run()
- * and \a end() functions.
- * 
- * \section PIThread_sec1 Using without subclassing
- * You can use %PIThread without subclassing by using "ThreadFunc" pointer
- * that can be set from constructor or by overloaded function \a start(ThreadFunc func, int timer_delay).
- * If "func" if not null this function will be executed as \a run(). ThreadFunc is any static
- * function with format void func(void * data). "Data" is custom data set from constructor or
- * with function \a setData(). \n Also you can connect to event \a started(), but
- * in this case you should to white your thread main cycle, because this event raised only one time.
- * 
- * \section PIThread_sec2 Locking
- * %PIThread has inrternal mutex that can be locked and unlocked every \a run() if you set this flag
- * with function \a needLockRun(bool). Also you can access to this mutex by functions \a lock(), \a unlock()
- * and \a mutex(). Using this functions together with needLockRun(true) can guarantee one-thread access to
- * some data.
- * 
- */
-
-
-__PIThreadCollection *__PIThreadCollection::instance() {
-	return __PIThreadCollection_Initializer__::__instance__;
-}
-
-
-void __PIThreadCollection::registerThread(PIThread * t) {
-	lock();
-	if (!threads_.contains(t))
-		threads_ << t;
-	unlock();
-}
-
-
-void __PIThreadCollection::unregisterThread(PIThread * t) {
-	lock();
-	threads_.removeAll(t);
-	unlock();
-}
-
-
-PIVector<PIThread * > __PIThreadCollection::threads() const {
-	return threads_;
-}
-
-
-void __PIThreadCollection::startedAuto(PIThread * t) {
-	PIMutexLocker _ml(auto_mutex);
-	auto_threads_ << t;
-}
-
-
-void __PIThreadCollection::stoppedAuto() {
-	PIThread * t = emitter()->cast<PIThread>();
-	if (!t) return;
-	auto_mutex.lock();
-	auto_threads_.removeAll(t);
-	auto_mutex.unlock();
-	delete t;
-}
-
-
-
-
-int __PIThreadCollection_Initializer__::count_(0);
-__PIThreadCollection * __PIThreadCollection_Initializer__::__instance__(0);
-
-
-__PIThreadCollection_Initializer__::__PIThreadCollection_Initializer__() {
-	count_++;
-	//PICout(PICoutManipulators::DefaultControls) << "try create Core" << count_;
-	if (count_ > 1) return;
-	//PICout(PICoutManipulators::DefaultControls) << "create Core";
-	__instance__ = new __PIThreadCollection();
-}
-
-
-__PIThreadCollection_Initializer__::~__PIThreadCollection_Initializer__() {
-	count_--;
-	//PICout(PICoutManipulators::DefaultControls) << "try delete Core" << count_;
-	if (count_ > 0) return;
-	//PICout(PICoutManipulators::DefaultControls) << "delete Core";
-	if (__instance__ != 0) {
-		delete __instance__;
-		__instance__ = 0;
-	}
-}
-
-
-
-
-PRIVATE_DEFINITION_START(PIThread)
-#ifndef WINDOWS
-	pthread_t thread;
-	sched_param sparam;
-#else
-	void * thread;
-#endif
-PRIVATE_DEFINITION_END(PIThread)
-
-
-PIThread::PIThread(void * data, ThreadFunc func, bool startNow, int timer_delay): PIObject() {
-	PIINTROSPECTION_THREAD_NEW(this);
-	tid_ = -1;
-	PRIVATE->thread = 0;
-	data_ = data;
-	ret_func = func;
-	terminating = running_ = lockRun = false;
-	priority_ = piNormal;
-	delay_ = timer_delay;
-	if (startNow) start(timer_delay);
-}
-
-
-#ifdef PIP_CXX11_SUPPORT
-PIThread::PIThread(std::function<void ()> func, bool startNow, int timer_delay) {
-	PIINTROSPECTION_THREAD_NEW(this);
-	tid_ = -1;
-	PRIVATE->thread = 0;
-	data_ = 0;
-	ret_func = [func](void*){func();};
-	terminating = running_ = lockRun = false;
-	priority_ = piNormal;
-	delay_ = timer_delay;
-	if (startNow) start(timer_delay);
-}
-#endif
-
-
-PIThread::PIThread(bool startNow, int timer_delay): PIObject() {
-	PIINTROSPECTION_THREAD_NEW(this);
-	tid_ = -1;
-	PRIVATE->thread = 0;
-	ret_func = 0;
-	terminating = running_ = lockRun = false;
-	priority_ = piNormal;
-	delay_ = timer_delay;
-	if (startNow) start(timer_delay);
-}
-
-
-PIThread::~PIThread() {
-	PIINTROSPECTION_THREAD_DELETE(this);
-	if (!running_ || PRIVATE->thread == 0) return;
-#ifdef FREERTOS
-	//void * ret(0);
-	//PICout(PICoutManipulators::DefaultControls) << "~PIThread" << PRIVATE->thread;
-	//PICout(PICoutManipulators::DefaultControls) << pthread_join(PRIVATE->thread, 0);
-	PICout(PICoutManipulators::DefaultControls) << "FreeRTOS can't terminate pthreads! waiting for stop";
-	stop(true);
-	//PICout(PICoutManipulators::DefaultControls) << "stopped!";
-#else
-#ifndef WINDOWS
-#    ifdef ANDROID
-	pthread_kill(PRIVATE->thread, SIGTERM);
-#    else
-	pthread_cancel(PRIVATE->thread);
-#    endif
-#  else
-	TerminateThread(PRIVATE->thread, 0);
-	CloseHandle(PRIVATE->thread);
-#  endif
-#endif
-	terminating = running_ = false;
-}
-
-
-void PIThread::stop(bool wait) {
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop ..." << running_ << wait;
-	terminating = true;
-	if (wait) waitForFinish();
-}
-
-
-bool PIThread::start(int timer_delay) {
-	if (running_) return false;
-	delay_ = timer_delay;
-	return _startThread((void*)thread_function);
-}
-
-
-bool PIThread::startOnce() {
-	if (running_) return false;
-	return _startThread((void*)thread_function_once);
-}
-
-
-void PIThread::terminate() {
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "terminate ..." << running_;
-#ifdef FREERTOS
-	PICout(PICoutManipulators::DefaultControls) << "FreeRTOS can't terminate pthreads! waiting for stop";
-	stop(true);
-	//PICout(PICoutManipulators::DefaultControls) << "stopped!";
-#else
-	if (PRIVATE->thread == 0) return;
-	UNREGISTER_THREAD(this);
-	terminating = running_ = false;
-	tid_ = -1;
-	//PICout(PICoutManipulators::DefaultControls) << "terminate" << PRIVATE->thread;
-#ifndef WINDOWS
-#  ifdef ANDROID
-	pthread_kill(PRIVATE->thread, SIGTERM);
-#  else
-	//pthread_kill(PRIVATE->thread, SIGKILL);
-	//void * ret(0);
-	pthread_cancel(PRIVATE->thread);
-	//pthread_join(PRIVATE->thread, &ret);
-#  endif
-#else
-	TerminateThread(PRIVATE->thread, 0);
-	CloseHandle(PRIVATE->thread);
-#endif
-	PRIVATE->thread = 0;
-	end();
-#endif
-	PIINTROSPECTION_THREAD_STOP(this);
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "terminate ok" << running_;
-}
-
-
-int PIThread::priority2System(PIThread::Priority p) {
-	switch (p) {
-#  ifdef QNX
-	case piLowerst: return 8;
-	case piLow: return 9;
-	case piNormal: return 10;
-	case piHigh: return 11;
-	case piHighest: return 12;
-#  else
-#    ifdef WINDOWS
-	case piLowerst: return -2;
-	case piLow: return -1;
-	case piNormal: return 0;
-	case piHigh: return 1;
-	case piHighest: return 2;
-#    else
-	case piLowerst: return 2;
-	case piLow: return 1;
-	case piNormal: return 0;
-	case piHigh: return -1;
-	case piHighest: return -2;
-#    endif
-#  endif
-	default: return 0;
-	}
-	return 0;
-}
-
-
-bool PIThread::_startThread(void * func) {
-	terminating = false;
-	running_ = true;
-#ifndef WINDOWS
-	pthread_attr_t attr;
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	int ret = pthread_create(&PRIVATE->thread, &attr, (void*(*)(void*))func, this);
-	//PICout(PICoutManipulators::DefaultControls) << "pthread_create" << PRIVATE->thread;
-	pthread_attr_destroy(&attr);
-	if (ret == 0) {
-#  ifdef MAC_OS
-		pthread_setname_np(((PIString&)name().elided(15, 0.4f).resize(15, '\0')).dataAscii());
-		pthread_threadid_np(PRIVATE->thread, (__uint64_t*)&tid_);
-#  else
-#    ifdef FREERTOS
-		tid_ = PRIVATE->thread;
-#    else
-		pthread_setname_np(PRIVATE->thread, ((PIString&)name().elided(15, 0.4f).resize(15, '\0')).dataAscii());
-#    endif
-#  endif
-#else
-	if (PRIVATE->thread) CloseHandle(PRIVATE->thread);
-#  ifdef CC_GCC
-	PRIVATE->thread = (void *)_beginthreadex(0, 0, (unsigned(__stdcall*)(void*))func, this, 0, 0);
-#  else
-	PRIVATE->thread = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)func, this, 0, 0);
-#  endif
-	if (PRIVATE->thread != 0) {
-#endif
-		setPriority(priority_);
-		return true;
-	} else {
-		running_ = false;
-		PRIVATE->thread = 0;
-		piCoutObj << "Error: Can`t start new thread:" << errorString();
-	}
-	running_ = false;
-	return false;
-}
-
-
-void PIThread::setPriority(PIThread::Priority prior) {
-#ifndef FREERTOS  // FreeRTOS can't change priority runtime
- 	priority_ = prior;
-#  ifndef WINDOWS
-	if (!running_ || (PRIVATE->thread == 0)) return;
-	//PICout(PICoutManipulators::DefaultControls) << "setPriority" << PRIVATE->thread;
-	policy_ = 0;
-	memset(&(PRIVATE->sparam), 0, sizeof(PRIVATE->sparam));
-	pthread_getschedparam(PRIVATE->thread, &policy_, &(PRIVATE->sparam));
-	PRIVATE->sparam.
-#    ifndef LINUX
-			sched_priority
-#    else
-			__sched_priority
-#    endif
-							= priority2System(priority_);
-	pthread_setschedparam(PRIVATE->thread, policy_, &(PRIVATE->sparam));
-#  else
-	if (!running_ || (PRIVATE->thread == 0)) return;
-	SetThreadPriority(PRIVATE->thread, priority2System(priority_));
-#  endif
-#endif //FREERTOS
-}
-
-
-#ifdef WINDOWS
-bool isExists(HANDLE hThread) {
-	//errorClear();
-	//piCout << "isExists" << hThread;
-	DWORD dw = 0;
-	GetExitCodeThread(hThread, &dw);
-	//piCout << ret << dw << errorString();
-	if (dw == STILL_ACTIVE) return true;
-	//piCout << errorString();
-	return false;
-}
-#endif
-
-bool PIThread::waitForFinish(int timeout_msecs) {
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "PIThread::waitForFinish" << running_ << terminating << timeout_msecs;
-	if (!running_) return true;
-	if (timeout_msecs < 0) {
-		while (running_) {
-			msleep(PIP_MIN_MSLEEP);
-#ifdef WINDOWS
-			if (!isExists(PRIVATE->thread)) {
-				unlock();
-				return true;
-			}
-#endif
-		}
-		return true;
-	}
-	tmf_.reset();
-	while (running_ && tmf_.elapsed_m() < timeout_msecs) {
-		msleep(PIP_MIN_MSLEEP);
-#ifdef WINDOWS
-		if (!isExists(PRIVATE->thread)) {
-			unlock();
-			return true;
-		}
-#endif
-	}
-	return tmf_.elapsed_m() < timeout_msecs;
-}
-
-
-bool PIThread::waitForStart(int timeout_msecs) {
-	if (running_) return true;
-	if (timeout_msecs < 0) {
-		while (!running_)
-			msleep(PIP_MIN_MSLEEP);
-		return true;
-	}
-	tms_.reset();
-	while (!running_ && tms_.elapsed_m() < timeout_msecs)
-		msleep(PIP_MIN_MSLEEP);
-	return tms_.elapsed_m() < timeout_msecs;
-}
-
-
-void PIThread::_beginThread() {
-#ifndef WINDOWS
-#  if !defined(ANDROID) && !defined(FREERTOS)
-	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0);
-	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, 0);
-#  endif
-#endif
-#ifdef WINDOWS
-	tid_ = GetCurrentThreadId();
-#endif
-#ifdef LINUX
-	tid_ = gettid();
-#endif
-	PIINTROSPECTION_THREAD_START(this);
-	REGISTER_THREAD(this);
-	running_ = true;
-	if (lockRun) mutex_.lock();
-	begin();
-	if (lockRun) mutex_.unlock();
-	started();
-}
-
-
-void PIThread::_runThread() {
-	PIINTROSPECTION_THREAD_RUN(this);
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "lock" << "...";
-	if (lockRun) mutex_.lock();
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "lock" << "ok";
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "run" << "...";
-#ifdef PIP_INTROSPECTION
-	PITimeMeasurer _tm;
-#endif
-	run();
-#ifdef PIP_INTROSPECTION
-	PIINTROSPECTION_THREAD_RUN_DONE(this, ullong(_tm.elapsed_u()));
-#endif
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "run" << "ok";
-	//printf("thread %p tick\n", this);
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "ret_func" << "...";
-	if (ret_func != 0) ret_func(data_);
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "ret_func" << "ok";
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "unlock" << "...";
-	if (lockRun) mutex_.unlock();
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "unlock" << "ok";
-}
-
-
-void PIThread::_endThread() {
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop" << "...";
-	stopped();
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop" << "ok";
-	if (lockRun) mutex_.lock();
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "end" << "...";
-	end();
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop" << "ok";
-	if (lockRun) mutex_.unlock();
-	terminating = running_ = false;
-	tid_ = -1;
-	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "exit";
-	//cout << "thread " << t << " exiting ... " << endl;
-	//PICout(PICoutManipulators::DefaultControls) << "pthread_exit" << (__privateinitializer__.p)->thread;
-	UNREGISTER_THREAD(this);
-	PIINTROSPECTION_THREAD_STOP(this);
-#ifndef WINDOWS
-	pthread_detach(PRIVATE->thread);
-	PRIVATE->thread = 0;
-#endif
-#ifndef WINDOWS
-	pthread_exit(0);
-#else
-#  ifdef CC_GCC
-	_endthreadex(0);
-#  else
-	ExitThread(0);
-#  endif
-#endif
-}
-
-
-void PIThread::__thread_func__() {
-	_beginThread();
-	while (!terminating) {
-		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "queued" << "...";
-		maybeCallQueuedEvents();
-		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "queued" << "ok";
-		_runThread();
-		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "wait" << "...";
-		PIINTROSPECTION_THREAD_WAIT(this);
-		if (delay_ > 0) {
-			tmr_.reset();
-			double sl(0.);
-			while (1) {
-				sl = piMind(delay_ - tmr_.elapsed_m(), PIP_MIN_MSLEEP);
-				if (terminating) break;
-				if (sl <= 0.) break;
-				piMSleep(sl);
-			}
-		}
-		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "wait" << "ok";
-	}
-	_endThread();
-}
-
-
-void PIThread::__thread_func_once__() {
-	_beginThread();
-	_runThread();
-	_endThread();
-}
-
-
-void PIThread::runOnce(PIObject * object, const char * handler, const PIString & name) {
-	PIThread * t = new PIThread();
-	t->setName(name);
-	if (!PIObject::piConnectU(t, PIStringAscii("started"), object, object, PIStringAscii(handler), "PIThread::runOnce")) {
-		delete t;
-		return;
-	}
-	__PIThreadCollection::instance()->startedAuto(t);
-	CONNECTU(t, stopped, __PIThreadCollection::instance(), stoppedAuto);
-	t->startOnce();
-}
-
-
-void PIThread::runOnce(std::function<void ()> func, const PIString & name) {
-	PIThread * t = new PIThread();
-	t->setName(name);
-	t->setSlot(func);
-	__PIThreadCollection::instance()->startedAuto(t);
-	CONNECTU(t, stopped, __PIThreadCollection::instance(), stoppedAuto);
-	t->startOnce();
-}
-
+/*
+	PIP - Platform Independent Primitives
+	Thread
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piincludes_p.h"
+#include "pithread.h"
+#include "pisystemtests.h"
+#include "piintrospection_threads.h"
+#include <signal.h>
+#ifdef WINDOWS
+#  define __THREAD_FUNC_RET__ uint __stdcall
+#else
+#  define __THREAD_FUNC_RET__ void*
+#endif
+#if defined(LINUX)
+#  include <sys/syscall.h>
+#  define gettid() syscall(SYS_gettid)
+#endif
+#if defined(MAC_OS) || defined(BLACKBERRY) || defined(FREERTOS)
+#  include <pthread.h>
+#endif
+__THREAD_FUNC_RET__ thread_function(void * t) {((PIThread*)t)->__thread_func__(); return 0;}
+__THREAD_FUNC_RET__ thread_function_once(void * t) {((PIThread*)t)->__thread_func_once__(); return 0;}
+
+#define REGISTER_THREAD(t) __PIThreadCollection::instance()->registerThread(t)
+#define UNREGISTER_THREAD(t) __PIThreadCollection::instance()->unregisterThread(t)
+
+
+/*! \class PIThread
+ * \brief Thread class
+ * \details This class allow you exec your code in separate thread.
+ * 
+ * \section PIThread_sec0 Synopsis
+ * Multithreading allow you to write program which will be executed
+ * in several threads simultaneously. This trend allow you to use all 
+ * cores of modern processors, but there are many dangers.
+ * 
+ * This class provide virtual functions \a begin(), \a run() and \a end(),
+ * which describes start, execution and finish work of some process.
+ * These functions executes in \b separate thread. When you execute
+ * \a start(), %PIThread create separate system thread and sequentially
+ * executes function \a begin(), \a run() and \a end(). You can
+ * reimplement each function and write your own code to execute.
+ * Scheme of functions executing:
+\code{.cpp}
+begin();
+event started();
+while (isRunning()) {
+    run();
+    ThreadFunc();
+    msleep(timer_delay);
+}
+event stopped();
+end();
+\endcode
+ * Unlike from directly using "pthread" or some similar you doesn`t need
+ * to write your own main thread cycle and sleep at every cycle end.
+ * %PIThread make it for you, and your job is to set sleep value from
+ * contructor or when starting thread, and reimplement \a begin(), \a run()
+ * and \a end() functions.
+ * 
+ * \section PIThread_sec1 Using without subclassing
+ * You can use %PIThread without subclassing by using "ThreadFunc" pointer
+ * that can be set from constructor or by overloaded function \a start(ThreadFunc func, int timer_delay).
+ * If "func" if not null this function will be executed as \a run(). ThreadFunc is any static
+ * function with format void func(void * data). "Data" is custom data set from constructor or
+ * with function \a setData(). \n Also you can connect to event \a started(), but
+ * in this case you should to white your thread main cycle, because this event raised only one time.
+ * 
+ * \section PIThread_sec2 Locking
+ * %PIThread has inrternal mutex that can be locked and unlocked every \a run() if you set this flag
+ * with function \a needLockRun(bool). Also you can access to this mutex by functions \a lock(), \a unlock()
+ * and \a mutex(). Using this functions together with needLockRun(true) can guarantee one-thread access to
+ * some data.
+ * 
+ */
+
+
+__PIThreadCollection *__PIThreadCollection::instance() {
+	return __PIThreadCollection_Initializer__::__instance__;
+}
+
+
+void __PIThreadCollection::registerThread(PIThread * t) {
+	lock();
+	if (!threads_.contains(t))
+		threads_ << t;
+	unlock();
+}
+
+
+void __PIThreadCollection::unregisterThread(PIThread * t) {
+	lock();
+	threads_.removeAll(t);
+	unlock();
+}
+
+
+PIVector<PIThread * > __PIThreadCollection::threads() const {
+	return threads_;
+}
+
+
+void __PIThreadCollection::startedAuto(PIThread * t) {
+	PIMutexLocker _ml(auto_mutex);
+	auto_threads_ << t;
+}
+
+
+void __PIThreadCollection::stoppedAuto() {
+	PIThread * t = emitter()->cast<PIThread>();
+	if (!t) return;
+	auto_mutex.lock();
+	auto_threads_.removeAll(t);
+	auto_mutex.unlock();
+	delete t;
+}
+
+
+
+
+int __PIThreadCollection_Initializer__::count_(0);
+__PIThreadCollection * __PIThreadCollection_Initializer__::__instance__(0);
+
+
+__PIThreadCollection_Initializer__::__PIThreadCollection_Initializer__() {
+	count_++;
+	//PICout(PICoutManipulators::DefaultControls) << "try create Core" << count_;
+	if (count_ > 1) return;
+	//PICout(PICoutManipulators::DefaultControls) << "create Core";
+	__instance__ = new __PIThreadCollection();
+}
+
+
+__PIThreadCollection_Initializer__::~__PIThreadCollection_Initializer__() {
+	count_--;
+	//PICout(PICoutManipulators::DefaultControls) << "try delete Core" << count_;
+	if (count_ > 0) return;
+	//PICout(PICoutManipulators::DefaultControls) << "delete Core";
+	if (__instance__ != 0) {
+		delete __instance__;
+		__instance__ = 0;
+	}
+}
+
+
+
+
+PRIVATE_DEFINITION_START(PIThread)
+#ifndef WINDOWS
+	pthread_t thread;
+	sched_param sparam;
+#else
+	void * thread;
+#endif
+PRIVATE_DEFINITION_END(PIThread)
+
+
+PIThread::PIThread(void * data, ThreadFunc func, bool startNow, int timer_delay): PIObject() {
+	PIINTROSPECTION_THREAD_NEW(this);
+	tid_ = -1;
+	PRIVATE->thread = 0;
+	data_ = data;
+	ret_func = func;
+	terminating = running_ = lockRun = false;
+	priority_ = piNormal;
+	delay_ = timer_delay;
+	if (startNow) start(timer_delay);
+}
+
+
+#ifdef PIP_CXX11_SUPPORT
+PIThread::PIThread(std::function<void ()> func, bool startNow, int timer_delay) {
+	PIINTROSPECTION_THREAD_NEW(this);
+	tid_ = -1;
+	PRIVATE->thread = 0;
+	data_ = 0;
+	ret_func = [func](void*){func();};
+	terminating = running_ = lockRun = false;
+	priority_ = piNormal;
+	delay_ = timer_delay;
+	if (startNow) start(timer_delay);
+}
+#endif
+
+
+PIThread::PIThread(bool startNow, int timer_delay): PIObject() {
+	PIINTROSPECTION_THREAD_NEW(this);
+	tid_ = -1;
+	PRIVATE->thread = 0;
+	ret_func = 0;
+	terminating = running_ = lockRun = false;
+	priority_ = piNormal;
+	delay_ = timer_delay;
+	if (startNow) start(timer_delay);
+}
+
+
+PIThread::~PIThread() {
+	PIINTROSPECTION_THREAD_DELETE(this);
+	if (!running_ || PRIVATE->thread == 0) return;
+#ifdef FREERTOS
+	//void * ret(0);
+	//PICout(PICoutManipulators::DefaultControls) << "~PIThread" << PRIVATE->thread;
+	//PICout(PICoutManipulators::DefaultControls) << pthread_join(PRIVATE->thread, 0);
+	PICout(PICoutManipulators::DefaultControls) << "FreeRTOS can't terminate pthreads! waiting for stop";
+	stop(true);
+	//PICout(PICoutManipulators::DefaultControls) << "stopped!";
+#else
+#ifndef WINDOWS
+#    ifdef ANDROID
+	pthread_kill(PRIVATE->thread, SIGTERM);
+#    else
+	pthread_cancel(PRIVATE->thread);
+#    endif
+#  else
+	TerminateThread(PRIVATE->thread, 0);
+	CloseHandle(PRIVATE->thread);
+#  endif
+#endif
+	terminating = running_ = false;
+}
+
+
+void PIThread::stop(bool wait) {
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop ..." << running_ << wait;
+	terminating = true;
+	if (wait) waitForFinish();
+}
+
+
+bool PIThread::start(int timer_delay) {
+	if (running_) return false;
+	delay_ = timer_delay;
+	return _startThread((void*)thread_function);
+}
+
+
+bool PIThread::startOnce() {
+	if (running_) return false;
+	return _startThread((void*)thread_function_once);
+}
+
+
+void PIThread::terminate() {
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "terminate ..." << running_;
+#ifdef FREERTOS
+	PICout(PICoutManipulators::DefaultControls) << "FreeRTOS can't terminate pthreads! waiting for stop";
+	stop(true);
+	//PICout(PICoutManipulators::DefaultControls) << "stopped!";
+#else
+	if (PRIVATE->thread == 0) return;
+	UNREGISTER_THREAD(this);
+	terminating = running_ = false;
+	tid_ = -1;
+	//PICout(PICoutManipulators::DefaultControls) << "terminate" << PRIVATE->thread;
+#ifndef WINDOWS
+#  ifdef ANDROID
+	pthread_kill(PRIVATE->thread, SIGTERM);
+#  else
+	//pthread_kill(PRIVATE->thread, SIGKILL);
+	//void * ret(0);
+	pthread_cancel(PRIVATE->thread);
+	//pthread_join(PRIVATE->thread, &ret);
+#  endif
+#else
+	TerminateThread(PRIVATE->thread, 0);
+	CloseHandle(PRIVATE->thread);
+#endif
+	PRIVATE->thread = 0;
+	end();
+#endif
+	PIINTROSPECTION_THREAD_STOP(this);
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "terminate ok" << running_;
+}
+
+
+int PIThread::priority2System(PIThread::Priority p) {
+	switch (p) {
+#  ifdef QNX
+	case piLowerst: return 8;
+	case piLow: return 9;
+	case piNormal: return 10;
+	case piHigh: return 11;
+	case piHighest: return 12;
+#  else
+#    ifdef WINDOWS
+	case piLowerst: return -2;
+	case piLow: return -1;
+	case piNormal: return 0;
+	case piHigh: return 1;
+	case piHighest: return 2;
+#    else
+	case piLowerst: return 2;
+	case piLow: return 1;
+	case piNormal: return 0;
+	case piHigh: return -1;
+	case piHighest: return -2;
+#    endif
+#  endif
+	default: return 0;
+	}
+	return 0;
+}
+
+
+bool PIThread::_startThread(void * func) {
+	terminating = false;
+	running_ = true;
+#ifndef WINDOWS
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+	int ret = pthread_create(&PRIVATE->thread, &attr, (void*(*)(void*))func, this);
+	//PICout(PICoutManipulators::DefaultControls) << "pthread_create" << PRIVATE->thread;
+	pthread_attr_destroy(&attr);
+	if (ret == 0) {
+#  ifdef MAC_OS
+		pthread_setname_np(((PIString&)name().elided(15, 0.4f).resize(15, '\0')).dataAscii());
+		pthread_threadid_np(PRIVATE->thread, (__uint64_t*)&tid_);
+#  else
+#    ifdef FREERTOS
+		tid_ = PRIVATE->thread;
+#    else
+		pthread_setname_np(PRIVATE->thread, ((PIString&)name().elided(15, 0.4f).resize(15, '\0')).dataAscii());
+#    endif
+#  endif
+#else
+	if (PRIVATE->thread) CloseHandle(PRIVATE->thread);
+#  ifdef CC_GCC
+	PRIVATE->thread = (void *)_beginthreadex(0, 0, (unsigned(__stdcall*)(void*))func, this, 0, 0);
+#  else
+	PRIVATE->thread = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)func, this, 0, 0);
+#  endif
+	if (PRIVATE->thread != 0) {
+#endif
+		setPriority(priority_);
+		return true;
+	} else {
+		running_ = false;
+		PRIVATE->thread = 0;
+		piCoutObj << "Error: Can`t start new thread:" << errorString();
+	}
+	running_ = false;
+	return false;
+}
+
+
+void PIThread::setPriority(PIThread::Priority prior) {
+#ifndef FREERTOS  // FreeRTOS can't change priority runtime
+ 	priority_ = prior;
+#  ifndef WINDOWS
+	if (!running_ || (PRIVATE->thread == 0)) return;
+	//PICout(PICoutManipulators::DefaultControls) << "setPriority" << PRIVATE->thread;
+	policy_ = 0;
+	memset(&(PRIVATE->sparam), 0, sizeof(PRIVATE->sparam));
+	pthread_getschedparam(PRIVATE->thread, &policy_, &(PRIVATE->sparam));
+	PRIVATE->sparam.
+#    ifndef LINUX
+			sched_priority
+#    else
+			__sched_priority
+#    endif
+							= priority2System(priority_);
+	pthread_setschedparam(PRIVATE->thread, policy_, &(PRIVATE->sparam));
+#  else
+	if (!running_ || (PRIVATE->thread == 0)) return;
+	SetThreadPriority(PRIVATE->thread, priority2System(priority_));
+#  endif
+#endif //FREERTOS
+}
+
+
+#ifdef WINDOWS
+bool isExists(HANDLE hThread) {
+	//errorClear();
+	//piCout << "isExists" << hThread;
+	DWORD dw = 0;
+	GetExitCodeThread(hThread, &dw);
+	//piCout << ret << dw << errorString();
+	if (dw == STILL_ACTIVE) return true;
+	//piCout << errorString();
+	return false;
+}
+#endif
+
+bool PIThread::waitForFinish(int timeout_msecs) {
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "PIThread::waitForFinish" << running_ << terminating << timeout_msecs;
+	if (!running_) return true;
+	if (timeout_msecs < 0) {
+		while (running_) {
+			msleep(PIP_MIN_MSLEEP);
+#ifdef WINDOWS
+			if (!isExists(PRIVATE->thread)) {
+				unlock();
+				return true;
+			}
+#endif
+		}
+		return true;
+	}
+	tmf_.reset();
+	while (running_ && tmf_.elapsed_m() < timeout_msecs) {
+		msleep(PIP_MIN_MSLEEP);
+#ifdef WINDOWS
+		if (!isExists(PRIVATE->thread)) {
+			unlock();
+			return true;
+		}
+#endif
+	}
+	return tmf_.elapsed_m() < timeout_msecs;
+}
+
+
+bool PIThread::waitForStart(int timeout_msecs) {
+	if (running_) return true;
+	if (timeout_msecs < 0) {
+		while (!running_)
+			msleep(PIP_MIN_MSLEEP);
+		return true;
+	}
+	tms_.reset();
+	while (!running_ && tms_.elapsed_m() < timeout_msecs)
+		msleep(PIP_MIN_MSLEEP);
+	return tms_.elapsed_m() < timeout_msecs;
+}
+
+
+void PIThread::_beginThread() {
+#ifndef WINDOWS
+#  if !defined(ANDROID) && !defined(FREERTOS)
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0);
+	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, 0);
+#  endif
+#endif
+#ifdef WINDOWS
+	tid_ = GetCurrentThreadId();
+#endif
+#ifdef LINUX
+	tid_ = gettid();
+#endif
+	PIINTROSPECTION_THREAD_START(this);
+	REGISTER_THREAD(this);
+	running_ = true;
+	if (lockRun) mutex_.lock();
+	begin();
+	if (lockRun) mutex_.unlock();
+	started();
+}
+
+
+void PIThread::_runThread() {
+	PIINTROSPECTION_THREAD_RUN(this);
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "lock" << "...";
+	if (lockRun) mutex_.lock();
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "lock" << "ok";
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "run" << "...";
+#ifdef PIP_INTROSPECTION
+	PITimeMeasurer _tm;
+#endif
+	run();
+#ifdef PIP_INTROSPECTION
+	PIINTROSPECTION_THREAD_RUN_DONE(this, ullong(_tm.elapsed_u()));
+#endif
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "run" << "ok";
+	//printf("thread %p tick\n", this);
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "ret_func" << "...";
+	if (ret_func != 0) ret_func(data_);
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "ret_func" << "ok";
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "unlock" << "...";
+	if (lockRun) mutex_.unlock();
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "unlock" << "ok";
+}
+
+
+void PIThread::_endThread() {
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop" << "...";
+	stopped();
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop" << "ok";
+	if (lockRun) mutex_.lock();
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "end" << "...";
+	end();
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "stop" << "ok";
+	if (lockRun) mutex_.unlock();
+	terminating = running_ = false;
+	tid_ = -1;
+	//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "exit";
+	//cout << "thread " << t << " exiting ... " << endl;
+	//PICout(PICoutManipulators::DefaultControls) << "pthread_exit" << (__privateinitializer__.p)->thread;
+	UNREGISTER_THREAD(this);
+	PIINTROSPECTION_THREAD_STOP(this);
+#ifndef WINDOWS
+	pthread_detach(PRIVATE->thread);
+	PRIVATE->thread = 0;
+#endif
+#ifndef WINDOWS
+	pthread_exit(0);
+#else
+#  ifdef CC_GCC
+	_endthreadex(0);
+#  else
+	ExitThread(0);
+#  endif
+#endif
+}
+
+
+void PIThread::__thread_func__() {
+	_beginThread();
+	while (!terminating) {
+		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "queued" << "...";
+		maybeCallQueuedEvents();
+		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "queued" << "ok";
+		_runThread();
+		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "wait" << "...";
+		PIINTROSPECTION_THREAD_WAIT(this);
+		if (delay_ > 0) {
+			tmr_.reset();
+			double sl(0.);
+			while (1) {
+				sl = piMind(delay_ - tmr_.elapsed_m(), PIP_MIN_MSLEEP);
+				if (terminating) break;
+				if (sl <= 0.) break;
+				piMSleep(sl);
+			}
+		}
+		//PICout(PICoutManipulators::DefaultControls) << "thread" << this << "wait" << "ok";
+	}
+	_endThread();
+}
+
+
+void PIThread::__thread_func_once__() {
+	_beginThread();
+	_runThread();
+	_endThread();
+}
+
+
+void PIThread::runOnce(PIObject * object, const char * handler, const PIString & name) {
+	PIThread * t = new PIThread();
+	t->setName(name);
+	if (!PIObject::piConnectU(t, PIStringAscii("started"), object, object, PIStringAscii(handler), "PIThread::runOnce")) {
+		delete t;
+		return;
+	}
+	__PIThreadCollection::instance()->startedAuto(t);
+	CONNECTU(t, stopped, __PIThreadCollection::instance(), stoppedAuto);
+	t->startOnce();
+}
+
+
+void PIThread::runOnce(std::function<void ()> func, const PIString & name) {
+	PIThread * t = new PIThread();
+	t->setName(name);
+	t->setSlot(func);
+	__PIThreadCollection::instance()->startedAuto(t);
+	CONNECTU(t, stopped, __PIThreadCollection::instance(), stoppedAuto);
+	t->startOnce();
+}
+
diff --git a/src_main/thread/pithread.h b/lib/main/thread/pithread.h
old mode 100755
new mode 100644
similarity index 96%
rename from src_main/thread/pithread.h
rename to lib/main/thread/pithread.h
index 5cf0055f..a2805bea
--- a/src_main/thread/pithread.h
+++ b/lib/main/thread/pithread.h
@@ -1,270 +1,270 @@
-/*! \file pithread.h
- * \brief Thread
- * 
- * This file declare thread class and some wait functions
-*/
-/*
-	PIP - Platform Independent Primitives
-	Thread
-	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PITHREAD_H
-#define PITHREAD_H
-
-#include "piinit.h"
-#include "pimutex.h"
-#include "piobject.h"
-
-class PIThread;
-class PIIntrospectionThreads;
-
-class PIP_EXPORT __PIThreadCollection: public PIObject {
-	PIOBJECT(__PIThreadCollection)
-public:
-	static __PIThreadCollection * instance();
-	void registerThread(PIThread * t);
-	void unregisterThread(PIThread * t);
-	PIVector<PIThread * > threads() const;
-	void lock() {mutex.lock();}
-	void unlock() {mutex.unlock();}
-	void startedAuto(PIThread * t);
-	EVENT_HANDLER(void, stoppedAuto);
-private:
-	PIVector<PIThread * > threads_, auto_threads_;
-	mutable PIMutex mutex, auto_mutex;
-};
-
-
-class PIP_EXPORT __PIThreadCollection_Initializer__ {
-public:
-	__PIThreadCollection_Initializer__();
-	~__PIThreadCollection_Initializer__();
-	static int count_;
-	static __PIThreadCollection * __instance__;
-};
-
-static __PIThreadCollection_Initializer__ __PIThreadCollection_initializer__;
-
-
-#ifdef PIP_CXX11_SUPPORT
-typedef std::function<void(void *)> ThreadFunc;
-#else
-typedef void (*ThreadFunc)(void * );
-#endif
-
-class PIP_EXPORT PIThread: public PIObject
-{
-	PIOBJECT_SUBCLASS(PIThread, PIObject)
-	friend class PIIntrospectionThreads;
-public:
-	
-	//! Contructs thread with custom data "data", external function "func" and main loop delay "loop_delay".
-	PIThread(void * data, ThreadFunc func, bool startNow = false, int loop_delay = -1);
-
-#ifdef PIP_CXX11_SUPPORT
-	//! Contructs thread with external function "func" and main loop delay "loop_delay".
-	PIThread(std::function<void()> func, bool startNow = false, int loop_delay = -1);
-#endif
-
-	//! Contructs thread with main loop delay "loop_delay".
-	PIThread(bool startNow = false, int loop_delay = -1);
-	
-	virtual ~PIThread();
-
-	//! Priority of thread
-	enum Priority {
-		piLowerst /** Lowest */,
-		piLow /** Low */,
-		piNormal /** Normal, this is default priority of threads and timers */,
-		piHigh /** High */,
-		piHighest /** Highest */
-	};
-
-	EVENT_HANDLER0(bool, start) {return start(-1);}
-	EVENT_HANDLER1(bool, start, int, timer_delay);
-	bool start(ThreadFunc func) {return start(func, -1);}
-	bool start(ThreadFunc func, int timer_delay) {ret_func = func; return start(timer_delay);}
-#ifdef PIP_CXX11_SUPPORT
-	bool start(std::function<void()> func) {return start(func, -1);}
-	bool start(std::function<void()> func, int timer_delay) {ret_func = [func](void*){func();}; return start(timer_delay);}
-#endif
-	EVENT_HANDLER0(bool, startOnce);
-	EVENT_HANDLER1(bool, startOnce, ThreadFunc, func) {ret_func = func; return startOnce();}
-	EVENT_HANDLER0(void, stop) {stop(false);}
-	EVENT_HANDLER1(void, stop, bool, wait);
-	EVENT_HANDLER0(void, terminate);
-	
-	//! \brief Set common data passed to external function
-	void setData(void * d) {data_ = d;}
-
-	//! \brief Set external function that will be executed after every \a run()
-	void setSlot(ThreadFunc func) {ret_func = func;}
-
-#ifdef PIP_CXX11_SUPPORT
-	//! \brief Set external function that will be executed after every \a run()
-	void setSlot(std::function<void()> func) {ret_func = [func](void*){func();};}
-#endif
-
-	//! \brief Set priority of thread
-	void setPriority(PIThread::Priority prior);
-	
-	//! \brief Returns common data passed to external function
-	void * data() const {return data_;}
-
-	//! \brief Return priority of thread
-	PIThread::Priority priority() const {return priority_;}
-
-	//! \brief Return \c true if thread is running
-	bool isRunning() const {return running_;}
-	
-	bool isStopping() const {return running_ && terminating;}
-	
-	EVENT_HANDLER0(bool, waitForStart) {return waitForStart(-1);}
-	EVENT_HANDLER1(bool, waitForStart, int, timeout_msecs);
-	EVENT_HANDLER0(bool, waitForFinish) {return waitForFinish(-1);}
-	EVENT_HANDLER1(bool, waitForFinish, int, timeout_msecs);
-
-	//! \brief Set necessity of lock every \a run with internal mutex
-	void needLockRun(bool need) {lockRun = need;}
-	EVENT_HANDLER0(void, lock) {mutex_.lock();}
-	EVENT_HANDLER0(void, unlock) {mutex_.unlock();}
-
-	//! \brief Returns internal mutex
-	PIMutex & mutex() {return mutex_;}
-
-	//! \brief Returns thread ID
-	llong tid() const {return tid_;}
-	
-	void __thread_func__();
-	void __thread_func_once__();
-
-	EVENT(started)
-	EVENT(stopped)
-
-	//! \brief Start event handler with name \"handler\" of object \"object\"
-	//! in separate thread with name \"name\"
-	//! and automatically delete it on function finish
-	static void runOnce(PIObject * object, const char * handler, const PIString & name = PIString());
-
-#ifdef PIP_CXX11_SUPPORT
-	//! \brief Start function \"func\" in separate thread with name \"name\"
-	//! and automatically delete it on function finish
-	static void runOnce(std::function<void()> func, const PIString & name = PIString());
-#endif
-
-//! \handlers
-//! \{
-	
-	/** \fn bool start(int timer_delay = -1)
-	 * \brief Start thread
-	 * \details Start execution of \a run() in internal loop with
-	 * "timer_delay" delay in milliseconds. If "timer_delay" <= 0
-	 * there is no delay in loop. Thread also exec external function
-	 * set by \a setSlot() if it`s not null
-	 * 
-	 * \return \c false if thread already started or can`t start thread */
-	
-	/** \fn bool startOnce()
-	 * \brief Start thread without internal loop
-	 * \details Start execution of \a run() once. Thread also exec
-	 * external function set by \a setSlot() if it`s not null
-	 * 
-	 * \return \c false if thread already started or can`t start thread */
-	
-	/** \fn bool startOnce(ThreadFunc func)
-	 * \brief Start thread without internal loop
-	 * \details Overloaded function. Set external function "func" before start
-	 * 
-	 * \return \c false if thread already started or can`t start thread */
-	
-	/** \fn void stop(bool wait = false)
-	 * \brief Stop thread
-	 * \details Stop execution of thread and wait for it finish
-	 * if "wait" is \c true. This function can block for infinite
-	 * time if "wait" is \c true and any of thread function is
-	 * busy forever */
-	
-	/** \fn void terminate()
-	 * \brief Strongly stop thread
-	 * \details Stop execution of thread immediately */
-	
-	/** \fn bool waitForStart(int timeout_msecs = -1)
-	 * \brief Wait for thread start
-	 * \details This function block until thread start for "timeout_msecs"
-	 * or forever if "timeout_msecs" < 0
-	 * 
-	 * \return \c false if timeout is exceeded */
-	
-	/** \fn bool waitForFinish(int timeout_msecs = -1)
-	 * \brief Wait for thread finish
-	 * \details This function block until thread finish for "timeout_msecs"
-	 * or forever if "timeout_msecs" < 0
-	 * 
-	 * \return \c false if timeout is exceeded */
-	
-	//! \fn void lock()
-	//! \brief Lock internal mutex
-	
-	//! \fn void unlock()
-	//! \brief Unlock internal mutex
-	
-//! \}
-//! \events
-//! \{
-	
-	//! \fn void started()
-	//! \brief Raise on thread start
-	
-	//! \fn void stopped()
-	//! \brief Raise on thread stop
-	
-//! \}
-
-protected:
-	static int priority2System(PIThread::Priority p);
-	
-	//! Function executed once at the start of thread.
-	virtual void begin() {;}
-	
-	//! Function executed at every "timer_delay" msecs until thread was stopped.
-	virtual void run() {;}
-	
-	//! Function executed once at the end of thread.
-	virtual void end() {;}
-
-	volatile bool terminating, running_, lockRun;
-	int delay_, policy_;
-	llong tid_;
-	void * data_;
-	mutable PIMutex mutex_;
-	PITimeMeasurer tmf_, tms_, tmr_;
-	PIThread::Priority priority_;
-	ThreadFunc ret_func;
-	PRIVATE_DECLARATION
-
-private:
-	NO_COPY_CLASS(PIThread)
-
-	bool _startThread(void * func);
-	void _beginThread();
-	void _runThread();
-	void _endThread();
-
-};
-
-
-#endif // PITHREAD_H
+/*! \file pithread.h
+ * \brief Thread
+ * 
+ * This file declare thread class and some wait functions
+*/
+/*
+	PIP - Platform Independent Primitives
+	Thread
+	Ivan Pelipenko peri4ko@yandex.ru, Andrey Bychkov work.a.b@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PITHREAD_H
+#define PITHREAD_H
+
+#include "piinit.h"
+#include "pimutex.h"
+#include "piobject.h"
+
+class PIThread;
+class PIIntrospectionThreads;
+
+class PIP_EXPORT __PIThreadCollection: public PIObject {
+	PIOBJECT(__PIThreadCollection)
+public:
+	static __PIThreadCollection * instance();
+	void registerThread(PIThread * t);
+	void unregisterThread(PIThread * t);
+	PIVector<PIThread * > threads() const;
+	void lock() {mutex.lock();}
+	void unlock() {mutex.unlock();}
+	void startedAuto(PIThread * t);
+	EVENT_HANDLER(void, stoppedAuto);
+private:
+	PIVector<PIThread * > threads_, auto_threads_;
+	mutable PIMutex mutex, auto_mutex;
+};
+
+
+class PIP_EXPORT __PIThreadCollection_Initializer__ {
+public:
+	__PIThreadCollection_Initializer__();
+	~__PIThreadCollection_Initializer__();
+	static int count_;
+	static __PIThreadCollection * __instance__;
+};
+
+static __PIThreadCollection_Initializer__ __PIThreadCollection_initializer__;
+
+
+#ifdef PIP_CXX11_SUPPORT
+typedef std::function<void(void *)> ThreadFunc;
+#else
+typedef void (*ThreadFunc)(void * );
+#endif
+
+class PIP_EXPORT PIThread: public PIObject
+{
+	PIOBJECT_SUBCLASS(PIThread, PIObject)
+	friend class PIIntrospectionThreads;
+public:
+	
+	//! Contructs thread with custom data "data", external function "func" and main loop delay "loop_delay".
+	PIThread(void * data, ThreadFunc func, bool startNow = false, int loop_delay = -1);
+
+#ifdef PIP_CXX11_SUPPORT
+	//! Contructs thread with external function "func" and main loop delay "loop_delay".
+	PIThread(std::function<void()> func, bool startNow = false, int loop_delay = -1);
+#endif
+
+	//! Contructs thread with main loop delay "loop_delay".
+	PIThread(bool startNow = false, int loop_delay = -1);
+	
+	virtual ~PIThread();
+
+	//! Priority of thread
+	enum Priority {
+		piLowerst /** Lowest */,
+		piLow /** Low */,
+		piNormal /** Normal, this is default priority of threads and timers */,
+		piHigh /** High */,
+		piHighest /** Highest */
+	};
+
+	EVENT_HANDLER0(bool, start) {return start(-1);}
+	EVENT_HANDLER1(bool, start, int, timer_delay);
+	bool start(ThreadFunc func) {return start(func, -1);}
+	bool start(ThreadFunc func, int timer_delay) {ret_func = func; return start(timer_delay);}
+#ifdef PIP_CXX11_SUPPORT
+	bool start(std::function<void()> func) {return start(func, -1);}
+	bool start(std::function<void()> func, int timer_delay) {ret_func = [func](void*){func();}; return start(timer_delay);}
+#endif
+	EVENT_HANDLER0(bool, startOnce);
+	EVENT_HANDLER1(bool, startOnce, ThreadFunc, func) {ret_func = func; return startOnce();}
+	EVENT_HANDLER0(void, stop) {stop(false);}
+	EVENT_HANDLER1(void, stop, bool, wait);
+	EVENT_HANDLER0(void, terminate);
+	
+	//! \brief Set common data passed to external function
+	void setData(void * d) {data_ = d;}
+
+	//! \brief Set external function that will be executed after every \a run()
+	void setSlot(ThreadFunc func) {ret_func = func;}
+
+#ifdef PIP_CXX11_SUPPORT
+	//! \brief Set external function that will be executed after every \a run()
+	void setSlot(std::function<void()> func) {ret_func = [func](void*){func();};}
+#endif
+
+	//! \brief Set priority of thread
+	void setPriority(PIThread::Priority prior);
+	
+	//! \brief Returns common data passed to external function
+	void * data() const {return data_;}
+
+	//! \brief Return priority of thread
+	PIThread::Priority priority() const {return priority_;}
+
+	//! \brief Return \c true if thread is running
+	bool isRunning() const {return running_;}
+	
+	bool isStopping() const {return running_ && terminating;}
+	
+	EVENT_HANDLER0(bool, waitForStart) {return waitForStart(-1);}
+	EVENT_HANDLER1(bool, waitForStart, int, timeout_msecs);
+	EVENT_HANDLER0(bool, waitForFinish) {return waitForFinish(-1);}
+	EVENT_HANDLER1(bool, waitForFinish, int, timeout_msecs);
+
+	//! \brief Set necessity of lock every \a run with internal mutex
+	void needLockRun(bool need) {lockRun = need;}
+	EVENT_HANDLER0(void, lock) {mutex_.lock();}
+	EVENT_HANDLER0(void, unlock) {mutex_.unlock();}
+
+	//! \brief Returns internal mutex
+	PIMutex & mutex() {return mutex_;}
+
+	//! \brief Returns thread ID
+	llong tid() const {return tid_;}
+	
+	void __thread_func__();
+	void __thread_func_once__();
+
+	EVENT(started)
+	EVENT(stopped)
+
+	//! \brief Start event handler with name \"handler\" of object \"object\"
+	//! in separate thread with name \"name\"
+	//! and automatically delete it on function finish
+	static void runOnce(PIObject * object, const char * handler, const PIString & name = PIString());
+
+#ifdef PIP_CXX11_SUPPORT
+	//! \brief Start function \"func\" in separate thread with name \"name\"
+	//! and automatically delete it on function finish
+	static void runOnce(std::function<void()> func, const PIString & name = PIString());
+#endif
+
+//! \handlers
+//! \{
+	
+	/** \fn bool start(int timer_delay = -1)
+	 * \brief Start thread
+	 * \details Start execution of \a run() in internal loop with
+	 * "timer_delay" delay in milliseconds. If "timer_delay" <= 0
+	 * there is no delay in loop. Thread also exec external function
+	 * set by \a setSlot() if it`s not null
+	 * 
+	 * \return \c false if thread already started or can`t start thread */
+	
+	/** \fn bool startOnce()
+	 * \brief Start thread without internal loop
+	 * \details Start execution of \a run() once. Thread also exec
+	 * external function set by \a setSlot() if it`s not null
+	 * 
+	 * \return \c false if thread already started or can`t start thread */
+	
+	/** \fn bool startOnce(ThreadFunc func)
+	 * \brief Start thread without internal loop
+	 * \details Overloaded function. Set external function "func" before start
+	 * 
+	 * \return \c false if thread already started or can`t start thread */
+	
+	/** \fn void stop(bool wait = false)
+	 * \brief Stop thread
+	 * \details Stop execution of thread and wait for it finish
+	 * if "wait" is \c true. This function can block for infinite
+	 * time if "wait" is \c true and any of thread function is
+	 * busy forever */
+	
+	/** \fn void terminate()
+	 * \brief Strongly stop thread
+	 * \details Stop execution of thread immediately */
+	
+	/** \fn bool waitForStart(int timeout_msecs = -1)
+	 * \brief Wait for thread start
+	 * \details This function block until thread start for "timeout_msecs"
+	 * or forever if "timeout_msecs" < 0
+	 * 
+	 * \return \c false if timeout is exceeded */
+	
+	/** \fn bool waitForFinish(int timeout_msecs = -1)
+	 * \brief Wait for thread finish
+	 * \details This function block until thread finish for "timeout_msecs"
+	 * or forever if "timeout_msecs" < 0
+	 * 
+	 * \return \c false if timeout is exceeded */
+	
+	//! \fn void lock()
+	//! \brief Lock internal mutex
+	
+	//! \fn void unlock()
+	//! \brief Unlock internal mutex
+	
+//! \}
+//! \events
+//! \{
+	
+	//! \fn void started()
+	//! \brief Raise on thread start
+	
+	//! \fn void stopped()
+	//! \brief Raise on thread stop
+	
+//! \}
+
+protected:
+	static int priority2System(PIThread::Priority p);
+	
+	//! Function executed once at the start of thread.
+	virtual void begin() {;}
+	
+	//! Function executed at every "timer_delay" msecs until thread was stopped.
+	virtual void run() {;}
+	
+	//! Function executed once at the end of thread.
+	virtual void end() {;}
+
+	volatile bool terminating, running_, lockRun;
+	int delay_, policy_;
+	llong tid_;
+	void * data_;
+	mutable PIMutex mutex_;
+	PITimeMeasurer tmf_, tms_, tmr_;
+	PIThread::Priority priority_;
+	ThreadFunc ret_func;
+	PRIVATE_DECLARATION
+
+private:
+	NO_COPY_CLASS(PIThread)
+
+	bool _startThread(void * func);
+	void _beginThread();
+	void _runThread();
+	void _endThread();
+
+};
+
+
+#endif // PITHREAD_H
diff --git a/src_main/thread/pithreadmodule.h b/lib/main/thread/pithreadmodule.h
similarity index 100%
rename from src_main/thread/pithreadmodule.h
rename to lib/main/thread/pithreadmodule.h
diff --git a/src_main/thread/pitimer.cpp b/lib/main/thread/pitimer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/thread/pitimer.cpp
rename to lib/main/thread/pitimer.cpp
diff --git a/src_main/thread/pitimer.h b/lib/main/thread/pitimer.h
old mode 100755
new mode 100644
similarity index 100%
rename from src_main/thread/pitimer.h
rename to lib/main/thread/pitimer.h
diff --git a/src_opencl/3rd/clcomplex.h b/lib/opencl/3rd/clcomplex.h
similarity index 100%
rename from src_opencl/3rd/clcomplex.h
rename to lib/opencl/3rd/clcomplex.h
diff --git a/src_opencl/piopencl.cpp b/lib/opencl/piopencl.cpp
similarity index 100%
rename from src_opencl/piopencl.cpp
rename to lib/opencl/piopencl.cpp
diff --git a/src_opencl/resources.conf b/lib/opencl/resources.conf
similarity index 100%
rename from src_opencl/resources.conf
rename to lib/opencl/resources.conf
diff --git a/src_usb/piusb.cpp b/lib/usb/piusb.cpp
similarity index 100%
rename from src_usb/piusb.cpp
rename to lib/usb/piusb.cpp
diff --git a/main.cpp b/main.cpp
index a53a3716..bf4ec44a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -112,11 +112,17 @@ private:
 */
 
 
-PIKbdListener kbd(0, 0, false);
-
+//PIKbdListener kbd(0, 0, false);
 
 
+#include "pigpio.h"
 int main(int argc, char * argv[]) {
+	PIObject * o = PIIODevice::createFromFullPath("ser://COM1");
+	piCout << o;
+	piCout << o->cast<PIIODevice>();
+	piCout << o->cast<PISerial>();
+	piCout << o->scopeList();
+	piCout << "\n\n";
 	PIMap<uint, PIObject::__MetaData> & m(PIObject::__meta_data());
 	for (auto it = m.constBegin(); it != m.constEnd(); ++it) {
 		const PIObject::__MetaData & md(it.value());
@@ -125,6 +131,6 @@ int main(int argc, char * argv[]) {
 			piCout << "   " << j.value().fullFormat();
 		}
 		piCout << "";
-	}
+	}/**/
 	return 0;
 }
diff --git a/utils/remote_console/CMakeLists.txt b/utils/remote_console/CMakeLists.txt
index 6304a31f..33234067 100755
--- a/utils/remote_console/CMakeLists.txt
+++ b/utils/remote_console/CMakeLists.txt
@@ -1,6 +1,6 @@
 message(STATUS "Building pip_remote_console")
 add_executable(pip_remote_console "main.cpp")
-target_link_libraries(pip_remote_console pip)
+target_link_libraries(pip_remote_console pip pip_console)
 if (DEFINED LIB)
 	install(TARGETS pip_remote_console DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 endif ()
diff --git a/utils/system_daemon/CMakeLists.txt b/utils/system_daemon/CMakeLists.txt
index 1eb58c6f..004a22f8 100755
--- a/utils/system_daemon/CMakeLists.txt
+++ b/utils/system_daemon/CMakeLists.txt
@@ -2,7 +2,7 @@ message(STATUS "Building pisd")
 file(GLOB CPPS "*.cpp")
 file(GLOB HDRS "*.h")
 add_executable(pisd ${CPPS} ${HDRS})
-target_link_libraries(pisd pip pip_crypt)
+target_link_libraries(pisd pip pip_crypt pip_console)
 if (DEFINED LIB)
 	install(TARGETS pisd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 else()
diff --git a/utils/udp_file_transfer/CMakeLists.txt b/utils/udp_file_transfer/CMakeLists.txt
index 6333c33a..cc3ab463 100644
--- a/utils/udp_file_transfer/CMakeLists.txt
+++ b/utils/udp_file_transfer/CMakeLists.txt
@@ -1,6 +1,6 @@
 message(STATUS "Building pift")
 add_executable(pift "main.cpp")
-target_link_libraries(pift pip)
+target_link_libraries(pift pip pip_console)
 if (DEFINED LIB)
 	install(TARGETS pift DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 else()