diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b9d6bd92
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,215 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
diff --git a/i2pd.sln b/Win32/i2pd.sln
similarity index 100%
rename from i2pd.sln
rename to Win32/i2pd.sln
diff --git a/i2pd.vcxproj b/Win32/i2pd.vcxproj
similarity index 65%
rename from i2pd.vcxproj
rename to Win32/i2pd.vcxproj
index 2c04ff58..a98c7449 100644
--- a/i2pd.vcxproj
+++ b/Win32/i2pd.vcxproj
@@ -10,6 +10,54 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\base64.cpp" />
+    <ClCompile Include="..\Garlic.cpp" />
+    <ClCompile Include="..\HTTPServer.cpp" />
+    <ClCompile Include="..\I2NPProtocol.cpp" />
+    <ClCompile Include="..\i2p.cpp" />
+    <ClCompile Include="..\I2PEndian.cpp" />
+    <ClCompile Include="..\Identity.cpp" />
+    <ClCompile Include="..\LeaseSet.cpp" />
+    <ClCompile Include="..\Log.cpp" />
+    <ClCompile Include="..\NetDb.cpp" />
+    <ClCompile Include="..\NTCPSession.cpp" />
+    <ClCompile Include="..\RouterContext.cpp" />
+    <ClCompile Include="..\RouterInfo.cpp" />
+    <ClCompile Include="..\Streaming.cpp" />
+    <ClCompile Include="..\TransitTunnel.cpp" />
+    <ClCompile Include="..\Transports.cpp" />
+    <ClCompile Include="..\Tunnel.cpp" />
+    <ClCompile Include="..\TunnelEndpoint.cpp" />
+    <ClCompile Include="..\TunnelGateway.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\base64.h" />
+    <ClInclude Include="..\CryptoConst.h" />
+    <ClInclude Include="..\ElGamal.h" />
+    <ClInclude Include="..\Garlic.h" />
+    <ClInclude Include="..\HTTPServer.h" />
+    <ClInclude Include="..\I2NPProtocol.h" />
+    <ClInclude Include="..\I2PEndian.h" />
+    <ClInclude Include="..\Identity.h" />
+    <ClInclude Include="..\LeaseSet.h" />
+    <ClInclude Include="..\LittleBigEndian.h" />
+    <ClInclude Include="..\Log.h" />
+    <ClInclude Include="..\NetDb.h" />
+    <ClInclude Include="..\NTCPSession.h" />
+    <ClInclude Include="..\Queue.h" />
+    <ClInclude Include="..\RouterContext.h" />
+    <ClInclude Include="..\RouterInfo.h" />
+    <ClInclude Include="..\Streaming.h" />
+    <ClInclude Include="..\Timestamp.h" />
+    <ClInclude Include="..\TransitTunnel.h" />
+    <ClInclude Include="..\Transports.h" />
+    <ClInclude Include="..\Tunnel.h" />
+    <ClInclude Include="..\TunnelBase.h" />
+    <ClInclude Include="..\TunnelConfig.h" />
+    <ClInclude Include="..\TunnelEndpoint.h" />
+    <ClInclude Include="..\TunnelGateway.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{930568EC-31C9-406A-AD1C-9636DF5D8FAA}</ProjectGuid>
     <RootNamespace>i2pd</RootNamespace>
@@ -39,8 +87,9 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(BOOST);$(CRYPTOPP);$(IncludePath)</IncludePath>
+    <IncludePath>./..;$(BOOST);$(CRYPTOPP);$(IncludePath)</IncludePath>
     <LibraryPath>$(BOOST)\stage\lib;$(CRYPTOPP)\cryptopp\Win32\Output\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <SourcePath>./..;$(VC_SourcePath);</SourcePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <IncludePath>.\boost;.\cryptopp;$(IncludePath)</IncludePath>
