diff --git a/pom.xml b/pom.xml
index e340b4f..e0bbd3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <plugins>
             <plugin>        
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.0.0</version>  
+                <version>3.1.0</version>  
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -73,12 +73,15 @@
                         </goals>
                         <configuration>
                             <target> 
-                                <!--
-                                <exec executable="make" dir="src/main/cleaner">
+                                <exec executable="make" dir="src/main/cpp/cleaner/windows">
                                     <arg value="-f" />
                                     <arg value="Makefile.mingw" />
                                 </exec>
-                                <exec executable="make" dir="src/main/cpp/ide">
+                                <exec executable="make" dir="src/main/cpp/launcher/windows">
+                                    <arg value="-f" />
+                                    <arg value="Makefile.mingw" />
+                                </exec>
+                                <!--<exec executable="make" dir="src/main/cpp/ide">
                                     <arg value="-f" />
                                     <arg value="Makefile.mingw" />
                                 </exec>
diff --git a/src/assembly/assembly.xml b/src/assembly/assembly.xml
new file mode 100644
index 0000000..db432bc
--- /dev/null
+++ b/src/assembly/assembly.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>distribution</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/cleaner</directory>
+            <outputDirectory>native/cleaner/windows/dist/</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/launcher</directory>
+            <outputDirectory>native/launcher/windows/dist/</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/ide</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/cpp/cleaner/windows/Makefile b/src/main/cpp/cleaner/windows/Makefile
deleted file mode 100644
index 98cf53c..0000000
--- a/src/main/cpp/cleaner/windows/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-# Environment 
-MKDIR=mkdir
-CP=cp
-CCADMIN=CCadmin
-RANLIB=ranlib
-
-
-# build
-build: .build-pre .build-impl .build-post
-
-.build-pre:
-# Add your pre 'build' code here...
-
-.build-post:
-# Add your post 'build' code here...
-
-
-# clean
-clean: .clean-pre .clean-impl .clean-post
-
-.clean-pre:
-# Add your pre 'clean' code here...
-
-.clean-post:
-# Add your post 'clean' code here...
-
-
-# clobber
-clobber: .clobber-pre .clobber-impl .clobber-post
-
-.clobber-pre:
-# Add your pre 'clobber' code here...
-
-.clobber-post:
-# Add your post 'clobber' code here...
-
-
-# all
-all: .all-pre .all-impl .all-post
-
-.all-pre:
-# Add your pre 'all' code here...
-
-.all-post:
-# Add your post 'all' code here...
-
-
-# help
-help: .help-pre .help-impl .help-post
-
-.help-pre:
-# Add your pre 'help' code here...
-
-.help-post:
-# Add your post 'help' code here...
-
-
-
-# include project implementation makefile
-include nbproject/Makefile-impl.mk
diff --git a/src/main/cpp/cleaner/windows/Makefile-vc b/src/main/cpp/cleaner/windows/Makefile-vc
deleted file mode 100644
index b9edda9..0000000
--- a/src/main/cpp/cleaner/windows/Makefile-vc
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#
-
-
-!include <$(PLATFORM_SDK)/include/win32.mak>
-
-# define the compiler and linker for all the platforms
-CC32="$(VC_2005)\Bin\cl.exe"
-L32="$(VC_2005)\Bin\link.exe"
-
-BUILD_DIR32=.\build\32bit
-OUTPUT_FILE32=.\dist\cleaner.exe
-
-CC32_OPTS=/O1 /Os \
-	/I "$(VC_2005)\include" \
-	/D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" \
-	/FD /GS-\
-	/Fo"$(BUILD_DIR32)\\"  /Fd"$(BUILD_DIR32)\vc80.pdb" \
-	/W3 /nologo /c /Wp64 /TC /errorReport:prompt
-
-LINKING_LIBRARIES=\
-	shell32.lib \
-	kernel32.lib
-
-L32_OPTS=\
-	/OUT:$(OUTPUT_FILE32) \
-	/INCREMENTAL:NO \
-	/LIBPATH:"$(PLATFORM_SDK)\Lib" \
-	/MANIFEST:NO \
-	/NODEFAULTLIB \
-	/SUBSYSTEM:WINDOWS \
-	/OPT:REF /OPT:ICF \
-	/MACHINE:X86 \
-	/ERRORREPORT:PROMPT \
-	/ENTRY:WinMain \
-	$(LINKING_LIBRARIES)
-	
-all: init build-32
-
-clean:
-  
-
-init:
-  - md $(BUILD_DIR32)
-  - md .\dist
-
-  del /Q /S $(BUILD_DIR32)
-  del /Q  $(OUTPUT_FILE32)  
-
-build-32: 
-  Set CPU=i386
-  Set Lib=%VC_2005%\Lib;%PLATFORM_SDK%\Lib;%Lib%
-  Set Include=%PLATFORM_SDK%\Include;%Include%
-  Set Path=%PLATFORM_SDK%\Bin;%PLATFORM_SDK%\Bin\WinNT;%VC_2005_PATH%;%path%
-  Set APPVER=5.01
-  Set TARGETOS=WINNT
-  
-  $(CC32) $(CC32_OPTS) .\src\main.c
-  $(L32) $(L32_OPTS) $(BUILD_DIR32)\main.obj
diff --git a/src/main/cpp/cleaner/windows/nbproject/project.properties b/src/main/cpp/cleaner/windows/Makefile.mingw
similarity index 64%
rename from src/main/cpp/cleaner/windows/nbproject/project.properties
rename to src/main/cpp/cleaner/windows/Makefile.mingw
index 3807b67..8ae362b 100644
--- a/src/main/cpp/cleaner/windows/nbproject/project.properties
+++ b/src/main/cpp/cleaner/windows/Makefile.mingw
@@ -1,5 +1,3 @@
-
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,5 +14,18 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
 
