Merge pull request #116 from SofiaCPP/feature/ninja

Feature/ninja

58 files changed, 2175 insertions, 974 deletions

diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln
index 89a91b3..5fcaac4 100644
--- a/JSImpl/solution/JSImpl.sln
+++ b/JSImpl/solution/JSImpl.sln
@@ -9,12 +9,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSImpl", "JSImpl", "{C30B50
 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gctest", "gctest", "{5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}"

 	ProjectSection(ProjectDependencies) = postProject

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Test.vcxproj", "{45DC8C7C-3113-8E0D-DAFF-7310C6150A0F}"

 	ProjectSection(ProjectDependencies) = postProject

 		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF}

 		{30B03E7E-1C68-80CB-856F-592771461BBC} = {30B03E7E-1C68-80CB-856F-592771461BBC}

@@ -24,11 +24,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "..\test\Test.vcxpro
 		{EC34880F-5849-B0C0-21CB-53208D9EACF1} = {EC34880F-5849-B0C0-21CB-53208D9EACF1}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "..\test\gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{EC34880F-5849-B0C0-21CB-53208D9EACF1}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\test\gmock.vcxproj", "{B686840F-229B-ACC0-EB1C-502057F0A8F1}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{B686840F-229B-ACC0-EB1C-502057F0A8F1}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "..\test\gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcxproj", "{30B03E7E-1C68-80CB-856F-592771461BBC}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSLib", "JSLib.vcxproj", "{19EA680D-85FE-90BE-4E80-341EBA538DEF}"

 EndProject

@@ -37,23 +37,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSImpl", "JSImpl.vcxproj",
 		{19EA680D-85FE-90BE-4E80-341EBA538DEF} = {19EA680D-85FE-90BE-4E80-341EBA538DEF}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprt", "..\..\spasm\solution\sprt.vcxproj", "{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprt", "sprt.vcxproj", "{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm_lib", "..\..\spasm\solution\spasm_lib.vcxproj", "{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm_lib", "spasm_lib.vcxproj", "{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\solution\spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "spasm.vcxproj", "{69185F10-D52C-87C1-9EAE-2A210A8283F2}"

 	ProjectSection(ProjectDependencies) = postProject

 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "..\..\gctest\solution\test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "..\..\gctest\solution\leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}"

 	ProjectSection(ProjectDependencies) = postProject

 		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "..\..\gctest\solution\dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}"

 	ProjectSection(ProjectDependencies) = postProject

 		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325}

 	EndProjectSection

diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile
index 78a826a..e1ea347 100644
--- a/JSImpl/solution/Makefile
+++ b/JSImpl/solution/Makefile
@@ -14,19 +14,19 @@ all: $(PROJECTS)
 
 Test: sprt spasm_lib JSLib gtest gmock gtest_main
 	@echo "==== Building Test ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../test -f Test.make
+	@${MAKE} --no-print-directory -C . -f Test.make
 
 gtest: 
 	@echo "==== Building gtest ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../test -f gtest.make
+	@${MAKE} --no-print-directory -C . -f gtest.make
 
 gmock: 
 	@echo "==== Building gmock ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../test -f gmock.make
+	@${MAKE} --no-print-directory -C . -f gmock.make
 
 gtest_main: 
 	@echo "==== Building gtest_main ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../test -f gtest_main.make
+	@${MAKE} --no-print-directory -C . -f gtest_main.make
 
 JSLib: 
 	@echo "==== Building JSLib ($(config)) ===="
@@ -38,46 +38,46 @@ JSImpl: JSLib
 
 sprt: 
 	@echo "==== Building sprt ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make
+	@${MAKE} --no-print-directory -C . -f sprt.make
 
 spasm_lib: 
 	@echo "==== Building spasm_lib ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make
+	@${MAKE} --no-print-directory -C . -f spasm_lib.make
 
 spasm: spasm_lib
 	@echo "==== Building spasm ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make
+	@${MAKE} --no-print-directory -C . -f spasm.make
 
 sprun: sprt
 	@echo "==== Building sprun ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make
+	@${MAKE} --no-print-directory -C . -f sprun.make
 
 test_bench: 
 	@echo "==== Building test_bench ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make
+	@${MAKE} --no-print-directory -C . -f test_bench.make
 
 leak_gc: test_bench
 	@echo "==== Building leak_gc ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make
+	@${MAKE} --no-print-directory -C . -f leak_gc.make
 
 dummy_gc: test_bench
 	@echo "==== Building dummy_gc ($(config)) ===="
-	@${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make
+	@${MAKE} --no-print-directory -C . -f dummy_gc.make
 
 clean:
-	@${MAKE} --no-print-directory -C ../test -f Test.make clean
-	@${MAKE} --no-print-directory -C ../test -f gtest.make clean
-	@${MAKE} --no-print-directory -C ../test -f gmock.make clean
-	@${MAKE} --no-print-directory -C ../test -f gtest_main.make clean
+	@${MAKE} --no-print-directory -C . -f Test.make clean
+	@${MAKE} --no-print-directory -C . -f gtest.make clean
+	@${MAKE} --no-print-directory -C . -f gmock.make clean
+	@${MAKE} --no-print-directory -C . -f gtest_main.make clean
 	@${MAKE} --no-print-directory -C . -f JSLib.make clean
 	@${MAKE} --no-print-directory -C . -f JSImpl.make clean
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprt.make clean
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make clean
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make clean
-	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make clean
-	@${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make clean
-	@${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make clean
-	@${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make clean
+	@${MAKE} --no-print-directory -C . -f sprt.make clean
+	@${MAKE} --no-print-directory -C . -f spasm_lib.make clean
+	@${MAKE} --no-print-directory -C . -f spasm.make clean
+	@${MAKE} --no-print-directory -C . -f sprun.make clean
+	@${MAKE} --no-print-directory -C . -f test_bench.make clean
+	@${MAKE} --no-print-directory -C . -f leak_gc.make clean
+	@${MAKE} --no-print-directory -C . -f dummy_gc.make clean
 
 help:
 	@echo "Usage: make [config=name] [target]"
diff --git a/JSImpl/test/Test.make b/JSImpl/solution/Test.make
index 5701630..495a888 100644
--- a/JSImpl/test/Test.make
+++ b/JSImpl/solution/Test.make
@@ -47,7 +47,7 @@ ifeq ($(config),debug32)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
+  INCLUDES           += -I"../test/googletest/googletest/include" -I"../test/googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
@@ -65,12 +65,12 @@ ifeq ($(config),debug32)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/ASTInterpreterTests.o \
-	$(OBJDIR)/CodeGenerationTests.o \
-	$(OBJDIR)/LexerTests.o \
-	$(OBJDIR)/ParserTests.o \
-	$(OBJDIR)/empty.o \
-	$(OBJDIR)/sprtTests.o \
+	$(OBJDIR)/test/ASTInterpreterTests.o \
+	$(OBJDIR)/test/CodeGenerationTests.o \
+	$(OBJDIR)/test/LexerTests.o \
+	$(OBJDIR)/test/ParserTests.o \
+	$(OBJDIR)/test/empty.o \
+	$(OBJDIR)/test/sprtTests.o \
 
   define PREBUILDCMDS
   endef
@@ -85,7 +85,7 @@ ifeq ($(config),release32)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
+  INCLUDES           += -I"../test/googletest/googletest/include" -I"../test/googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
@@ -103,12 +103,12 @@ ifeq ($(config),release32)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/ASTInterpreterTests.o \
-	$(OBJDIR)/CodeGenerationTests.o \
-	$(OBJDIR)/LexerTests.o \
-	$(OBJDIR)/ParserTests.o \
-	$(OBJDIR)/empty.o \
-	$(OBJDIR)/sprtTests.o \
+	$(OBJDIR)/test/ASTInterpreterTests.o \
+	$(OBJDIR)/test/CodeGenerationTests.o \
+	$(OBJDIR)/test/LexerTests.o \
+	$(OBJDIR)/test/ParserTests.o \
+	$(OBJDIR)/test/empty.o \
+	$(OBJDIR)/test/sprtTests.o \
 
   define PREBUILDCMDS
   endef
@@ -123,7 +123,7 @@ ifeq ($(config),debug64)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
+  INCLUDES           += -I"../test/googletest/googletest/include" -I"../test/googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -141,12 +141,12 @@ ifeq ($(config),debug64)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/ASTInterpreterTests.o \
-	$(OBJDIR)/CodeGenerationTests.o \
-	$(OBJDIR)/LexerTests.o \
-	$(OBJDIR)/ParserTests.o \
-	$(OBJDIR)/empty.o \
-	$(OBJDIR)/sprtTests.o \
+	$(OBJDIR)/test/ASTInterpreterTests.o \
+	$(OBJDIR)/test/CodeGenerationTests.o \
+	$(OBJDIR)/test/LexerTests.o \
+	$(OBJDIR)/test/ParserTests.o \
+	$(OBJDIR)/test/empty.o \
+	$(OBJDIR)/test/sprtTests.o \
 
   define PREBUILDCMDS
   endef
@@ -161,7 +161,7 @@ ifeq ($(config),release64)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/Test
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest/include" -I"googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
+  INCLUDES           += -I"../test/googletest/googletest/include" -I"../test/googletest/googlemock/include" -I".." -I"../../spasm/src" -I"../../spasm/src/asm"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
@@ -179,12 +179,12 @@ ifeq ($(config),release64)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/ASTInterpreterTests.o \
-	$(OBJDIR)/CodeGenerationTests.o \
-	$(OBJDIR)/LexerTests.o \
-	$(OBJDIR)/ParserTests.o \
-	$(OBJDIR)/empty.o \
-	$(OBJDIR)/sprtTests.o \
+	$(OBJDIR)/test/ASTInterpreterTests.o \
+	$(OBJDIR)/test/CodeGenerationTests.o \
+	$(OBJDIR)/test/LexerTests.o \
+	$(OBJDIR)/test/ParserTests.o \
+	$(OBJDIR)/test/empty.o \
+	$(OBJDIR)/test/sprtTests.o \
 
   define PREBUILDCMDS
   endef
@@ -196,7 +196,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/. \
+	$(OBJDIR)/test \
 
 RESOURCES := \
 
@@ -256,27 +256,27 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/ASTInterpreterTests.o: ASTInterpreterTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
+$(OBJDIR)/test/ASTInterpreterTests.o: ../test/ASTInterpreterTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/CodeGenerationTests.o: CodeGenerationTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
+$(OBJDIR)/test/CodeGenerationTests.o: ../test/CodeGenerationTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/LexerTests.o: LexerTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
+$(OBJDIR)/test/LexerTests.o: ../test/LexerTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/ParserTests.o: ParserTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
+$(OBJDIR)/test/ParserTests.o: ../test/ParserTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/empty.o: empty.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
+$(OBJDIR)/test/empty.o: ../test/empty.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/sprtTests.o: sprtTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/.
+$(OBJDIR)/test/sprtTests.o: ../test/sprtTests.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/test
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/JSImpl/test/Test.vcxproj b/JSImpl/solution/Test.vcxproj
index 1b61e01..63a2306 100644
--- a/JSImpl/test/Test.vcxproj
+++ b/JSImpl/solution/Test.vcxproj
@@ -102,7 +102,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -119,7 +119,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -135,7 +135,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -152,7 +152,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -168,7 +168,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -185,7 +185,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -203,7 +203,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -220,7 +220,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest\include;googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest\include;..\test\googletest\googlemock\include;..;..\..\spasm\src;..\..\spasm\src\asm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -235,30 +235,30 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="ASTInterpreterTests.cpp">

+    <ClCompile Include="..\test\ASTInterpreterTests.cpp">

     </ClCompile>

-    <ClCompile Include="LexerTests.cpp">

+    <ClCompile Include="..\test\LexerTests.cpp">

     </ClCompile>

-    <ClCompile Include="CodeGenerationTests.cpp">

+    <ClCompile Include="..\test\CodeGenerationTests.cpp">

     </ClCompile>

-    <ClCompile Include="ParserTests.cpp">

+    <ClCompile Include="..\test\ParserTests.cpp">

     </ClCompile>

-    <ClCompile Include="sprtTests.cpp">

+    <ClCompile Include="..\test\sprtTests.cpp">

     </ClCompile>

-    <ClCompile Include="empty.cpp">

+    <ClCompile Include="..\test\empty.cpp">

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\solution\JSLib.vcxproj">

+    <ProjectReference Include="JSLib.vcxproj">

       <Project>{19EA680D-85FE-90BE-4E80-341EBA538DEF}</Project>

     </ProjectReference>

     <ProjectReference Include="gtest_main.vcxproj">

       <Project>{30B03E7E-1C68-80CB-856F-592771461BBC}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\..\spasm\solution\spasm_lib.vcxproj">

+    <ProjectReference Include="spasm_lib.vcxproj">

       <Project>{3F16CDE1-AB80-8158-F4BE-32FE60685FAD}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\..\spasm\solution\sprt.vcxproj">

+    <ProjectReference Include="sprt.vcxproj">

       <Project>{AE0A9E7C-9A41-9F0D-432E-85102F441B0F}</Project>

     </ProjectReference>

     <ProjectReference Include="gmock.vcxproj">

diff --git a/JSImpl/solution/Test.vcxproj.filters b/JSImpl/solution/Test.vcxproj.filters
new file mode 100644
index 0000000..cd184ce
--- /dev/null
+++ b/JSImpl/solution/Test.vcxproj.filters
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="test">

+      <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\test\ASTInterpreterTests.cpp">

+      <Filter>test</Filter>

+    </ClCompile>

+    <ClCompile Include="..\test\LexerTests.cpp">

+      <Filter>test</Filter>

+    </ClCompile>

+    <ClCompile Include="..\test\CodeGenerationTests.cpp">

+      <Filter>test</Filter>

+    </ClCompile>

+    <ClCompile Include="..\test\ParserTests.cpp">

+      <Filter>test</Filter>

+    </ClCompile>

+    <ClCompile Include="..\test\sprtTests.cpp">

+      <Filter>test</Filter>

+    </ClCompile>

+    <ClCompile Include="..\test\empty.cpp">

+      <Filter>test</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/JSImpl/solution/dummy_gc.make b/JSImpl/solution/dummy_gc.make
new file mode 100644
index 0000000..a11c028
--- /dev/null
+++ b/JSImpl/solution/dummy_gc.make
@@ -0,0 +1,243 @@
+# GNU Make project makefile autogenerated by GENie
+ifndef config
+  config=debug32
+endif
+
+ifndef verbose
+  SILENT = @
+endif
+
+SHELLTYPE := msdos
+ifeq (,$(ComSpec)$(COMSPEC))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(SHELL)))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(MAKESHELL)))
+  SHELLTYPE := posix
+endif
+
+ifeq (posix,$(SHELLTYPE))
+  MKDIR = $(SILENT) mkdir -p "$(1)"
+  COPY  = $(SILENT) cp -fR "$(1)" "$(2)"
+  RM    = $(SILENT) rm -f "$(1)"
+else
+  MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0
+  COPY  = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
+  RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
+endif
+
+CC  = gcc
+CXX = g++
+AR  = ar
+
+ifndef RESCOMP
+  ifdef WINDRES
+    RESCOMP = $(WINDRES)
+  else
+    RESCOMP = windres
+  endif
+endif
+
+MAKEFILE = dummy_gc.make
+
+ifeq ($(config),debug32)
+  OBJDIR              = ../build/obj/Debug/x32/Debug/dummy_gc
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/dummy_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_dummy.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release32)
+  OBJDIR              = ../build/obj/Release/x32/Release/dummy_gc
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/dummy_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_dummy.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),debug64)
+  OBJDIR              = ../build/obj/Debug/x64/Debug/dummy_gc
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/dummy_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_dummy.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release64)
+  OBJDIR              = ../build/obj/Release/x64/Release/dummy_gc
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/dummy_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_dummy.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+OBJDIRS := \
+	$(OBJDIR) \
+	$(OBJDIR)/gctest/src \
+
+RESOURCES := \
+
+.PHONY: clean prebuild prelink
+
+all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET)
+	@:
+
+$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS)
+	@echo Linking dummy_gc
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
+	-$(call MKDIR,$(TARGETDIR))
+
+$(OBJDIRS):
+	@echo Creating $(@)
+	-$(call MKDIR,$@)
+
+clean:
+	@echo Cleaning dummy_gc
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) rm -f  $(TARGET)
+	$(SILENT) rm -rf $(OBJDIR)
+else
+	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
+	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
+endif
+
+prebuild:
+	$(PREBUILDCMDS)
+
+prelink:
+	$(PRELINKCMDS)
+
+ifneq (,$(PCH))
+$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+
+$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+endif
+
+ifneq (,$(OBJRESP))
+$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+ifneq (,$(LDRESP))
+$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+$(OBJDIR)/gctest/src/gc_dummy.o: ../../gctest/src/gc_dummy.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+-include $(OBJECTS:%.o=%.d)
+ifneq (,$(PCH))
+  -include $(OBJDIR)/$(notdir $(PCH)).d
+  -include $(OBJDIR)/$(notdir $(PCH))_objc.d
+endif
diff --git a/JSImpl/solution/dummy_gc.vcxproj b/JSImpl/solution/dummy_gc.vcxproj
new file mode 100644
index 0000000..3cc8316
--- /dev/null
+++ b/JSImpl/solution/dummy_gc.vcxproj
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}</ProjectGuid>

