diff --git a/RouterInfo.cpp b/RouterInfo.cpp
new file mode 100644
index 00000000..ffde0602
--- /dev/null
+++ b/RouterInfo.cpp
@@ -0,0 +1,259 @@
+#include <stdio.h>
+#include <string.h>
+#include <endian.h>
+#include <fstream>
+#include <boost/lexical_cast.hpp>
+#include <cryptopp/sha.h>
+#include <cryptopp/dsa.h>
+#include "CryptoConst.h"
+#include "base64.h"
+#include "Timestamp.h"
+#include "Log.h"
+#include "RouterInfo.h"
+#include "RouterContext.h"
+
+namespace i2p
+{
+namespace data
+{		
+	RouterInfo::RouterInfo (const char * filename)
+	{
+		ReadFromFile (filename);
+	}	
+
+	RouterInfo::RouterInfo (const uint8_t * buf, int len)
+	{
+		memcpy (m_Buffer, buf, len);
+		m_BufferLen = len;
+		ReadFromBuffer ();
+	}	
+	
+	void RouterInfo::SetRouterIdentity (const RouterIdentity& identity)
+	{	
+		m_RouterIdentity = identity;
+		CryptoPP::SHA256().CalculateDigest(m_IdentHash, (uint8_t *)&m_RouterIdentity, sizeof (m_RouterIdentity));
+		m_Timestamp = i2p::util::GetMillisecondsSinceEpoch ();
+	}
+	
+	void RouterInfo::ReadFromFile (const char * filename)
+	{
+		std::ifstream s(filename);
+		if (s.is_open ())	
+		{	
+			s.seekg (0,std::ios::end);
+			m_BufferLen = s.tellg (); 
+			s.seekg(0, std::ios::beg);
+			s.read(m_Buffer,m_BufferLen);
+			ReadFromBuffer ();
+		}	
+		else
+			LogPrint ("Can't open file ", filename);
+	}	
+
+	void RouterInfo::ReadFromBuffer ()
+	{
+		std::stringstream str (std::string (m_Buffer, m_BufferLen));
+		ReadFromStream (str);
+		// verify signature
+		CryptoPP::DSA::PublicKey pubKey;
+		pubKey.Initialize (i2p::crypto::dsap, i2p::crypto::dsaq, i2p::crypto::dsag, CryptoPP::Integer (m_RouterIdentity.signingKey, 128));
+		CryptoPP::DSA::Verifier verifier (pubKey);
+		int l = m_BufferLen - 40;
+		if (!verifier.VerifyMessage ((uint8_t *)m_Buffer, l, (uint8_t *)m_Buffer + l, 40))
+		{	
+			LogPrint ("signature verification failed");
+		}	
+	}	
+	
+	void RouterInfo::ReadFromStream (std::istream& s)
+	{
+		s.read ((char *)&m_RouterIdentity, sizeof (m_RouterIdentity));
+		s.read ((char *)&m_Timestamp, sizeof (m_Timestamp));
+		m_Timestamp = be64toh (m_Timestamp);
+		// read addresses
+		uint8_t numAddresses;
+		s.read ((char *)&numAddresses, sizeof (numAddresses));
+		for (int i = 0; i < numAddresses; i++)
+		{
+			Address address;
+			s.read ((char *)&address.cost, sizeof (address.cost));
+			s.read ((char *)&address.date, sizeof (address.date));
+			char transportStyle[5];
+			ReadString (transportStyle, s);
+			if (!strcmp (transportStyle, "NTCP"))
+				address.transportStyle = eTransportNTCP;
+			else if (!strcmp (transportStyle, "SSU"))
+				address.transportStyle = eTransportSSU;
+			else
+				address.transportStyle = eTransportUnknown;
+			uint16_t size, r = 0;
+			s.read ((char *)&size, sizeof (size));
+			size = be16toh (size);
+			while (r < size)
+			{
+				char key[50], value[50];
+				r += ReadString (key, s);
+				s.seekg (1, std::ios_base::cur); r++; // =
+				r += ReadString (value, s); 
+				s.seekg (1, std::ios_base::cur); r++; // ;
+				if (!strcmp (key, "host"))
+					address.host = value;
+				else if (!strcmp (key, "port"))
+					address.port = boost::lexical_cast<int>(value);
+			}	
+			m_Addresses.push_back(address);
+		}	
+		// read peers
+		uint8_t numPeers;
+		s.read ((char *)&numPeers, sizeof (numPeers));
+		s.seekg (numPeers*32, std::ios_base::cur); // TODO: read peers
+		// read properties
+		uint16_t size, r = 0;
+		s.read ((char *)&size, sizeof (size));
+		size = be16toh (size);
+		while (r < size)
+		{
+			char key[50], value[50];
+			r += ReadString (key, s);
+			s.seekg (1, std::ios_base::cur); r++; // =
+			r += ReadString (value, s); 
+			s.seekg (1, std::ios_base::cur); r++; // ;
+			m_Properties[key] = value;
+		}		
+		
+		CryptoPP::SHA256().CalculateDigest(m_IdentHash, (uint8_t *)&m_RouterIdentity, sizeof (m_RouterIdentity));
+	}	
+
+	void RouterInfo::WriteToStream (std::ostream& s)
+	{
+		s.write ((char *)&m_RouterIdentity, sizeof (m_RouterIdentity));
+		uint64_t ts = htobe64 (m_Timestamp);
+		s.write ((char *)&ts, sizeof (ts));
+
+		// addresses
+		uint8_t numAddresses = m_Addresses.size ();
+		s.write ((char *)&numAddresses, sizeof (numAddresses));
+		for (auto& address : m_Addresses)
+		{
+			s.write ((char *)&address.cost, sizeof (address.cost));
+			s.write ((char *)&address.date, sizeof (address.date));
+			if (address.transportStyle == eTransportNTCP)
+				WriteString ("NTCP", s);
+			else if (address.transportStyle == eTransportSSU)
+				WriteString ("SSU", s);
+			else
+				WriteString ("", s);
+
+			std::stringstream properties;
+			WriteString ("host", properties);
+			properties << '=';
+			WriteString (address.host, properties);
+			properties << ';';
+			WriteString ("port", properties);
+			properties << '=';
+			WriteString (boost::lexical_cast<std::string>(address.port), properties);
+			properties << ';';
+			
+			uint16_t size = htobe16 (properties.str ().size ());
+			s.write ((char *)&size, sizeof (size));
+			s.write (properties.str ().c_str (), properties.str ().size ());
+		}	
+
+		// peers
+		uint8_t numPeers = 0;
+		s.write ((char *)&numPeers, sizeof (numPeers));
+
+		// properties
+		std::stringstream properties;
+		for (auto& p : m_Properties)
+		{
+			WriteString (p.first, properties);
+			properties << '=';
+			WriteString (p.second, properties);
+			properties << ';';
+		}	
+		uint16_t size = htobe16 (properties.str ().size ());
+		s.write ((char *)&size, sizeof (size));
+		s.write (properties.str ().c_str (), properties.str ().size ());
+	}	
+
+	void RouterInfo::CreateBuffer ()
+	{
+		std::stringstream s;
+		WriteToStream (s);
+		m_BufferLen = s.str ().size ();
+		memcpy (m_Buffer, s.str ().c_str (), m_BufferLen);
+		// signature
+		i2p::context.Sign ((uint8_t *)m_Buffer, m_BufferLen, (uint8_t *)m_Buffer + m_BufferLen);
+		m_BufferLen += 40;
+	}	
+	
+	size_t RouterInfo::ReadString (char * str, std::istream& s)
+	{
+		uint8_t len;
+		s.read ((char *)&len, 1);
+		s.read (str, len);
+		str[len] = 0;
+		return len+1;
+	}	
+
+	void RouterInfo::WriteString (const std::string& str, std::ostream& s)
+	{
+		uint8_t len = str.size ();
+		s.write ((char *)&len, 1);
+		s.write (str.c_str (), len);
+	}	
+
+	void RouterInfo::AddNTCPAddress (const char * host, int port)
+	{
+		Address addr;
+		addr.host = host;
+		addr.port = port;
+		addr.transportStyle = eTransportNTCP;
+		addr.cost = 2;
+		addr.date = 0;
+		m_Addresses.push_back(addr);	
+	}	
+
+	void RouterInfo::SetProperty (const char * key, const char * value)
+	{
+		m_Properties[key] = value;
+	}	
+
+	const char * RouterInfo::GetProperty (const char * key) const
+	{
+		auto it = m_Properties.find (key);
+		if (it != m_Properties.end ())
+			return it->second.c_str ();
+		return 0;
+	}	
+
+	bool RouterInfo::IsFloodfill () const
+	{
+		const char * caps = GetProperty ("caps");
+		if (caps)
+			return strchr (caps, 'f');
+		return false;	
+	}	
+
+	bool RouterInfo::IsNTCP () const
+	{
+		for (auto& address : m_Addresses)
+		{
+			if (address.transportStyle == eTransportNTCP)
+				return true;
+		}		
+		return false;
+	}	
+
+	RouterInfo::Address * RouterInfo::GetNTCPAddress () 
+	{
+		for (auto& address : m_Addresses)
+		{
+			if (address.transportStyle == eTransportNTCP)
+				return &address;
+		}	
+		return nullptr;
+	}	
+}
+}
diff --git a/RouterInfo.h b/RouterInfo.h
new file mode 100644
index 00000000..708e934e
--- /dev/null
+++ b/RouterInfo.h
@@ -0,0 +1,89 @@
+#ifndef ROUTER_INFO_H__
+#define ROUTER_INFO_H__
+
+#include <inttypes.h>
+#include <string>
+#include <map>
+#include <vector>
+#include <iostream>
+#include <boost/asio.hpp>
+
+namespace i2p
+{
+namespace data
+{		
+#pragma pack (1)
+
+	struct RouterIdentity
+	{
+		uint8_t publicKey[256];
+		uint8_t signingKey[128];
+		uint8_t certificate[3];
+	};
+#pragma pack ()	
+	
+	
+	class RouterInfo
+	{
+		public:
+
+			enum TransportStyle
+			{
+				eTransportUnknown = 0,
+				eTransportNTCP,
+				eTransportSSU
+			};
+
+			struct Address
+			{
+				TransportStyle transportStyle;
+				std::string host;
+				int port;
+				uint64_t date;
+				uint8_t cost;
+			};
+			
+			RouterInfo (const char * filename);
+			RouterInfo () = default;
+			RouterInfo (const RouterInfo& ) = default;
+			RouterInfo (const uint8_t * buf, int len);
+			
+			const RouterIdentity& GetRouterIdentity () const { return m_RouterIdentity; };
+			void SetRouterIdentity (const RouterIdentity& identity);
+			const uint8_t * GetIdentHash () const { return m_IdentHash; };
+			const std::vector<Address>& GetAddresses () const { return m_Addresses; };
+			Address * GetNTCPAddress ();
+			
+			void AddNTCPAddress (const char * host, int port);
+			void SetProperty (const char * key, const char * value);
+			const char * GetProperty (const char * key) const;
+			bool IsFloodfill () const;
+			bool IsNTCP () const;
+			
+			void CreateBuffer ();
+			const char * GetBuffer () const  { return m_Buffer; };
+			int GetBufferLen () const { return m_BufferLen; };
+			
+		private:
+
+			void ReadFromFile (const char * filename);
+			void ReadFromStream (std::istream& s);
+			void ReadFromBuffer ();
+			void WriteToStream (std::ostream& s);
+			size_t ReadString (char * str, std::istream& s);
+			void WriteString (const std::string& str, std::ostream& s);
+			
+		private:
+
+			RouterIdentity m_RouterIdentity;
+			uint8_t m_IdentHash[32];
+			char m_Buffer[2048];
+			int m_BufferLen;
+			uint64_t m_Timestamp;
+			std::vector<Address> m_Addresses;
+			std::map<std::string, std::string> m_Properties;
+	};	
+}	
+}
+
+#endif