diff --git a/nbproject/Package-flash.bash b/nbproject/Package-flash.bash
new file mode 100644
index 0000000..44fd0fc
--- /dev/null
+++ b/nbproject/Package-flash.bash
@@ -0,0 +1,75 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=GNU-Linux-x86
+CND_CONF=flash
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=MissingOutputInProject
+OUTPUT_BASENAME=MissingOutputInProject
+PACKAGE_TOP_DIR=stlink/
+
+# Functions
+function checkReturnCode
+{
+    rc=$?
+    if [ $rc != 0 ]
+    then
+        exit $rc
+    fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+    mkdir -p "$1"
+    checkReturnCode
+    if [ "$2" != "" ]
+    then
+      chmod $2 "$1"
+      checkReturnCode
+    fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+    cp "$1" "$2"
+    checkReturnCode
+    if [ "$3" != "" ]
+    then
+        chmod $3 "$2"
+        checkReturnCode
+    fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/stlink"
+copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/stlink.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/stlink.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index e129c44..f1fcd48 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -7,21 +7,42 @@
         </df>
       </df>
       <df name="example">
-        <df name="blink">
-          <in>main.c</in>
-        </df>
-        <df name="blink_flash">
+        <df name="32l_dac">
+          <in>discover_board.h</in>
           <in>main.c</in>
           <in>startup_stm32l1xx_md.s</in>
           <in>system_stm32l1xx.c</in>
         </df>
-        <df name="lcd">
+        <df name="32l_lcd">
           <in>discover_board.h</in>
           <in>main.c</in>
           <in>stm32l_discovery_lcd.c</in>
           <in>stm32l_discovery_lcd.h</in>
         </df>
-        <df name="libstm32l_discovery">
+        <df name="32vl_factory_demo">
+          <in>main.c</in>
+          <in>startup_stm32f10x_md_vl.S</in>
+          <in>stm32f10x_conf.h</in>
+          <in>stm32f10x_it.c</in>
+          <in>stm32f10x_it.h</in>
+          <in>system_stm32f10x.c</in>
+        </df>
+        <df name="blink">
+          <in>main.c</in>
+        </df>
+        <df name="blink_flash">
+          <in>discover_board.h</in>
+          <in>main.c</in>
+          <in>startup_stm32l1xx_md.s</in>
+          <in>system_stm32l1xx.c</in>
+        </df>
+        <df name="board_support">
+          <df name="discovery_32vl">
+            <in>STM32vldiscovery.c</in>
+            <in>STM32vldiscovery.h</in>
+          </df>
+        </df>
+        <df name="libs_stm">
           <df name="build">
           </df>
           <df name="inc">
@@ -33,71 +54,149 @@
               <in>core_cm3.h</in>
             </df>
             <df name="device_support">
+              <in>stm32f10x.h</in>
               <in>stm32l1xx.h</in>
+              <in>system_stm32f10x.h</in>
               <in>system_stm32l1xx.h</in>
             </df>
-            <in>misc.h</in>
-            <in>stm32l1xx_adc.h</in>
-            <in>stm32l1xx_comp.h</in>
-            <in>stm32l1xx_crc.h</in>
-            <in>stm32l1xx_dac.h</in>
-            <in>stm32l1xx_dbgmcu.h</in>
-            <in>stm32l1xx_dma.h</in>
-            <in>stm32l1xx_exti.h</in>
-            <in>stm32l1xx_flash.h</in>
-            <in>stm32l1xx_gpio.h</in>
-            <in>stm32l1xx_i2c.h</in>
-            <in>stm32l1xx_iwdg.h</in>
-            <in>stm32l1xx_lcd.h</in>
-            <in>stm32l1xx_pwr.h</in>
-            <in>stm32l1xx_rcc.h</in>
-            <in>stm32l1xx_rtc.h</in>
-            <in>stm32l1xx_spi.h</in>
-            <in>stm32l1xx_syscfg.h</in>
-            <in>stm32l1xx_tim.h</in>
-            <in>stm32l1xx_usart.h</in>
-            <in>stm32l1xx_wwdg.h</in>
+            <df name="stm32f10x">
+              <in>misc.h</in>
+              <in>stm32f10x_adc.h</in>
+              <in>stm32f10x_bkp.h</in>
+              <in>stm32f10x_can.h</in>
+              <in>stm32f10x_cec.h</in>
+              <in>stm32f10x_crc.h</in>
+              <in>stm32f10x_dac.h</in>
+              <in>stm32f10x_dbgmcu.h</in>
+              <in>stm32f10x_dma.h</in>
+              <in>stm32f10x_exti.h</in>
+              <in>stm32f10x_flash.h</in>
+              <in>stm32f10x_fsmc.h</in>
+              <in>stm32f10x_gpio.h</in>
+              <in>stm32f10x_i2c.h</in>
+              <in>stm32f10x_iwdg.h</in>
+              <in>stm32f10x_pwr.h</in>
+              <in>stm32f10x_rcc.h</in>
+              <in>stm32f10x_rtc.h</in>
+              <in>stm32f10x_sdio.h</in>
+              <in>stm32f10x_spi.h</in>
+              <in>stm32f10x_tim.h</in>
+              <in>stm32f10x_usart.h</in>
+              <in>stm32f10x_wwdg.h</in>
+            </df>
+            <df name="stm32l1xx">
+              <in>misc.h</in>
+              <in>stm32l1xx_adc.h</in>
+              <in>stm32l1xx_comp.h</in>
+              <in>stm32l1xx_crc.h</in>
+              <in>stm32l1xx_dac.h</in>
+              <in>stm32l1xx_dbgmcu.h</in>
+              <in>stm32l1xx_dma.h</in>
+              <in>stm32l1xx_exti.h</in>
+              <in>stm32l1xx_flash.h</in>
+              <in>stm32l1xx_gpio.h</in>
+              <in>stm32l1xx_i2c.h</in>
+              <in>stm32l1xx_iwdg.h</in>
+              <in>stm32l1xx_lcd.h</in>
+              <in>stm32l1xx_pwr.h</in>
+              <in>stm32l1xx_rcc.h</in>
+              <in>stm32l1xx_rtc.h</in>
+              <in>stm32l1xx_spi.h</in>
+              <in>stm32l1xx_syscfg.h</in>
+              <in>stm32l1xx_tim.h</in>
+              <in>stm32l1xx_usart.h</in>
+              <in>stm32l1xx_wwdg.h</in>
+            </df>
           </df>
           <df name="src">
-            <in>misc.c</in>
-            <in>stm32l1xx_adc.c</in>
-            <in>stm32l1xx_comp.c</in>
-            <in>stm32l1xx_crc.c</in>
-            <in>stm32l1xx_dac.c</in>
-            <in>stm32l1xx_dbgmcu.c</in>
-            <in>stm32l1xx_dma.c</in>
-            <in>stm32l1xx_exti.c</in>
-            <in>stm32l1xx_flash.c</in>
-            <in>stm32l1xx_flash_ramfunc.c</in>
-            <in>stm32l1xx_gpio.c</in>
-            <in>stm32l1xx_i2c.c</in>
-            <in>stm32l1xx_iwdg.c</in>
-            <in>stm32l1xx_lcd.c</in>
-            <in>stm32l1xx_pwr.c</in>
-            <in>stm32l1xx_rcc.c</in>
-            <in>stm32l1xx_rtc.c</in>
-            <in>stm32l1xx_spi.c</in>
-            <in>stm32l1xx_syscfg.c</in>
-            <in>stm32l1xx_tim.c</in>
-            <in>stm32l1xx_usart.c</in>
-            <in>stm32l1xx_wwdg.c</in>
+            <df name="stm32f10x">
+              <in>misc.c</in>
+              <in>stm32f10x_adc.c</in>
+              <in>stm32f10x_bkp.c</in>
+              <in>stm32f10x_can.c</in>
+              <in>stm32f10x_cec.c</in>
+              <in>stm32f10x_crc.c</in>
+              <in>stm32f10x_dac.c</in>
+              <in>stm32f10x_dbgmcu.c</in>
+              <in>stm32f10x_dma.c</in>
+              <in>stm32f10x_exti.c</in>
+              <in>stm32f10x_flash.c</in>
+              <in>stm32f10x_fsmc.c</in>
+              <in>stm32f10x_gpio.c</in>
+              <in>stm32f10x_i2c.c</in>
+              <in>stm32f10x_iwdg.c</in>
+              <in>stm32f10x_pwr.c</in>
+              <in>stm32f10x_rcc.c</in>
+              <in>stm32f10x_rtc.c</in>
+              <in>stm32f10x_sdio.c</in>
+              <in>stm32f10x_spi.c</in>
+              <in>stm32f10x_tim.c</in>
+              <in>stm32f10x_usart.c</in>
+              <in>stm32f10x_wwdg.c</in>
+            </df>
+            <df name="stm32l1xx">
+              <in>misc.c</in>
+              <in>stm32l1xx_adc.c</in>
+              <in>stm32l1xx_comp.c</in>
+              <in>stm32l1xx_crc.c</in>
+              <in>stm32l1xx_dac.c</in>
+              <in>stm32l1xx_dbgmcu.c</in>
+              <in>stm32l1xx_dma.c</in>
+              <in>stm32l1xx_exti.c</in>
+              <in>stm32l1xx_flash.c</in>
+              <in>stm32l1xx_flash_ramfunc.c</in>
+              <in>stm32l1xx_gpio.c</in>
+              <in>stm32l1xx_i2c.c</in>
+              <in>stm32l1xx_iwdg.c</in>
+              <in>stm32l1xx_lcd.c</in>
+              <in>stm32l1xx_pwr.c</in>
+              <in>stm32l1xx_rcc.c</in>
+              <in>stm32l1xx_rtc.c</in>
+              <in>stm32l1xx_spi.c</in>
+              <in>stm32l1xx_syscfg.c</in>
+              <in>stm32l1xx_tim.c</in>
+              <in>stm32l1xx_usart.c</in>
+              <in>stm32l1xx_wwdg.c</in>
+            </df>
           </df>
         </df>
-        <df name="original_fw">
-          <in>discover_board.h</in>
-          <in>discover_functions.c</in>
-          <in>discover_functions.h</in>
-          <in>icc_measure.c</in>
-          <in>icc_measure.h</in>
-          <in>icc_measure_Ram.c</in>
-          <in>main.c</in>
-          <in>stm32_tsl_conf.h</in>
-          <in>stm32l1xx_conf.h</in>
-          <in>stm32l1xx_it.c</in>
-          <in>stm32l1xx_it.h</in>
-          <in>stm32l_discovery_lcd.c</in>
-          <in>stm32l_discovery_lcd.h</in>
-          <in>system_stm32l1xx.c</in>
+        <df name="libs_stm">
+          <df name="inc">
+            <df name="base">
+            </df>
+            <df name="base">
+            </df>
+            <df name="device_support">
+            </df>
+            <df name="device_support">
+            </df>
+            <df name="stm32f10x">
+            </df>
+            <df name="stm32l1xx">
+            </df>
+            <df name="stm32l1xx">
+            </df>
+          </df>
+        </df>
+        <df name="libs_stm">
+          <df name="inc">
+            <df name="base">
+            </df>
+            <df name="base">
+            </df>
+            <df name="device_support">
+            </df>
+            <df name="device_support">
+            </df>
+            <df name="stm32f10x">
+            </df>
+            <df name="stm32f10x">
+            </df>
+            <df name="stm32l1xx">
+            </df>
+            <df name="stm32l1xx">
+            </df>
+          </df>
         </df>
       </df>
       <df name="flash">
@@ -154,18 +253,22 @@
           <buildCommand>${MAKE} -f Makefile</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>gdbserver/st-util</executablePath>
-          <cTool>
-            <incDir>
-              <pElem>.</pElem>
-            </incDir>
-            <preprocessorList>
-              <Elem>DEBUG=1</Elem>
-            </preprocessorList>
-          </cTool>
         </makeTool>
       </makefileType>
+      <item path="example/32l_dac/startup_stm32l1xx_md.s"
+            ex="true"
+            tool="4"
+            flavor="0">
+      </item>
+      <item path="example/32vl_factory_demo/startup_stm32f10x_md_vl.S"
+            ex="true"
+            tool="4"
+            flavor="0">
+      </item>
       <item path="example/blink/main.c" ex="true" tool="0" flavor="0">
       </item>
+      <item path="example/blink_flash/discover_board.h" ex="true" tool="3" flavor="0">
+      </item>
       <item path="example/blink_flash/main.c" ex="true" tool="0" flavor="0">
       </item>
       <item path="example/blink_flash/startup_stm32l1xx_md.s"
@@ -178,648 +281,302 @@
             tool="0"
             flavor="0">
       </item>
-      <item path="example/lcd/discover_board.h" ex="true" tool="3" flavor="0">
+      <item path="example/blink_mfischer/crt.c" ex="false" tool="3" flavor="0">
       </item>
-      <item path="example/lcd/main.c" ex="true" tool="0" flavor="0">
+      <item path="example/blink_mfischer/main.c" ex="false" tool="3" flavor="0">
       </item>
-      <item path="example/lcd/stm32l_discovery_lcd.c" ex="true" tool="0" flavor="0">
+      <item path="example/blink_mfischer/vectors_stm32f10x_md.c"
+            ex="false"
+            tool="3"
+            flavor="0">
       </item>
-      <item path="example/lcd/stm32l_discovery_lcd.h" ex="true" tool="3" flavor="0">
+      <item path="example/dac/main.c" ex="false" tool="3" flavor="0">
       </item>
-      <item path="example/libstm32l_discovery/inc/base/stdint.h"
+      <item path="example/dac/system_stm32l1xx.c" ex="false" tool="3" flavor="0">
+      </item>
+      <item path="example/lcd/main.c" ex="false" tool="3" flavor="0">
+      </item>
+      <item path="example/lcd/stm32l_discovery_lcd.c" ex="false" tool="3" flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/base/stdint.h" ex="true" tool="3" flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/core_support/core_cm3.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/device_support/stm32f10x.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/device_support/stm32l1xx.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/device_support/system_stm32f10x.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/device_support/system_stm32l1xx.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/misc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_adc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_bkp.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_can.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_cec.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_crc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_dac.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_dbgmcu.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_dma.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_exti.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_flash.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_fsmc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_gpio.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_i2c.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_iwdg.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_pwr.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_rcc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_rtc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_sdio.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_spi.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_tim.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_usart.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32f10x/stm32f10x_wwdg.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/misc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_adc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_comp.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_crc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_dac.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_dbgmcu.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_dma.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_exti.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_flash.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_gpio.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_i2c.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_iwdg.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_lcd.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_pwr.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_rcc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_rtc.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_spi.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_syscfg.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_tim.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_usart.h"
+            ex="true"
+            tool="3"
+            flavor="0">
+      </item>
+      <item path="example/libs_stm/inc/stm32l1xx/stm32l1xx_wwdg.h"
             ex="true"
             tool="3"
             flavor="0">
       </item>
       <item path="example/libstm32l_discovery/inc/core_support/core_cm3.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/core_support/core_cm3.h"
-            ex="true"
+            ex="false"
             tool="3"
             flavor="0">
       </item>
-      <item path="example/libstm32l_discovery/inc/device_support/stm32l1xx.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/device_support/system_stm32l1xx.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/misc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_adc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_comp.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_crc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dac.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dbgmcu.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dma.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_exti.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_flash.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_gpio.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_i2c.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_iwdg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_lcd.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_pwr.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_rcc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_rtc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_spi.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_syscfg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_tim.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_usart.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_wwdg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/misc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_adc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_comp.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_crc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dac.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dbgmcu.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dma.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_exti.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_flash.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_flash_ramfunc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_gpio.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_i2c.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_iwdg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_lcd.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_pwr.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_rcc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_rtc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_spi.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_syscfg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_tim.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_usart.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_wwdg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/discover_board.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/discover_functions.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/discover_functions.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure_Ram.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32_tsl_conf.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_conf.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_it.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_it.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l_discovery_lcd.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l_discovery_lcd.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/system_stm32l1xx.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <folder path="stlink/gdbserver">
+      <folder path="stlink/example">
         <cTool>
           <incDir>
-            <pElem>src</pElem>
+            <pElem>.</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>CONFIG_USE_LIBSG=1</Elem>
-            <Elem>CONFIG_USE_LIBUSB=1</Elem>
+            <Elem>DEBUG=1</Elem>
+          </preprocessorList>
+        </cTool>
+      </folder>
+      <folder path="stlink/flash">
+        <cTool>
+          <incDir>
+            <pElem>src</pElem>
+          </incDir>
+          <preprocessorList>
+            <Elem>CONFIG_USE_LIBUSB=1</Elem>
+            <Elem>DEBUG</Elem>
           </preprocessorList>
         </cTool>
       </folder>
-      <item path="flash/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="gdbserver/gdb-remote.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="gdbserver/gdb-server.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="toremove/stm32l/src/stlink-hw.h" ex="true" tool="3" flavor="0">
-      </item>
-    </conf>
-    <conf name="gdbserver" type="0">
-      <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
-        <compilerSet>default</compilerSet>
-      </toolsSet>
-      <makefileType>
-        <makeTool>
-          <buildCommandWorkingDir>gdbserver</buildCommandWorkingDir>
-          <buildCommand>${MAKE} -f Makefile</buildCommand>
-          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
-          <executablePath></executablePath>
-        </makeTool>
-      </makefileType>
-      <item path="example/blink/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/blink_flash/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/blink_flash/startup_stm32l1xx_md.s"
-            ex="true"
-            tool="4"
-            flavor="0">
-      </item>
-      <item path="example/blink_flash/system_stm32l1xx.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/lcd/discover_board.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/lcd/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/lcd/stm32l_discovery_lcd.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/lcd/stm32l_discovery_lcd.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/base/stdint.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/core_support/core_cm3.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/core_support/core_cm3.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/device_support/stm32l1xx.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/device_support/system_stm32l1xx.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/misc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_adc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_comp.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_crc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dac.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dbgmcu.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dma.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_exti.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_flash.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_gpio.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_i2c.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_iwdg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_lcd.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_pwr.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_rcc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_rtc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_spi.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_syscfg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_tim.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_usart.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_wwdg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/misc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_adc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_comp.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_crc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dac.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dbgmcu.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dma.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_exti.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_flash.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_flash_ramfunc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_gpio.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_i2c.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_iwdg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_lcd.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_pwr.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_rcc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_rtc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_spi.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_syscfg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_tim.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_usart.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_wwdg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/discover_board.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/discover_functions.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/discover_functions.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure_Ram.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32_tsl_conf.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_conf.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_it.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_it.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l_discovery_lcd.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l_discovery_lcd.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/system_stm32l1xx.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
       <folder path="stlink/gdbserver">
         <cTool>
           <incDir>
             <pElem>src</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>CONFIG_USE_LIBSG=1</Elem>
             <Elem>CONFIG_USE_LIBUSB=1</Elem>
           </preprocessorList>
         </cTool>
@@ -834,8 +591,6 @@
           </preprocessorList>
         </cTool>
       </folder>
-      <item path="flash/main.c" ex="true" tool="0" flavor="0">
-      </item>
       <item path="toremove/stm32l/src/stlink-hw.h" ex="true" tool="3" flavor="0">
       </item>
     </conf>
@@ -857,6 +612,11 @@
           </cTool>
         </makeTool>
       </makefileType>
+      <item path="example/32vl_factory_demo/startup_stm32f10x_md_vl.S"
+            ex="true"
+            tool="4"
+            flavor="0">
+      </item>
       <item path="example/blink/main.c" ex="true" tool="0" flavor="0">
       </item>
       <item path="example/blink_flash/main.c" ex="true" tool="0" flavor="0">
@@ -871,307 +631,12 @@
             tool="0"
             flavor="0">
       </item>
-      <item path="example/lcd/discover_board.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/lcd/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/lcd/stm32l_discovery_lcd.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/lcd/stm32l_discovery_lcd.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/base/stdint.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/core_support/core_cm3.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/core_support/core_cm3.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/device_support/stm32l1xx.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/device_support/system_stm32l1xx.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/misc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_adc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_comp.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_crc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dac.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dbgmcu.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_dma.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_exti.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_flash.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_gpio.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_i2c.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_iwdg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_lcd.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_pwr.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_rcc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_rtc.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_spi.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_syscfg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_tim.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_usart.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/inc/stm32l1xx_wwdg.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/misc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_adc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_comp.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_crc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dac.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dbgmcu.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_dma.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_exti.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_flash.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_flash_ramfunc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_gpio.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_i2c.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_iwdg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_lcd.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_pwr.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_rcc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_rtc.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_spi.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_syscfg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_tim.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_usart.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/libstm32l_discovery/src/stm32l1xx_wwdg.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/discover_board.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/discover_functions.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/discover_functions.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/icc_measure_Ram.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/main.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32_tsl_conf.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_conf.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_it.c" ex="true" tool="0" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l1xx_it.h" ex="true" tool="3" flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l_discovery_lcd.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/stm32l_discovery_lcd.h"
-            ex="true"
-            tool="3"
-            flavor="0">
-      </item>
-      <item path="example/original_fw/system_stm32l1xx.c"
-            ex="true"
-            tool="0"
-            flavor="0">
-      </item>
       <folder path="stlink/flash">
         <cTool>
           <incDir>
             <pElem>src</pElem>
           </incDir>
           <preprocessorList>
-            <Elem>CONFIG_USE_LIBSG=1</Elem>
             <Elem>CONFIG_USE_LIBUSB=1</Elem>
           </preprocessorList>
         </cTool>
@@ -1192,13 +657,12 @@
           <incDir>
             <pElem>.</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>DEBUG=1</Elem>
-          </preprocessorList>
         </cTool>
       </folder>
       <item path="gdbserver/gdb-remote.c" ex="true" tool="0" flavor="0">
       </item>
+      <item path="gdbserver/gdb-remote.h" ex="true" tool="3" flavor="0">
+      </item>
       <item path="gdbserver/gdb-server.c" ex="true" tool="0" flavor="0">
       </item>
       <item path="toremove/stm32l/src/stlink-hw.h" ex="true" tool="3" flavor="0">
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 946c06f..7526e4b 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -17,10 +17,6 @@
                     <name>Default</name>
                     <type>0</type>
                 </confElem>
-                <confElem>
-                    <name>gdbserver</name>
-                    <type>0</type>
-                </confElem>
                 <confElem>
                     <name>flash</name>
                     <type>0</type>