+    <RootNamespace>dummy_gc</RootNamespace>

+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>

+    <TargetName>dummy_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>

+    <TargetName>dummy_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\dummy_gc\</IntDir>

+    <TargetName>dummy_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\dummy_gc\</IntDir>

+    <TargetName>dummy_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)dummy_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dummy_gc.pdb</ProgramDatabaseFile>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)dummy_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)dummy_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dummy_gc.pdb</ProgramDatabaseFile>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)dummy_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>MaxSpeed</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)dummy_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dummy_gc.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)dummy_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>MaxSpeed</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)dummy_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)dummy_gc.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)dummy_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\gctest\src\gc_dummy.cpp">

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="test_bench.vcxproj">

+      <Project>{A41847E7-90D0-8834-F9D7-6190E5AE2325}</Project>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>

diff --git a/JSImpl/solution/dummy_gc.vcxproj.filters b/JSImpl/solution/dummy_gc.vcxproj.filters
new file mode 100644
index 0000000..8234682
--- /dev/null
+++ b/JSImpl/solution/dummy_gc.vcxproj.filters
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="gctest">

+      <UniqueIdentifier>{4F3063FF-3BD2-8DD5-248D-A12910CE1426}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="gctest\src">

+      <UniqueIdentifier>{F32A4563-DFE2-86B0-48EA-5F0C34C121A1}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\gctest\src\gc_dummy.cpp">

+      <Filter>gctest\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua
index 5d36fc8..0da986a 100644
--- a/JSImpl/solution/genie.lua
+++ b/JSImpl/solution/genie.lua
@@ -17,6 +17,11 @@ solution 'JSImpl'
 
 
     local root = '../build/'
+    if _ACTION ~= 'ninja' then
+        location '.'
+    else
+        location './ninja'
+    end
 
     configuration 'Debug'
         targetdir(root .. 'bin/Debug')
@@ -36,6 +41,7 @@ solution 'JSImpl'
             kind 'StaticLib'
             language 'C++'
             uuid(os.uuid('JSLib'))
+            location(solution().location)
             files '../src/*.cpp'
             removefiles '../src/main.cpp'
             files '../src/*.h'
@@ -44,6 +50,7 @@ solution 'JSImpl'
             kind 'ConsoleApp'
             language 'C++'
             uuid(os.uuid('JSImpl'))
+            location(solution().location)
             files '../src/main.cpp'
             links 'JSLib'
 