@@ -73,54 +122,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="base64.h" />
-    <ClInclude Include="CryptoConst.h" />
-    <ClInclude Include="ElGamal.h" />
-    <ClInclude Include="Garlic.h" />
-    <ClInclude Include="HTTPServer.h" />
-    <ClInclude Include="I2NPProtocol.h" />
-    <ClInclude Include="I2PEndian.h" />
-    <ClInclude Include="Identity.h" />
-    <ClInclude Include="LeaseSet.h" />
-    <ClInclude Include="LittleBigEndian.h" />
-    <ClInclude Include="Log.h" />
-    <ClInclude Include="NetDb.h" />
-    <ClInclude Include="NTCPSession.h" />
-    <ClInclude Include="Queue.h" />
-    <ClInclude Include="RouterContext.h" />
-    <ClInclude Include="RouterInfo.h" />
-    <ClInclude Include="Streaming.h" />
-    <ClInclude Include="Timestamp.h" />
-    <ClInclude Include="TransitTunnel.h" />
-    <ClInclude Include="Transports.h" />
-    <ClInclude Include="Tunnel.h" />
-    <ClInclude Include="TunnelBase.h" />
-    <ClInclude Include="TunnelConfig.h" />
-    <ClInclude Include="TunnelEndpoint.h" />
-    <ClInclude Include="TunnelGateway.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="base64.cpp" />
-    <ClCompile Include="Garlic.cpp" />
-    <ClCompile Include="HTTPServer.cpp" />
-    <ClCompile Include="I2NPProtocol.cpp" />
-    <ClCompile Include="i2p.cpp" />
-    <ClCompile Include="I2PEndian.cpp" />
-    <ClCompile Include="Identity.cpp" />
-    <ClCompile Include="LeaseSet.cpp" />
-    <ClCompile Include="Log.cpp" />
-    <ClCompile Include="NetDb.cpp" />
-    <ClCompile Include="NTCPSession.cpp" />
-    <ClCompile Include="RouterContext.cpp" />
-    <ClCompile Include="RouterInfo.cpp" />
-    <ClCompile Include="Streaming.cpp" />
-    <ClCompile Include="TransitTunnel.cpp" />
-    <ClCompile Include="Transports.cpp" />
-    <ClCompile Include="Tunnel.cpp" />
-    <ClCompile Include="TunnelEndpoint.cpp" />
-    <ClCompile Include="TunnelGateway.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/i2pd.vcxproj.filters b/Win32/i2pd.vcxproj.filters
similarity index 63%
rename from i2pd.vcxproj.filters
rename to Win32/i2pd.vcxproj.filters
index 99d5e78f..39abceab 100644
--- a/i2pd.vcxproj.filters
+++ b/Win32/i2pd.vcxproj.filters
@@ -15,139 +15,139 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ElGamal.h">
+    <ClCompile Include="..\Identity.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\LeaseSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\NetDb.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\NTCPSession.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RouterContext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RouterInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Streaming.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\TransitTunnel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Transports.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Tunnel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\TunnelEndpoint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\TunnelGateway.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\base64.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Garlic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\HTTPServer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\I2NPProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\i2p.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\I2PEndian.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Identity.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Garlic.h">
+    <ClInclude Include="..\LeaseSet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="HTTPServer.h">
+    <ClInclude Include="..\LittleBigEndian.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="I2NPProtocol.h">
+    <ClInclude Include="..\Log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LeaseSet.h">
+    <ClInclude Include="..\NetDb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Log.h">
+    <ClInclude Include="..\NTCPSession.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="NetDb.h">
+    <ClInclude Include="..\Queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="NTCPSession.h">
+    <ClInclude Include="..\RouterContext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Queue.h">
+    <ClInclude Include="..\RouterInfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RouterContext.h">
+    <ClInclude Include="..\Streaming.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RouterInfo.h">
+    <ClInclude Include="..\Timestamp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Timestamp.h">
+    <ClInclude Include="..\TransitTunnel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TransitTunnel.h">
+    <ClInclude Include="..\Transports.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Transports.h">
+    <ClInclude Include="..\Tunnel.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Tunnel.h">
+    <ClInclude Include="..\TunnelBase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TunnelBase.h">
+    <ClInclude Include="..\TunnelConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TunnelConfig.h">
+    <ClInclude Include="..\TunnelEndpoint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TunnelEndpoint.h">
+    <ClInclude Include="..\TunnelGateway.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TunnelGateway.h">
+    <ClInclude Include="..\base64.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="base64.h">
+    <ClInclude Include="..\CryptoConst.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CryptoConst.h">
+    <ClInclude Include="..\ElGamal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="I2PEndian.h">
+    <ClInclude Include="..\Garlic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LittleBigEndian.h">
+    <ClInclude Include="..\HTTPServer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Streaming.h">
+    <ClInclude Include="..\I2NPProtocol.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Identity.h">
+    <ClInclude Include="..\I2PEndian.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Garlic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HTTPServer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="I2NPProtocol.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="i2p.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LeaseSet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Log.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NetDb.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NTCPSession.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RouterContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RouterInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TransitTunnel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Transports.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Tunnel.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TunnelEndpoint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TunnelGateway.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="base64.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="I2PEndian.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Streaming.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Identity.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
 </Project>
\ No newline at end of file