diff --git a/Filelists.mk b/Filelists.mk
index fefe3e8..c64b5cd 100644
--- a/Filelists.mk
+++ b/Filelists.mk
@@ -39,9 +39,11 @@ CONTRIBAPPFILES=$(CONTRIBDIR)/apps/httpserver/httpserver-netconn.c \
$(CONTRIBDIR)/apps/tcpecho_raw/tcpecho_raw.c \
$(CONTRIBDIR)/apps/netio/netio.c \
$(CONTRIBDIR)/apps/ping/ping.c \
- $(CONTRIBDIR)/apps/snmp_private_mib/lwip_prvmib.c \
- $(CONTRIBDIR)/apps/snmp_v3/snmpv3_dummy.c \
$(CONTRIBDIR)/apps/socket_examples/socket_examples.c \
$(CONTRIBDIR)/apps/rtp/rtp.c \
+ $(CONTRIBDIR)/examples/httpd/fs_example/fs_example.c \
+ $(CONTRIBDIR)/examples/httpd/ssi_example/ssi_example.c \
+ $(CONTRIBDIR)/examples/snmp/snmp_private_mib/lwip_prvmib.c \
+ $(CONTRIBDIR)/examples/snmp/snmp_v3/snmpv3_dummy.c \
$(CONTRIBDIR)/addons/tcp_isn/tcp_isn.c \
$(CONTRIBDIR)/addons/ipv6_static_routing/ip6_route_table.c
diff --git a/ports/win32/msvc/lwIP_Test.vcxproj b/ports/win32/msvc/lwIP_Test.vcxproj
index 94de425..fd80842 100644
--- a/ports/win32/msvc/lwIP_Test.vcxproj
+++ b/ports/win32/msvc/lwIP_Test.vcxproj
@@ -81,6 +81,8 @@
MachineX86
+ true
+ $(TargetDir)$(TargetName).map
@@ -119,16 +121,19 @@
MachineX86
+ false
+ $(TargetDir)$(TargetName).map
-
-
-
+
+
+
+
Disabled
%(AdditionalIncludeDirectories)
@@ -147,11 +152,8 @@
-
-
-
@@ -160,13 +162,16 @@
-
+
+
+
+
diff --git a/ports/win32/msvc/lwIP_Test.vcxproj.filters b/ports/win32/msvc/lwIP_Test.vcxproj.filters
index 0c463ca..dc3a844 100644
--- a/ports/win32/msvc/lwIP_Test.vcxproj.filters
+++ b/ports/win32/msvc/lwIP_Test.vcxproj.filters
@@ -17,14 +17,26 @@
{93b36161-88b2-448c-9c45-ac6f27b98290}
-
- {03ee0ff9-27f9-44c7-a8fe-cab9e4798e23}
+
+ {6456d2d6-61e6-4c99-9f1f-1f225437a642}
-
- {0987428d-3c30-404d-b995-8231e405b63d}
+
+ {75bb877e-aa45-4e2e-82fe-946ddadc6a64}
-
- {59d9ad5f-ca65-47ee-ac48-81f557e2b905}
+
+ {78411edf-fe39-4edb-a6bd-2833755e0342}
+
+
+ {531dd0cf-ec13-42b7-a3bb-b837382d4ecd}
+
+
+ {d71bdb12-c5ed-4823-99f0-2d537765a2eb}
+
+
+ {0b9db8c7-f352-4ca6-86c6-1a6c58482c5d}
+
+
+ {97f0ea5c-16cf-4640-a6b3-ace059ed2388}
@@ -64,23 +76,23 @@
Source Files\apps
-
- Source Files\apps
-
Source Files\addons\tcp_isn
Source Files\addons\ipv6_static_routing
-
- Source Files\apps
+
+ Source Files\examples\httpd\fs_example
+
+
+ Source Files\examples\httpd\ssi_example
-
- Source Files\addons\httpd\fs_example
+
+ Source Files\examples\snmp\snmp_private_mib
-
- Source Files\addons\httpd\ssi_example
+
+ Source Files\examples\snmp\snmp_v3
@@ -126,14 +138,17 @@
Source Files\addons\ipv6_static_routing
-
- Source Files\apps
+
+ Source Files\examples\httpd\fs_example
+
+
+ Source Files\examples\httpd\ssi_example
-
- Source Files\addons\httpd\fs_example
+
+ Source Files\examples\snmp\snmp_private_mib
-
- Source Files\addons\httpd\ssi_example
+
+ Source Files\examples\snmp\snmp_v3
diff --git a/ports/win32/test.c b/ports/win32/test.c
index 38679aa..9d58c5c 100644
--- a/ports/win32/test.c
+++ b/ports/win32/test.c
@@ -76,10 +76,11 @@
#include "apps/udpecho/udpecho.h"
#include "apps/tcpecho_raw/tcpecho_raw.h"
#include "apps/socket_examples/socket_examples.h"
-#include "apps/snmp_v3/snmpv3_dummy.h"
-#include "addons/httpd/fs_example/fs_example.h"
-#include "addons/httpd/ssi_example/ssi_example.h"
+#include "examples/snmp/snmp_v3/snmpv3_dummy.h"
+
+#include "examples/httpd/fs_example/fs_example.h"
+#include "examples/httpd/ssi_example/ssi_example.h"
#if NO_SYS
/* ... then we need information about the timer intervals: */