diff --git a/JSImpl/test/gmock.make b/JSImpl/solution/gmock.make
index 879ceb3..e171c1e 100644
--- a/JSImpl/test/gmock.make
+++ b/JSImpl/solution/gmock.make
@@ -47,7 +47,7 @@ ifeq ($(config),debug32)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgmock.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
@@ -65,7 +65,7 @@ ifeq ($(config),debug32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googlemock/src/gmock-all.o \
+	$(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \
 
   define PREBUILDCMDS
   endef
@@ -80,7 +80,7 @@ ifeq ($(config),release32)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgmock.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
@@ -98,7 +98,7 @@ ifeq ($(config),release32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googlemock/src/gmock-all.o \
+	$(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \
 
   define PREBUILDCMDS
   endef
@@ -113,7 +113,7 @@ ifeq ($(config),debug64)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgmock.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -131,7 +131,7 @@ ifeq ($(config),debug64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googlemock/src/gmock-all.o \
+	$(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \
 
   define PREBUILDCMDS
   endef
@@ -146,7 +146,7 @@ ifeq ($(config),release64)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgmock.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googlemock" -I"googletest/googlemock/include" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googlemock" -I"../test/googletest/googlemock/include" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
@@ -164,7 +164,7 @@ ifeq ($(config),release64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googlemock/src/gmock-all.o \
+	$(OBJDIR)/test/googletest/googlemock/src/gmock-all.o \
 
   define PREBUILDCMDS
   endef
@@ -176,7 +176,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/googletest/googlemock/src \
+	$(OBJDIR)/test/googletest/googlemock/src \
 
 RESOURCES := \
 
@@ -241,7 +241,7 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/googletest/googlemock/src/gmock-all.o: googletest/googlemock/src/gmock-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/googletest/googlemock/src
+$(OBJDIR)/test/googletest/googlemock/src/gmock-all.o: ../test/googletest/googlemock/src/gmock-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/test/googletest/googlemock/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/JSImpl/test/gmock.vcxproj b/JSImpl/solution/gmock.vcxproj
index 5847c81..a792ffa 100644
--- a/JSImpl/test/gmock.vcxproj
+++ b/JSImpl/solution/gmock.vcxproj
@@ -98,7 +98,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -115,7 +115,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gmock.lib</OutputFile>

@@ -131,7 +131,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -148,7 +148,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gmock.lib</OutputFile>

@@ -164,7 +164,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -181,7 +181,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gmock.lib</OutputFile>

@@ -199,7 +199,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -216,7 +216,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googlemock;googletest\googlemock\include;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googlemock;..\test\googletest\googlemock\include;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gmock.lib</OutputFile>

@@ -231,20 +231,20 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h" />

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-matchers.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-nice-strict.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-cardinalities.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-more-matchers.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-actions.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-matchers.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-more-actions.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-spec-builders.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-function-mockers.h" />

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-actions.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="googletest\googlemock\src\gmock-all.cc">

+    <ClCompile Include="..\test\googletest\googlemock\src\gmock-all.cc">

     </ClCompile>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/JSImpl/solution/gmock.vcxproj.filters b/JSImpl/solution/gmock.vcxproj.filters
new file mode 100644
index 0000000..7c25639
--- /dev/null
+++ b/JSImpl/solution/gmock.vcxproj.filters
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="test">

+      <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest">

+      <UniqueIdentifier>{3EADE347-AA38-510C-B349-D4001F54AD0C}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googlemock">

+      <UniqueIdentifier>{41EA1C81-2DFA-C851-96B3-2D7082E2B7EA}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googlemock\src">

+      <UniqueIdentifier>{E58D4E3E-D1B3-18A5-BAF9-9D70A6BE3D71}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googlemock\include">

+      <UniqueIdentifier>{412E1FB2-2D6A-221C-967C-3A1382D7CA36}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googlemock\include\gmock">

+      <UniqueIdentifier>{6E3BF3ED-5AB8-E630-8335-E7446F1183C4}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-matchers.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-cardinalities.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-more-matchers.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-actions.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-matchers.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-more-actions.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-spec-builders.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googlemock\include\gmock\gmock-actions.h">

+      <Filter>test\googletest\googlemock\include\gmock</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\test\googletest\googlemock\src\gmock-all.cc">

+      <Filter>test\googletest\googlemock\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/JSImpl/test/gtest.make b/JSImpl/solution/gtest.make
index e0fc567..474f7be 100644
--- a/JSImpl/test/gtest.make
+++ b/JSImpl/solution/gtest.make
@@ -47,7 +47,7 @@ ifeq ($(config),debug32)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgtest.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
@@ -65,7 +65,7 @@ ifeq ($(config),debug32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest-all.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest-all.o \
 
   define PREBUILDCMDS
   endef
@@ -80,7 +80,7 @@ ifeq ($(config),release32)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgtest.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
@@ -98,7 +98,7 @@ ifeq ($(config),release32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest-all.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest-all.o \
 
   define PREBUILDCMDS
   endef
@@ -113,7 +113,7 @@ ifeq ($(config),debug64)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgtest.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -131,7 +131,7 @@ ifeq ($(config),debug64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest-all.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest-all.o \
 
   define PREBUILDCMDS
   endef
@@ -146,7 +146,7 @@ ifeq ($(config),release64)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgtest.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
@@ -164,7 +164,7 @@ ifeq ($(config),release64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest-all.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest-all.o \
 
   define PREBUILDCMDS
   endef
@@ -176,7 +176,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/googletest/googletest/src \
+	$(OBJDIR)/test/googletest/googletest/src \
 
 RESOURCES := \
 
@@ -241,7 +241,7 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/googletest/googletest/src/gtest-all.o: googletest/googletest/src/gtest-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/googletest/googletest/src
+$(OBJDIR)/test/googletest/googletest/src/gtest-all.o: ../test/googletest/googletest/src/gtest-all.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/test/googletest/googletest/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/JSImpl/test/gtest.vcxproj b/JSImpl/solution/gtest.vcxproj
index 15f24e8..d0df4d8 100644
--- a/JSImpl/test/gtest.vcxproj
+++ b/JSImpl/solution/gtest.vcxproj
@@ -98,7 +98,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -115,7 +115,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest.lib</OutputFile>

@@ -131,7 +131,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -148,7 +148,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest.lib</OutputFile>

@@ -164,7 +164,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -181,7 +181,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest.lib</OutputFile>

@@ -199,7 +199,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -216,7 +216,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest.lib</OutputFile>

@@ -231,19 +231,19 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h" />

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-message.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-param-test.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-typed-test.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest_pred_impl.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-spi.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-death-test.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-printers.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-test-part.h" />

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest_prod.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="googletest\googletest\src\gtest-all.cc">

+    <ClCompile Include="..\test\googletest\googletest\src\gtest-all.cc">

     </ClCompile>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/JSImpl/solution/gtest.vcxproj.filters b/JSImpl/solution/gtest.vcxproj.filters
new file mode 100644
index 0000000..68d19e3
--- /dev/null
+++ b/JSImpl/solution/gtest.vcxproj.filters
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="test">

+      <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest">

+      <UniqueIdentifier>{3EADE347-AA38-510C-B349-D4001F54AD0C}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googletest">

+      <UniqueIdentifier>{77982081-63A8-CC51-CC61-3170B890BBEA}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googletest\src">

+      <UniqueIdentifier>{1B674AD8-078D-143F-F0D2-990ADC97390B}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googletest\include">

+      <UniqueIdentifier>{77B2302C-63EE-3396-CC00-4C8DB85BDCB0}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googletest\include\gtest">

+      <UniqueIdentifier>{5A3EE434-46BB-D777-6F38-D88B5B14740B}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-message.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-param-test.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-typed-test.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest_pred_impl.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-spi.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-death-test.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-printers.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest-test-part.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+    <ClInclude Include="..\test\googletest\googletest\include\gtest\gtest_prod.h">

+      <Filter>test\googletest\googletest\include\gtest</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\test\googletest\googletest\src\gtest-all.cc">

+      <Filter>test\googletest\googletest\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/JSImpl/test/gtest_main.make b/JSImpl/solution/gtest_main.make
index 87cbc27..ab25f0b 100644
--- a/JSImpl/test/gtest_main.make
+++ b/JSImpl/solution/gtest_main.make
@@ -47,7 +47,7 @@ ifeq ($(config),debug32)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgtest_main.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
@@ -65,7 +65,7 @@ ifeq ($(config),debug32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest_main.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest_main.o \
 
   define PREBUILDCMDS
   endef
@@ -80,7 +80,7 @@ ifeq ($(config),release32)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgtest_main.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
@@ -98,7 +98,7 @@ ifeq ($(config),release32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest_main.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest_main.o \
 
   define PREBUILDCMDS
   endef
@@ -113,7 +113,7 @@ ifeq ($(config),debug64)
   TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libgtest_main.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
@@ -131,7 +131,7 @@ ifeq ($(config),debug64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest_main.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest_main.o \
 
   define PREBUILDCMDS
   endef
@@ -146,7 +146,7 @@ ifeq ($(config),release64)
   TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libgtest_main.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
-  INCLUDES           += -I"googletest/googletest" -I"googletest/googletest/include"
+  INCLUDES           += -I"../test/googletest/googletest" -I"../test/googletest/googletest/include"
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
   ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
@@ -164,7 +164,7 @@ ifeq ($(config),release64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/googletest/googletest/src/gtest_main.o \
+	$(OBJDIR)/test/googletest/googletest/src/gtest_main.o \
 
   define PREBUILDCMDS
   endef
@@ -176,7 +176,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/googletest/googletest/src \
+	$(OBJDIR)/test/googletest/googletest/src \
 
 RESOURCES := \
 
@@ -241,7 +241,7 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/googletest/googletest/src/gtest_main.o: googletest/googletest/src/gtest_main.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/googletest/googletest/src
+$(OBJDIR)/test/googletest/googletest/src/gtest_main.o: ../test/googletest/googletest/src/gtest_main.cc $(GCH) $(MAKEFILE) | $(OBJDIR)/test/googletest/googletest/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/JSImpl/test/gtest_main.vcxproj b/JSImpl/solution/gtest_main.vcxproj
index 6c6df7c..5531dc1 100644
--- a/JSImpl/test/gtest_main.vcxproj
+++ b/JSImpl/solution/gtest_main.vcxproj
@@ -98,7 +98,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -115,7 +115,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

@@ -131,7 +131,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <FunctionLevelLinking>true</FunctionLevelLinking>

@@ -148,7 +148,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

@@ -164,7 +164,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -181,7 +181,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

@@ -199,7 +199,7 @@
     <ClCompile>

       <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>MaxSpeed</Optimization>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <StringPooling>true</StringPooling>

@@ -216,7 +216,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>googletest\googletest;googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\test\googletest\googletest;..\test\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

   <Lib>

     <OutputFile>$(OutDir)gtest_main.lib</OutputFile>

@@ -231,7 +231,7 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="googletest\googletest\src\gtest_main.cc">

+    <ClCompile Include="..\test\googletest\googletest\src\gtest_main.cc">

     </ClCompile>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/JSImpl/solution/gtest_main.vcxproj.filters b/JSImpl/solution/gtest_main.vcxproj.filters
new file mode 100644
index 0000000..f0131fd
--- /dev/null
+++ b/JSImpl/solution/gtest_main.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="test">

+      <UniqueIdentifier>{65689E7C-519F-9F0D-FA8B-8510E6A11B0F}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest">

+      <UniqueIdentifier>{3EADE347-AA38-510C-B349-D4001F54AD0C}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googletest">

+      <UniqueIdentifier>{77982081-63A8-CC51-CC61-3170B890BBEA}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="test\googletest\googletest\src">

+      <UniqueIdentifier>{1B674AD8-078D-143F-F0D2-990ADC97390B}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\test\googletest\googletest\src\gtest_main.cc">

+      <Filter>test\googletest\googletest\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/JSImpl/solution/leak_gc.make b/JSImpl/solution/leak_gc.make
new file mode 100644
index 0000000..141ea6b
--- /dev/null
+++ b/JSImpl/solution/leak_gc.make
@@ -0,0 +1,243 @@
+# GNU Make project makefile autogenerated by GENie
+ifndef config
+  config=debug32
+endif
+
+ifndef verbose
+  SILENT = @
+endif
+
+SHELLTYPE := msdos
+ifeq (,$(ComSpec)$(COMSPEC))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(SHELL)))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(MAKESHELL)))
+  SHELLTYPE := posix
+endif
+
+ifeq (posix,$(SHELLTYPE))
+  MKDIR = $(SILENT) mkdir -p "$(1)"
+  COPY  = $(SILENT) cp -fR "$(1)" "$(2)"
+  RM    = $(SILENT) rm -f "$(1)"
+else
+  MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0
+  COPY  = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
+  RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
+endif
+
+CC  = gcc
+CXX = g++
+AR  = ar
+
+ifndef RESCOMP
+  ifdef WINDRES
+    RESCOMP = $(WINDRES)
+  else
+    RESCOMP = windres
+  endif
+endif
+
+MAKEFILE = leak_gc.make
+
+ifeq ($(config),debug32)
+  OBJDIR              = ../build/obj/Debug/x32/Debug/leak_gc
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/leak_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_leak.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release32)
+  OBJDIR              = ../build/obj/Release/x32/Release/leak_gc
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/leak_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_leak.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),debug64)
+  OBJDIR              = ../build/obj/Debug/x64/Debug/leak_gc
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/leak_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_leak.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release64)
+  OBJDIR              = ../build/obj/Release/x64/Release/leak_gc
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/leak_gc
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/gc_leak.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+OBJDIRS := \
+	$(OBJDIR) \
+	$(OBJDIR)/gctest/src \
+
+RESOURCES := \
+
+.PHONY: clean prebuild prelink
+
+all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET)
+	@:
+
+$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS)
+	@echo Linking leak_gc
+	$(SILENT) $(LINKCMD)
+	$(POSTBUILDCMDS)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
+	-$(call MKDIR,$(TARGETDIR))
+
+$(OBJDIRS):
+	@echo Creating $(@)
+	-$(call MKDIR,$@)
+
+clean:
+	@echo Cleaning leak_gc
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) rm -f  $(TARGET)
+	$(SILENT) rm -rf $(OBJDIR)
+else
+	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
+	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
+endif
+
+prebuild:
+	$(PREBUILDCMDS)
+
+prelink:
+	$(PRELINKCMDS)
+
+ifneq (,$(PCH))
+$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+
+$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+endif
+
+ifneq (,$(OBJRESP))
+$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+ifneq (,$(LDRESP))
+$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+$(OBJDIR)/gctest/src/gc_leak.o: ../../gctest/src/gc_leak.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+-include $(OBJECTS:%.o=%.d)
+ifneq (,$(PCH))
+  -include $(OBJDIR)/$(notdir $(PCH)).d
+  -include $(OBJDIR)/$(notdir $(PCH))_objc.d
+endif
diff --git a/JSImpl/solution/leak_gc.vcxproj b/JSImpl/solution/leak_gc.vcxproj
new file mode 100644
index 0000000..7ba5b98
--- /dev/null
+++ b/JSImpl/solution/leak_gc.vcxproj
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}</ProjectGuid>

+    <RootNamespace>leak_gc</RootNamespace>

+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>Application</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\leak_gc\</IntDir>

+    <TargetName>leak_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\leak_gc\</IntDir>

+    <TargetName>leak_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\leak_gc\</IntDir>

+    <TargetName>leak_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\leak_gc\</IntDir>

+    <TargetName>leak_gc</TargetName>

+    <TargetExt>.exe</TargetExt>

+    <LinkIncremental>false</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)leak_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)leak_gc.pdb</ProgramDatabaseFile>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)leak_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)leak_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)leak_gc.pdb</ProgramDatabaseFile>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)leak_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>MaxSpeed</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)leak_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)leak_gc.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)leak_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>MaxSpeed</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level4</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(IntDir)leak_gc.compile.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+    <Link>