+TMPFLD = ../../../../../target/tmp/
+OFLD = ../../../../../target/cleaner/
+
+all: prepfolder cleaner.exe
+
+prepfolder:
+	mkdir -p $(TMPFLD)
+	mkdir -p $(OFLD)
+
+clean:
+	rm -f *.res *.exe *.dll
+
+cleaner.exe: src/main.c
+	i686-w64-mingw32-gcc -s -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -Wl,--no-insert-timestamp -mwindows src/main.c -o$(OFLD)cleaner.exe -static -lstdc++ -static-libstdc++ -static-libgcc
diff --git a/src/main/cpp/cleaner/windows/nbproject/configurations.xml b/src/main/cpp/cleaner/windows/nbproject/configurations.xml
deleted file mode 100644
index b16b628..0000000
--- a/src/main/cpp/cleaner/windows/nbproject/configurations.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
-<configurationDescriptor version="35">
-  <logicalFolder name="root" displayName="root" projectFiles="true">
-    <logicalFolder name="SourceFiles"
-                   displayName="Source Files"
-                   projectFiles="true">
-      <itemPath>src/main.c</itemPath>
-    </logicalFolder>
-    <logicalFolder name="HeaderFiles"
-                   displayName="Header Files"
-                   projectFiles="true">
-    </logicalFolder>
-    <logicalFolder name="ResourceFiles"
-                   displayName="Resource Files"
-                   projectFiles="true">
-    </logicalFolder>
-    <logicalFolder name="ExternalFiles"
-                   displayName="Important Files"
-                   projectFiles="false">
-      <itemPath>Makefile</itemPath>
-    </logicalFolder>
-  </logicalFolder>
-  <projectmakefile>Makefile</projectmakefile>
-  <defaultConf>0</defaultConf>
-  <confs>
-    <conf name="Debug" type="1">
-      <toolsSet>
-        <compilerSet>Cygwin</compilerSet>
-        <cRequired>true</cRequired>
-        <cppRequired>true</cppRequired>
-        <fortranRequired>false</fortranRequired>
-        <platform>3</platform>
-      </toolsSet>
-      <compileType>
-        <linkerTool>
-          <output>dist/cleaner</output>
-          <stripSymbols>true</stripSymbols>
-          <linkerLibItems>
-            <linkerOptionItem>-lshell32 -lkernel32</linkerOptionItem>
-          </linkerLibItems>
-          <commandLine>-mno-cygwin -mwindows</commandLine>
-        </linkerTool>
-      </compileType>
-      <item path="src/main.c">
-        <itemTool>0</itemTool>
-      </item>
-    </conf>
-    <conf name="Release" type="1">
-      <toolsSet>
-        <compilerSet>Cygwin</compilerSet>
-        <cRequired>true</cRequired>
-        <cppRequired>true</cppRequired>
-        <fortranRequired>false</fortranRequired>
-        <platform>3</platform>
-      </toolsSet>
-      <compileType>
-        <cCompilerTool>
-          <developmentMode>5</developmentMode>
-        </cCompilerTool>
-        <ccCompilerTool>
-          <developmentMode>5</developmentMode>
-        </ccCompilerTool>
-        <fortranCompilerTool>
-          <developmentMode>5</developmentMode>
-        </fortranCompilerTool>
-        <linkerTool>
-          <linkerLibItems>
-          </linkerLibItems>
-        </linkerTool>
-      </compileType>
-      <item path="src/main.c">
-        <itemTool>0</itemTool>
-      </item>
-    </conf>
-  </confs>
-</configurationDescriptor>
diff --git a/src/main/cpp/cleaner/windows/nbproject/project.xml b/src/main/cpp/cleaner/windows/nbproject/project.xml
deleted file mode 100644
index ded3e3c..0000000
--- a/src/main/cpp/cleaner/windows/nbproject/project.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.cnd.makeproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>NBI Native Cleaner : Windows</name>
-            <make-project-type>0</make-project-type>
-        </data>
-    </configuration>
-</project>
diff --git a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.ncb b/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.ncb
deleted file mode 100644
index 9057eba..0000000
--- a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.ncb
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft C/C++ MSF 7.00
diff --git a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.sln b/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.sln
deleted file mode 100644
index 659a421..0000000
--- a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-﻿
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NBI Native Cleaner", "NBI Native Cleaner.vcproj", "{0DB81F65-E9E6-4506-BE27-C020AAD1B04A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0DB81F65-E9E6-4506-BE27-C020AAD1B04A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0DB81F65-E9E6-4506-BE27-C020AAD1B04A}.Debug|Win32.Build.0 = Debug|Win32
-		{0DB81F65-E9E6-4506-BE27-C020AAD1B04A}.Release|Win32.ActiveCfg = Release|Win32
-		{0DB81F65-E9E6-4506-BE27-C020AAD1B04A}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.suo b/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.suo
deleted file mode 100644
index 189f7a2..0000000
--- a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.suo
+++ /dev/null
Binary files differ
diff --git a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.vcproj b/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.vcproj
deleted file mode 100644
index dd72b1f..0000000
--- a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.vcproj
+++ /dev/null
@@ -1,209 +0,0 @@
-﻿<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="NBI Native Cleaner"
-	ProjectGUID="{0DB81F65-E9E6-4506-BE27-C020AAD1B04A}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Shell32.lib"
-				OutputFile="..\dist\cleaner.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="false"
-				AdditionalLibraryDirectories="C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				EntryPointSymbol="WinMain"
-				TargetMachine="1"
-				ErrorReporting="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\src\main.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.vcproj.user b/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.vcproj.user
deleted file mode 100644
index a5ca4f9..0000000
--- a/src/main/cpp/cleaner/windows/vcproject/NBI Native Cleaner.vcproj.user
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><VisualStudioUserFile ProjectType="Visual C++" Version="8.00" ShowAllFiles="true"></VisualStudioUserFile>
\ No newline at end of file
diff --git a/src/main/cpp/launcher/windows/.dep.inc b/src/main/cpp/launcher/windows/.dep.inc
deleted file mode 100644
index 4560e55..0000000
--- a/src/main/cpp/launcher/windows/.dep.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# This code depends on make tool being used
-DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES}))
-ifneq (${DEPFILES},)
-include ${DEPFILES}
-endif
diff --git a/src/main/cpp/launcher/windows/Makefile b/src/main/cpp/launcher/windows/Makefile
deleted file mode 100644
index 1debec6..0000000
--- a/src/main/cpp/launcher/windows/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
-#
-#  There exist several targets which are by default empty and which can be 
-#  used for execution of your targets. These targets are usually executed 
-#  before and after some main targets. They are: 
-#
-#     .build-pre:              called before 'build' target
-#     .build-post:             called after 'build' target
-#     .clean-pre:              called before 'clean' target
-#     .clean-post:             called after 'clean' target
-#     .clobber-pre:            called before 'clobber' target
-#     .clobber-post:           called after 'clobber' target
-#     .all-pre:                called before 'all' target
-#     .all-post:               called after 'all' target
-#     .help-pre:                called before 'help' target
-#     .help-post:               called after 'help' target
-#
-#  Targets beginning with '.' are not intended to be called on their own.
-#
-#  Main targets can be executed directly, and they are:
-#  
-#     build                    build a specific configuration
-#     clean                    remove built files from a configuration
-#     clobber                  remove all built files
-#     all                      build all configurations
-#     help                     print help mesage
-#  
-#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
-#  .help-impl are implemented in nbproject/makefile-impl.mk.
-#
-
-# Environment 
-MKDIR=mkdir
-CP=cp
-CCADMIN=CCadmin
-RANLIB=ranlib
-RESCOMP=windres
-
-
-# build
-build: .build-pre .build-impl .build-post
-
-.build-pre:
-	mkdir -p build
-	windres -I resources -o  build/icon.o -i resources/res.rc
-
-.build-post:
-# Add your post 'build' code here...
-
-
-# clean
-clean: .clean-pre .clean-impl .clean-post
-
-.clean-pre:
-	rm -rf build/icon.o
-
-.clean-post:
-# Add your post 'clean' code here...
-
-
-# clobber
-clobber: .clobber-pre .clobber-impl .clobber-post
-
-.clobber-pre:
-# Add your pre 'clobber' code here...
-
-.clobber-post:
-# Add your post 'clobber' code here...
-
-
-# all
-all: .all-pre .all-impl .all-post
-
-.all-pre:
-# Add your pre 'all' code here...
-
-.all-post:
-# Add your post 'all' code here...
-
-
-# help
-help: .help-pre .help-impl .help-post
-
-.help-pre:
-# Add your pre 'help' code here...
-
-.help-post:
-# Add your post 'help' code here...
-
-# include project implementation makefile
-include nbproject/Makefile-impl.mk
diff --git a/src/main/cpp/launcher/windows/Makefile-vc b/src/main/cpp/launcher/windows/Makefile-vc
deleted file mode 100644
index 78bc631..0000000
--- a/src/main/cpp/launcher/windows/Makefile-vc
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-#
-
-
-!include <$(PLATFORM_SDK)/include/win32.mak>
-
-# define the compiler and linker for all the platforms
-CC32="$(VC_2005)\Bin\cl.exe"
-L32="$(VC_2005)\Bin\link.exe"
-MT32="$(PLATFORM_SDK)\Bin\mt.exe"
-RC32="$(VC_2005)\Bin\rc.exe"
-
-BUILD_DIR32=.\build\32bit
-OUTPUT_FILE32=.\dist\nlw.exe
-MANIFEST_FILE32=.\resources\nlw.exe.manifest
-#Alternative manifest file - read more in resources\res.rc
-#MANIFEST_FILE32=.\resources\nlw-alt.exe.manifest
-
-SOURCE_FILES=\
-	.\src\ExtractUtils.c \
-	.\src\FileUtils.c \
-	.\src\JavaUtils.c \
-	.\src\Launcher.c \
-	.\src\Main.c \
-	.\src\ProcessUtils.c \
-	.\src\RegistryUtils.c \
-	.\src\StringUtils.c \
-	.\src\SystemUtils.c
-
-
-CC32_OPTS=/O1 /Os \
-	/I "$(VC_2005)\include" \
-	/D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" \
-	/FD /EHsc /MT \
-	/Fo"$(BUILD_DIR32)\\"  /Fd"$(BUILD_DIR32)\vc80.pdb" \
-	/W3 /nologo /c /Wp64 /TC /errorReport:prompt
-
-LINKING_LIBRARIES=\
-	user32.lib\
-	gdi32.lib \
-	comdlg32.lib \
-	comctl32.lib \
-	advapi32.lib\
-	shell32.lib \
-	ole32.lib \
-	oleaut32.lib \
-	userenv.lib \
-	libcmt.lib \
-	kernel32.lib
-
-L32_OPTS=\
-	/OUT:$(OUTPUT_FILE32) \
-	/INCREMENTAL:NO \
-	/LIBPATH:"$(PLATFORM_SDK)\Lib" \
-	/MANIFEST \
-	/MANIFESTFILE:"$(BUILD_DIR32)\nlw.exe.intermediate.manifest" \
-	/NODEFAULTLIB \
-	/SUBSYSTEM:WINDOWS \
-	/OPT:REF /OPT:ICF \
-	/MACHINE:X86 \
-	/ERRORREPORT:PROMPT \
-	$(LINKING_LIBRARIES)
-
-	
-RC32_OPTS=\
-	/I ".\resources" /fo $(BUILD_DIR32)\resources.obj
-	
-
-all: init build-32
-
-clean:
-  
-
-init:
-  - md $(BUILD_DIR32)
-  - md .\dist
-
-  del /Q /S $(BUILD_DIR32)
-  del /Q  $(OUTPUT_FILE32)  
-
-build-32: 
-  Set CPU=i386
-  Set Lib=%VC_2005%\Lib;%PLATFORM_SDK%\Lib;%Lib%
-  Set Include=%PLATFORM_SDK%\Include;%Include%
-  Set Path=%PLATFORM_SDK%\Bin;%PLATFORM_SDK%\Bin\WinNT;%VC_2005_PATH%;%path%
-  Set APPVER=5.01
-  Set TARGETOS=WINNT
-  
-  $(CC32) $(CC32_OPTS) $(SOURCE_FILES)
-  $(RC32) $(RC32_OPTS) resources/res.rc
-  $(L32) $(L32_OPTS) $(BUILD_DIR32)\ExtractUtils.obj $(BUILD_DIR32)\FileUtils.obj $(BUILD_DIR32)\JavaUtils.obj $(BUILD_DIR32)\Launcher.obj $(BUILD_DIR32)\Main.obj $(BUILD_DIR32)\ProcessUtils.obj $(BUILD_DIR32)\RegistryUtils.obj $(BUILD_DIR32)\StringUtils.obj $(BUILD_DIR32)\SystemUtils.obj $(BUILD_DIR32)\resources.obj
-  $(MT32)  /outputresource:"$(OUTPUT_FILE32);#1" -manifest $(MANIFEST_FILE32) $(BUILD_DIR32)\nlw.exe.intermediate.manifest
diff --git a/src/main/cpp/launcher/windows/Makefile-vc-wo-crt b/src/main/cpp/launcher/windows/Makefile-vc-wo-crt
deleted file mode 100644
index 6a693f5..0000000
--- a/src/main/cpp/launcher/windows/Makefile-vc-wo-crt
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-#
-
-
-!include <$(PLATFORM_SDK)/include/win32.mak>
-
-# define the compiler and linker for all the platforms
-CC32="$(VC_2005)\Bin\cl.exe"
-L32="$(VC_2005)\Bin\link.exe"
-MT32="$(PLATFORM_SDK)\Bin\mt.exe"
-RC32="$(VC_2005)\Bin\rc.exe"
-
-BUILD_DIR32=.\build\32bit
-OUTPUT_FILE32=.\dist\nlw.exe
-MANIFEST_FILE32=.\resources\nlw.exe.manifest
-#Alternative manifest file - read more in resources\res.rc
-#MANIFEST_FILE32=.\resources\nlw-alt.exe.manifest
-
-SOURCE_FILES=\
-	.\src\ExtractUtils.c \
-	.\src\FileUtils.c \
-	.\src\JavaUtils.c \
-	.\src\Launcher.c \
-	.\src\Main.c \
-	.\src\ProcessUtils.c \
-	.\src\RegistryUtils.c \
-	.\src\StringUtils.c \
-	.\src\SystemUtils.c
-
-
-CC32_OPTS=/O1 /Os \
-	/I "$(VC_2005)\include" \
-	/D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" \
-	/FD /EHsc /GS- \
-	/Fo"$(BUILD_DIR32)\\"  /Fd"$(BUILD_DIR32)\vc80.pdb" \
-	/W3 /nologo /c /Wp64 /TC /errorReport:prompt
-
-LINKING_LIBRARIES=\
-	user32.lib\
-	gdi32.lib \
-	comdlg32.lib \
-	comctl32.lib \
-	advapi32.lib\
-	shell32.lib \
-	ole32.lib \
-	oleaut32.lib \
-	userenv.lib \
-	kernel32.lib \
-
-L32_OPTS=\
-	/OUT:$(OUTPUT_FILE32) \
-	/INCREMENTAL:NO \
-	/LIBPATH:"$(PLATFORM_SDK)\Lib" \
-	/MANIFEST \
-	/MANIFESTFILE:"$(BUILD_DIR32)\nlw.exe.intermediate.manifest" \
-	/NODEFAULTLIB \
-	/SUBSYSTEM:WINDOWS \
-	/OPT:REF /OPT:ICF \
-	/MACHINE:X86 \
-	/ERRORREPORT:PROMPT \
-        /ENTRY:MyMain \
-	$(LINKING_LIBRARIES)
-
-	
-RC32_OPTS=\
-	/I ".\resources" /fo $(BUILD_DIR32)\resources.obj
-	
-
-all: init build-32
-
-clean:
-  
-
-init:
-  - md $(BUILD_DIR32)
-  - md .\dist
-
-  del /Q /S $(BUILD_DIR32)
-  del /Q  $(OUTPUT_FILE32)  
-
-build-32: 
-  Set CPU=i386
-  Set Lib=%VC_2005%\Lib;%PLATFORM_SDK%\Lib;%Lib%
-  Set Include=%PLATFORM_SDK%\Include;%Include%
-  Set Path=%PLATFORM_SDK%\Bin;%PLATFORM_SDK%\Bin\WinNT;%VC_2005_PATH%;%path%
-  Set APPVER=5.01
-  Set TARGETOS=WINNT
-  
-  $(CC32) $(CC32_OPTS) $(SOURCE_FILES)
-  $(RC32) $(RC32_OPTS) resources/res.rc
-  $(L32) $(L32_OPTS) $(BUILD_DIR32)\ExtractUtils.obj $(BUILD_DIR32)\FileUtils.obj $(BUILD_DIR32)\JavaUtils.obj $(BUILD_DIR32)\Launcher.obj $(BUILD_DIR32)\Main.obj $(BUILD_DIR32)\ProcessUtils.obj $(BUILD_DIR32)\RegistryUtils.obj $(BUILD_DIR32)\StringUtils.obj $(BUILD_DIR32)\SystemUtils.obj $(BUILD_DIR32)\resources.obj
-  $(MT32)  /outputresource:"$(OUTPUT_FILE32);#1" -manifest $(MANIFEST_FILE32) $(BUILD_DIR32)\nlw.exe.intermediate.manifest
diff --git a/src/main/cpp/launcher/windows/Makefile.mingw b/src/main/cpp/launcher/windows/Makefile.mingw
new file mode 100644
index 0000000..7085105
--- /dev/null
+++ b/src/main/cpp/launcher/windows/Makefile.mingw
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+TMPFLD = ../../../../../target/tmp/
+OFLD = ../../../../../target/launcher/
+
+all: prepfolder nlw.exe
+
+prepfolder:
+	mkdir -p $(TMPFLD)
+	mkdir -p $(OFLD)
+
+clean:
+	rm -f *.res *.exe *.dll
+
+nlw.res: resources/res.rc
+	i686-w64-mingw32-windres -o$(TMPFLD)nlw.res -Ocoff resources/res.rc
+
+
+nlw.exe: nlw.res
+	i686-w64-mingw32-gcc -s -DARCHITECTURE=32 -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -Wl,--no-insert-timestamp -mwindows src/Main.c src/Launcher.c src/ExtractUtils.c src/FileUtils.c src/SystemUtils.c src/RegistryUtils.c src/ProcessUtils.c src/JavaUtils.c src/StringUtils.c -o$(OFLD)nlw.exe -static -lstdc++ -lcomctl32 -luserenv -static-libstdc++ -static-libgcc
diff --git a/src/main/cpp/launcher/windows/nbproject/configurations.xml b/src/main/cpp/launcher/windows/nbproject/configurations.xml
deleted file mode 100644
index 095caed..0000000
--- a/src/main/cpp/launcher/windows/nbproject/configurations.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<configurationDescriptor version="84">
-  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
-    <logicalFolder name="HeaderFiles"
-                   displayName="Header Files"
-                   projectFiles="true">
-      <itemPath>src/Errors.h</itemPath>
-      <itemPath>src/ExtractUtils.h</itemPath>
-      <itemPath>src/FileUtils.h</itemPath>
-      <itemPath>src/JavaUtils.h</itemPath>
-      <itemPath>src/Launcher.h</itemPath>
-      <itemPath>src/Main.h</itemPath>
-      <itemPath>src/ProcessUtils.h</itemPath>
-      <itemPath>src/RegistryUtils.h</itemPath>
-      <itemPath>src/StringUtils.h</itemPath>
-      <itemPath>src/SystemUtils.h</itemPath>
-      <itemPath>src/Types.h</itemPath>
-    </logicalFolder>
-    <logicalFolder name="ResourceFiles"
-                   displayName="Resource Files"
-                   projectFiles="true">
-      <itemPath>resources/res.rc</itemPath>
-    </logicalFolder>
-    <logicalFolder name="SourceFiles"
-                   displayName="Source Files"
-                   projectFiles="true">
-      <itemPath>src/ExtractUtils.c</itemPath>
-      <itemPath>src/FileUtils.c</itemPath>
-      <itemPath>src/JavaUtils.c</itemPath>
-      <itemPath>src/Launcher.c</itemPath>
-      <itemPath>src/Main.c</itemPath>
-      <itemPath>src/ProcessUtils.c</itemPath>
-      <itemPath>src/RegistryUtils.c</itemPath>
-      <itemPath>src/StringUtils.c</itemPath>
-      <itemPath>src/SystemUtils.c</itemPath>
-    </logicalFolder>
-    <logicalFolder name="ExternalFiles"
-                   displayName="Important Files"
-                   projectFiles="false">
-      <itemPath>Makefile</itemPath>
-    </logicalFolder>
-  </logicalFolder>
-  <projectmakefile>Makefile</projectmakefile>
-  <confs>
-    <conf name="Debug" type="1">
-      <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
-        <compilerSet>Cygwin|Cygwin</compilerSet>
-      </toolsSet>
-      <compileType>
-        <cTool>
-          <stripSymbols>true</stripSymbols>
-          <commandLine>-mno-cygwin</commandLine>
-          <warningLevel>3</warningLevel>
-        </cTool>
-        <ccTool>
-          <stripSymbols>true</stripSymbols>
-        </ccTool>
-        <linkerTool>
-          <output>dist/nlw</output>
-          <stripSymbols>true</stripSymbols>
-          <linkerLibItems>
-            <linkerOptionItem>-lole32 -luuid -lkernel32 -lcomctl32 -luserenv</linkerOptionItem>
-          </linkerLibItems>
-          <commandLine>-mwindows -mno-cygwin build/icon.o</commandLine>
-        </linkerTool>
-      </compileType>
-    </conf>
-    <conf name="Release" type="1">
-      <toolsSet>
-        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>
-        <compilerSet>Cygwin|Cygwin</compilerSet>
-      </toolsSet>
-      <compileType>
-        <cTool>
-          <developmentMode>5</developmentMode>
-        </cTool>
-        <ccTool>
-          <developmentMode>5</developmentMode>
-        </ccTool>
-        <fortranCompilerTool>
-          <developmentMode>5</developmentMode>
-        </fortranCompilerTool>
-      </compileType>
-    </conf>
-  </confs>
-</configurationDescriptor>
diff --git a/src/main/cpp/launcher/windows/nbproject/project.properties b/src/main/cpp/launcher/windows/nbproject/project.properties
deleted file mode 100644
index 3807b67..0000000
--- a/src/main/cpp/launcher/windows/nbproject/project.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# 
-
diff --git a/src/main/cpp/launcher/windows/nbproject/project.xml b/src/main/cpp/launcher/windows/nbproject/project.xml
deleted file mode 100644
index 017b77b..0000000
--- a/src/main/cpp/launcher/windows/nbproject/project.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.cnd.makeproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>NBI Native Launcher : Windows</name>
-            <make-project-type>0</make-project-type>
-            <c-extensions>c</c-extensions>
-            <cpp-extensions/>
-            <header-extensions>h</header-extensions>
-            <sourceEncoding>UTF-8</sourceEncoding>
-            <make-dep-projects/>
-            <sourceRootList/>
-            <confList>
-                <confElem>
-                    <name>Debug</name>
-                    <type>1</type>
-                </confElem>
-                <confElem>
-                    <name>Release</name>
-                    <type>1</type>
-                </confElem>
-            </confList>
-        </data>
-    </configuration>
-</project>
diff --git a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.ncb b/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.ncb
deleted file mode 100644
index 9057eba..0000000
--- a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.ncb
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft C/C++ MSF 7.00
diff --git a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.sln b/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.sln
deleted file mode 100644
index cad338e..0000000
--- a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.sln
+++ /dev/null
@@ -1,17 +0,0 @@
-﻿
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NBI Native Launcher", "NBI Native Launcher.vcproj", "{BC558D87-D517-4F10-BFCA-0371AC724252}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC558D87-D517-4F10-BFCA-0371AC724252}.Release|Win32.ActiveCfg = Release|Win32
-		{BC558D87-D517-4F10-BFCA-0371AC724252}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.suo b/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.suo
deleted file mode 100644
index 6a0abfa..0000000
--- a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.suo
+++ /dev/null
Binary files differ
diff --git a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj b/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj
deleted file mode 100644
index 44a49a4..0000000
--- a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj
+++ /dev/null
@@ -1,304 +0,0 @@
-﻿<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="NBI Native Launcher"
-	ProjectGUID="{BC558D87-D517-4F10-BFCA-0371AC724252}"
-	RootNamespace="NBI Native Launcher"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Include&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_STATIC_CPPLIB"
-				MinimalRebuild="false"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Userenv.lib user32.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib gdi32.lib libcmt.lib"
-				OutputFile="..\dist\nlw.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="false"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib&quot;"
-				GenerateManifest="true"
-				ManifestFile="$(IntDir)\$(TargetFileName).intermediate.manifest"
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="true"
-				SuppressStartupBanner="false"
-				VerboseOutput="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib userenv.lib libcmt.lib"
-				OutputFile="../dist/nlw.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="false"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\Lib&quot;"
-				GenerateManifest="true"
-				IgnoreAllDefaultLibraries="true"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-				AllowIsolation="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				AdditionalManifestFiles="$(ProjectDir)..\resources\nlw.exe.manifest"
-				EmbedManifest="true"
-				SuppressStartupBanner="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\src\Errors.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ExtractUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\FileUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\JavaUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\Launcher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\Main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ProcessUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\RegistryUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\StringUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\SystemUtils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\Types.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\resources\res.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\src\ExtractUtils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\FileUtils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\JavaUtils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\Launcher.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\Main.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ProcessUtils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\RegistryUtils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\StringUtils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\SystemUtils.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj.SARD.dlm198383.user b/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj.SARD.dlm198383.user
deleted file mode 100644
index ab27aa5..0000000
--- a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj.SARD.dlm198383.user
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8,00"
-	ShowAllFiles="true"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SARD"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SARD"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj.user b/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj.user
deleted file mode 100644
index a5ca4f9..0000000
--- a/src/main/cpp/launcher/windows/vcproject/NBI Native Launcher.vcproj.user
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><VisualStudioUserFile ProjectType="Visual C++" Version="8.00" ShowAllFiles="true"></VisualStudioUserFile>
\ No newline at end of file