+      <SubSystem>Console</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)leak_gc.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+      <AdditionalLibraryDirectories>;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <OutputFile>$(OutDir)leak_gc.exe</OutputFile>

+      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <TargetMachine>MachineX64</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\gctest\src\gc_leak.cpp">

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="test_bench.vcxproj">

+      <Project>{A41847E7-90D0-8834-F9D7-6190E5AE2325}</Project>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>

diff --git a/JSImpl/solution/leak_gc.vcxproj.filters b/JSImpl/solution/leak_gc.vcxproj.filters
new file mode 100644
index 0000000..c04d52b
--- /dev/null
+++ b/JSImpl/solution/leak_gc.vcxproj.filters
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="gctest">

+      <UniqueIdentifier>{4F3063FF-3BD2-8DD5-248D-A12910CE1426}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="gctest\src">

+      <UniqueIdentifier>{F32A4563-DFE2-86B0-48EA-5F0C34C121A1}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\gctest\src\gc_leak.cpp">

+      <Filter>gctest\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/spasm/solution/spasm.make b/JSImpl/solution/spasm.make
index 9a6687d..27fa261 100644
--- a/spasm/solution/spasm.make
+++ b/JSImpl/solution/spasm.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = spasm.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/spasm
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x32/Debug/spasm
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/spasm
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -54,9 +54,9 @@ ifeq ($(config),debug32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libspasm_lib.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libspasm_lib.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
+  LIBDEPS            += ../build/bin/Debug/libspasm_lib.a
+  LDDEPS             += ../build/bin/Debug/libspasm_lib.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -64,7 +64,7 @@ ifeq ($(config),debug32)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/main.o \
+	$(OBJDIR)/spasm/src/asm/main.o \
 
   define PREBUILDCMDS
   endef
@@ -75,8 +75,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/spasm
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x32/Release/spasm
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/spasm
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -86,9 +86,9 @@ ifeq ($(config),release32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libspasm_lib.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libspasm_lib.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
+  LIBDEPS            += ../build/bin/Release/libspasm_lib.a
+  LDDEPS             += ../build/bin/Release/libspasm_lib.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -96,7 +96,7 @@ ifeq ($(config),release32)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/main.o \
+	$(OBJDIR)/spasm/src/asm/main.o \
 
   define PREBUILDCMDS
   endef
@@ -107,8 +107,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/spasm
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x64/Debug/spasm
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/spasm
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -118,9 +118,9 @@ ifeq ($(config),debug64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libspasm_lib.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libspasm_lib.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
+  LIBDEPS            += ../build/bin/Debug/libspasm_lib.a
+  LDDEPS             += ../build/bin/Debug/libspasm_lib.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -128,7 +128,7 @@ ifeq ($(config),debug64)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/main.o \
+	$(OBJDIR)/spasm/src/asm/main.o \
 
   define PREBUILDCMDS
   endef
@@ -139,8 +139,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/spasm
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x64/Release/spasm
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/spasm
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -150,9 +150,9 @@ ifeq ($(config),release64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libspasm_lib.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libspasm_lib.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
+  LIBDEPS            += ../build/bin/Release/libspasm_lib.a
+  LDDEPS             += ../build/bin/Release/libspasm_lib.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -160,7 +160,7 @@ ifeq ($(config),release64)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/main.o \
+	$(OBJDIR)/spasm/src/asm/main.o \
 
   define PREBUILDCMDS
   endef
@@ -172,7 +172,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/src/asm \
+	$(OBJDIR)/spasm/src/asm \
 
 RESOURCES := \
 
@@ -232,7 +232,7 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/src/asm/main.o: ../src/asm/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+$(OBJDIR)/spasm/src/asm/main.o: ../../spasm/src/asm/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/spasm/solution/spasm.vcxproj b/JSImpl/solution/spasm.vcxproj
index e74771d..dabe74a 100644
--- a/spasm/solution/spasm.vcxproj
+++ b/JSImpl/solution/spasm.vcxproj
@@ -31,7 +31,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,29 +71,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\spasm\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\spasm\</IntDir>

     <TargetName>spasm</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\spasm\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\spasm\</IntDir>

     <TargetName>spasm</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\spasm\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\spasm\</IntDir>

     <TargetName>spasm</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\spasm\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\spasm\</IntDir>

     <TargetName>spasm</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

@@ -231,7 +227,7 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\asm\main.cpp">

+    <ClCompile Include="..\..\spasm\src\asm\main.cpp">

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

diff --git a/JSImpl/solution/spasm.vcxproj.filters b/JSImpl/solution/spasm.vcxproj.filters
new file mode 100644
index 0000000..17e26cc
--- /dev/null
+++ b/JSImpl/solution/spasm.vcxproj.filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="spasm">

+      <UniqueIdentifier>{69185F10-D52C-87C1-9EAE-2A210A8283F2}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="spasm\src">

+      <UniqueIdentifier>{0D90CBE1-79FA-7F58-C238-31FE2EE25DAD}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="spasm\src\asm">

+      <UniqueIdentifier>{4AED32FE-B6AD-AE34-7FE8-F7B1EB67F310}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\spasm\src\asm\main.cpp">

+      <Filter>spasm\src\asm</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/spasm/solution/spasm_lib.make b/JSImpl/solution/spasm_lib.make
index f52e8d0..5377633 100644
--- a/spasm/solution/spasm_lib.make
+++ b/JSImpl/solution/spasm_lib.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = spasm_lib.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/spasm_lib
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x32/Debug/spasm_lib
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libspasm_lib.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -64,12 +64,12 @@ ifeq ($(config),debug32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/assembler.o \
-	$(OBJDIR)/src/asm/bytecode.o \
-	$(OBJDIR)/src/asm/lexer.o \
-	$(OBJDIR)/src/asm/symbol.o \
-	$(OBJDIR)/src/asm/token.o \
-	$(OBJDIR)/src/asm/tokenizer.o \
+	$(OBJDIR)/spasm/src/asm/assembler.o \
+	$(OBJDIR)/spasm/src/asm/bytecode.o \
+	$(OBJDIR)/spasm/src/asm/lexer.o \
+	$(OBJDIR)/spasm/src/asm/symbol.o \
+	$(OBJDIR)/spasm/src/asm/token.o \
+	$(OBJDIR)/spasm/src/asm/tokenizer.o \
 
   define PREBUILDCMDS
   endef
@@ -80,8 +80,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/spasm_lib
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x32/Release/spasm_lib
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libspasm_lib.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -101,12 +101,12 @@ ifeq ($(config),release32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/assembler.o \
-	$(OBJDIR)/src/asm/bytecode.o \
-	$(OBJDIR)/src/asm/lexer.o \
-	$(OBJDIR)/src/asm/symbol.o \
-	$(OBJDIR)/src/asm/token.o \
-	$(OBJDIR)/src/asm/tokenizer.o \
+	$(OBJDIR)/spasm/src/asm/assembler.o \
+	$(OBJDIR)/spasm/src/asm/bytecode.o \
+	$(OBJDIR)/spasm/src/asm/lexer.o \
+	$(OBJDIR)/spasm/src/asm/symbol.o \
+	$(OBJDIR)/spasm/src/asm/token.o \
+	$(OBJDIR)/spasm/src/asm/tokenizer.o \
 
   define PREBUILDCMDS
   endef
@@ -117,8 +117,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/spasm_lib
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x64/Debug/spasm_lib
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libspasm_lib.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -138,12 +138,12 @@ ifeq ($(config),debug64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/assembler.o \
-	$(OBJDIR)/src/asm/bytecode.o \
-	$(OBJDIR)/src/asm/lexer.o \
-	$(OBJDIR)/src/asm/symbol.o \
-	$(OBJDIR)/src/asm/token.o \
-	$(OBJDIR)/src/asm/tokenizer.o \
+	$(OBJDIR)/spasm/src/asm/assembler.o \
+	$(OBJDIR)/spasm/src/asm/bytecode.o \
+	$(OBJDIR)/spasm/src/asm/lexer.o \
+	$(OBJDIR)/spasm/src/asm/symbol.o \
+	$(OBJDIR)/spasm/src/asm/token.o \
+	$(OBJDIR)/spasm/src/asm/tokenizer.o \
 
   define PREBUILDCMDS
   endef
@@ -154,8 +154,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/spasm_lib
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x64/Release/spasm_lib
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libspasm_lib.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -175,12 +175,12 @@ ifeq ($(config),release64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/asm/assembler.o \
-	$(OBJDIR)/src/asm/bytecode.o \
-	$(OBJDIR)/src/asm/lexer.o \
-	$(OBJDIR)/src/asm/symbol.o \
-	$(OBJDIR)/src/asm/token.o \
-	$(OBJDIR)/src/asm/tokenizer.o \
+	$(OBJDIR)/spasm/src/asm/assembler.o \
+	$(OBJDIR)/spasm/src/asm/bytecode.o \
+	$(OBJDIR)/spasm/src/asm/lexer.o \
+	$(OBJDIR)/spasm/src/asm/symbol.o \
+	$(OBJDIR)/spasm/src/asm/token.o \
+	$(OBJDIR)/spasm/src/asm/tokenizer.o \
 
   define PREBUILDCMDS
   endef
@@ -192,7 +192,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/src/asm \
+	$(OBJDIR)/spasm/src/asm \
 
 RESOURCES := \
 
@@ -257,27 +257,27 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/src/asm/assembler.o: ../src/asm/assembler.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+$(OBJDIR)/spasm/src/asm/assembler.o: ../../spasm/src/asm/assembler.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/src/asm/bytecode.o: ../src/asm/bytecode.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+$(OBJDIR)/spasm/src/asm/bytecode.o: ../../spasm/src/asm/bytecode.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/src/asm/lexer.o: ../src/asm/lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+$(OBJDIR)/spasm/src/asm/lexer.o: ../../spasm/src/asm/lexer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/src/asm/symbol.o: ../src/asm/symbol.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+$(OBJDIR)/spasm/src/asm/symbol.o: ../../spasm/src/asm/symbol.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/src/asm/token.o: ../src/asm/token.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+$(OBJDIR)/spasm/src/asm/token.o: ../../spasm/src/asm/token.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
-$(OBJDIR)/src/asm/tokenizer.o: ../src/asm/tokenizer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src/asm
+$(OBJDIR)/spasm/src/asm/tokenizer.o: ../../spasm/src/asm/tokenizer.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src/asm
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/spasm/solution/spasm_lib.vcxproj b/JSImpl/solution/spasm_lib.vcxproj
index bcb4ab9..68f208a 100644
--- a/spasm/solution/spasm_lib.vcxproj
+++ b/JSImpl/solution/spasm_lib.vcxproj
@@ -31,7 +31,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,26 +71,26 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\spasm_lib\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\spasm_lib\</IntDir>

     <TargetName>spasm_lib</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\spasm_lib\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\spasm_lib\</IntDir>

     <TargetName>spasm_lib</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\spasm_lib\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\spasm_lib\</IntDir>

     <TargetName>spasm_lib</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\spasm_lib\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\spasm_lib\</IntDir>

     <TargetName>spasm_lib</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

@@ -227,17 +223,17 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\asm\assembler.cpp">

+    <ClCompile Include="..\..\spasm\src\asm\bytecode.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\asm\bytecode.cpp">

+    <ClCompile Include="..\..\spasm\src\asm\symbol.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\asm\lexer.cpp">

+    <ClCompile Include="..\..\spasm\src\asm\tokenizer.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\asm\symbol.cpp">

+    <ClCompile Include="..\..\spasm\src\asm\assembler.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\asm\token.cpp">

+    <ClCompile Include="..\..\spasm\src\asm\lexer.cpp">

     </ClCompile>

-    <ClCompile Include="..\src\asm\tokenizer.cpp">

+    <ClCompile Include="..\..\spasm\src\asm\token.cpp">

     </ClCompile>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/JSImpl/solution/spasm_lib.vcxproj.filters b/JSImpl/solution/spasm_lib.vcxproj.filters
new file mode 100644
index 0000000..76e6e4a
--- /dev/null
+++ b/JSImpl/solution/spasm_lib.vcxproj.filters
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="spasm">

+      <UniqueIdentifier>{69185F10-D52C-87C1-9EAE-2A210A8283F2}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="spasm\src">

+      <UniqueIdentifier>{0D90CBE1-79FA-7F58-C238-31FE2EE25DAD}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="spasm\src\asm">

+      <UniqueIdentifier>{4AED32FE-B6AD-AE34-7FE8-F7B1EB67F310}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\spasm\src\asm\bytecode.cpp">

+      <Filter>spasm\src\asm</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\spasm\src\asm\symbol.cpp">

+      <Filter>spasm\src\asm</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\spasm\src\asm\tokenizer.cpp">

+      <Filter>spasm\src\asm</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\spasm\src\asm\assembler.cpp">

+      <Filter>spasm\src\asm</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\spasm\src\asm\lexer.cpp">

+      <Filter>spasm\src\asm</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\spasm\src\asm\token.cpp">

+      <Filter>spasm\src\asm</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/spasm/solution/sprt.make b/JSImpl/solution/sprt.make
index b093263..1edc73e 100644
--- a/spasm/solution/sprt.make
+++ b/JSImpl/solution/sprt.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = sprt.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/sprt
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x32/Debug/sprt
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libsprt.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -64,7 +64,7 @@ ifeq ($(config),debug32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/spasm.o \
+	$(OBJDIR)/spasm/src/spasm.o \
 
   define PREBUILDCMDS
   endef
@@ -75,8 +75,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/sprt
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x32/Release/sprt
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libsprt.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -96,7 +96,7 @@ ifeq ($(config),release32)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/spasm.o \
+	$(OBJDIR)/spasm/src/spasm.o \
 
   define PREBUILDCMDS
   endef
@@ -107,8 +107,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/sprt
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x64/Debug/sprt
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libsprt.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -128,7 +128,7 @@ ifeq ($(config),debug64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/spasm.o \
+	$(OBJDIR)/spasm/src/spasm.o \
 
   define PREBUILDCMDS
   endef
@@ -139,8 +139,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/sprt
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x64/Release/sprt
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libsprt.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -160,7 +160,7 @@ ifeq ($(config),release64)
   LINKCMD             = $(AR)  -rcs $(TARGET)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/spasm.o \
+	$(OBJDIR)/spasm/src/spasm.o \
 
   define PREBUILDCMDS
   endef
@@ -172,7 +172,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/src \
+	$(OBJDIR)/spasm/src \
 
 RESOURCES := \
 
@@ -237,7 +237,7 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/src/spasm.o: ../src/spasm.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
+$(OBJDIR)/spasm/src/spasm.o: ../../spasm/src/spasm.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/spasm/solution/sprt.vcxproj b/JSImpl/solution/sprt.vcxproj
index 6e7737f..e663532 100644
--- a/spasm/solution/sprt.vcxproj
+++ b/JSImpl/solution/sprt.vcxproj
@@ -31,7 +31,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,26 +71,26 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\sprt\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\sprt\</IntDir>

     <TargetName>sprt</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\sprt\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\sprt\</IntDir>

     <TargetName>sprt</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\sprt\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\sprt\</IntDir>

     <TargetName>sprt</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\sprt\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\sprt\</IntDir>

     <TargetName>sprt</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

@@ -227,7 +223,7 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\spasm.cpp">

+    <ClCompile Include="..\..\spasm\src\spasm.cpp">

     </ClCompile>

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/JSImpl/solution/sprt.vcxproj.filters b/JSImpl/solution/sprt.vcxproj.filters
new file mode 100644
index 0000000..a916177
--- /dev/null
+++ b/JSImpl/solution/sprt.vcxproj.filters
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="spasm">

+      <UniqueIdentifier>{69185F10-D52C-87C1-9EAE-2A210A8283F2}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="spasm\src">

+      <UniqueIdentifier>{0D90CBE1-79FA-7F58-C238-31FE2EE25DAD}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\spasm\src\spasm.cpp">

+      <Filter>spasm\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/spasm/solution/sprun.make b/JSImpl/solution/sprun.make
index 39498b7..93d59fa 100644
--- a/spasm/solution/sprun.make
+++ b/JSImpl/solution/sprun.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = sprun.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/sprun
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x32/Debug/sprun
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/sprun
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -54,9 +54,9 @@ ifeq ($(config),debug32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libsprt.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libsprt.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
+  LIBDEPS            += ../build/bin/Debug/libsprt.a
+  LDDEPS             += ../build/bin/Debug/libsprt.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -64,7 +64,7 @@ ifeq ($(config),debug32)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/main.o \
+	$(OBJDIR)/spasm/src/main.o \
 
   define PREBUILDCMDS
   endef
@@ -75,8 +75,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/sprun
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x32/Release/sprun
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/sprun
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -86,9 +86,9 @@ ifeq ($(config),release32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libsprt.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libsprt.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
+  LIBDEPS            += ../build/bin/Release/libsprt.a
+  LDDEPS             += ../build/bin/Release/libsprt.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -96,7 +96,7 @@ ifeq ($(config),release32)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/main.o \
+	$(OBJDIR)/spasm/src/main.o \
 
   define PREBUILDCMDS
   endef
@@ -107,8 +107,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/sprun
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x64/Debug/sprun
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/sprun
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -118,9 +118,9 @@ ifeq ($(config),debug64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libsprt.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libsprt.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
+  LIBDEPS            += ../build/bin/Debug/libsprt.a
+  LDDEPS             += ../build/bin/Debug/libsprt.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -128,7 +128,7 @@ ifeq ($(config),debug64)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/main.o \
+	$(OBJDIR)/spasm/src/main.o \
 
   define PREBUILDCMDS
   endef
@@ -139,8 +139,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/sprun
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x64/Release/sprun
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/sprun
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -150,9 +150,9 @@ ifeq ($(config),release64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -Wall -Wextra -g -O3 -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libsprt.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libsprt.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
+  LIBDEPS            += ../build/bin/Release/libsprt.a
+  LDDEPS             += ../build/bin/Release/libsprt.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -160,7 +160,7 @@ ifeq ($(config),release64)
   LINKCMD             = $(CXX) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
   OBJRESP             =
   OBJECTS := \
-	$(OBJDIR)/src/main.o \
+	$(OBJDIR)/spasm/src/main.o \
 
   define PREBUILDCMDS
   endef
@@ -172,7 +172,7 @@ endif
 
 OBJDIRS := \
 	$(OBJDIR) \
-	$(OBJDIR)/src \
+	$(OBJDIR)/spasm/src \
 
 RESOURCES := \
 
@@ -232,7 +232,7 @@ $(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
 	$(SILENT) echo $^ > $@
 endif
 
-$(OBJDIR)/src/main.o: ../src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/src
+$(OBJDIR)/spasm/src/main.o: ../../spasm/src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/spasm/src
 	@echo $(notdir $<)
 	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
 
diff --git a/spasm/solution/sprun.vcxproj b/JSImpl/solution/sprun.vcxproj
index 15ab7f9..d4bfefc 100644
--- a/spasm/solution/sprun.vcxproj
+++ b/JSImpl/solution/sprun.vcxproj
@@ -31,7 +31,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,29 +71,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\sprun\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\sprun\</IntDir>

     <TargetName>sprun</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\sprun\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\sprun\</IntDir>

     <TargetName>sprun</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\sprun\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\sprun\</IntDir>

     <TargetName>sprun</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\sprun\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\sprun\</IntDir>

     <TargetName>sprun</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

@@ -231,7 +227,7 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\main.cpp">

+    <ClCompile Include="..\..\spasm\src\main.cpp">

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

diff --git a/JSImpl/solution/sprun.vcxproj.filters b/JSImpl/solution/sprun.vcxproj.filters
new file mode 100644
index 0000000..62f9194
--- /dev/null
+++ b/JSImpl/solution/sprun.vcxproj.filters
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="spasm">

+      <UniqueIdentifier>{69185F10-D52C-87C1-9EAE-2A210A8283F2}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="spasm\src">

+      <UniqueIdentifier>{0D90CBE1-79FA-7F58-C238-31FE2EE25DAD}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\spasm\src\main.cpp">

+      <Filter>spasm\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/JSImpl/solution/test_bench.make b/JSImpl/solution/test_bench.make
new file mode 100644
index 0000000..460d693
--- /dev/null
+++ b/JSImpl/solution/test_bench.make
@@ -0,0 +1,256 @@
+# GNU Make project makefile autogenerated by GENie
+ifndef config
+  config=debug32
+endif
+
+ifndef verbose
+  SILENT = @
+endif
+
+SHELLTYPE := msdos
+ifeq (,$(ComSpec)$(COMSPEC))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(SHELL)))
+  SHELLTYPE := posix
+endif
+ifeq (/bin,$(findstring /bin,$(MAKESHELL)))
+  SHELLTYPE := posix
+endif
+
+ifeq (posix,$(SHELLTYPE))
+  MKDIR = $(SILENT) mkdir -p "$(1)"
+  COPY  = $(SILENT) cp -fR "$(1)" "$(2)"
+  RM    = $(SILENT) rm -f "$(1)"
+else
+  MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0
+  COPY  = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
+  RM    = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
+endif
+
+CC  = gcc
+CXX = g++
+AR  = ar
+
+ifndef RESCOMP
+  ifdef WINDRES
+    RESCOMP = $(WINDRES)
+  else
+    RESCOMP = windres
+  endif
+endif
+
+MAKEFILE = test_bench.make
+
+ifeq ($(config),debug32)
+  OBJDIR              = ../build/obj/Debug/x32/Debug/test_bench
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/libtest_bench.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -m32
+  LIBDEPS            +=
+  LDDEPS             +=
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/main.o \
+	$(OBJDIR)/gctest/src/minitrace.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release32)
+  OBJDIR              = ../build/obj/Release/x32/Release/test_bench
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/libtest_bench.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -m32
+  LIBDEPS            +=
+  LDDEPS             +=
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/main.o \
+	$(OBJDIR)/gctest/src/minitrace.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),debug64)
+  OBJDIR              = ../build/obj/Debug/x64/Debug/test_bench
+  TARGETDIR           = ../build/bin/Debug
+  TARGET              = $(TARGETDIR)/libtest_bench.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -m64
+  LIBDEPS            +=
+  LDDEPS             +=
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/main.o \
+	$(OBJDIR)/gctest/src/minitrace.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+ifeq ($(config),release64)
+  OBJDIR              = ../build/obj/Release/x64/Release/test_bench
+  TARGETDIR           = ../build/bin/Release
+  TARGET              = $(TARGETDIR)/libtest_bench.a
+  DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
+  ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
+  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
+  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
+  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
+  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
+  ALL_LDFLAGS        += $(LDFLAGS) -m64
+  LIBDEPS            +=
+  LDDEPS             +=
+  LDRESP              =
+  LIBS               += $(LDDEPS)
+  EXTERNAL_LIBS      +=
+  LINKOBJS            = $(OBJECTS)
+  LINKCMD             = $(AR)  -rcs $(TARGET)
+  OBJRESP             =
+  OBJECTS := \
+	$(OBJDIR)/gctest/src/main.o \
+	$(OBJDIR)/gctest/src/minitrace.o \
+
+  define PREBUILDCMDS
+  endef
+  define PRELINKCMDS
+  endef
+  define POSTBUILDCMDS
+  endef
+endif
+
+OBJDIRS := \
+	$(OBJDIR) \
+	$(OBJDIR)/gctest/src \
+
+RESOURCES := \
+
+.PHONY: clean prebuild prelink
+
+all: $(OBJDIRS) $(TARGETDIR) prebuild prelink $(TARGET)
+	@:
+
+$(TARGET): $(GCH) $(OBJECTS) $(LIBDEPS) $(EXTERNAL_LIBS) $(RESOURCES) $(OBJRESP) $(LDRESP) | $(TARGETDIR) $(OBJDIRS)
+	@echo Archiving test_bench
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) rm -f  $(TARGET)
+else
+	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
+endif
+	$(SILENT) $(LINKCMD) $(LINKOBJS)
+	$(POSTBUILDCMDS)
+
+$(TARGETDIR):
+	@echo Creating $(TARGETDIR)
+	-$(call MKDIR,$(TARGETDIR))
+
+$(OBJDIRS):
+	@echo Creating $(@)
+	-$(call MKDIR,$@)
+
+clean:
+	@echo Cleaning test_bench
+ifeq (posix,$(SHELLTYPE))
+	$(SILENT) rm -f  $(TARGET)
+	$(SILENT) rm -rf $(OBJDIR)
+else
+	$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
+	$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
+endif
+
+prebuild:
+	$(PREBUILDCMDS)
+
+prelink:
+	$(PRELINKCMDS)
+
+ifneq (,$(PCH))
+$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) -x c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+
+$(GCH_OBJC): $(PCH) $(MAKEFILE) | $(OBJDIR)
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header $(DEFINES) $(INCLUDES) -o "$@" -c "$<"
+endif
+
+ifneq (,$(OBJRESP))
+$(OBJRESP): $(OBJECTS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+ifneq (,$(LDRESP))
+$(LDRESP): $(LDDEPS) | $(TARGETDIR) $(OBJDIRS)
+	$(SILENT) echo $^
+	$(SILENT) echo $^ > $@
+endif
+
+$(OBJDIR)/gctest/src/main.o: ../../gctest/src/main.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+$(OBJDIR)/gctest/src/minitrace.o: ../../gctest/src/minitrace.cpp $(GCH) $(MAKEFILE) | $(OBJDIR)/gctest/src
+	@echo $(notdir $<)
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -c "$<"
+
+-include $(OBJECTS:%.o=%.d)
+ifneq (,$(PCH))
+  -include $(OBJDIR)/$(notdir $(PCH)).d
+  -include $(OBJDIR)/$(notdir $(PCH))_objc.d
+endif
diff --git a/JSImpl/solution/test_bench.vcxproj b/JSImpl/solution/test_bench.vcxproj
new file mode 100644
index 0000000..88ac6fa
--- /dev/null
+++ b/JSImpl/solution/test_bench.vcxproj
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{A41847E7-90D0-8834-F9D7-6190E5AE2325}</ProjectGuid>

+    <RootNamespace>test_bench</RootNamespace>

+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <VCProjectVersion>16.0</VCProjectVersion>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v142</PlatformToolset>

+    <DebugSymbols>true</DebugSymbols>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\test_bench\</IntDir>

+    <TargetName>test_bench</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\test_bench\</IntDir>

+    <TargetName>test_bench</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\test_bench\</IntDir>

+    <TargetName>test_bench</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\test_bench\</IntDir>

+    <TargetName>test_bench</TargetName>

+    <TargetExt>.lib</TargetExt>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)test_bench.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)test_bench.lib</OutputFile>

+    <TargetMachine>MachineX86</TargetMachine>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)test_bench.pdb</ProgramDatabaseFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)test_bench.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)test_bench.lib</OutputFile>

+    <TargetMachine>MachineX64</TargetMachine>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)test_bench.pdb</ProgramDatabaseFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>MaxSpeed</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)test_bench.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)test_bench.lib</OutputFile>

+    <TargetMachine>MachineX86</TargetMachine>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)test_bench.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <AdditionalOptions>  %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>MaxSpeed</Optimization>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>false</MinimalRebuild>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <PrecompiledHeader></PrecompiledHeader>

+      <WarningLevel>Level3</WarningLevel>

+      <TreatWarningAsError>true</TreatWarningAsError>

+      <LanguageStandard>stdcpp17</LanguageStandard>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <ProgramDataBaseFileName>$(OutDir)test_bench.pdb</ProgramDataBaseFileName>

+      <DiagnosticsFormat>Caret</DiagnosticsFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;MTR_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ResourceCompile>

+  <Lib>

+    <OutputFile>$(OutDir)test_bench.lib</OutputFile>

+    <TargetMachine>MachineX64</TargetMachine>

+  </Lib>

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>$(OutDir)test_bench.pdb</ProgramDatabaseFile>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\gctest\src\main.cpp">

+    </ClCompile>

+    <ClCompile Include="..\..\gctest\src\minitrace.cpp">

+    </ClCompile>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>

diff --git a/JSImpl/solution/test_bench.vcxproj.filters b/JSImpl/solution/test_bench.vcxproj.filters
new file mode 100644
index 0000000..c1f7270
--- /dev/null
+++ b/JSImpl/solution/test_bench.vcxproj.filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="gctest">

+      <UniqueIdentifier>{4F3063FF-3BD2-8DD5-248D-A12910CE1426}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="gctest\src">

+      <UniqueIdentifier>{F32A4563-DFE2-86B0-48EA-5F0C34C121A1}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\gctest\src\main.cpp">

+      <Filter>gctest\src</Filter>

+    </ClCompile>

+    <ClCompile Include="..\..\gctest\src\minitrace.cpp">

+      <Filter>gctest\src</Filter>

+    </ClCompile>

+  </ItemGroup>

+</Project>

diff --git a/JSImpl/test/Test.vcxproj.filters b/JSImpl/test/Test.vcxproj.filters
deleted file mode 100644
index 50fcfb0..0000000
--- a/JSImpl/test/Test.vcxproj.filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <ClCompile Include="ASTInterpreterTests.cpp" />

-    <ClCompile Include="LexerTests.cpp" />

-    <ClCompile Include="CodeGenerationTests.cpp" />

-    <ClCompile Include="ParserTests.cpp" />

-    <ClCompile Include="sprtTests.cpp" />

-    <ClCompile Include="empty.cpp" />

-  </ItemGroup>

-</Project>

diff --git a/JSImpl/test/genie.lua b/JSImpl/test/genie.lua
index c3cd1d6..26b180f 100644
--- a/JSImpl/test/genie.lua
+++ b/JSImpl/test/genie.lua
@@ -2,6 +2,7 @@ project 'Test'
     kind 'ConsoleApp'
     language 'C++'
     uuid(os.uuid('Test'))
+    location(solution().location)
 
     files '*.cpp'
 
@@ -29,6 +30,7 @@ group 'gtest'
         kind 'StaticLib'
         language 'C++'
         uuid(os.uuid('gtest'))
+        location(solution().location)
         files 'googletest/googletest/src/gtest-all.cc'
         files 'googletest/googletest/include/gtest/*.h'
         includedirs {
@@ -40,6 +42,7 @@ group 'gtest'
         kind 'StaticLib'
         language 'C++'
         uuid(os.uuid('gmock'))
+        location(solution().location)
         files 'googletest/googlemock/src/gmock-all.cc'
         files 'googletest/googlemock/include/gmock/*.h'
         includedirs {
@@ -52,6 +55,7 @@ group 'gtest'
         kind 'StaticLib'
         language 'C++'
         uuid(os.uuid('gtest_main'))
+        location(solution().location)
         files 'googletest/googletest/src/gtest_main.cc'
         includedirs {
             'googletest/googletest',
diff --git a/JSImpl/test/gmock.vcxproj.filters b/JSImpl/test/gmock.vcxproj.filters
deleted file mode 100644
index cbfa3cf..0000000
--- a/JSImpl/test/gmock.vcxproj.filters
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="googletest">

-      <UniqueIdentifier>{E2296FC4-CEE1-B011-37E9-896D23C04B02}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googlemock">

-      <UniqueIdentifier>{65B8EA6D-D124-A668-9A18-3EC60644C8D0}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googlemock\src">

-      <UniqueIdentifier>{09CEDE5B-7590-12E6-BE40-A1722A42EBC3}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googlemock\include">

-      <UniqueIdentifier>{65E05AA0-D1F8-41CA-9AA5-D163067DD663}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googlemock\include\gmock">

-      <UniqueIdentifier>{92F8DC2D-FEB1-47D8-8711-62B2F3C9FD47}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-matchers.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-nice-strict.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-cardinalities.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-matchers.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-actions.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-matchers.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-more-actions.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-spec-builders.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-generated-function-mockers.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googlemock\include\gmock\gmock-actions.h">

-      <Filter>googletest\googlemock\include\gmock</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="googletest\googlemock\src\gmock-all.cc">

-      <Filter>googletest\googlemock\src</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/JSImpl/test/gtest.vcxproj.filters b/JSImpl/test/gtest.vcxproj.filters
deleted file mode 100644
index 5f8e24b..0000000
--- a/JSImpl/test/gtest.vcxproj.filters
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="googletest">

-      <UniqueIdentifier>{E2296FC4-CEE1-B011-37E9-896D23C04B02}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googletest">

-      <UniqueIdentifier>{9B66EE6D-07D3-A968-D0C6-41C63CF2CBD0}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googletest\src">

-      <UniqueIdentifier>{3FA7DAF5-AB69-0E80-F419-9D0C601BE75D}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googletest\include">

-      <UniqueIdentifier>{9B646C1A-077D-5344-D029-E3DD3C01E8DD}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googletest\include\gtest">

-      <UniqueIdentifier>{7EFBCD74-EAB4-381F-7314-53F9DFCCEE8E}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-message.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-param-test.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-typed-test.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_pred_impl.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-spi.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-death-test.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-printers.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest-test-part.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-    <ClInclude Include="googletest\googletest\include\gtest\gtest_prod.h">

-      <Filter>googletest\googletest\include\gtest</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="googletest\googletest\src\gtest-all.cc">

-      <Filter>googletest\googletest\src</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/JSImpl/test/gtest_main.vcxproj.filters b/JSImpl/test/gtest_main.vcxproj.filters
deleted file mode 100644
index 55a8bc8..0000000
--- a/JSImpl/test/gtest_main.vcxproj.filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="googletest">

-      <UniqueIdentifier>{E2296FC4-CEE1-B011-37E9-896D23C04B02}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googletest">

-      <UniqueIdentifier>{9B66EE6D-07D3-A968-D0C6-41C63CF2CBD0}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="googletest\googletest\src">

-      <UniqueIdentifier>{3FA7DAF5-AB69-0E80-F419-9D0C601BE75D}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="googletest\googletest\src\gtest_main.cc">

-      <Filter>googletest\googletest\src</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/gctest/solution/dummy_gc.make b/gctest/solution/dummy_gc.make
index 7b308c8..f50e834 100644
--- a/gctest/solution/dummy_gc.make
+++ b/gctest/solution/dummy_gc.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = dummy_gc.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/dummy_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x32/Debug/dummy_gc
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -54,9 +54,9 @@ ifeq ($(config),debug32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -75,8 +75,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/dummy_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x32/Release/dummy_gc
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -86,9 +86,9 @@ ifeq ($(config),release32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -107,8 +107,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/dummy_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x64/Debug/dummy_gc
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -118,9 +118,9 @@ ifeq ($(config),debug64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -139,8 +139,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/dummy_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x64/Release/dummy_gc
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/dummy_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -150,9 +150,9 @@ ifeq ($(config),release64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
diff --git a/gctest/solution/dummy_gc.vcxproj b/gctest/solution/dummy_gc.vcxproj
index f10ece1..aeb0afa 100644
--- a/gctest/solution/dummy_gc.vcxproj
+++ b/gctest/solution/dummy_gc.vcxproj
@@ -31,7 +31,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,29 +71,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\dummy_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\dummy_gc\</IntDir>

     <TargetName>dummy_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

diff --git a/gctest/solution/genie.lua b/gctest/solution/genie.lua
index 8a1473a..394417a 100644
--- a/gctest/solution/genie.lua
+++ b/gctest/solution/genie.lua
@@ -19,6 +19,12 @@ if not solution() then
 

     local root = '../build/'

 

+    if _ACTION ~= 'ninja' then

+        location '.'

+    else

+        location './ninja'

+    end

+

     configuration 'Debug'

         targetdir(root .. 'bin/Debug')

         objdir(root .. 'obj/Debug')

@@ -44,6 +50,7 @@ function setup()
     configuration 'gcc'

         removeflags 'ExtraWarnings'

     configuration '*'

+    location(solution().location)

 end

 

     project 'test_bench'

diff --git a/gctest/solution/leak_gc.make b/gctest/solution/leak_gc.make
index 4414edf..87e7c7f 100644
--- a/gctest/solution/leak_gc.make
+++ b/gctest/solution/leak_gc.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = leak_gc.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/leak_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x32/Debug/leak_gc
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -54,9 +54,9 @@ ifeq ($(config),debug32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m32
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -75,8 +75,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/leak_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x32/Release/leak_gc
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -86,9 +86,9 @@ ifeq ($(config),release32)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m32 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m32
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m32
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -107,8 +107,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/leak_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x64/Debug/leak_gc
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -118,9 +118,9 @@ ifeq ($(config),debug64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Debug" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Debug/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Debug/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Debug" -m64
+  LIBDEPS            += ../build/bin/Debug/libtest_bench.a
+  LDDEPS             += ../build/bin/Debug/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
@@ -139,8 +139,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/leak_gc
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x64/Release/leak_gc
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/leak_gc
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -150,9 +150,9 @@ ifeq ($(config),release64)
   ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64
   ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Werror -g -O3 -m64 -std=c++17
   ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)
-  ALL_LDFLAGS        += $(LDFLAGS) -L"../../JSImpl/build/bin/Release" -m64
-  LIBDEPS            += ../../JSImpl/build/bin/Release/libtest_bench.a
-  LDDEPS             += ../../JSImpl/build/bin/Release/libtest_bench.a
+  ALL_LDFLAGS        += $(LDFLAGS) -L"../build/bin/Release" -m64
+  LIBDEPS            += ../build/bin/Release/libtest_bench.a
+  LDDEPS             += ../build/bin/Release/libtest_bench.a
   LDRESP              =
   LIBS               += $(LDDEPS)
   EXTERNAL_LIBS      +=
diff --git a/gctest/solution/leak_gc.vcxproj b/gctest/solution/leak_gc.vcxproj
index eeba8db..f3e49a6 100644
--- a/gctest/solution/leak_gc.vcxproj
+++ b/gctest/solution/leak_gc.vcxproj
@@ -31,7 +31,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,29 +71,29 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\leak_gc\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\leak_gc\</IntDir>

     <TargetName>leak_gc</TargetName>

     <TargetExt>.exe</TargetExt>

     <LinkIncremental>false</LinkIncremental>

diff --git a/gctest/solution/test_bench.make b/gctest/solution/test_bench.make
index f58b981..f9a3344 100644
--- a/gctest/solution/test_bench.make
+++ b/gctest/solution/test_bench.make
@@ -43,8 +43,8 @@ endif
 MAKEFILE = test_bench.make
 
 ifeq ($(config),debug32)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x32/Debug/test_bench
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x32/Debug/test_bench
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -76,8 +76,8 @@ ifeq ($(config),debug32)
 endif
 
 ifeq ($(config),release32)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x32/Release/test_bench
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x32/Release/test_bench
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -109,8 +109,8 @@ ifeq ($(config),release32)
 endif
 
 ifeq ($(config),debug64)
-  OBJDIR              = ../../JSImpl/build/obj/Debug/x64/Debug/test_bench
-  TARGETDIR           = ../../JSImpl/build/bin/Debug
+  OBJDIR              = ../build/obj/Debug/x64/Debug/test_bench
+  TARGETDIR           = ../build/bin/Debug
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
@@ -142,8 +142,8 @@ ifeq ($(config),debug64)
 endif
 
 ifeq ($(config),release64)
-  OBJDIR              = ../../JSImpl/build/obj/Release/x64/Release/test_bench
-  TARGETDIR           = ../../JSImpl/build/bin/Release
+  OBJDIR              = ../build/obj/Release/x64/Release/test_bench
+  TARGETDIR           = ../build/bin/Release
   TARGET              = $(TARGETDIR)/libtest_bench.a
   DEFINES            += -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DMTR_ENABLED
   ALL_CPPFLAGS       += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
diff --git a/gctest/solution/test_bench.vcxproj b/gctest/solution/test_bench.vcxproj
index 5625175..b25e5ff 100644
--- a/gctest/solution/test_bench.vcxproj
+++ b/gctest/solution/test_bench.vcxproj
@@ -31,7 +31,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

@@ -39,7 +38,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

@@ -47,7 +45,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

@@ -55,7 +52,6 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <PlatformToolset>v142</PlatformToolset>

-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>

     <DebugSymbols>true</DebugSymbols>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -75,26 +71,26 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x32\Debug\test_bench\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x32\Debug\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Debug\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Debug\x64\Debug\test_bench\</IntDir>

+    <OutDir>..\build\bin\Debug\</OutDir>

+    <IntDir>..\build\obj\Debug\x64\Debug\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x32\Release\test_bench\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x32\Release\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>..\..\JSImpl\build\bin\Release\</OutDir>

-    <IntDir>..\..\JSImpl\build\obj\Release\x64\Release\test_bench\</IntDir>

+    <OutDir>..\build\bin\Release\</OutDir>

+    <IntDir>..\build\obj\Release\x64\Release\test_bench\</IntDir>

     <TargetName>test_bench</TargetName>

     <TargetExt>.lib</TargetExt>

   </PropertyGroup>

diff --git a/gctest/src/minitrace/msvc/minitrace.vcxproj b/gctest/src/minitrace/msvc/minitrace.vcxproj
deleted file mode 100644
index 362922f..0000000
--- a/gctest/src/minitrace/msvc/minitrace.vcxproj
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5554FDA1-8300-4DD4-AF89-0084AD76CD82}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>minitrace</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>MTR_ENABLED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\minitrace.c" />
-    <ClCompile Include="..\minitrace_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\minitrace.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/gctest/src/minitrace/msvc/minitrace.vcxproj.filters b/gctest/src/minitrace/msvc/minitrace.vcxproj.filters
deleted file mode 100644
index daffed3..0000000
--- a/gctest/src/minitrace/msvc/minitrace.vcxproj.filters
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\minitrace.c" />
-    <ClCompile Include="..\minitrace_test.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\minitrace.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/spasm/solution/genie.lua b/spasm/solution/genie.lua
index d1fb495..5ba467c 100644
--- a/spasm/solution/genie.lua
+++ b/spasm/solution/genie.lua
@@ -15,6 +15,12 @@ if not solution() then
 
     local root = '../build/'
 
+    if _ACTION ~= 'ninja' then
+        location '.'
+    else
+        location './ninja'
+    end
+
     configuration 'Debug'
         targetdir(root .. 'bin/Debug')
         objdir(root .. 'obj/Debug')
@@ -38,6 +44,7 @@ end
         kind 'StaticLib'
         language 'C++'
         uuid(os.uuid('spasm_lib'))
+        location(solution().location)
         files '../src/asm/*.cpp'
         removefiles {
             '../src/asm/main.cpp',
@@ -50,6 +57,7 @@ end
         kind 'ConsoleApp'
         language 'C++'
         uuid(os.uuid('spasm'))
+        location(solution().location)
 		links 'spasm_lib'
         files '../src/asm/main.cpp'
         removefiles {
@@ -62,6 +70,7 @@ end
         kind 'ConsoleApp'
         language 'C++'
         uuid(os.uuid('sprun'))
+        location(solution().location)
         files '../src/main.cpp'
         links 'sprt'
 
diff --git a/spasm/solution/spasm.vcxproj.filters b/spasm/solution/spasm.vcxproj.filters
deleted file mode 100644
index d75f1a8..0000000
--- a/spasm/solution/spasm.vcxproj.filters
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="src">

-      <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="src\asm">

-      <UniqueIdentifier>{6A9848A9-D677-C744-DF8F-521B4BEE2DA6}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\src\asm\main.cpp">

-      <Filter>src\asm</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/spasm/solution/spasm.vcxproj.user b/spasm/solution/spasm.vcxproj.user
deleted file mode 100644
index f927c73..0000000
--- a/spasm/solution/spasm.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-</Project>

diff --git a/spasm/solution/spasm_lib.vcxproj.filters b/spasm/solution/spasm_lib.vcxproj.filters
deleted file mode 100644
index 82b5f56..0000000
--- a/spasm/solution/spasm_lib.vcxproj.filters
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="src">

-      <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="src\asm">

-      <UniqueIdentifier>{6A9848A9-D677-C744-DF8F-521B4BEE2DA6}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\src\asm\assembler.cpp">

-      <Filter>src\asm</Filter>

-    </ClCompile>

-    <ClCompile Include="..\src\asm\bytecode.cpp">

-      <Filter>src\asm</Filter>

-    </ClCompile>

-    <ClCompile Include="..\src\asm\lexer.cpp">

-      <Filter>src\asm</Filter>

-    </ClCompile>

-    <ClCompile Include="..\src\asm\symbol.cpp">

-      <Filter>src\asm</Filter>

-    </ClCompile>

-    <ClCompile Include="..\src\asm\token.cpp">

-      <Filter>src\asm</Filter>

-    </ClCompile>

-    <ClCompile Include="..\src\asm\tokenizer.cpp">

-      <Filter>src\asm</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/spasm/solution/sprt.vcxproj.filters b/spasm/solution/sprt.vcxproj.filters
deleted file mode 100644
index 51bfc92..0000000
--- a/spasm/solution/sprt.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="src">

-      <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\src\spasm.cpp">

-      <Filter>src</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/spasm/solution/sprt.vcxproj.user b/spasm/solution/sprt.vcxproj.user
deleted file mode 100644
index f927c73..0000000
--- a/spasm/solution/sprt.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-</Project>

diff --git a/spasm/solution/sprun.vcxproj.filters b/spasm/solution/sprun.vcxproj.filters
deleted file mode 100644
index a140a04..0000000
--- a/spasm/solution/sprun.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="src">

-      <UniqueIdentifier>{2DAB880B-99B4-887C-2230-9F7C8E38947C}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\src\main.cpp">

-      <Filter>src</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/spasm/solution/sprun.vcxproj.user b/spasm/solution/sprun.vcxproj.user
deleted file mode 100644
index f927c73..0000000
--- a/spasm/solution/sprun.vcxproj.user
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

-    <LocalDebuggerCommandArguments></LocalDebuggerCommandArguments>

-  </PropertyGroup>

-</Project>